Skip to content

Commit 086b5b8

Browse files
committed
Remove capturing lambdas from active jetpack lookup
1 parent 8004e0e commit 086b5b8

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

src/main/java/mekanism/common/item/ItemGaugeDropper.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package mekanism.common.item;
22

33
import java.util.List;
4+
import java.util.OptionalInt;
45
import mekanism.api.chemical.Chemical;
56
import mekanism.api.chemical.ChemicalStack;
67
import mekanism.api.chemical.IChemicalHandler;
@@ -44,7 +45,11 @@ public int getBarWidth(@NotNull ItemStack stack) {
4445

4546
@Override
4647
public int getBarColor(@NotNull ItemStack stack) {
47-
return FluidUtils.getRGBDurabilityForDisplay(stack).orElseGet(() -> ChemicalUtil.getRGBDurabilityForDisplay(stack));
48+
OptionalInt color = FluidUtils.getRGBDurabilityForDisplay(stack);
49+
if (color.isPresent()) {
50+
return color.getAsInt();
51+
}
52+
return ChemicalUtil.getRGBDurabilityForDisplay(stack);
4853
}
4954

5055
@NotNull

src/main/java/mekanism/common/item/interfaces/IJetpackItem.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,11 @@ static ItemStack getActiveJetpack(LivingEntity entity) {
9090
if (entity.isPassenger()) {
9191
return ItemStack.EMPTY;
9292
}
93-
return getJetpack(entity, stack -> {
94-
if (stack.getItem() instanceof IJetpackItem jetpackItem && jetpackItem.canUseJetpack(stack)) {
95-
return !(entity instanceof Player player) || !player.getCooldowns().isOnCooldown(stack.getItem());
96-
}
97-
return false;
98-
});
93+
ItemStack jetpack = getJetpack(entity, stack -> stack.getItem() instanceof IJetpackItem jetpackItem && jetpackItem.canUseJetpack(stack));
94+
if (entity instanceof Player player && player.getCooldowns().isOnCooldown(jetpack.getItem())) {
95+
return ItemStack.EMPTY;
96+
}
97+
return jetpack;
9998
}
10099

101100
/**

0 commit comments

Comments
 (0)