Deep earth heating pump Slight Rework and Balance Attempt (#3379)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>

4 files changed, 54 insertions, 76 deletions

diff --git a/src/main/java/bartworks/common/configs/Configuration.java b/src/main/java/bartworks/common/configs/Configuration.java
index 813c825dce..50d144dc32 100644
--- a/src/main/java/bartworks/common/configs/Configuration.java
+++ b/src/main/java/bartworks/common/configs/Configuration.java
@@ -72,10 +72,6 @@ public class Configuration {
         @Config.DefaultInt(20_000_000)
         public int energyPerCell;
 
-        @Config.Comment("This switch enables the Direct Steam Mode of the DEHP. If enabled it will take in Waterand output steam. If disabled it will Input IC2Coolant and output hot coolant")
-        @Config.DefaultBoolean(false)
-        public boolean DEHPDirectSteam;
-
         @Config.Ignore()
         public static int megaMachinesMax = 256;
 
diff --git a/src/main/java/bartworks/common/loaders/recipes/Assembler.java b/src/main/java/bartworks/common/loaders/recipes/Assembler.java
index e1575fb3d9..b96c6653b2 100644
--- a/src/main/java/bartworks/common/loaders/recipes/Assembler.java
+++ b/src/main/java/bartworks/common/loaders/recipes/Assembler.java
@@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidRegistry;
 
 import bartworks.common.loaders.ItemRegistry;
 import bartworks.system.material.WerkstoffLoader;
+import goodgenerator.items.GGMaterial;
 import gregtech.api.GregTechAPI;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
@@ -98,6 +99,19 @@ public class Assembler implements Runnable {
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
+        GTValues.RA.stdBuilder() // DEHP
+            .itemInputs(
+                ItemList.OilDrill4.get(1),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 8),
+                GGMaterial.incoloy903.get(OrePrefixes.gearGt, 32),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Polytetrafluoroethylene, 16),
+                ItemList.Field_Generator_IV.get(1))
+            .itemOutputs(ItemRegistry.dehp)
+            .fluidInputs(Materials.HSSE.getMolten(32 * 144))
+            .duration(60 * SECONDS)
+            .eut(TierEU.RECIPE_IV)
+            .addTo(assemblerRecipes);
+
         GTValues.RA.stdBuilder()
             .itemInputs(
                 GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 64L),
diff --git a/src/main/java/bartworks/common/loaders/recipes/AssemblyLine.java b/src/main/java/bartworks/common/loaders/recipes/AssemblyLine.java
index eed4b4286a..2613a8c3b5 100644
--- a/src/main/java/bartworks/common/loaders/recipes/AssemblyLine.java
+++ b/src/main/java/bartworks/common/loaders/recipes/AssemblyLine.java
@@ -1,6 +1,5 @@
 package bartworks.common.loaders.recipes;
 
-import static gregtech.api.util.GTRecipeBuilder.HOURS;
 import static gregtech.api.util.GTRecipeBuilder.MINUTES;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
@@ -27,22 +26,6 @@ public class AssemblyLine implements Runnable {
         Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null
             ? FluidRegistry.getFluid("molten.indalloy140")
             : FluidRegistry.getFluid("molten.solderingalloy");
-        GTValues.RA.stdBuilder()
-            .metadata(RESEARCH_ITEM, ItemList.Pump_HV.get(1L))
-            .metadata(RESEARCH_TIME, 1 * HOURS)
-            .itemInputs(
-                ItemList.Pump_HV.get(16),
-                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 32L),
-                GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L),
-                GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L),
-                ItemList.Field_Generator_LuV.get(8))
-            .fluidInputs(
-                new FluidStack(solderIndalloy, 32 * 144),
-                Materials.Polytetrafluoroethylene.getMolten(32 * 144))
-            .itemOutputs(ItemRegistry.dehp)
-            .eut(TierEU.RECIPE_LuV)
-            .duration(4 * MINUTES + 10 * SECONDS)
-            .addTo(AssemblyLine);
 
         GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.OreDrill4.get(1L))
diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java b/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java
index 68988e52fa..8f329e2348 100644
--- a/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java
+++ b/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java
@@ -13,6 +13,7 @@
 
 package bartworks.common.tileentities.multis;
 
+import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS;
 import static gregtech.api.enums.GTValues.VN;
 
 import java.lang.reflect.Field;
@@ -25,7 +26,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 
-import bartworks.common.configs.Configuration;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -96,25 +96,19 @@ public class MTEDeepEarthHeatingPump extends MTEDrillerBase {
             .getDisplayName();
         tt.addMachineType("Geothermal Heat Pump")
             .addInfo("Consumes " + GTValues.V[this.mTier + 2] + "EU/t")
-            .addInfo("Has 4 Modes, use the Screwdriver to change them:");
-        if (Configuration.multiblocks.DEHPDirectSteam) {
-            tt.addInfo("0 Idle, 1 Steam, 2 Superheated Steam (requires Distilled Water), 3 Retract")
-                .addInfo("Explodes when it runs out of Water/Distilled Water")
-                .addInfo(
-                    "Converts " + (long) (this.mTier * 1200 * 20)
-                        + "L/s Water(minus 10% per Maintenance Problem) to Steam")
-                .addInfo(
-                    "Converts " + (long) (this.mTier * 600 * 20)
-                        + "L/s Distilled Water(minus 10% per Maintenance Problem) to SuperheatedSteam");
-
-        } else {
-            tt.addInfo("0 Idle, 1 & 2 Coolant Heating Mode (no Difference between them), 3 Retract")
-                .addInfo("Explodes when it runs out of Coolant")
-                .addInfo(
-                    "Heats up " + (long) (this.mTier * 24 * (double) MTEDeepEarthHeatingPump.nulearHeatMod) * 20
-                        + "L/s Coolant(minus 10% per Maintenance Problem)");
-        }
-        tt.beginStructureBlock(3, 7, 3, false)
+            .addInfo("Has 3 Modes, use the Screwdriver to change them:");
+
+        tt.addInfo("Direct Steam, Coolant Heating, Retract")
+            .addInfo(
+                "Direct Steam Mode: Consumes Distilled Water to produce " + (long) (this.mTier * 25600 * 20)
+                    + "L/s of Superheated Steam")
+            .addInfo(
+                "Coolant Heating Mode: Converts " + (long) (this.mTier * 96 * 2 * 20) + "L/s Coolant to Hot Coolant")
+            .addInfo("Each maintenance issue lowers output efficiency by 10%")
+            .addInfo("Explodes when it runs out of Distilled Water/Coolant");
+
+        tt.addSeparator()
+            .beginStructureBlock(3, 7, 3, false)
             .addController("Front bottom")
             .addOtherStructurePart(casings, "form the 3x1x3 Base")
             .addOtherStructurePart(casings, "1x3x1 pillar above the center of the base (2 minimum total)")
@@ -126,7 +120,7 @@ public class MTEDeepEarthHeatingPump extends MTEDrillerBase {
             .addInputBus("Mining Pipes, optional, any base casing")
             .addInputHatch("Any base casing")
             .addOutputHatch("Any base casing")
-            .toolTipFinisher();
+            .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS);
         return tt;
     }
 
@@ -199,15 +193,21 @@ public class MTEDeepEarthHeatingPump extends MTEDrillerBase {
         if (this.getBaseMetaTileEntity()
             .getWorld().isRemote) return;
         ++this.mMode;
-        if (this.mMode >= 4) this.mMode = 0;
-        GTUtility.sendChatToPlayer(aPlayer, "Mode: " + this.mMode);
+        if (this.mMode >= 3) this.mMode = 0;
+        if (this.mMode == 0) {
+            GTUtility.sendChatToPlayer(aPlayer, "Mode: Direct Steam");
+        } else if (this.mMode == 1) {
+            GTUtility.sendChatToPlayer(aPlayer, "Mode: Coolant Heating");
+        } else if (this.mMode == 2) {
+            GTUtility.sendChatToPlayer(aPlayer, "Mode: Retract");
+        }
         super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ);
     }
 
     @Override
     protected boolean workingDownward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe,
         int yHead, int oldYHead) {
-        if (this.mMode == 3) {
+        if (this.mMode == 2) {
             this.isPickingPipes = true;
             this.workState = 2;
             return true;
@@ -219,38 +219,23 @@ public class MTEDeepEarthHeatingPump extends MTEDrillerBase {
         if (this.waitForPipes()) {
             return false;
         }
-        if (this.mMode == 0) {
-            this.mMode = 1;
-        }
-        if (Configuration.multiblocks.DEHPDirectSteam) {
-            if (this.mMode == 1) {
-                long steamProduced = this.mTier * 600 * 2L * this.mEfficiency / 10000L;
-                long waterConsume = (steamProduced + 160) / 160;
-
-                if (this.getWaterFromHatches(false) - waterConsume > 0) {
-                    this.consumeFluid(FluidRegistry.WATER, waterConsume);
-                    this.addOutput(GTModHandler.getSteam(steamProduced));
-                } else {
-                    this.explodeMultiblock();
-                    return false;
-                }
-            } else if (this.mMode == 2) {
-                long steamProduced = this.mTier * 300 * 2L * this.mEfficiency / 10000L;
-                long waterConsume = (steamProduced + 160) / 160;
 
-                if (this.getWaterFromHatches(true) - waterConsume > 0) {
-                    this.consumeFluid(
-                        GTModHandler.getDistilledWater(1)
-                            .getFluid(),
-                        waterConsume);
-                    this.addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", (int) steamProduced));
-                } else {
-                    this.explodeMultiblock();
-                    return false;
-                }
+        if (this.mMode == 0) {
+            long steamProduced = this.mTier * 25600L * this.mEfficiency / 10000L;
+            long waterConsume = (steamProduced + 160) / 160;
+
+            if (this.getWaterFromHatches(true) - waterConsume > 0) {
+                this.consumeFluid(
+                    GTModHandler.getDistilledWater(1)
+                        .getFluid(),
+                    waterConsume);
+                this.addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", (int) steamProduced));
+            } else {
+                this.explodeMultiblock();
+                return false;
             }
-        } else if (this.mMode == 1 || this.mMode == 2) {
-            long coolantConverted = (long) (this.mTier * 24
+        } else if (this.mMode == 1) {
+            long coolantConverted = (long) (this.mTier * 96L
                 * (double) MTEDeepEarthHeatingPump.nulearHeatMod
                 * this.mEfficiency
                 / 10000L);
@@ -312,7 +297,7 @@ public class MTEDeepEarthHeatingPump extends MTEDrillerBase {
     @Override
     protected void setElectricityStats() {
         try {
-            this.mEUt = this.isPickingPipes ? 60 : Math.toIntExact(GTValues.V[this.getMinTier()]);
+            this.mEUt = this.isPickingPipes ? -60 : -1 * Math.toIntExact(GTValues.V[this.getMinTier()]);
         } catch (ArithmeticException e) {
             e.printStackTrace();
             this.mEUt = Integer.MAX_VALUE - 7;