Fix Large Boiler and Steam Machines giving incorrect info in TheOneProbe/HWYLA (GregTechCEu#2001)

Author: ghzdude

src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java

@@ -204,6 +204,16 @@ public void setLastTickSteam(int lastTickSteamOutput) {
         this.lastTickSteamOutput = lastTickSteamOutput;
     }
 
+    @Override
+    public int getInfoProviderEUt() {
+        return this.lastTickSteamOutput;
+    }
+
+    @Override
+    public boolean consumesEnergy() {
+        return false;
+    }
+
     public void invalidate() {
         progressTime = 0;
         maxProgressTime = 0;

src/main/java/gregtech/integration/hwyla/provider/RecipeLogicDataProvider.java

@@ -5,7 +5,9 @@
 import gregtech.api.capability.impl.AbstractRecipeLogic;
 import gregtech.api.metatileentity.SteamMetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
+import gregtech.api.unification.material.Materials;
 import gregtech.api.util.GTUtility;
+import gregtech.common.metatileentities.multi.MetaTileEntityLargeBoiler;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaRegistrar;
@@ -58,18 +60,25 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> tooltip, IWai
             if (tag.getBoolean("Working")) {
                 int EUt = tag.getInteger("RecipeEUt");
                 int absEUt = Math.abs(EUt);
+                boolean consumer = EUt > 0;
                 String endText = null;
 
                 if (accessor.getTileEntity() instanceof IGregTechTileEntity gtte) {
-                    if (gtte.getMetaTileEntity() instanceof SteamMetaTileEntity) {
-                        endText = ": " + absEUt + TextFormatting.RESET + " L/t " + I18n.format("material.steam");
+                    if (gtte.getMetaTileEntity() instanceof SteamMetaTileEntity || gtte.getMetaTileEntity() instanceof MetaTileEntityLargeBoiler) {
+                        endText = ": " + absEUt + TextFormatting.RESET + " L/t " + I18n.format("gregtech.top.steam")+ " " + I18n.format(Materials.Steam.getUnlocalizedName());
+                    }
+                    AbstractRecipeLogic arl = gtte.getMetaTileEntity().getRecipeLogic();
+                    if (arl != null) {
+                        consumer = arl.consumesEnergy();
                     }
                 }
                 if (endText == null) {
                     endText = ": " + absEUt + TextFormatting.RESET + " EU/t (" + GTValues.VNF[GTUtility.getTierByVoltage(absEUt)] + TextFormatting.RESET + ")";
                 }
 
-                if (EUt > 0) {
+                if (EUt == 0) return tooltip;
+
+                if (consumer) {
                     tooltip.add(I18n.format("gregtech.top.energy_consumption") + endText);
                 } else {
                     tooltip.add(I18n.format("gregtech.top.energy_production") + endText);

src/main/java/gregtech/integration/theoneprobe/provider/RecipeLogicInfoProvider.java

@@ -7,7 +7,9 @@
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.SteamMetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
+import gregtech.api.unification.material.Materials;
 import gregtech.api.util.GTUtility;
+import gregtech.common.metatileentities.multi.MetaTileEntityLargeBoiler;
 import mcjty.theoneprobe.api.IProbeHitData;
 import mcjty.theoneprobe.api.IProbeInfo;
 import mcjty.theoneprobe.api.TextStyleClass;
@@ -40,23 +42,26 @@ protected void addProbeInfo(@Nonnull AbstractRecipeLogic capability, @Nonnull IP
             }
             int EUt = capability.getInfoProviderEUt();
             int absEUt = Math.abs(EUt);
+            boolean consumer = capability.consumesEnergy();
             String text = null;
 
             if (tileEntity instanceof IGregTechTileEntity) {
                 IGregTechTileEntity gtTileEntity = (IGregTechTileEntity) tileEntity;
                 MetaTileEntity mte = gtTileEntity.getMetaTileEntity();
-                if (mte instanceof SteamMetaTileEntity) {
-                    text = TextFormatting.RED.toString() + absEUt + TextStyleClass.INFO + " L/t " + "{*material.steam*}";
+                if (mte instanceof SteamMetaTileEntity || mte instanceof MetaTileEntityLargeBoiler) {
+                    text = TextFormatting.RED.toString() + absEUt + TextStyleClass.INFO + " L/t {*gregtech.top.steam*} {*" + Materials.Steam.getUnlocalizedName() + "*}";
                 }
             }
             if (text == null) {
                 // Default behavior, if this TE is not a steam machine (or somehow not instanceof IGregTechTileEntity...)
                 text = TextFormatting.RED.toString() + absEUt + TextStyleClass.INFO + " EU/t" + TextFormatting.GREEN + " (" + GTValues.VNF[GTUtility.getTierByVoltage(absEUt)] + TextFormatting.GREEN + ")";
             }
 
-            if (EUt > 0) {
+            if (EUt == 0) return; // idk what to do for 0 eut
+
+            if (consumer) {
                 probeInfo.text(TextStyleClass.INFO + "{*gregtech.top.energy_consumption*} " + text);
-            } else if (EUt < 0) {
+            } else {
                 probeInfo.text(TextStyleClass.INFO + "{*gregtech.top.energy_production*} " + text);
             }
         }

src/main/resources/assets/gregtech/lang/en_us.lang

@@ -57,6 +57,7 @@ gregtech.top.working_disabled=Working Disabled
 
 gregtech.top.energy_consumption=Using
 gregtech.top.energy_production=Producing
+gregtech.top.steam=of
 
 gregtech.top.transform_up=Step Up
 gregtech.top.transform_down=Step Down