the heinous sludge has consumed my brain

changelog

@@ -1,21 +1,6 @@
-## Added
-* Phosphor vines
-  * Will be used for an upcoming dungeon, don't worry about it
-
 ## Changed
-* Raw bedrock ore taken out of the creative tab now has the stats of the position the player is in, instead of being worthless
-* U233's color coded isotope indicator is now yellow instead of orange, making yellow standard code for "secondary fissile isotope" and orange for "radioisotope"
-* NITAN powders can now be found in the creative tab
-* Coltass' description no longer calls the player a dipshit
+* The bedrock ore processor now has an NEI handler
 
 ## Fixed
-* Fixed raw bedrock ore tooltip not showing the density's color correctly
-* Fixed T45 helmet not protecting against carbon monoxide
-* Fixed general issues regarding the rotary furnace
-* Fixed corrupted broadcaster noise having infinite range
-* Fixed packet issues for explosive charges and custom machines
-* Fixed one of the rotary furnace's visual connections now properly showing up
-* Fixed dupe regarding items on a conveyor belt
-* Potentially fixed chunkloading drones for real this time(tm)
-  * No, I did not test it
-* Fixed missing localization for keybinds
+* Fixed incorrect tooltip in the automatic control rod's GUI
+* Fixed recipe autogen creating recipes for nonexistant thorium bedrock ore

src/main/java/com/hbm/handler/nei/NEIUniversalHandler.java

@@ -242,19 +242,19 @@ public abstract class NEIUniversalHandler extends TemplateRecipeHandler implemen
 		case 6: return new int[][] {
 			{102, 6}, {120, 6},
 			{102, 24}, {120, 24},
-			{102, 32}, {120, 32},
+			{102, 42}, {120, 42},
 		};
 		case 7: return new int[][] {
 			{102, 6}, {120, 6},
 			{102, 24}, {120, 24},
-			{102, 32}, {120, 32},
+			{102, 42}, {120, 42},
 			{138, 24},
 		};
 		case 8: return new int[][] {
 			{102, 6}, {120, 6},
 			{102, 24}, {120, 24},
-			{102, 32}, {120, 32},
-			{138, 24}, {138, 32},
+			{102, 42}, {120, 42},
+			{138, 24}, {138, 42},
 		};
 		}
 		

src/main/java/com/hbm/handler/nei/OreSlopperHandler.java

@@ -0,0 +1,37 @@
+package com.hbm.handler.nei;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import com.hbm.blocks.ModBlocks;
+import com.hbm.inventory.fluid.Fluids;
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.ItemFluidIcon;
+import com.hbm.items.special.ItemBedrockOreNew;
+import com.hbm.items.special.ItemBedrockOreNew.BedrockOreGrade;
+import com.hbm.items.special.ItemBedrockOreNew.BedrockOreType;
+
+import net.minecraft.item.ItemStack;
+
+public class OreSlopperHandler extends NEIUniversalHandler {
+
+	public OreSlopperHandler() {
+		super(ModBlocks.machine_ore_slopper.getLocalizedName(), ModBlocks.machine_ore_slopper, getRecipes());
+	}
+
+	@Override
+	public String getKey() {
+		return "ntmOreSlopper";
+	}
+	
+	public static HashMap getRecipes() {
+		HashMap<Object, Object> recipes = new HashMap<Object, Object>();
+		List<ItemStack> outputs = new ArrayList();
+		for(BedrockOreType type : BedrockOreType.values()) outputs.add(ItemBedrockOreNew.make(BedrockOreGrade.BASE, type));
+		outputs.add(ItemFluidIcon.make(Fluids.SLOP, 1000));
+		recipes.put(new ItemStack[] {ItemFluidIcon.make(Fluids.WATER, 1000), new ItemStack(ModItems.bedrock_ore_base)}, outputs.toArray(new ItemStack[0]));
+		
+		return recipes;
+	}
+}

src/main/java/com/hbm/inventory/material/MaterialShapes.java

@@ -10,6 +10,7 @@ public class MaterialShapes {
 	public static final List<MaterialShapes> allShapes = new ArrayList();
 	
 	public static final MaterialShapes ANY = new MaterialShapes(0).noAutogen();
+	public static final MaterialShapes ONLY_ORE = new MaterialShapes(0, "ore").noAutogen();
 	public static final MaterialShapes ORE = new MaterialShapes(0, "ore", "oreNether").noAutogen();
 	public static final MaterialShapes ORENETHER = new MaterialShapes(0, "oreNether").noAutogen();
 	

src/main/java/com/hbm/inventory/material/Mats.java

@@ -98,7 +98,7 @@ public class Mats {
 	public static final NTMMaterial MAT_GHIORSIUM	= makeSmeltable(12836,		GH336,		0xF4EFE1, 0x2A3306, 0xC6C6A1).setAutogen(NUGGET, BILLET, BLOCK).m();
 
 	//Base metals
-	public static final NTMMaterial MAT_TITANIUM		= makeSmeltable(2200,		TI,				0xF7F3F2, 0x4F4C4B, 0xA99E79).setAutogen(FRAGMENT, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, BLOCK, HEAVY_COMPONENT).m();
+	public static final NTMMaterial MAT_TITANIUM		= makeSmeltable(2200,		TI,				0xF7F3F2, 0x4F4C4B, 0xA99E79).setAutogen(FRAGMENT, DUST, PLATE, DENSEWIRE, CASTPLATE, WELDEDPLATE, SHELL, BLOCK, HEAVY_COMPONENT).m();
 	public static final NTMMaterial MAT_COPPER			= makeSmeltable(2900,		CU,				0xFDCA88, 0x601E0D, 0xC18336).setAutogen(FRAGMENT, WIRE, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, PIPE, BLOCK, HEAVY_COMPONENT).m();
 	public static final NTMMaterial MAT_TUNGSTEN		= makeSmeltable(7400,		W,				0x868686, 0x000000, 0x977474).setAutogen(FRAGMENT, WIRE, BOLT, DUST, DENSEWIRE, CASTPLATE, WELDEDPLATE, BLOCK, HEAVY_COMPONENT).m();
 	public static final NTMMaterial MAT_ALUMINIUM		= makeSmeltable(1300,		AL,				0xFFFFFF, 0x344550, 0xD0B8EB).setAutogen(FRAGMENT, WIRE, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, PIPE, BLOCK, HEAVY_COMPONENT).m();
@@ -107,7 +107,7 @@ public class Mats {
 	public static final NTMMaterial MAT_ARSENIC			= makeSmeltable(3300,		AS,				0x6CBABA, 0x242525, 0x558080).setAutogen(NUGGET).m();
 	public static final NTMMaterial MAT_TANTALIUM		= makeSmeltable(7300,		TA,				0xFFFFFF, 0x1D1D36, 0xA89B74).setAutogen(NUGGET, DUST, BLOCK).m();
 	public static final NTMMaterial MAT_NEODYMIUM		= makeSmeltable(6000,		ND,				0xE6E6B6, 0x1C1C00, 0x8F8F5F).setAutogen(FRAGMENT, NUGGET, DUSTTINY, INGOT, DUST, DENSEWIRE, BLOCK).m();
-	public static final NTMMaterial MAT_NIOBIUM			= makeSmeltable(4100,		NB,				0xB76EC9, 0x2F2D42, 0xD576B1).setAutogen(FRAGMENT, NUGGET, DUSTTINY, DUST, BLOCK).m();
+	public static final NTMMaterial MAT_NIOBIUM			= makeSmeltable(4100,		NB,				0xB76EC9, 0x2F2D42, 0xD576B1).setAutogen(FRAGMENT, NUGGET, DUSTTINY, DUST, DENSEWIRE, BLOCK).m();
 	public static final NTMMaterial MAT_BERYLLIUM		= makeSmeltable(400,		BE,				0xB2B2A6, 0x0F0F03, 0xAE9572).setAutogen(FRAGMENT, NUGGET, DUST, BLOCK).m();
 	public static final NTMMaterial MAT_EMERALD			= makeNonSmeltable(401,		EMERALD,		0xBAFFD4, 0x003900, 0x17DD62).setConversion(MAT_BERYLLIUM, 4, 3).setAutogen(FRAGMENT, DUST, GEM, BLOCK).n();
 	public static final NTMMaterial MAT_COBALT			= makeSmeltable(2700,		CO,				0xC2D1EE, 0x353554, 0x8F72AE).setAutogen(FRAGMENT, NUGGET, DUSTTINY, BILLET, DUST, BLOCK).m();

src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java

@@ -65,7 +65,7 @@ public class CrystallizerRecipes extends SerializableRecipe {
 		registerRecipe(LAPIS.ore(),		new CrystallizerRecipe(ModItems.crystal_lapis, baseTime));
 		registerRecipe(DIAMOND.ore(),	new CrystallizerRecipe(ModItems.crystal_diamond, baseTime));
 		registerRecipe(U.ore(),			new CrystallizerRecipe(ModItems.crystal_uranium, baseTime), sulfur);
-		for(String ore : OreDictManager.TH232.all(MaterialShapes.ORE)) registerRecipe(ore,	new CrystallizerRecipe(ModItems.crystal_thorium, baseTime), sulfur);
+		for(String ore : OreDictManager.TH232.all(MaterialShapes.ONLY_ORE)) registerRecipe(ore,	new CrystallizerRecipe(ModItems.crystal_thorium, baseTime), sulfur);
 		registerRecipe(PU.ore(),		new CrystallizerRecipe(ModItems.crystal_plutonium, baseTime), sulfur);
 		registerRecipe(TI.ore(),		new CrystallizerRecipe(ModItems.crystal_titanium, baseTime), sulfur);
 		registerRecipe(S.ore(),			new CrystallizerRecipe(ModItems.crystal_sulfur, baseTime));

src/main/java/com/hbm/main/NEIRegistry.java

@@ -32,6 +32,7 @@ public class NEIRegistry {
 		handlers.add(new ReformingHandler());
 		handlers.add(new HydrotreatingHandler());
 		handlers.add(new ChemplantRecipeHandler());
+		handlers.add(new OreSlopperHandler()); //before acidizing
 		handlers.add(new CrystallizerRecipeHandler());
 		handlers.add(new BookRecipeHandler());
 		handlers.add(new FusionRecipeHandler());

src/main/java/com/hbm/util/InventoryUtil.java

@@ -2,6 +2,7 @@ package com.hbm.util;
 
 import com.hbm.inventory.RecipesCommon.AStack;
 import com.hbm.inventory.recipes.anvil.AnvilRecipes.AnvilOutput;
+import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityFurnaceBrick;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
@@ -428,6 +429,7 @@ public class InventoryUtil {
 			return stacks;
 		}
 
+		MainRegistry.logger.warn("InventoryUtil: extractObject failed for type " + o);
 		return new ItemStack[0][0];
 	}