Show "Working Disabled" instead of "Idle" when machine is soft mallet…

…ed (#3780) Co-authored-by: Martin Robertz <[email protected]>
GTNewHorizons · Jan 10, 2025 · 6ce7bf8 · 6ce7bf8
1 parent a863f08
commit 6ce7bf8
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/src/main/java/ggfab/mte/MTEAdvAssLine.java b/src/main/java/ggfab/mte/MTEAdvAssLine.java
@@ -931,6 +931,7 @@ public void getWailaBody(ItemStack itemStack, List<String> currentTip, IWailaDat
         NBTTagCompound tag = accessor.getNBTData();
         String machineProgressString = GTWaila.getMachineProgressString(
             tag.getBoolean("isActive"),
+            tag.getBoolean("isAllowedToWork"),
             tag.getInteger("maxProgress"),
             tag.getInteger("progress"));
         currentTip.remove(machineProgressString);

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java
@@ -1225,6 +1225,7 @@ public void getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDat
             currenttip.add(
                 GTWaila.getMachineProgressString(
                     isActive,
+                    tag.getBoolean("isAllowedToWorkSingleBlock"),
                     tag.getInteger("maxProgressSingleBlock"),
                     tag.getInteger("progressSingleBlock")));
         }
@@ -1255,6 +1256,7 @@ public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompou
         final IGregTechTileEntity tileEntity = getBaseMetaTileEntity();
         if (tileEntity != null) {
             tag.setBoolean("isActiveSingleBlock", tileEntity.isActive());
+            tag.setBoolean("isAllowedToWorkSingleBlock", tileEntity.isAllowedToWork());
             tag.setInteger(
                 "outputFacingSingleBlock",
                 tileEntity.getFrontFacing()

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
@@ -1007,7 +1007,7 @@ protected int getMaxBatchSize() {
 
     /**
      * Gets the pollution this Device outputs to a Muffler per tick (10000 = one Pullution Block)
-     * 
+     *
      * @param aStack what is in controller
      */
     public int getPollutionPerTick(ItemStack aStack) {
@@ -1019,7 +1019,7 @@ public int getPollutionPerTick(ItemStack aStack) {
      * the code of the multiblock.
      *
      * This returns the unmodified raw pollution value, not the one after muffler discounts.
-     * 
+     *
      * @param aStack what is in controller
      */
     public int getPollutionPerSecond(ItemStack aStack) {
@@ -2049,8 +2049,12 @@ public void getWailaBody(ItemStack itemStack, List<String> currentTip, IWailaDat
                 }
             }
         }
-        currentTip
-            .add(GTWaila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress")));
+        currentTip.add(
+            GTWaila.getMachineProgressString(
+                isActive,
+                tag.getBoolean("isAllowedToWork"),
+                tag.getInteger("maxProgress"),
+                tag.getInteger("progress")));
         // Show ns on the tooltip
         if (GTMod.gregtechproxy.wailaAverageNS && tag.hasKey("averageNS")) {
             int tAverageTime = tag.getInteger("averageNS");
@@ -2099,6 +2103,7 @@ public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompou
         final IGregTechTileEntity tileEntity = getBaseMetaTileEntity();
         if (tileEntity != null) {
             tag.setBoolean("isActive", tileEntity.isActive());
+            tag.setBoolean("isAllowedToWork", tileEntity.isAllowedToWork());
             if (tileEntity.isActive()) {
                 if (mEUt < 0) tag.setLong("energyUsage", getActualEnergyUsage());
                 else tag.setLong("energyUsage", (long) -mEUt * mEfficiency / 10000);

diff --git a/src/main/java/gregtech/api/util/GTWaila.java b/src/main/java/gregtech/api/util/GTWaila.java
@@ -3,11 +3,22 @@
 public abstract class GTWaila {
 
     public static String getMachineProgressString(boolean isActive, int maxProgresstime, int progresstime) {
-        return getMachineProgressString(isActive, maxProgresstime, (long) progresstime);
+        return getMachineProgressString(isActive, true, maxProgresstime, (long) progresstime);
+    }
+
+    public static String getMachineProgressString(boolean isActive, boolean isAllowedToWork, int maxProgresstime,
+        int progresstime) {
+        return getMachineProgressString(isActive, isAllowedToWork, maxProgresstime, (long) progresstime);
     }
 
     public static String getMachineProgressString(boolean isActive, long maxProgresstime, long progresstime) {
+        return getMachineProgressString(isActive, true, maxProgresstime, progresstime);
+    }
+
+    public static String getMachineProgressString(boolean isActive, boolean isAllowedToWork, long maxProgresstime,
+        long progresstime) {
 
+        if (!isAllowedToWork) return "Working Disabled";
         if (!isActive) return "Idle";
 
         return "In progress: " + String.format("%,.1f", (double) progresstime / 20)

diff --git a/...a/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTESteamMultiBase.java b/...a/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTESteamMultiBase.java
@@ -393,8 +393,12 @@ public void getWailaBody(ItemStack itemStack, List<String> currentTip, IWailaDat
                         .translateToLocalFormatted("GTPP.waila.steam.use", formatNumbers(actualEnergyUsage * 20)));
             }
         }
-        currentTip
-            .add(GTWaila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress")));
+        currentTip.add(
+            GTWaila.getMachineProgressString(
+                isActive,
+                tag.getBoolean("isAllowedToWork"),
+                tag.getInteger("maxProgress"),
+                tag.getInteger("progress")));
         // Show ns on the tooltip
         if (GTMod.gregtechproxy.wailaAverageNS && tag.hasKey("averageNS")) {
             int tAverageTime = tag.getInteger("averageNS");