From 418deff17ece735deabd28cc76e8aec45ad29ef7 Mon Sep 17 00:00:00 2001
From: unknown <gtandemmodding@gmail.com>
Date: Tue, 1 Mar 2022 20:34:58 +1100
Subject: Fix disstank, fix NEI issues, fix localization

---
 .../common/register/WerkstoffMaterialPool.java     | 13 +++++-
 .../gtnhlanth/common/tileentity/Digester.java      |  2 +-
 .../common/tileentity/DissolutionTank.java         | 52 +++++++++++-----------
 3 files changed, 37 insertions(+), 30 deletions(-)

(limited to 'src/main/java/com/elisis/gtnhlanth/common')

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 {
-- 
cgit