remove shift active check

GTNewHorizons · Feb 11, 2025 · b7c7486 · b7c7486
1 parent 523323c
commit b7c7486
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 35 deletions.
diff --git a/src/main/java/appeng/core/settings/TickRates.java b/src/main/java/appeng/core/settings/TickRates.java
@@ -40,7 +40,9 @@ public enum TickRates {
 
     OpenComputersTunnel(1, 5),
 
-    PressureTunnel(1, 120);
+    PressureTunnel(1, 120),
+
+    ThroughputMonitor(20, 100);
 
     private int min;
     private int max;

diff --git a/src/main/java/appeng/parts/reporting/PartThroughputMonitor.java b/src/main/java/appeng/parts/reporting/PartThroughputMonitor.java
@@ -18,6 +18,7 @@
 import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.texture.CableBusTextures;
+import appeng.core.settings.TickRates;
 import appeng.helpers.Reflected;
 import appeng.util.IWideReadableNumberConverter;
 import appeng.util.Platform;
@@ -109,15 +110,10 @@ public boolean onPartShiftActivate(final EntityPlayer player, final Vec3 pos) {
             return false;
         }
 
-        final TileEntity te = this.getTile();
-        final ItemStack eq = player.getCurrentEquippedItem();
+        this.timeMode = (this.timeMode + TIME_UNIT.length - 1) % TIME_UNIT.length;
+        this.host.markForUpdate();
 
-        if (!Platform.isWrench(player, eq, te.xCoord, te.yCoord, te.zCoord) && this.isLocked()) {
-            this.timeMode = (this.timeMode + TIME_UNIT.length - 1) % TIME_UNIT.length;
-            return true;
-        } else {
-            return super.onPartShiftActivate(player, pos);
-        }
+        return true;
     }
 
     @Override
@@ -139,32 +135,13 @@ public boolean onPartActivate(final EntityPlayer player, final Vec3 pos) {
 
         if (!Platform.isWrench(player, eq, te.xCoord, te.yCoord, te.zCoord) && this.isLocked()) {
             this.timeMode = (this.timeMode + 1) % TIME_UNIT.length;
+            this.host.markForUpdate();
             return true;
         } else {
             return super.onPartActivate(player, pos);
         }
     }
 
-    public void updateThroughput(int tick) {
-        if (Platform.isClient()) {
-            return;
-        }
-
-        if (this.getDisplayed() == null) {
-            this.lastStackSize = -1;
-            this.host.markForUpdate();
-            return;
-        } else {
-            long nowStackSize = this.getDisplayed().getStackSize();
-            if (this.lastStackSize != -1) {
-                long changeStackSize = nowStackSize - this.lastStackSize;
-                this.itemNumsChange = (changeStackSize * NUMBER_MULTIPLIER[this.timeMode]) / tick;
-                this.host.markForUpdate();
-            }
-            this.lastStackSize = nowStackSize;
-        }
-    }
-
     @Override
     public void tesrRenderItemNumber(final IAEItemStack ais) {
         GL11.glTranslatef(0.0f, 0.14f, -0.24f);
@@ -196,13 +173,33 @@ public void tesrRenderItemNumber(final IAEItemStack ais) {
 
     @Override
     public TickingRequest getTickingRequest(IGridNode node) {
-        return new TickingRequest(20, 100, false, false);
+        return new TickingRequest(
+                TickRates.ThroughputMonitor.getMin(),
+                TickRates.ThroughputMonitor.getMax(),
+                false,
+                false);
     }
 
     @Override
     public TickRateModulation tickingRequest(IGridNode node, int TicksSinceLastCall) {
-        this.updateThroughput(TicksSinceLastCall);
-        return TickRateModulation.SAME;
+        if (Platform.isClient()) {
+            return TickRateModulation.SAME;
+        }
+
+        if (this.getDisplayed() == null) {
+            this.lastStackSize = -1;
+            this.host.markForUpdate();
+            return TickRateModulation.IDLE;
+        } else {
+            long nowStackSize = this.getDisplayed().getStackSize();
+            if (this.lastStackSize != -1) {
+                long changeStackSize = nowStackSize - this.lastStackSize;
+                this.itemNumsChange = (changeStackSize * NUMBER_MULTIPLIER[this.timeMode]) / TicksSinceLastCall;
+                this.host.markForUpdate();
+            }
+            this.lastStackSize = nowStackSize;
+        }
+        return TickRateModulation.FASTER;
     }
 
 }
diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java
@@ -1924,14 +1924,14 @@ public static String formatNumberLongRestrictedByWidth(final double n, final int
             postFix = String.valueOf(NUM_UNIT[exponent]);
         }
 
-        final String withPrecision = df.format(last / DIVISION_BASE) + postFix;
-        final String withoutPrecision = Long.toString((long) base) + postFix;
+        final String withPrecision = df.format(last / DIVISION_BASE);
+        final String withoutPrecision = Long.toString((long) base);
 
         final String slimResult = (withPrecision.length() <= width) ? withPrecision : withoutPrecision;
 
         // post condition
         assert slimResult.length() <= width;
 
-        return slimResult;
+        return slimResult + postFix;
     }
 }