Cache various values that are based on number of installed upgrades

Author: pupnewfster

src/main/java/mekanism/common/tile/machine/TileEntityElectricPump.java

@@ -83,6 +83,7 @@ public class TileEntityElectricPump extends TileEntityMekanism implements IConfi
      */
     private static final int BASE_TICKS_REQUIRED = 19;
     public static final int MAX_FLUID = 10_000;
+    private static final int BASE_OUTPUT_RATE = 256;
 
     /**
      * This pump's tank
@@ -101,6 +102,7 @@ public class TileEntityElectricPump extends TileEntityMekanism implements IConfi
      */
     public int operatingTicks;
     private boolean usedEnergy = false;
+    private int outputRate = BASE_OUTPUT_RATE;
     /**
      * The nodes that have full sources near them or in them
      */
@@ -179,7 +181,7 @@ protected boolean onUpdateServer() {
             if (fluidHandlerAbove.isEmpty()) {
                 fluidHandlerAbove = List.of(Capabilities.FLUID.createCache((ServerLevel) level, worldPosition.above(), Direction.DOWN));
             }
-            FluidUtils.emit(fluidHandlerAbove, fluidTank, 256 * (1 + upgradeComponent.getUpgrades(Upgrade.SPEED)));
+            FluidUtils.emit(fluidHandlerAbove, fluidTank, outputRate);
         }
         return sendUpdatePacket;
     }
@@ -369,6 +371,7 @@ public void recalculateUpgrades(Upgrade upgrade) {
         super.recalculateUpgrades(upgrade);
         if (upgrade == Upgrade.SPEED) {
             ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED);
+            outputRate = BASE_OUTPUT_RATE * (1 + upgradeComponent.getUpgrades(Upgrade.SPEED));
         }
     }
 

src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java

@@ -96,6 +96,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityRecipeMachine<Ele
      */
     public static final long MAX_GAS = 2_400;
     public static final int MAX_FLUID = 24_000;
+    private static final int BASE_DUMP_RATE = 8;
     private static final BiFunction<FloatingLong, TileEntityElectrolyticSeparator, FloatingLong> BASE_ENERGY_CALCULATOR =
           (base, tile) -> base.multiply(tile.getRecipeEnergyMultiplier());
 
@@ -124,6 +125,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityRecipeMachine<Ele
     private FloatingLong clientEnergyUsed = FloatingLong.ZERO;
     private FloatingLong recipeEnergyMultiplier = FloatingLong.ONE;
     private int baselineMaxOperations = 1;
+    private long dumpRate = BASE_DUMP_RATE;
 
     private final IOutputHandler<@NotNull ElectrolysisRecipeOutput> outputHandler;
     private final IInputHandler<@NotNull FluidStack> inputHandler;
@@ -246,7 +248,7 @@ protected boolean onUpdateServer() {
     private void handleTank(IGasTank tank, GasMode mode) {
         if (!tank.isEmpty()) {
             if (mode == GasMode.DUMPING) {
-                tank.shrinkStack(8 * (long) Math.pow(2, upgradeComponent.getUpgrades(Upgrade.SPEED)), Action.EXECUTE);
+                tank.shrinkStack(dumpRate, Action.EXECUTE);
             } else if (mode == GasMode.DUMPING_EXCESS) {
                 long target = getDumpingExcessTarget(tank);
                 long stored = tank.getStored();
@@ -319,7 +321,9 @@ public CachedRecipe<ElectrolysisRecipe> createNewCachedRecipe(@NotNull Electroly
     public void recalculateUpgrades(Upgrade upgrade) {
         super.recalculateUpgrades(upgrade);
         if (upgrade == Upgrade.SPEED) {
-            baselineMaxOperations = (int) Math.pow(2, upgradeComponent.getUpgrades(Upgrade.SPEED));
+            double speed = Math.pow(2, upgradeComponent.getUpgrades(Upgrade.SPEED));
+            baselineMaxOperations = (int) speed;
+            dumpRate = (long) (BASE_DUMP_RATE * speed);
         }
     }
 

src/main/java/mekanism/common/tile/qio/TileEntityQIOFilterHandler.java

@@ -17,6 +17,8 @@ public class TileEntityQIOFilterHandler extends TileEntityQIOComponent implement
 
     @SuppressWarnings({"unchecked", "rawtypes"})
     private final SortableFilterManager<QIOFilter<?>> filterManager = new SortableFilterManager<QIOFilter<?>>((Class) QIOFilter.class, this::markForSave);
+    private int maxTransitCount = 64;
+    private int maxTransitTypes = 1;
 
     public TileEntityQIOFilterHandler(IBlockProvider blockProvider, BlockPos pos, BlockState state) {
         super(blockProvider, pos, state);
@@ -27,6 +29,18 @@ public SortableFilterManager<QIOFilter<?>> getFilterManager() {
         return filterManager;
     }
 
+    @Override
+    public void recalculateUpgrades(Upgrade upgrade) {
+        super.recalculateUpgrades(upgrade);
+        if (upgrade == Upgrade.SPEED) {
+            int speedUpgrades = upgradeComponent.getUpgrades(Upgrade.SPEED);
+            // 64 to 320 items
+            maxTransitCount = 64 + 32 * speedUpgrades;
+            // 1 to 5 types
+            maxTransitTypes = Math.round(1F + speedUpgrades / 2F);
+        }
+    }
+
     @Override
     public void writeSustainedData(CompoundTag dataMap) {
         super.writeSustainedData(dataMap);
@@ -46,13 +60,11 @@ public void addContainerTrackers(MekanismContainer container) {
     }
 
     protected int getMaxTransitCount() {
-        // 64 to 320 items
-        return 64 + 32 * upgradeComponent.getUpgrades(Upgrade.SPEED);
+        return maxTransitCount;
     }
 
     protected int getMaxTransitTypes() {
-        // 1 to 5 types
-        return Math.round(1F + upgradeComponent.getUpgrades(Upgrade.SPEED) / 2F);
+        return maxTransitTypes;
     }
 
     //Methods relating to IComputerTile