Merge branch 'aaargh' of https://github.com/70000hp/Hbm-s-Nuclear-Tech-GIT into aaargh

src/main/java/com/hbm/handler/imc/ICompatNHNEI.java

@@ -0,0 +1,14 @@
+package com.hbm.handler.imc;
+
+import net.minecraft.item.ItemStack;
+
+import java.util.ArrayList;
+
+public interface ICompatNHNEI {
+    /**First item on the list is the icon for the recipe in the NEI GUI, the rest are displayed on the sidebar
+     * as other items that can be used for the same purpose**/
+    ItemStack[] getMachinesForRecipe();
+
+    String getRecipeID();
+
+}

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

@@ -7,6 +7,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.gui.GUIDiFurnace;
 import com.hbm.inventory.recipes.BlastFurnaceRecipes;
 import com.hbm.inventory.recipes.MachineRecipes;
@@ -17,10 +19,22 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class AlloyFurnaceRecipeHandler extends TemplateRecipeHandler {
+public class AlloyFurnaceRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
 
 	public static ArrayList<Fuel> fuels;
 
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_difurnace_off),
+				new ItemStack(ModBlocks.machine_difurnace_rtg_off)};
+	}
+
+	@Override
+	public String getRecipeID() {
+		return "alloysmelting";
+	}
+
 	public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe {
 		PositionedStack input1;
 		PositionedStack input2;

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

@@ -7,7 +7,9 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
+import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.machine.NTMAnvil;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.RecipesCommon.AStack;
 import com.hbm.inventory.gui.GUIAnvil;
 import com.hbm.inventory.recipes.anvil.AnvilRecipes;
@@ -24,7 +26,29 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-public class AnvilRecipeHandler extends TemplateRecipeHandler {
+public class AnvilRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
+
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.anvil_iron),
+				new ItemStack(ModBlocks.anvil_lead),
+				new ItemStack(ModBlocks.anvil_steel),
+				new ItemStack(ModBlocks.anvil_desh),
+				new ItemStack(ModBlocks.anvil_saturnite),
+				new ItemStack(ModBlocks.anvil_ferrouranium),
+				new ItemStack(ModBlocks.anvil_bismuth_bronze),
+				new ItemStack(ModBlocks.anvil_arsenic_bronze),
+				new ItemStack(ModBlocks.anvil_schrabidate),
+				new ItemStack(ModBlocks.anvil_dnt),
+				new ItemStack(ModBlocks.anvil_osmiridium),
+				new ItemStack(ModBlocks.anvil_murky)};
+	}
+
+	@Override
+	public String getRecipeID() {
+		return "ntmAnvil";
+	}
 
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();

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

@@ -6,6 +6,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.inventory.gui.GUIMachineAssembler;
 import com.hbm.inventory.recipes.AssemblerRecipes;
@@ -19,13 +21,25 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class AssemblerRecipeHandler extends TemplateRecipeHandler {
+public class AssemblerRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
 	
     public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
     public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
     public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();
     public LinkedList<Class<? extends GuiContainer>> guiGui = new LinkedList<Class<? extends GuiContainer>>();
 
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_assembler),
+				new ItemStack(ModBlocks.machine_assemfac)};
+	}
+
+	@Override
+	public String getRecipeID() {
+		return "assembly";
+	}
+
     public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe {
     	
 		List<PositionedStack> input;

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

@@ -4,6 +4,8 @@ import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.RecipesCommon.AStack;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.inventory.RecipesCommon.OreDictStack;
@@ -14,12 +16,22 @@ import com.hbm.inventory.recipes.MagicRecipes.MagicRecipe;
 import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+import com.hbm.items.ModItems;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class BookRecipeHandler extends TemplateRecipeHandler {
+public class BookRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModItems.book_of_)};
+	}
 
-    public class RecipeSet extends TemplateRecipeHandler.CachedRecipe {
+	@Override
+	public String getRecipeID() {
+		return "book_of_boxcars";
+	}
+	public class RecipeSet extends TemplateRecipeHandler.CachedRecipe {
     	
     	List<PositionedStack> input;
         PositionedStack result;

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

@@ -5,6 +5,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.gui.GUIMachineReactorBreeding;
 import com.hbm.inventory.recipes.BreederRecipes;
 import com.hbm.inventory.recipes.BreederRecipes.BreederRecipe;
@@ -16,8 +18,18 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class BreederRecipeHandler extends TemplateRecipeHandler {
+public class BreederRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
 
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_reactor_breeding)};
+	}
+
+	@Override
+	public String getRecipeID() {
+		return "breeding";
+	}
 	public class BreedingSet extends TemplateRecipeHandler.CachedRecipe {
 
 		PositionedStack input;

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

@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.FluidStack;
 import com.hbm.inventory.RecipesCommon.AStack;
 import com.hbm.inventory.gui.GUIMachineChemplant;
@@ -20,14 +22,26 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class ChemplantRecipeHandler extends TemplateRecipeHandler {
+public class ChemplantRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
 
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
 	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();
 	public LinkedList<Class<? extends GuiContainer>> guiGui = new LinkedList<Class<? extends GuiContainer>>();
 
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_chemplant),
+				new ItemStack(ModBlocks.machine_chemfac)};
+	}
+
+	@Override
+	public String getRecipeID() {
+		return "chemistry";
+	}
 	public class RecipeSet extends TemplateRecipeHandler.CachedRecipe {
+
 		PositionedStack[] itemIn = new PositionedStack[4];
 		PositionedStack[] fluidIn = new PositionedStack[2];
 		PositionedStack[] itemOut = new PositionedStack[4];

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

@@ -16,6 +16,14 @@ public class ConstructionHandler extends NEIUniversalHandler {
 		super("Construction", getRecipes(true), getRecipes(false));
 	}
 
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModItems.acetylene_torch),
+				new ItemStack(ModItems.blowtorch),
+				new ItemStack(ModItems.boltgun)};
+	}
+
 	@Override
 	public String getKey() {
 		return "ntmConstruction";

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

@@ -6,6 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.material.Mats;
 import com.hbm.inventory.material.Mats.MaterialStack;
 import com.hbm.inventory.material.NTMMaterial;
@@ -20,7 +21,16 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class CrucibleAlloyingHandler extends TemplateRecipeHandler {
+public class CrucibleAlloyingHandler extends TemplateRecipeHandler implements ICompatNHNEI {
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_crucible)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "ntmCrucibleAlloying";
+	}
 	
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();

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

@@ -6,6 +6,8 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.material.Mats;
 import com.hbm.inventory.recipes.CrucibleRecipes;
 import com.hbm.items.machine.ItemMold;
@@ -17,7 +19,19 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class CrucibleCastingHandler extends TemplateRecipeHandler {
+public class CrucibleCastingHandler extends TemplateRecipeHandler implements ICompatNHNEI {
+
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.foundry_basin),
+				new ItemStack(ModBlocks.foundry_mold),
+				new ItemStack(ModBlocks.machine_strand_caster)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "ntmCrucibleFoundry";
+	}
 	
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();

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

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map.Entry;
 
 import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.RecipesCommon.AStack;
 import com.hbm.inventory.recipes.CrucibleRecipes;
 import com.hbm.lib.RefStrings;
@@ -19,8 +20,17 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class CrucibleSmeltingHandler extends TemplateRecipeHandler {
+public class CrucibleSmeltingHandler extends TemplateRecipeHandler implements ICompatNHNEI {
-	
+
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_crucible)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "ntmCrucibleSmelting";
+	}
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();
 	

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

@@ -6,6 +6,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.gui.GUIMachineCyclotron;
 import com.hbm.inventory.recipes.CyclotronRecipes;
 import com.hbm.lib.RefStrings;
@@ -16,8 +18,17 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class CyclotronRecipeHandler extends TemplateRecipeHandler {
+public class CyclotronRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
-	
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_cyclotron)};
+	}
+
+	@Override
+	public String getRecipeID() {
+		return "cyclotronProcessing";
+	}
     public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
     public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
     public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();

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

@@ -5,7 +5,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.recipes.MachineRecipes;
+import com.hbm.items.ModItems;
 import com.hbm.lib.RefStrings;
 
 import codechicken.nei.NEIServerUtils;
@@ -14,7 +17,23 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class FluidRecipeHandler extends TemplateRecipeHandler {
+public class FluidRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModItems.fluid_barrel_empty),
+				new ItemStack(ModItems.fluid_tank_empty),
+				new ItemStack(ModItems.fluid_tank_lead_empty),
+				new ItemStack(ModItems.canister_empty),
+				new ItemStack(ModItems.gas_empty),
+				new ItemStack(ModItems.cell_empty),
+				new ItemStack(ModItems.disperser_canister_empty),
+				new ItemStack(ModItems.glyphid_gland_empty)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "fluidcons";
+	}
 
     public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe
     {

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

@@ -6,6 +6,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.gui.GUIITER;
 import com.hbm.inventory.recipes.FusionRecipes;
 import com.hbm.lib.RefStrings;
@@ -16,8 +18,17 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class FusionRecipeHandler extends TemplateRecipeHandler {
+public class FusionRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
-	
+
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.iter)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "fusion";
+	}
     public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
     public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
     public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();

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

@@ -9,6 +9,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.gui.GUIMachineGasCent;
 import com.hbm.inventory.recipes.GasCentrifugeRecipes;
 import com.hbm.inventory.recipes.MachineRecipes;
@@ -22,8 +24,16 @@ import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler {
+public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
-
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_gascent)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "gascentprocessing";
+	}
 	public static ArrayList<Fuel> fuels;
 
 	public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe {

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

@@ -8,6 +8,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.gui.GUIHadron;
 import com.hbm.inventory.recipes.HadronRecipes;
 import com.hbm.inventory.recipes.HadronRecipes.HadronRecipe;
@@ -21,8 +23,17 @@ import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class HadronRecipeHandler extends TemplateRecipeHandler {
+public class HadronRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
 
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.hadron_core)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "hadron";
+	}
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
 	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();

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

@@ -10,6 +10,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map.Entry;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.lib.RefStrings;
 import com.hbm.util.InventoryUtil;
 
@@ -21,8 +23,13 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-public abstract class NEIUniversalHandler extends TemplateRecipeHandler {
+public abstract class NEIUniversalHandler extends TemplateRecipeHandler implements ICompatNHNEI {
-	
+
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return machine;
+	}
+
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
 	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();
@@ -34,7 +41,6 @@ public abstract class NEIUniversalHandler extends TemplateRecipeHandler {
 	public final HashMap<Object, Object> recipes;
 	public HashMap<Object, Object> machineOverrides;
 	/// SETUP ///
-
 	public NEIUniversalHandler(String display, ItemStack machine[], HashMap recipes) {
 		this.display = display;
 		this.machine = machine;
@@ -305,4 +311,9 @@ public abstract class NEIUniversalHandler extends TemplateRecipeHandler {
 	}
 	
 	public abstract String getKey();
+
+	@Override
+	public String getRecipeID() {
+		return getKey();
+	}
 }

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

@@ -7,6 +7,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.interfaces.Untested;
 import com.hbm.inventory.RecipesCommon.AStack;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
@@ -25,8 +27,19 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
 @Untested
-public class PressRecipeHandler extends TemplateRecipeHandler {
+public class PressRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
 
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_press),
+				new ItemStack(ModBlocks.machine_epress),
+				new ItemStack(ModBlocks.machine_conveyor_press)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "pressing";
+	}
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
 	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();

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

@@ -8,6 +8,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map.Entry;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.gui.GUIRadiolysis;
 import com.hbm.inventory.recipes.RadiolysisRecipes;
 import com.hbm.lib.RefStrings;
@@ -18,8 +20,17 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class RadiolysisRecipeHandler extends TemplateRecipeHandler {
+public class RadiolysisRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
-	
+
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_radiolysis)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "ntmRadiolysis";
+	}
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
 	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();

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

@@ -7,6 +7,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.gui.GUIMachineRefinery;
 import com.hbm.inventory.recipes.RefineryRecipes;
 import com.hbm.lib.RefStrings;
@@ -16,8 +18,17 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class RefineryRecipeHandler extends TemplateRecipeHandler {
+public class RefineryRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
 
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_refinery)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "refinery";
+	}
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
 	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();

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

@@ -7,6 +7,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.gui.GUISILEX;
 import com.hbm.inventory.recipes.SILEXRecipes;
 import com.hbm.inventory.recipes.SILEXRecipes.SILEXRecipe;
@@ -24,8 +26,17 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-public class SILEXRecipeHandler extends TemplateRecipeHandler {
+public class SILEXRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
 
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_silex)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "silex";
+	}
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
 	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();

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

@@ -7,6 +7,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.inventory.gui.GUIMachineShredder;
 import com.hbm.inventory.recipes.MachineRecipes;
@@ -19,8 +21,17 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class ShredderRecipeHandler extends TemplateRecipeHandler {
+public class ShredderRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
 
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.machine_shredder)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "ntmRadiolysis";
+	}
 	public static ArrayList<Fuel> fuels;
 
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();

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

@@ -5,6 +5,8 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.imc.ICompatNHNEI;
 import com.hbm.inventory.gui.GUIAnvil;
 import com.hbm.inventory.recipes.anvil.AnvilRecipes;
 import com.hbm.inventory.recipes.anvil.AnvilSmithingRecipe;
@@ -18,8 +20,28 @@ import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-public class SmithingRecipeHandler extends TemplateRecipeHandler {
+public class SmithingRecipeHandler extends TemplateRecipeHandler implements ICompatNHNEI {
 
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModBlocks.anvil_iron),
+				new ItemStack(ModBlocks.anvil_lead),
+				new ItemStack(ModBlocks.anvil_steel),
+				new ItemStack(ModBlocks.anvil_desh),
+				new ItemStack(ModBlocks.anvil_saturnite),
+				new ItemStack(ModBlocks.anvil_ferrouranium),
+				new ItemStack(ModBlocks.anvil_bismuth_bronze),
+				new ItemStack(ModBlocks.anvil_arsenic_bronze),
+				new ItemStack(ModBlocks.anvil_schrabidate),
+				new ItemStack(ModBlocks.anvil_dnt),
+				new ItemStack(ModBlocks.anvil_osmiridium),
+				new ItemStack(ModBlocks.anvil_murky)};
+	}
+	@Override
+	public String getRecipeID() {
+		return "ntmSmithing";
+	}
 	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
 	public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
 	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();

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

@@ -1,9 +1,17 @@
 package com.hbm.handler.nei;
 
 import com.hbm.blocks.generic.BlockToolConversion;
+import com.hbm.items.ModItems;
+import net.minecraft.item.ItemStack;
 
 public class ToolingHandler extends NEIUniversalHandler {
-
+	@Override
+	public ItemStack[] getMachinesForRecipe() {
+		return new ItemStack[]{
+				new ItemStack(ModItems.boltgun),
+				new ItemStack(ModItems.blowtorch),
+				new ItemStack(ModItems.acetylene_torch)};
+	}
 	public ToolingHandler() {
 		super("Tooling", BlockToolConversion.getRecipes(true), BlockToolConversion.getRecipes(false));
 	}

src/main/java/com/hbm/main/MainRegistry.java

@@ -52,13 +52,10 @@ import com.hbm.world.feature.OreCave;
 import com.hbm.world.feature.OreLayer3D;
 import com.hbm.world.feature.SchistStratum;
 import com.hbm.world.generator.CellularDungeonFactory;
-import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.*;
-import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
 import cpw.mods.fml.common.Mod.Metadata;
-import cpw.mods.fml.common.ModMetadata;
-import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
 import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
@@ -820,14 +817,12 @@ public class MainRegistry {
 		IMCHandler.registerHandler("blastfurnace", new IMCBlastFurnace());
 		IMCHandler.registerHandler("crystallizer", new IMCCrystallizer());
 		IMCHandler.registerHandler("centrifuge", new IMCCentrifuge());
-<<<<<<< HEAD
+
 		if (Loader.isModLoaded("NotEnoughItems")){
 			if (Loader.instance().getIndexedModList().get("NotEnoughItems").getVersion().contains("GTNH")) {
 				proxy.handleNHNEICompat();
 			}
 		}
-=======
->>>>>>> 13aaa627b243ad1b3aa7dc13c07882396fbdbfbb
 	}
 	
 	@EventHandler

src/main/java/com/hbm/main/NEIConfig.java

@@ -1,12 +1,15 @@
 package com.hbm.main;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import codechicken.nei.recipe.*;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.generic.BlockMotherOfAllOres.TileEntityRandomOre;
 import com.hbm.config.CustomMachineConfigJSON;
 import com.hbm.config.CustomMachineConfigJSON.MachineConfiguration;
 import com.hbm.config.VersatileConfig;
+import com.hbm.handler.imc.IMCHandlerNHNEI;
 import com.hbm.handler.nei.*;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemBattery;
@@ -16,10 +19,6 @@ import codechicken.nei.api.API;
 import codechicken.nei.api.IConfigureNEI;
 import codechicken.nei.api.IHighlightHandler;
 import codechicken.nei.api.ItemInfo.Layout;
-import codechicken.nei.recipe.GuiCraftingRecipe;
-import codechicken.nei.recipe.GuiUsageRecipe;
-import codechicken.nei.recipe.ICraftingHandler;
-import codechicken.nei.recipe.IUsageHandler;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -29,7 +28,6 @@ import net.minecraft.world.World;
 import static com.hbm.main.ClientProxy.handlerList;
 
 public class NEIConfig implements IConfigureNEI {
-
 	@Override
 	public void loadConfig() {
 		for (TemplateRecipeHandler handler: handlerList()) {