Finish going through and replacing various numbers with taking constants into account to make it easier to track down what things need to be adjusted to fully support vanilla's tick command

Author: pupnewfster

src/datagen/main/java/mekanism/client/texture/MekanismSpriteSourceProvider.java

@@ -33,7 +33,7 @@ protected void gather() {
               Mekanism.rl("entity/armor/mekatool")
         );
 
-        //TODO - 1.20: Add javadocs stating that chemical resources now need to be added via sources???
+        //TODO - 1.21: Add javadocs stating that chemical resources now need to be added via sources???
         // is this even accurate? See if fluids need it as well. Chemicals potentially should use their own directory as well
         // just to simplify things? Or maybe we add manually and then also add a specific directory to make it easier for others
         addChemicalSprites(atlas);

src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java

@@ -131,17 +131,17 @@ public class GeneratorsConfig extends BaseMekanismConfig {
         turbineBladesPerCoil = CachedIntValue.wrap(this, builder.comment("The number of blades on each turbine coil per blade applied.")
               .defineInRange("turbineBladesPerCoil", 4, 1, 12));
         turbineVentGasFlow = CachedDoubleValue.wrap(this, builder.comment("The rate at which steam is vented into the turbine.")
-              .defineInRange("turbineVentGasFlow", 32_000D, 0.1, 1_024_000));
+              .defineInRange("turbineVentGasFlow", 32D * FluidType.BUCKET_VOLUME, 0.1, 1_024 * FluidType.BUCKET_VOLUME));
         turbineDisperserGasFlow = CachedDoubleValue.wrap(this, builder.comment("The rate at which steam is dispersed into the turbine.")
-              .defineInRange("turbineDisperserGasFlow", 1_280D, 0.1, 1_024_000));
+              .defineInRange("turbineDisperserGasFlow", 1_280D, 0.1, 1_024 * FluidType.BUCKET_VOLUME));
         turbineEnergyCapacityPerVolume = CachedFloatingLongValue.define(this, builder, "Amount of energy (J) that each block of the turbine contributes to the total energy capacity. Max = volume * energyCapacityPerVolume",
               "energyCapacityPerVolume", FloatingLong.createConst(16_000_000L), CachedFloatingLongValue.greaterZeroLessThan(FloatingLong.createConst(1_000_000_000_000L)));
         //Note: We use maxVolume as it still is a large number, and we have no reason to go higher even if some things we technically could
         int maxTurbine = 17 * 17 * 18;
         turbineGasPerTank = CachedLongValue.wrap(this, builder.comment("Amount of gas (mB) that each block of the turbine's steam cavity contributes to the volume. Max = volume * gasPerTank")
               .defineInRange("gasPerTank", 64L * FluidType.BUCKET_VOLUME, 1, Long.MAX_VALUE / maxTurbine));
         condenserRate = CachedIntValue.wrap(this, builder.comment("The rate at which steam is condensed in the turbine.")
-              .defineInRange("condenserRate", 64_000, 1, 2_000_000));
+              .defineInRange("condenserRate", 64 * FluidType.BUCKET_VOLUME, 1, 2_000 * FluidType.BUCKET_VOLUME));
         builder.pop();
 
         builder.comment("Wind Generator Settings").push(WIND_CATEGORY);

src/generators/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java

@@ -4,8 +4,10 @@
 import mekanism.api.RelativeSide;
 import mekanism.api.math.FloatingLong;
 import mekanism.common.tile.interfaces.IBoundingBlock;
+import mekanism.common.util.MekanismUtils;
 import mekanism.generators.common.config.MekanismGeneratorsConfig;
 import mekanism.generators.common.registries.GeneratorsBlocks;
+import net.minecraft.SharedConstants;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.Level;
@@ -101,7 +103,7 @@ private static class AdvancedSolarCheck extends SolarCheck {
         public AdvancedSolarCheck(Level world, BlockPos pos) {
             super(world, pos);
             //Recheck between every 10-30 ticks, to not end up checking each position each tick
-            recheckFrequency = Mth.nextInt(world.random, 10, 30);
+            recheckFrequency = Mth.nextInt(world.random, MekanismUtils.TICKS_PER_HALF_SECOND, MekanismUtils.TICKS_PER_HALF_SECOND + SharedConstants.TICKS_PER_SECOND);
         }
 
         @Override

src/generators/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java

@@ -93,7 +93,7 @@ protected IFluidTankHolder getInitialFluidTanks(IContentsListener listener) {
     protected IInventorySlotHolder getInitialInventory(IContentsListener listener) {
         InventorySlotHelper builder = InventorySlotHelper.forSide(this::getDirection);
         //Divide the burn time by 20 as that is the ratio of how much a bucket of lava would burn for
-        // Eventually we may want to grab the 20 dynamically in case some mod is changing the burn time of a lava bucket
+        //TODO: Eventually we may want to grab the 20 dynamically in case some mod is changing the burn time of a lava bucket
         builder.addSlot(fuelSlot = FluidFuelInventorySlot.forFuel(lavaTank, stack -> stack.getBurnTime(null) / 20, size -> new FluidStack(Fluids.LAVA, size),
               listener, 17, 35), RelativeSide.FRONT, RelativeSide.LEFT, RelativeSide.BACK, RelativeSide.TOP, RelativeSide.BOTTOM);
         builder.addSlot(energySlot = EnergyInventorySlot.drain(getEnergyContainer(), listener, 143, 35), RelativeSide.RIGHT);

src/main/java/mekanism/client/recipe_viewer/jei/BaseRecipeCategory.java

@@ -210,14 +210,14 @@ public IDrawable getIcon() {
 
     protected IProgressInfoHandler getSimpleProgressTimer() {
         if (timer == null) {
-            timer = guiHelper.createTickTimer(SharedConstants.TICKS_PER_SECOND, 20, false);
+            timer = guiHelper.createTickTimer(SharedConstants.TICKS_PER_SECOND, SharedConstants.TICKS_PER_SECOND, false);
         }
-        return () -> timer.getValue() / 20D;
+        return () -> timer.getValue() / (double) SharedConstants.TICKS_PER_SECOND;
     }
 
     protected IBarInfoHandler getBarProgressTimer() {
         if (timer == null) {
-            timer = guiHelper.createTickTimer(SharedConstants.TICKS_PER_SECOND, 20, false);
+            timer = guiHelper.createTickTimer(SharedConstants.TICKS_PER_SECOND, SharedConstants.TICKS_PER_SECOND, false);
         }
         return new IBarInfoHandler() {
             @Override
@@ -227,7 +227,7 @@ public Component getTooltip() {
 
             @Override
             public double getLevel() {
-                return timer.getValue() / 20D;
+                return timer.getValue() / (double) SharedConstants.TICKS_PER_SECOND;
             }
         };
     }

src/main/java/mekanism/client/render/ModelRenderer.java

@@ -12,14 +12,15 @@
 import mekanism.common.util.MekanismUtils;
 import net.minecraft.core.Direction;
 import net.neoforged.neoforge.fluids.FluidStack;
+import net.neoforged.neoforge.fluids.FluidType;
 import org.jetbrains.annotations.Nullable;
 
 public final class ModelRenderer {
 
     private ModelRenderer() {
     }
 
-    private static final int BLOCK_STAGES = 1_000;
+    private static final int BLOCK_STAGES = FluidType.BUCKET_VOLUME;
 
     private static final Map<RenderData, Int2ObjectMap<Model3D>> cachedCenterData = new Object2ObjectOpenHashMap<>();
     private static final Map<ValveRenderData, Float2ObjectMap<Model3D>> cachedValveFluids = new Object2ObjectOpenHashMap<>();

src/main/java/mekanism/client/render/lib/effect/BoltRenderer.java

@@ -24,7 +24,7 @@ public class BoltRenderer {
 
     /** Amount of times per tick we refresh. 3 implies 60 Hz. */
     private static final float REFRESH_TIME = 3F;
-    /** We will keep track of an owner's render data for 100 ticks after there are no bolts remaining. */
+    /** We will keep track of an owner's render data for 5 seconds after there are no bolts remaining. */
     private static final double MAX_OWNER_TRACK_TIME = 5 * SharedConstants.TICKS_PER_SECOND;
 
     private Timestamp refreshTimestamp = new Timestamp();

src/main/java/mekanism/client/sound/SoundHandler.java

@@ -291,7 +291,7 @@ private static class TileTickableSound extends AbstractTickableSoundInstance {
 
         private final float originalVolume;
 
-        // Choose an interval between 60-80 ticks (3-4 seconds) to check for muffling changes. We do this
+        // Choose an interval between 20-40 ticks (1-2 seconds) to check for muffling changes. We do this
         // to ensure that not every tile sound tries to run on the same tick and thus create
         // uneven spikes of CPU usage
         private final int checkInterval = SharedConstants.TICKS_PER_SECOND + ThreadLocalRandom.current().nextInt(SharedConstants.TICKS_PER_SECOND);

src/main/java/mekanism/common/block/attribute/AttributeEnergy.java

@@ -2,6 +2,7 @@
 
 import mekanism.api.math.FloatingLong;
 import mekanism.api.math.FloatingLongSupplier;
+import net.minecraft.SharedConstants;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -11,7 +12,7 @@ public class AttributeEnergy implements Attribute {
 
     private FloatingLongSupplier energyUsage = () -> FloatingLong.ZERO;
     // 2 operations (20 secs) worth of ticks * usage
-    private FloatingLongSupplier energyStorage = () -> energyUsage.get().multiply(400);
+    private FloatingLongSupplier energyStorage = () -> energyUsage.get().multiply(20 * SharedConstants.TICKS_PER_SECOND);
 
     public AttributeEnergy(@Nullable FloatingLongSupplier energyUsage, @Nullable FloatingLongSupplier energyStorage) {
         if (energyUsage != null) {

src/main/java/mekanism/common/capabilities/energy/ResistiveHeaterEnergyContainer.java

@@ -9,6 +9,7 @@
 import mekanism.common.block.attribute.AttributeEnergy;
 import mekanism.common.tile.machine.TileEntityResistiveHeater;
 import mekanism.common.util.NBTUtils;
+import net.minecraft.SharedConstants;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import org.jetbrains.annotations.NotNull;
@@ -17,7 +18,7 @@
 @NothingNullByDefault
 public class ResistiveHeaterEnergyContainer extends MachineEnergyContainer<TileEntityResistiveHeater> {
 
-    public static final long USAGE_MULTIPLIER = 400;
+    public static final long USAGE_MULTIPLIER = 20 * SharedConstants.TICKS_PER_SECOND;
 
     public static ResistiveHeaterEnergyContainer input(TileEntityResistiveHeater tile, @Nullable IContentsListener listener) {
         AttributeEnergy electricBlock = validateBlock(tile);