Partially fix dissolution tank, nei handler fuckery

7 files changed, 109 insertions, 24 deletions

diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
index c5e6954f73..4d8a00bd19 100644
--- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
+++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
@@ -9,6 +9,7 @@ import com.elisis.gtnhlanth.common.register.ItemList;
 import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;

 import com.elisis.gtnhlanth.loader.BotRecipes;

 import com.elisis.gtnhlanth.loader.RecipeLoader;

+import com.elisis.gtnhlanth.xmod.nei.IMC;

 import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;

 import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;

 

@@ -53,6 +54,7 @@ public class GTNHLanthanides {
     public static void init(FMLInitializationEvent e) {

         proxy.init(e);

         WerkstoffMaterialPool.runInit();

+        //IMC.IMCSender();

     }

     

     @EventHandler

diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
index f43a77f143..02723e9b9a 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
@@ -116,28 +116,20 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 		ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]);
 		long tVoltage = this.getMaxInputVoltage();
 		
-		
-		for (GT_Recipe aRecipe : RecipeAdder.instance.DissolutionTankRecipes.mRecipeList) {
-			GT_Log.out.print("input: " + aRecipe.mFluidInputs[0] + "\n");
-			GT_Log.out.print("output: " + aRecipe.mFluidOutputs[0] + "\n");
-		}
-		
-		GT_Log.out.print("tFluidInputArray " + Arrays.toString(tFluidInputArray));
-		
-		
 		//Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList;
 		GT_Recipe tRecipe = RecipeAdder.instance.DissolutionTankRecipes.findRecipe(
-				this.getBaseMetaTileEntity(), 
-				this.doTickProfilingInThisTick, 
+				getBaseMetaTileEntity(), 
+				false, 
 				tVoltage, 
-				tFluidInputArray
+				tFluidInputArray,
+				tItems
 			);
 		
 		if (tRecipe == null)
 			return false;
 
 		GT_Log.out.print("Recipe not null\n");
-		if (tRecipe.isRecipeInputEqual(true, tFluidInputArray)) {
+		if (tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) {
 			
 			this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000);
 			this.mEfficiencyIncrease = 10000;
@@ -150,7 +142,7 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 				this.mEUt = (-this.mEUt);	
 			
 			FluidStack majorGenericFluid = tRecipe.mFluidInputs[0];
-			FluidStack minorGenericFluid = tRecipe.mFluidOutputs[1];
+			FluidStack minorGenericFluid = tRecipe.mFluidInputs[1];
 			
 			FluidStack majorInput = null;
 			FluidStack minorInput = null;
@@ -158,19 +150,22 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 			FluidStack fluidInputOne = tFluidInputs.get(0);
 			FluidStack fluidInputTwo = tFluidInputs.get(1);
 			
-			majorInput = (fluidInputOne.getUnlocalizedName() == majorGenericFluid.getUnlocalizedName() ? fluidInputOne : fluidInputTwo);
-			if (fluidInputOne.getUnlocalizedName() == majorGenericFluid.getUnlocalizedName()) {
-				if (fluidInputTwo.getUnlocalizedName() == minorGenericFluid.getUnlocalizedName()) {
+			majorInput = ((fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) ? fluidInputOne : fluidInputTwo);
+			GT_Log.out.print(majorInput.getLocalizedName());
+			if (fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) {
+				if (fluidInputTwo.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) {
 					majorInput = fluidInputOne;
 					minorInput = fluidInputTwo;
+					GT_Log.out.print("in first IF");
 				}
 				else
 					return false; // No valid other input
 
-			} else if (fluidInputTwo.getUnlocalizedName() == majorGenericFluid.getUnlocalizedName()) {
-				if (fluidInputOne.getUnlocalizedName() == minorGenericFluid.getUnlocalizedName()) {
+			} else if (fluidInputTwo.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) {
+				if (fluidInputOne.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) {
 					majorInput = fluidInputTwo;
 					minorInput = fluidInputOne;
+					GT_Log.out.print("in second if");
 				}
 				else
 					return false;
@@ -179,6 +174,8 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 			else
 				return false;
 			
+			GT_Log.out.print("out of switch weirdness");
+			
 			/*
 			for (FluidStack fluid : tFluidInputs) {
 				String name = fluid.getUnlocalizedName();
@@ -195,6 +192,8 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 			GT_Log.out.print("major " + majorInput.getLocalizedName());
 			GT_Log.out.print("minor " + minorInput.getLocalizedName());
 			
+			GT_Log.out.print("mjrinputamt " + majorInput.amount);
+			
 			if ((majorInput.amount / tRecipe.mSpecialValue) != (minorInput.amount))
 				return false;
 			
@@ -213,7 +212,7 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 	
 	@Override
     public Object getClientGUI(int id, InventoryPlayer playerInventory, IGregTechTileEntity metaTileEntity) {
-        return new GT_GUIContainer_MultiMachine(playerInventory, metaTileEntity, getLocalName(), "DissolutionTank.png");
+        return new GT_GUIContainer_MultiMachine(playerInventory, metaTileEntity, getLocalName(), "Disstank.png");
     }
 	
 	@Override
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
index a1febdf33e..e0cf247b51 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
@@ -35,7 +35,7 @@ public class RecipeAdder {
 			null,
 			"gtnhlanth:textures/gui/Disstank",
 			1, 1, 1, 1, 1,
-			StatCollector.translateToLocal("value.disstank") + " ",
+			StatCollector.translateToLocal("value.disstank") + ": ",
 			1,
 			":1",
 			false,
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index 9c34ff3190..9c87289a66 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -350,7 +350,9 @@ public class RecipeLoader {
         				Materials.Water.getFluid(10000), 
         				WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(1000)
         		},
-        		null,
+        		new ItemStack[] {
+        				Materials.Saltpeter.getDust(1)
+        		},
         		WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(11000), 
         		new ItemStack[] {
             			WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dustTiny, 4),
@@ -595,7 +597,7 @@ public class RecipeLoader {
         		},
         		null,
         		new FluidStack[] {
-        				WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(1000)
+        				WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000)
         		},
         		null,
         		100,
@@ -739,7 +741,9 @@ public class RecipeLoader {
         				Materials.Water.getFluid(10000),
         				WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1000)
         		}, 
-        		null, 
+        		new ItemStack[] {
+        				Materials.Saltpeter.getDust(1)
+        		}, 
         		WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(11000), 
         		new ItemStack[] {
         				WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 1)
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java
new file mode 100644
index 0000000000..f09666abea
--- /dev/null
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java
@@ -0,0 +1,26 @@
+package com.elisis.gtnhlanth.xmod.nei;
+
+import codechicken.nei.recipe.GuiCraftingRecipe;
+import codechicken.nei.recipe.GuiUsageRecipe;
+import codechicken.nei.recipe.TemplateRecipeHandler;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gregtech.nei.GT_NEI_DefaultHandler;
+
+public class DigesterHandler extends GT_NEI_DefaultHandler {
+
+	public DigesterHandler(GT_Recipe_Map recipeMap) {
+		super(recipeMap);
+		FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier());
+		GuiCraftingRecipe.craftinghandlers.add(this);
+		GuiUsageRecipe.usagehandlers.add(this);
+		
+	}
+	
+	@Override
+    public TemplateRecipeHandler newInstance() {
+        return new DigesterHandler(this.mRecipeMap);
+    }
+
+}
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
new file mode 100644
index 0000000000..e1799facf0
--- /dev/null
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
@@ -0,0 +1,27 @@
+package com.elisis.gtnhlanth.xmod.nei;
+
+import cpw.mods.fml.common.event.FMLInterModComms;
+import net.minecraft.nbt.NBTTagCompound;
+
+public class IMC {
+
+	public static void IMCSender() {
+        setNBTAndSend("com.elisis.gtnhlanth.xmod.nei.DigesterHandler", "gregtech:gt.blockmachines:10500");
+        
+    }
+
+    private static void setNBTAndSend(String aName, String aBlock) {
+        NBTTagCompound aNBT = new NBTTagCompound();
+        aNBT.setString("handler", aName);
+        aNBT.setString("modName", "GTNH: Lanthanides");
+        aNBT.setString("modId", "gtnhlanth");
+        aNBT.setBoolean("modRequired", true);
+        aNBT.setString("itemName", aBlock);
+        aNBT.setInteger("handlerHeight", 135);
+        aNBT.setInteger("handlerWidth", 166);
+        aNBT.setInteger("maxRecipesPerPage", 1);
+        aNBT.setInteger("yShift", 6);
+        FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
+    }
+	
+}
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
new file mode 100644
index 0000000000..3d94257c74
--- /dev/null
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
@@ -0,0 +1,27 @@
+package com.elisis.gtnhlanth.xmod.nei;
+
+import com.elisis.gtnhlanth.Tags;
+import com.elisis.gtnhlanth.loader.RecipeAdder;
+
+import codechicken.nei.api.IConfigureNEI;
+
+public class NEI_Config implements IConfigureNEI {
+
+	@Override
+	public String getName() {
+		return "GTNH: Lanthanides NEI";	
+	}
+
+	@Override
+	public String getVersion() {
+		return Tags.VERSION;
+	}
+
+	@Override
+	public void loadConfig() {
+		//new DigesterHandler(RecipeAdder.instance.DigesterRecipes);
+		
+	}
+	
+
+}