extract removeFluid function

Slimefun · Sep 8, 2024 · dcb9802 · dcb9802
1 parent d41ad3f
commit dcb9802
Showing 1 changed file with 24 additions and 17 deletions.
diff --git a/.../io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java b/.../io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java
@@ -142,13 +142,7 @@ protected void tick(@Nonnull Block b) {
                 }
 
                 Block nextFluid = findNextFluid(fluid);
-
-                if (nextFluid != null) {
-                    removeCharge(blockLocation, ENERGY_CONSUMPTION);
-                    menu.consumeItem(slot);
-                    menu.pushItem(bucket, getOutputSlots());
-                    nextFluid.setType(Material.AIR);
-                }
+                removeFluid(menu, blockLocation, slot, bucket, nextFluid, null);
 
                 return;
             } else if (SlimefunUtils.isItemSimilar(itemInSlot, emptyBottle, true, false)) {
@@ -159,22 +153,35 @@ protected void tick(@Nonnull Block b) {
                 }
 
                 Block nextFluid = findNextFluid(fluid);
-
-                if (nextFluid != null) {
-                    removeCharge(blockLocation, ENERGY_CONSUMPTION);
-                    menu.consumeItem(slot);
-                    menu.pushItem(bottle, getOutputSlots());
-
-                    if (ThreadLocalRandom.current().nextInt(100) < 30) {
-                        nextFluid.setType(Material.AIR);
-                    }
-                }
+                removeFluid(menu, blockLocation, slot, bottle, nextFluid, 30);
 
                 return;
             }
         }
     }
 
+    /**
+     * @param menu Menu from which take the iem and push the new element
+     * @param blockLocation Location of the FluidPump
+     * @param slot Slot to consume the item from
+     * @param stack Item to push into the menu
+     * @param nextFluid Fluid to potentially remove
+     * @param chance Chance of the removal of the fluid, if null it is 100%
+     */
+    private void removeFluid(BlockMenu menu, Location blockLocation, int slot, ItemStack stack, Block nextFluid, Integer chance) {
+        if (nextFluid == null) {
+            return;
+        }
+
+        removeCharge(blockLocation, ENERGY_CONSUMPTION);
+        menu.consumeItem(slot);
+        menu.pushItem(stack, getOutputSlots());
+
+        if (chance == null || ThreadLocalRandom.current().nextInt(100) < chance) {
+            nextFluid.setType(Material.AIR);
+        }
+    }
+
     @Nullable
     private Block findNextFluid(@Nonnull Block fluid) {
         if (fluid.getType() == Material.WATER || fluid.getType() == Material.BUBBLE_COLUMN) {