Remove capturing lambdas when updating swim and step height attributes

src/api/java/mekanism/api/functions/ToFloatFunction.java

@@ -0,0 +1,26 @@
+package mekanism.api.functions;
+
+import java.util.function.Function;
+
+/**
+ * Represents a function that produces a float-valued result.  This is the {@code float}-producing primitive specialization for {@link Function}.
+ *
+ * <p>This is a <a href="package-summary.html">functional interface</a>
+ * whose functional method is {@link #applyAsFloat(Object)}.
+ *
+ * @param <T> the type of the input to the function
+ *
+ * @see Function
+ * @since 10.5.15
+ */
+@FunctionalInterface
+public interface ToFloatFunction<T> {
+
+    /**
+     * Applies this function to the given argument.
+     *
+     * @param value the function argument
+     * @return the function result
+     */
+    float applyAsFloat(T value);
+}

src/main/java/mekanism/client/render/lib/QuadUtils.java

@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Function;
+import mekanism.api.functions.ToFloatFunction;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 
@@ -83,15 +83,15 @@ public static void contractUVs(Quad quad) {
         }
     }
 
-    private static float[] contract(Quad quad, Function<Vertex, Float> uvf, float ep) {
+    private static float[] contract(Quad quad, ToFloatFunction<Vertex> uvf, float ep) {
         float center = 0;
         float[] ret = new float[4];
         for (int v = 0; v < 4; v++) {
-            center += uvf.apply(quad.getVertices()[v]);
+            center += uvf.applyAsFloat(quad.getVertices()[v]);
         }
         center /= 4;
         for (int v = 0; v < 4; v++) {
-            float orig = uvf.apply(quad.getVertices()[v]);
+            float orig = uvf.applyAsFloat(quad.getVertices()[v]);
             float shifted = orig * (1 - eps) + center * eps;
             float delta = orig - shifted;
             if (Math.abs(delta) < ep) { // not moving a fraction of a pixel

src/main/java/mekanism/common/base/PlayerState.java

@@ -3,7 +3,7 @@
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import java.util.Set;
 import java.util.UUID;
-import mekanism.api.functions.FloatSupplier;
+import mekanism.api.functions.ToFloatFunction;
 import mekanism.client.sound.PlayerSound.SoundType;
 import mekanism.client.sound.SoundHandler;
 import mekanism.common.CommonPlayerTickHandler;
@@ -145,7 +145,7 @@ public Set<UUID> getActiveScubaMasks() {
     // ----------------------
 
     public void updateStepAssist(Player player) {
-        updateAttribute(player, NeoForgeMod.STEP_HEIGHT.value(), STEP_ASSIST_MODIFIER_UUID, "Step Assist", () -> CommonPlayerTickHandler.getStepBoost(player));
+        updateAttribute(player, NeoForgeMod.STEP_HEIGHT.value(), STEP_ASSIST_MODIFIER_UUID, "Step Assist", CommonPlayerTickHandler::getStepBoost);
     }
 
     // ----------------------
@@ -155,15 +155,15 @@ public void updateStepAssist(Player player) {
     // ----------------------
 
     public void updateSwimBoost(Player player) {
-        updateAttribute(player, NeoForgeMod.SWIM_SPEED.value(), SWIM_BOOST_MODIFIER_UUID, "Swim Boost", () -> CommonPlayerTickHandler.getSwimBoost(player));
+        updateAttribute(player, NeoForgeMod.SWIM_SPEED.value(), SWIM_BOOST_MODIFIER_UUID, "Swim Boost", CommonPlayerTickHandler::getSwimBoost);
     }
 
-    //TODO - 1.20.4: Move these to the items?
-    private void updateAttribute(Player player, Attribute attribute, UUID uuid, String name, FloatSupplier additionalSupplier) {
+    //Note: The attributes that currently use this cannot be converted to just being attributes on the items, as they can be disabled based on the player state
+    private void updateAttribute(Player player, Attribute attribute, UUID uuid, String name, ToFloatFunction<Player> additionalSupplier) {
         AttributeInstance attributeInstance = player.getAttribute(attribute);
         if (attributeInstance != null) {
             AttributeModifier existing = attributeInstance.getModifier(uuid);
-            float additional = additionalSupplier.getAsFloat();
+            float additional = additionalSupplier.applyAsFloat(player);
             if (existing != null) {
                 if (existing.getAmount() == additional) {
                     //If we already have it set to the correct value just exit