Removed lava from ehe, updated description and nei info page

GTNewHorizons · Nov 16, 2024 · 2c252f8 · 2c252f8
1 parent 472189a
commit 2c252f8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 33 deletions.
diff --git a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java
@@ -42,27 +42,21 @@ private static class EHESpecialValueFormatter implements INEISpecialInfoFormatte
         @Override
         public List<String> format(RecipeDisplayInfo recipeInfo) {
             FluidStack[] Inputs = recipeInfo.recipe.mFluidInputs;
-            FluidStack[] Outputs = recipeInfo.recipe.mFluidOutputs;
-            int[] waterInput = new int[2];
-            if (Inputs[0].getUnlocalizedName()
+            int threshold = recipeInfo.recipe.mSpecialValue;
+            String[] description = new String[4];
+            description[0] = StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " "
+                + GTUtility.formatNumbers(Inputs[0].amount)
+                + " L/s";
+            description[1] = StatCollector.translateToLocal("value.extreme_heat_exchanger.1");
+            description[2] = GTUtility.formatNumbers(Inputs[1].amount) + " L/s";
+            if (!Inputs[0].getUnlocalizedName()
                 .contains("plasma")) {
-                ;
-                waterInput[0] = 0;
-                waterInput[1] = Inputs[1].amount;
-            } else {
-                waterInput[0] = Outputs[0].amount / 160;
-                waterInput[1] = Outputs[1].amount / 160;
+                description[3] = StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " "
+                    + threshold
+                    + " L/s";
+
             }
-            int threshold = recipeInfo.recipe.mSpecialValue;
-            return Arrays.asList(
-                StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " "
-                    + GTUtility.formatNumbers(Inputs[0].amount)
-                    + " L/s",
-                StatCollector.translateToLocal("value.extreme_heat_exchanger.1"),
-                GTUtility.formatNumbers(waterInput[0]) + " L/s",
-                StatCollector.translateToLocal("value.extreme_heat_exchanger.2"),
-                GTUtility.formatNumbers(waterInput[1]) + " L/s",
-                StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " " + threshold + " L/s");
+            return Arrays.asList(description);
         }
     }
 }
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java
@@ -204,9 +204,13 @@ public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStac
     protected MultiblockTooltipBuilder createTooltip() {
         final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Heat Exchanger/Plasma Heat Exchanger")
-            .addInfo("Accept Hot fluid like lava, hot coolant or plasma.")
-            .addInfo("Output SC Steam/SH Steam/Steam.")
-            .addInfo("Check NEI for more info.")
+            .addInfo("Outputs SH steam by cooling hot fluids with distilled water.")
+            .addInfo("Supplying more hot fluid than the threshold causes overheating,")
+            .addInfo("producing SC steam instead.")
+            .addInfo("Plasma always produces SC steam.")
+            .addInfo("Maximum input and output values per second are shown in NEI.")
+            .addInfo("Actual output is proportional to the amount of hot fluid inserted.")
+            .addInfo("Explodes if it runs out of water.")
             .addController("Front bottom")
             .addOtherStructurePart("Input Hatch", "distilled water", 1)
             .addOtherStructurePart("Output Hatch", "SC Steam/SH Steam/Steam", 2)

diff --git a/src/main/java/goodgenerator/loader/RecipeLoader2.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java
@@ -1063,14 +1063,6 @@ public static void RecipeLoad() {
             .eut(TierEU.RECIPE_IV)
             .addTo(assemblerRecipes);
 
-        MyRecipeAdder.instance.addExtremeHeatExchangerRecipe(
-            FluidRegistry.getFluidStack("lava", 20000),
-            FluidRegistry.getFluidStack("ic2pahoehoelava", 20000),
-            FluidRegistry.getFluidStack("ic2distilledwater", 20000),
-            FluidRegistry.getFluidStack("steam", 3200000),
-            FluidRegistry.getFluidStack("ic2superheatedsteam", 1600000),
-            10000);
-
         MyRecipeAdder.instance.addExtremeHeatExchangerRecipe(
             FluidRegistry.getFluidStack("ic2hotcoolant", 16000),
             FluidRegistry.getFluidStack("ic2coolant", 16000),

diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -342,8 +342,7 @@ value.neutron_activator.0=Minimum Neutron Kinetic Energy:
 value.neutron_activator.1=Maximum Neutron Kinetic Energy:
 value.neutron_activator.2= MeV
 value.extreme_heat_exchanger.0=Max Hot Fluid Input:
-value.extreme_heat_exchanger.1=Max Distilled Water Input(Normal):
-value.extreme_heat_exchanger.2=Max Distilled Water Input(OverHeated):
+value.extreme_heat_exchanger.1=Max Distilled Water Input:
 value.extreme_heat_exchanger.4=Threshold:
 value.precise_assembler=Need MK-%s Casing
 value.component_assembly_line=Casing Tier: %s

diff --git a/src/main/resources/assets/goodgenerator/lang/zh_CN.lang b/src/main/resources/assets/goodgenerator/lang/zh_CN.lang
@@ -281,7 +281,6 @@ value.neutron_activator.1=最高中子动能：
 value.neutron_activator.2= MeV
 value.extreme_heat_exchanger.0=最大热流体输入：
 value.extreme_heat_exchanger.1=最大工质输入：
-value.extreme_heat_exchanger.2=最大热工质输出：
 value.extreme_heat_exchanger.4=阈值：
 value.precise_assembler=要求 MK-%s 机械方块