Work on removing more capturing lambdas

Author: pupnewfster

src/additions/java/mekanism/additions/common/item/ItemWalkieTalkie.java

@@ -63,7 +63,7 @@ public void changeMode(@NotNull Player player, @NotNull ItemStack stack, int shi
             int newChannel = Math.floorMod(data.getChannel() + shift - 1, 8) + 1;
             if (data.getChannel() != newChannel) {
                 data.channel = newChannel;
-                displayChange.sendMessage(player, () -> AdditionsLang.CHANNEL_CHANGE.translate(newChannel));
+                displayChange.sendMessage(player, newChannel, AdditionsLang.CHANNEL_CHANGE::translate);
             }
         }
     }

src/api/java/mekanism/api/IDisableableEnum.java

@@ -17,11 +17,21 @@ public interface IDisableableEnum<TYPE extends Enum<TYPE> & IDisableableEnum<TYP
      */
     boolean isEnabled();
 
+    @Override
+    default TYPE getNext() {
+        return IIncrementalEnum.super.getNext(IDisableableEnum::isEnabled);
+    }
+
     @Override
     default TYPE getNext(Predicate<TYPE> isValid) {
         return IIncrementalEnum.super.getNext(element -> element.isEnabled() && isValid.test(element));
     }
 
+    @Override
+    default TYPE getPrevious() {
+        return IIncrementalEnum.super.getPrevious(IDisableableEnum::isEnabled);
+    }
+
     @Override
     default TYPE getPrevious(Predicate<TYPE> isValid) {
         return IIncrementalEnum.super.getPrevious(element -> element.isEnabled() && isValid.test(element));

src/generators/java/mekanism/generators/client/render/RenderFissionReactor.java

@@ -24,7 +24,6 @@
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.profiling.ProfilerFiller;
-import net.neoforged.neoforge.common.util.Lazy;
 
 @NothingNullByDefault
 public class RenderFissionReactor extends MultiblockTileEntityRenderer<FissionReactorMultiblockData, TileEntityFissionReactorCasing> {
@@ -55,8 +54,9 @@ public RenderFissionReactor(BlockEntityRendererProvider.Context context) {
     protected void render(TileEntityFissionReactorCasing tile, FissionReactorMultiblockData multiblock, float partialTick, PoseStack matrix, MultiBufferSource renderer,
           int light, int overlayLight, ProfilerFiller profiler) {
         BlockPos pos = tile.getBlockPos();
-        Lazy<VertexConsumer> buffer = Lazy.of(() -> renderer.getBuffer(Sheets.translucentCullBlockSheet()));
+        VertexConsumer buffer = null;
         if (multiblock.isBurning()) {
+            buffer = renderer.getBuffer(Sheets.translucentCullBlockSheet());
             profiler.push(GeneratorsProfilerConstants.FISSION_FUEL_ASSEMBLY);
             Model3D model = glowModel.get();
             Camera camera = getCamera();
@@ -66,20 +66,26 @@ protected void render(TileEntityFissionReactorCasing tile, FissionReactorMultibl
                 matrix.translate(assemblyPos.getX() - pos.getX(), assemblyPos.getY() - pos.getY(), assemblyPos.getZ() - pos.getZ());
                 //Add a bit of extra distance so that it includes the lower part of the control rod
                 matrix.scale(1, assembly.height() + 0.625F, 1);
-                MekanismRenderer.renderObject(model, matrix, buffer.get(), GLOW_ARGB, LightTexture.FULL_BRIGHT, overlayLight, FaceDisplay.FRONT, camera, assemblyPos);
+                MekanismRenderer.renderObject(model, matrix, buffer, GLOW_ARGB, LightTexture.FULL_BRIGHT, overlayLight, FaceDisplay.FRONT, camera, assemblyPos);
                 matrix.popPose();
             }
             profiler.pop();
         }
         if (!multiblock.fluidCoolantTank.isEmpty()) {
+            if (buffer == null) {
+                buffer = renderer.getBuffer(Sheets.translucentCullBlockSheet());
+            }
             FluidRenderData data = RenderData.Builder.create(multiblock.fluidCoolantTank.getFluid()).of(multiblock).build();
-            renderObject(data, multiblock.valves, pos, matrix, buffer.get(), overlayLight, multiblock.prevCoolantScale);
+            renderObject(data, multiblock.valves, pos, matrix, buffer, overlayLight, multiblock.prevCoolantScale);
         }
         if (!multiblock.heatedCoolantTank.isEmpty()) {
+            if (buffer == null) {
+                buffer = renderer.getBuffer(Sheets.translucentCullBlockSheet());
+            }
             RenderData data = RenderData.Builder.create(multiblock.heatedCoolantTank.getStack()).of(multiblock).build();
             //Create a slightly shrunken version of the model if it is missing to prevent z-fighting
             Model3D gasModel = cachedHeatedCoolantModels.computeIfAbsent(data, d -> ModelRenderer.getModel(d, 1).copy().shrink(0.01F));
-            renderObject(data, pos, gasModel, matrix, buffer.get(), overlayLight, multiblock.prevHeatedCoolantScale);
+            renderObject(data, pos, gasModel, matrix, buffer, overlayLight, multiblock.prevHeatedCoolantScale);
         }
     }
 

src/generators/java/mekanism/generators/client/render/RenderWindGenerator.java

@@ -26,7 +26,9 @@ public RenderWindGenerator(BlockEntityRendererProvider.Context context) {
 
     @Override
     protected void render(TileEntityWindGenerator tile, float partialTick, PoseStack matrix, MultiBufferSource renderer, int light, int overlayLight, ProfilerFiller profiler) {
-        renderTranslated(tile, partialTick, matrix, (poseStack, angle) -> model.render(poseStack, renderer, angle, light, overlayLight, false));
+        double angle = setupRenderer(tile, partialTick, matrix);
+        model.render(matrix, renderer, angle, light, overlayLight, false);
+        matrix.popPose();
     }
 
     @Override
@@ -49,11 +51,13 @@ public AABB getRenderBoundingBox(TileEntityWindGenerator tile) {
     @Override
     public void renderWireFrame(BlockEntity tile, float partialTick, PoseStack matrix, VertexConsumer buffer, int red, int green, int blue, int alpha) {
         if (tile instanceof TileEntityWindGenerator windGenerator) {
-            renderTranslated(windGenerator, partialTick, matrix, (poseStack, angle) -> model.renderWireFrame(poseStack, buffer, angle, red, green, blue, alpha));
+            double angle = setupRenderer(windGenerator, partialTick, matrix);
+            model.renderWireFrame(matrix, buffer, angle, red, green, blue, alpha);
+            matrix.popPose();
         }
     }
 
-    private void renderTranslated(TileEntityWindGenerator tile, float partialTick, PoseStack matrix, WindGeneratorRenderer renderer) {
+    private double setupRenderer(TileEntityWindGenerator tile, float partialTick, PoseStack matrix) {
         matrix.pushPose();
         matrix.translate(0.5, 1.5, 0.5);
         MekanismRenderer.rotate(matrix, tile.getDirection(), 0, 180, 90, 270);
@@ -62,12 +66,6 @@ private void renderTranslated(TileEntityWindGenerator tile, float partialTick, P
         if (tile.getActive() && partialTick > 0) {
             angle = (angle + tile.getHeightSpeedRatio() * partialTick) % 360;
         }
-        renderer.render(matrix, angle);
-        matrix.popPose();
-    }
-
-    private interface WindGeneratorRenderer {
-
-        void render(PoseStack poseStack, double angle);
+        return angle;
     }
 }

src/generators/java/mekanism/generators/common/content/gear/mekasuit/ModuleGeothermalGeneratorUnit.java

@@ -1,5 +1,7 @@
 package mekanism.generators.common.content.gear.mekasuit;
 
+import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import java.util.Map;
 import mekanism.api.Action;
 import mekanism.api.AutomationType;
@@ -9,9 +11,12 @@
 import mekanism.api.gear.IModule;
 import mekanism.api.heat.HeatAPI;
 import mekanism.api.math.FloatingLong;
+import mekanism.api.math.FloatingLongSupplier;
+import mekanism.common.config.listener.ConfigBasedCachedFloatSupplier;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.FluidInDetails;
 import mekanism.generators.common.config.MekanismGeneratorsConfig;
+import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
 import net.minecraft.tags.DamageTypeTags;
 import net.minecraft.world.damagesource.DamageSource;
@@ -24,14 +29,28 @@
 @ParametersAreNotNullByDefault
 public class ModuleGeothermalGeneratorUnit implements ICustomModule<ModuleGeothermalGeneratorUnit> {
 
+    private static final Int2ObjectMap<ModuleDamageAbsorbInfo> DAMAGE_ABSORB_VALUES = Util.make(() -> {
+        int maxSize = 8;
+        //Based on the max size of the module
+        Int2ObjectMap<ModuleDamageAbsorbInfo> map = new Int2ObjectArrayMap<>(maxSize);
+        FloatingLongSupplier NO_COST = () -> FloatingLong.ZERO;
+        for (int count = 1; count <= maxSize; count++) {
+            //Scale the amount absorbed by how many modules are installed out of the possible number installed
+            float ratio = count / (float) maxSize;
+            map.put(count, new ModuleDamageAbsorbInfo(new ConfigBasedCachedFloatSupplier(() -> MekanismGeneratorsConfig.gear.mekaSuitHeatDamageReductionRatio.get() * ratio,
+                  MekanismGeneratorsConfig.gear.mekaSuitHeatDamageReductionRatio), NO_COST));
+        }
+        return map;
+    });
+
     @Override
     public void tickServer(IModule<ModuleGeothermalGeneratorUnit> module, Player player) {
         IEnergyContainer energyContainer = module.getEnergyContainer();
         if (energyContainer != null && !energyContainer.getNeeded().isZero()) {
             double highestScaledDegrees = 0;
             double legHeight = player.isCrouching() ? 0.6 : 0.7;
-            Map<FluidType, FluidInDetails> fluidsIn = MekanismUtils.getFluidsIn(player, bb -> new AABB(bb.minX, bb.minY, bb.minZ, bb.maxX,
-                  Math.min(bb.minY + legHeight, bb.maxY), bb.maxZ));
+            Map<FluidType, FluidInDetails> fluidsIn = MekanismUtils.getFluidsIn(player, legHeight, (bb, data) -> new AABB(bb.minX, bb.minY, bb.minZ, bb.maxX,
+                  Math.min(bb.minY + data, bb.maxY), bb.maxZ));
             for (Map.Entry<FluidType, FluidInDetails> entry : fluidsIn.entrySet()) {
                 FluidInDetails details = entry.getValue();
                 double height = details.getMaxHeight();
@@ -75,11 +94,6 @@ public void tickServer(IModule<ModuleGeothermalGeneratorUnit> module, Player pla
     @Nullable
     @Override
     public ModuleDamageAbsorbInfo getDamageAbsorbInfo(IModule<ModuleGeothermalGeneratorUnit> module, DamageSource damageSource) {
-        if (damageSource.is(DamageTypeTags.IS_FIRE)) {
-            //Scale the amount absorbed by how many modules are installed out of the possible number installed
-            float ratio = MekanismGeneratorsConfig.gear.mekaSuitHeatDamageReductionRatio.get() * (module.getInstalledCount() / (float) module.getData().getMaxStackSize());
-            return new ModuleDamageAbsorbInfo(() -> ratio, () -> FloatingLong.ZERO);
-        }
-        return null;
+        return damageSource.is(DamageTypeTags.IS_FIRE) ? DAMAGE_ABSORB_VALUES.get(module.getInstalledCount()) : null;
     }
 }

src/main/java/mekanism/client/key/MekKeyBindingBuilder.java

@@ -6,6 +6,7 @@
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import mekanism.api.annotations.NothingNullByDefault;
+import mekanism.api.functions.ConstantPredicates;
 import mekanism.api.text.IHasTranslationKey;
 import mekanism.common.MekanismLang;
 import net.minecraft.client.KeyMapping;
@@ -93,7 +94,7 @@ public MekKeyBindingBuilder onKeyUp(Consumer<KeyMapping> onKeyUp) {
     }
 
     public MekKeyBindingBuilder toggleable() {
-        return toggleable(() -> true);
+        return toggleable(ConstantPredicates.ALWAYS_TRUE);
     }
 
     public MekKeyBindingBuilder toggleable(BooleanSupplier toggleable) {

src/main/java/mekanism/client/recipe_viewer/QIOCraftingTransferHandler.java

@@ -264,7 +264,10 @@ record TrackedIngredients<SLOT extends RVRecipeSlot>(SLOT view, Set<HashedItem>
             }
             if (!missingSlots.isEmpty()) {
                 //If we have any missing slots, report that they are missing to the user and don't allow transferring
-                List<SLOT> missing = missingSlots.intStream().mapToObj(slot -> hashedIngredients.get((byte) slot).view()).toList();
+                List<SLOT> missing = new ArrayList<>(missingSlots.size());
+                for (byte slot : missingSlots) {
+                    missing.add(hashedIngredients.get(slot).view());
+                }
                 return recipeHelper.createMissingSlotsError(missing);
             }
         }

src/main/java/mekanism/client/recipe_viewer/color/PaintingColorDetails.java

@@ -6,7 +6,7 @@
 public class PaintingColorDetails extends RecipeViewerColorDetails<Pigment, PigmentStack> {
 
     public PaintingColorDetails() {
-        super(PigmentStack.EMPTY);
+        super(() -> PigmentStack.EMPTY);
     }
 
     @Override

src/main/java/mekanism/client/recipe_viewer/color/PigmentExtractorColorDetails.java

@@ -6,7 +6,7 @@
 public class PigmentExtractorColorDetails extends RecipeViewerColorDetails<Pigment, PigmentStack> {
 
     public PigmentExtractorColorDetails() {
-        super(PigmentStack.EMPTY);
+        super(() -> PigmentStack.EMPTY);
     }
 
     @Override

src/main/java/mekanism/client/recipe_viewer/color/PigmentMixerColorDetails.java

@@ -9,7 +9,7 @@ public class PigmentMixerColorDetails extends RecipeViewerColorDetails<Pigment,
     private Supplier<PigmentStack> outputIngredient;
 
     public PigmentMixerColorDetails() {
-        super(PigmentStack.EMPTY);
+        super(() -> PigmentStack.EMPTY);
         setOutputIngredient(empty);
     }
 
@@ -29,10 +29,6 @@ public int getColorTo() {
         return getColor(outputIngredient);
     }
 
-    public void setOutputIngredient(PigmentStack outputIngredient) {
-        setOutputIngredient(() -> outputIngredient);
-    }
-
     public void setOutputIngredient(Supplier<PigmentStack> outputIngredient) {
         this.outputIngredient = outputIngredient;
     }