From 8806f3540aaa5ea45d28b7a0ba3cc1cd14d632d5 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 25 Jan 2023 23:44:30 +0100 Subject: [PATCH] quick fix : Manual min/max calculation --- src/main/java/tconstruct/smeltery/gui/SmelteryGui.java | 2 +- src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java | 6 +++--- src/main/java/tconstruct/smeltery/model/SmelteryRender.java | 2 +- src/main/java/tconstruct/tools/entity/ArrowEntity.java | 6 +----- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java index 1ecc6fc6..a1635700 100644 --- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java @@ -160,7 +160,7 @@ public class SmelteryGui extends ActiveContainerGui { int fuel = logic.getScaledFuelGague(52); int count = 0; while (fuel > 0) { - int size = fuel >= 16 ? 16 : fuel; + int size = Math.min(fuel, 16); fuel -= size; drawLiquidRect( cornerX + 117, diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index a2c13e94..b17b8584 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -113,17 +113,17 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci int[] tempActive = activeTemps; activeTemps = new int[maxBlockCapacity]; - int activeLength = tempActive.length > activeTemps.length ? activeTemps.length : tempActive.length; + int activeLength = Math.min(tempActive.length, activeTemps.length); System.arraycopy(tempActive, 0, activeTemps, 0, activeLength); int[] tempMelting = meltingTemps; meltingTemps = new int[maxBlockCapacity]; - int meltingLength = tempMelting.length > meltingTemps.length ? meltingTemps.length : tempMelting.length; + int meltingLength = Math.min(tempMelting.length, meltingTemps.length); System.arraycopy(tempMelting, 0, meltingTemps, 0, meltingLength); ItemStack[] tempInv = inventory; inventory = new ItemStack[maxBlockCapacity]; - int invLength = tempInv.length > inventory.length ? inventory.length : tempInv.length; + int invLength = Math.min(tempInv.length, inventory.length); System.arraycopy(tempInv, 0, inventory, 0, invLength); if (activeTemps.length > 0 && activeTemps.length > tempActive.length) { diff --git a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java index 0de6c0c5..771cd48a 100644 --- a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java +++ b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java @@ -57,7 +57,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler { while (liquidSize > 0) { int cap = logic.getCapacityPerLayer(); int room = cap - liquidBase; - int countSize = liquidSize > room ? room : liquidSize; + int countSize = Math.min(liquidSize, room); liquidSize -= countSize; float height = countSize > cap ? 1.0F : (float) countSize / (float) cap; diff --git a/src/main/java/tconstruct/tools/entity/ArrowEntity.java b/src/main/java/tconstruct/tools/entity/ArrowEntity.java index cd4d8202..3f431157 100644 --- a/src/main/java/tconstruct/tools/entity/ArrowEntity.java +++ b/src/main/java/tconstruct/tools/entity/ArrowEntity.java @@ -450,11 +450,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa return 0; } else { - int l = stackSize; - - if (stackSize > stack.getMaxStackSize() - stack.stackSize) { - l = stack.getMaxStackSize() - stack.stackSize; - } + int l = Math.min(stackSize, stack.getMaxStackSize() - stack.stackSize); if (l > 64 - stack.stackSize) { l = 64 - stack.stackSize;