Use MachineBlockBreakHandler

Slimefun · Dec 12, 2024 · fb13699 · fb13699
1 parent 584afa0
commit fb13699
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 120 deletions.
diff --git a/...ava/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractFilterNode.java b/...ava/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractFilterNode.java
@@ -4,6 +4,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -52,17 +53,7 @@ public boolean hasItemFilter() {
 
     @Nonnull
     private BlockBreakHandler onBreak() {
-        return new SimpleBlockBreakHandler() {
-
-            @Override
-            public void onBlockBreak(@Nonnull Block b) {
-                BlockMenu inv = BlockStorage.getInventory(b);
-
-                if (inv != null) {
-                    inv.dropItems(b.getLocation(), SLOTS);
-                }
-            }
-        };
+        return new MachineBlockBreakHandler(SLOTS);
     }
 
     @Nonnull

diff --git a/...java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/ReactorAccessPort.java b/...java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/ReactorAccessPort.java
@@ -4,6 +4,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -117,19 +118,7 @@ public int[] getSlotsAccessedByItemTransport(DirtyChestMenu menu, ItemTransportF
 
     @Nonnull
     private BlockBreakHandler onBreak() {
-        return new SimpleBlockBreakHandler() {
-
-            @Override
-            public void onBlockBreak(@Nonnull Block b) {
-                BlockMenu inv = BlockStorage.getInventory(b);
-
-                if (inv != null) {
-                    inv.dropItems(b.getLocation(), getFuelSlots());
-                    inv.dropItems(b.getLocation(), getCoolantSlots());
-                    inv.dropItems(b.getLocation(), getOutputSlots());
-                }
-            }
-        };
+        return new MachineBlockBreakHandler(getFuelSlots(), getCoolantSlots(), getOutputSlots());
     }
 
     private void constructMenu(@Nonnull BlockMenuPreset preset) {

diff --git a/.../io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java b/.../io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java
@@ -8,6 +8,7 @@
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
+import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -70,18 +71,7 @@ public FluidPump(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeT
 
     @Nonnull
     private BlockBreakHandler onBreak() {
-        return new SimpleBlockBreakHandler() {
-
-            @Override
-            public void onBlockBreak(Block b) {
-                BlockMenu inv = BlockStorage.getInventory(b);
-
-                if (inv != null) {
-                    inv.dropItems(b.getLocation(), getInputSlots());
-                    inv.dropItems(b.getLocation(), getOutputSlots());
-                }
-            }
-        };
+        return new MachineBlockBreakHandler(getOutputSlots(), getOutputSlots());
     }
 
     private void constructMenu(@Nonnull BlockMenuPreset preset) {

diff --git a/...mefun4/implementation/items/electric/machines/accelerators/AbstractGrowthAccelerator.java b/...mefun4/implementation/items/electric/machines/accelerators/AbstractGrowthAccelerator.java
@@ -3,6 +3,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.inventory.ItemStack;
@@ -39,17 +40,7 @@ protected AbstractGrowthAccelerator(ItemGroup itemGroup, SlimefunItemStack item,
 
     @Nonnull
     private BlockBreakHandler onBreak() {
-        return new SimpleBlockBreakHandler() {
-
-            @Override
-            public void onBlockBreak(Block b) {
-                BlockMenu inv = BlockStorage.getInventory(b);
-
-                if (inv != null) {
-                    inv.dropItems(b.getLocation(), getInputSlots());
-                }
-            }
-        };
+        return new MachineBlockBreakHandler(getInputSlots());
     }
 
     private void constructMenu(BlockMenuPreset preset) {

diff --git a/...thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AutoBreeder.java b/...thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AutoBreeder.java
@@ -3,6 +3,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
 import org.bukkit.Material;
 import org.bukkit.Particle;
 import org.bukkit.block.Block;
@@ -50,17 +51,7 @@ public AutoBreeder(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recip
 
     @Nonnull
     private ItemHandler onBreak() {
-        return new SimpleBlockBreakHandler() {
-
-            @Override
-            public void onBlockBreak(Block b) {
-                BlockMenu inv = BlockStorage.getInventory(b);
-
-                if (inv != null) {
-                    inv.dropItems(b.getLocation(), getInputSlots());
-                }
-            }
-        };
+        return new MachineBlockBreakHandler(getInputSlots());
     }
 
     protected void constructMenu(BlockMenuPreset preset) {

diff --git a/...hebusybiscuit/slimefun4/implementation/items/electric/machines/entities/ExpCollector.java b/...hebusybiscuit/slimefun4/implementation/items/electric/machines/entities/ExpCollector.java
@@ -5,6 +5,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -77,17 +78,7 @@ public void onPlayerPlace(@Nonnull BlockPlaceEvent e) {
     }
 
     private @Nonnull ItemHandler onBreak() {
-        return new SimpleBlockBreakHandler() {
-
-            @Override
-            public void onBlockBreak(@Nonnull Block b) {
-                BlockMenu inv = BlockStorage.getInventory(b);
-
-                if (inv != null) {
-                    inv.dropItems(b.getLocation(), getOutputSlots());
-                }
-            }
-        };
+        return new MachineBlockBreakHandler(getOutputSlots());
     }
 
     @Override

diff --git a/...va/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java b/...va/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java
@@ -10,6 +10,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -122,19 +123,9 @@ public MachineProcessor<FuelOperation> getMachineProcessor() {
 
     @Nonnull
     private BlockBreakHandler onBreak() {
-        return new SimpleBlockBreakHandler() {
-
+        return new MachineBlockBreakHandler(processor, getFuelSlots(), getCoolantSlots(), getOutputSlots()) {
             @Override
-            public void onBlockBreak(@Nonnull Block b) {
-                BlockMenu inv = BlockStorage.getInventory(b);
-
-                if (inv != null) {
-                    inv.dropItems(b.getLocation(), getFuelSlots());
-                    inv.dropItems(b.getLocation(), getCoolantSlots());
-                    inv.dropItems(b.getLocation(), getOutputSlots());
-                }
-
-                processor.endOperation(b);
+            public void afterBreak(@Nonnull Block b) {
                 removeHologram(b);
             }
         };

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java
@@ -7,6 +7,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
 import org.apache.commons.lang.Validate;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -197,18 +198,10 @@ public void onPlayerPlace(BlockPlaceEvent e) {
 
     @Nonnull
     private BlockBreakHandler onBlockBreak() {
-        return new SimpleBlockBreakHandler() {
-
+        return new MachineBlockBreakHandler(OUTPUT_SLOTS) {
             @Override
-            public void onBlockBreak(@Nonnull Block b) {
+            protected void beforeBreak(@Nonnull Block b) {
                 removeHologram(b);
-                BlockMenu inv = BlockStorage.getInventory(b);
-
-                if (inv != null) {
-                    inv.dropItems(b.getLocation(), OUTPUT_SLOTS);
-                }
-
-                processor.endOperation(b);
             }
         };
     }

diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java
@@ -8,6 +8,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -67,21 +68,7 @@ protected AContainer(ItemGroup itemGroup, SlimefunItemStack item, RecipeType rec
 
     @Nonnull
     protected BlockBreakHandler onBlockBreak() {
-        return new SimpleBlockBreakHandler() {
-
-            @Override
-            public void onBlockBreak(Block b) {
-                BlockMenu inv = BlockStorage.getInventory(b);
-
-                if (inv != null) {
-                    inv.dropItems(b.getLocation(), getInputSlots());
-                    inv.dropItems(b.getLocation(), getOutputSlots());
-                }
-
-                processor.endOperation(b);
-            }
-
-        };
+        return new MachineBlockBreakHandler(processor, getOutputSlots(), getInputSlots());
     }
 
     @ParametersAreNonnullByDefault

diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java
@@ -7,6 +7,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -89,20 +90,7 @@ public MachineProcessor<FuelOperation> getMachineProcessor() {
 
     @Nonnull
     protected BlockBreakHandler onBlockBreak() {
-        return new SimpleBlockBreakHandler() {
-
-            @Override
-            public void onBlockBreak(Block b) {
-                BlockMenu inv = BlockStorage.getInventory(b);
-
-                if (inv != null) {
-                    inv.dropItems(b.getLocation(), getInputSlots());
-                    inv.dropItems(b.getLocation(), getOutputSlots());
-                }
-
-                processor.endOperation(b);
-            }
-        };
+        return new MachineBlockBreakHandler(processor, getInputSlots(), getOutputSlots());
     }
 
     private void constructMenu(BlockMenuPreset preset) {