Merge remote-tracking branch 'origin/capacityless-fluid-containers' i…

…nto dev
GTNewHorizons · Mar 2, 2025 · 3f57ec3 · 3f57ec3
2 parents aa3d697 + cbfaf11
commit 3f57ec3
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java
@@ -1880,12 +1880,15 @@ public static ItemStack fillFluidContainer(FluidStack aFluid, ItemStack aStack,
             }
             return null;
         }
-        if (aCheckIFluidContainerItems && aStack.getItem() instanceof IFluidContainerItem
-            && ((IFluidContainerItem) aStack.getItem()).getFluid(aStack) == null
-            && ((IFluidContainerItem) aStack.getItem()).getCapacity(aStack) <= aFluid.amount) {
-            if (aRemoveFluidDirectly) aFluid.amount -= ((IFluidContainerItem) aStack.getItem())
-                .fill(aStack = copyAmount(1, aStack), aFluid, true);
-            else((IFluidContainerItem) aStack.getItem()).fill(aStack = copyAmount(1, aStack), aFluid, true);
+        if (aCheckIFluidContainerItems && aStack.getItem() instanceof IFluidContainerItem fluidContainerItem
+            && fluidContainerItem.getFluid(aStack) == null
+            && fluidContainerItem.getCapacity(aStack) > 0
+            && fluidContainerItem.getCapacity(aStack) <= aFluid.amount) {
+            if (aRemoveFluidDirectly) {
+                aFluid.amount -= fluidContainerItem.fill(aStack = copyAmount(1, aStack), aFluid, true);
+            } else {
+                fluidContainerItem.fill(aStack = copyAmount(1, aStack), aFluid, true);
+            }
             return aStack;
         }
         Map<String, FluidContainerData> tFluidToContainer = sEmptyContainerToFluidToData.get(new GTItemStack(aStack));