Remove capturing lambdas from active jetpack lookup

mekanism · Apr 7, 2024 · 086b5b8 · 086b5b8
1 parent 8004e0e
commit 086b5b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java
@@ -1,6 +1,7 @@
 package mekanism.common.item;
 
 import java.util.List;
+import java.util.OptionalInt;
 import mekanism.api.chemical.Chemical;
 import mekanism.api.chemical.ChemicalStack;
 import mekanism.api.chemical.IChemicalHandler;
@@ -44,7 +45,11 @@ public int getBarWidth(@NotNull ItemStack stack) {
 
     @Override
     public int getBarColor(@NotNull ItemStack stack) {
-        return FluidUtils.getRGBDurabilityForDisplay(stack).orElseGet(() -> ChemicalUtil.getRGBDurabilityForDisplay(stack));
+        OptionalInt color = FluidUtils.getRGBDurabilityForDisplay(stack);
+        if (color.isPresent()) {
+            return color.getAsInt();
+        }
+        return ChemicalUtil.getRGBDurabilityForDisplay(stack);
     }
 
     @NotNull

diff --git a/src/main/java/mekanism/common/item/interfaces/IJetpackItem.java b/src/main/java/mekanism/common/item/interfaces/IJetpackItem.java
@@ -90,12 +90,11 @@ static ItemStack getActiveJetpack(LivingEntity entity) {
         if (entity.isPassenger()) {
             return ItemStack.EMPTY;
         }
-        return getJetpack(entity, stack -> {
-            if (stack.getItem() instanceof IJetpackItem jetpackItem && jetpackItem.canUseJetpack(stack)) {
-                return !(entity instanceof Player player) || !player.getCooldowns().isOnCooldown(stack.getItem());
-            }
-            return false;
-        });
+        ItemStack jetpack = getJetpack(entity, stack -> stack.getItem() instanceof IJetpackItem jetpackItem && jetpackItem.canUseJetpack(stack));
+        if (entity instanceof Player player && player.getCooldowns().isOnCooldown(jetpack.getItem())) {
+            return ItemStack.EMPTY;
+        }
+        return jetpack;
     }
 
     /**