Fix disstank, fix NEI issues, fix localization

10 files changed, 118 insertions, 39 deletions

diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
index 4d8a00bd19..a37b59e858 100644
--- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
+++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
@@ -54,7 +54,7 @@ public class GTNHLanthanides {
     public static void init(FMLInitializationEvent e) {

         proxy.init(e);

         WerkstoffMaterialPool.runInit();

-        //IMC.IMCSender();

+        IMC.IMCSender();

     }

     

     @EventHandler

diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
index 4e6b8cdca6..68a2b4e424 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
@@ -894,7 +894,7 @@ public class WerkstoffMaterialPool implements Runnable {
     		"Terbium Nitrate",

     		subscriptNumbers("TbNO3"),

     		new Werkstoff.Stats().setElektrolysis(true),

-    		Werkstoff.Types.MIXTURE,

+    		Werkstoff.Types.COMPOUND,

     		new Werkstoff.GenerationFeatures().disable().onlyDust(),

     		offsetID2 + 27,

     		TextureSet.SET_DULL,

@@ -904,7 +904,16 @@ public class WerkstoffMaterialPool implements Runnable {
     		new Pair<>(Materials.Oxygen, 3)

     	);

     

-    

+    public static final Werkstoff SamariumOreConcentrate = new Werkstoff(

+    		new short[] {255, 200, 230},

+    		"Samarium Ore Concentrate",

+    		subscriptNumbers("??Sm??"),

+    		new Werkstoff.Stats(),

+    		Werkstoff.Types.MIXTURE,

+    		new Werkstoff.GenerationFeatures().disable().onlyDust(),

+    		offsetID2 + 28,

+    		TextureSet.SET_DULL

+    	);

     

     

     

diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
index 08d3ea73db..8aa0096a93 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
@@ -176,7 +176,7 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester>
 
 	@Override
 	public String[] getStructureDescription(ItemStack arg0) {
-		return DescTextLocalization.addText("Digester.hint", 5);
+		return DescTextLocalization.addText("Digester.hint", 6);
 	}
 
 	@Override
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 02723e9b9a..6662f02ebe 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
@@ -109,7 +109,7 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 	@Override
 	public boolean checkRecipe(ItemStack itemStack) {
 		
-		GT_Log.out.print("in checkRecipe");
+		//GT_Log.out.print("in checkRecipe");
 		
 		ArrayList<FluidStack> tFluidInputs = this.getStoredFluids();
 		FluidStack[] tFluidInputArray = tFluidInputs.toArray(new FluidStack[0]);
@@ -128,7 +128,7 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 		if (tRecipe == null)
 			return false;
 
-		GT_Log.out.print("Recipe not null\n");
+		//GT_Log.out.print("Recipe not null\n");
 		if (tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) {
 			
 			this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000);
@@ -147,16 +147,21 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 			FluidStack majorInput = null;
 			FluidStack minorInput = null;
 			
+			int majorAmount = 0;
+			int minorAmount = 0;
+			
 			FluidStack fluidInputOne = tFluidInputs.get(0);
 			FluidStack fluidInputTwo = tFluidInputs.get(1);
 			
 			majorInput = ((fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) ? fluidInputOne : fluidInputTwo);
-			GT_Log.out.print(majorInput.getLocalizedName());
+			//GT_Log.out.print(majorInput.getLocalizedName());
 			if (fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) {
 				if (fluidInputTwo.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) {
 					majorInput = fluidInputOne;
+					majorAmount = fluidInputOne.amount;
 					minorInput = fluidInputTwo;
-					GT_Log.out.print("in first IF");
+					minorAmount = fluidInputTwo.amount;
+					//GT_Log.out.print("in first IF");
 				}
 				else
 					return false; // No valid other input
@@ -164,8 +169,10 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 			} else if (fluidInputTwo.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) {
 				if (fluidInputOne.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) {
 					majorInput = fluidInputTwo;
+					majorAmount = fluidInputTwo.amount;
 					minorInput = fluidInputOne;
-					GT_Log.out.print("in second if");
+					minorAmount = fluidInputOne.amount;
+					//GT_Log.out.print("in second if");
 				}
 				else
 					return false;
@@ -174,7 +181,7 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 			else
 				return false;
 			
-			GT_Log.out.print("out of switch weirdness");
+			//GT_Log.out.print("out of switch weirdness");
 			
 			/*
 			for (FluidStack fluid : tFluidInputs) {
@@ -189,13 +196,16 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
 			if (majorInput == null || minorInput == null)
 				return false;
 			
-			GT_Log.out.print("major " + majorInput.getLocalizedName());
-			GT_Log.out.print("minor " + minorInput.getLocalizedName());
-			
-			GT_Log.out.print("mjrinputamt " + majorInput.amount);
+			//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;
+			*/
+			if ((majorAmount / tRecipe.mSpecialValue) != (minorAmount))
+				return false;
 			
 			this.mOutputFluids = new FluidStack[] {
 					tRecipe.getFluidOutput(0)
@@ -219,23 +229,11 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
     public String[] getDescription() {
 		final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType("Heat Exchanger")
-                .addInfo("Controller Block for the Large Heat Exchanger")
-                .addInfo("More complicated than a Fusion Reactor. Seriously")
-                .addInfo("Inputs are Hot Coolant or Lava")
-                .addInfo("Outputs Coolant or Pahoehoe Lava and SH Steam/Steam")
-                .addInfo("Read the wiki article to understand how it works")
-                .addInfo("Then go to the Discord to understand the wiki")
-                .addSeparator()
-                .beginStructureBlock(3, 4, 3, false)
-                .addController("Front bottom")
-                .addCasingInfo("Stable Titanium Machine Casing", 20)
-                .addOtherStructurePart("Titanium Pipe Casing", "Center 2 blocks")
-                .addMaintenanceHatch("Any casing", 1)
-                .addInputHatch("Hot fluid, bottom center", 2)
-                .addInputHatch("Distilled water, any casing", 1)
-                .addOutputHatch("Cold fluid, top center", 3)
-                .addOutputHatch("Steam/SH Steam, any casing", 1)
-                .toolTipFinisher("Gregtech");
+                .addInfo("Controller Block for the Dissolution Tank")
+                .addInfo("Input Water and Fluid, output Fluid")
+                .addInfo("You must input the Fluids at the correct Ratio")
+                .addInfo("(Not currently working)")
+                .toolTipFinisher("GTNH: Lanthanides");
 		if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
 	        return tt.getInformation();
 	    } else {
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
index e0cf247b51..fcb0b0d0da 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
@@ -25,7 +25,7 @@ public class RecipeAdder {
 			1,
 			"K",
 			false,
-			true	
+			false	
 		);
 	
 	public final DissolutionTankMap DissolutionTankRecipes = new DissolutionTankMap(
@@ -35,11 +35,11 @@ public class RecipeAdder {
 			null,
 			"gtnhlanth:textures/gui/Disstank",
 			1, 1, 1, 1, 1,
-			StatCollector.translateToLocal("value.disstank") + ": ",
+			StatCollector.translateToLocal("value.disstank") + ": ", // Ratio
 			1,
 			":1",
 			false,
-			true			
+			false		
 		);
 	
 	
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index 9c87289a66..ebb6385558 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -918,6 +918,17 @@ public class RecipeLoader {
         		480
         	);
         
+        GT_Values.RA.addChemicalRecipe(
+        		WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1),
+        		WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1),
+        		Materials.HydrofluoricAcid.getFluid(2000),
+        		null,
+        		WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2),
+        		null,
+        		350,
+        		480
+        		);
+        
         GT_Values.RA.addBlastRecipe(
         		WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2),
         		Materials.Calcium.getDust(3),
@@ -1126,6 +1137,9 @@ public class RecipeLoader {
                             if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
                                 tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+                            }
                         }
                         if (!tRecipe.equals(recipe)){
                             reAdd.add(tRecipe);
@@ -1160,6 +1174,9 @@ public class RecipeLoader {
                             if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
                                 tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+                            }
                         }
                         if (!tRecipe.equals(recipe)){
                             reAdd.add(tRecipe);
@@ -1194,6 +1211,9 @@ public class RecipeLoader {
                             if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
                                 tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+                            }
                         }
                         if (!tRecipe.equals(recipe)){
                             reAdd.add(tRecipe);
@@ -1235,6 +1255,15 @@ public class RecipeLoader {
                             } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDustSmall(1))) {
                                 tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dustSmall, 1));
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDustTiny(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dustTiny, 1));
+                            }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+                            }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDustSmall(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dustSmall, 1));
+                            }
                         }
                         if (!tRecipe.equals(recipe)){
                             reAdd.add(tRecipe);
@@ -1278,6 +1307,9 @@ public class RecipeLoader {
                             if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
                                 tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));                            
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+                            }
                         }
                         if (!tRecipe.equals(recipe)){
                             reAdd.add(tRecipe);
@@ -1315,6 +1347,9 @@ public class RecipeLoader {
         					else if (tRecipe.mOutputs[i].isItemEqual(WerkstoffMaterialPool.Zirconium.get(OrePrefixes.dust, 1))) { //TODO: Does not work and I have zero clue why
         						tRecipe.mOutputs[i] = null;
         					}
+        					else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = null;
+                            }
         					
         				}
         				if (!tRecipe.equals(recipe)){
@@ -1434,6 +1469,9 @@ public class RecipeLoader {
                             if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
                                 remove.add(tRecipe);                         
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	remove.add(tRecipe);
+                            }
                         }
                         break;
                     }
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java
index f09666abea..0a7ed624e6 100644
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java
@@ -12,10 +12,11 @@ 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);
-		
+		if (!NEI_Config.isAdded) {
+			FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier());
+			GuiCraftingRecipe.craftinghandlers.add(this);
+			GuiUsageRecipe.usagehandlers.add(this);
+		}
 	}
 	
 	@Override
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java
new file mode 100644
index 0000000000..ffc396a3f4
--- /dev/null
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java
@@ -0,0 +1,27 @@
+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 DisstankHandler extends GT_NEI_DefaultHandler {
+
+	public DisstankHandler(GT_Recipe_Map recipeMap) {
+		super(recipeMap);
+		if (!NEI_Config.isAdded) {
+			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 DisstankHandler(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
index e1799facf0..09f1b0b61a 100644
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
@@ -7,6 +7,7 @@ public class IMC {
 
 	public static void IMCSender() {
         setNBTAndSend("com.elisis.gtnhlanth.xmod.nei.DigesterHandler", "gregtech:gt.blockmachines:10500");
+        setNBTAndSend("com.elisis.gtnhlanth.xmod.nei.DisstankHandler", "gregtech:gt.blockmachines:10501");
         
     }
 
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
index 3d94257c74..a25007e3bd 100644
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
@@ -6,6 +6,8 @@ import com.elisis.gtnhlanth.loader.RecipeAdder;
 import codechicken.nei.api.IConfigureNEI;
 
 public class NEI_Config implements IConfigureNEI {
+	
+	public static boolean isAdded = true;
 
 	@Override
 	public String getName() {
@@ -19,7 +21,10 @@ public class NEI_Config implements IConfigureNEI {
 
 	@Override
 	public void loadConfig() {
-		//new DigesterHandler(RecipeAdder.instance.DigesterRecipes);
+		isAdded = false;
+		new DigesterHandler(RecipeAdder.instance.DigesterRecipes);
+		new DisstankHandler(RecipeAdder.instance.DissolutionTankRecipes);
+		isAdded = true;
 		
 	}