Split out the listener class from ItemsAdderHook.

The embedded class was hard to mock when running Level addon tests.
BentoBoxWorld · Mar 5, 2025 · be672f4 · be672f4
1 parent 1447290
commit be672f4
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 51 deletions.
diff --git a/src/main/java/world/bentobox/bentobox/hooks/BlockInteractListener.java b/src/main/java/world/bentobox/bentobox/hooks/BlockInteractListener.java
@@ -0,0 +1,58 @@
+package world.bentobox.bentobox.hooks;
+
+import org.bukkit.Location;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityExplodeEvent;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.flags.FlagListener;
+import world.bentobox.bentobox.api.user.User;
+
+/**
+ * Listens for changes to the ItemsAdder flag
+ */
+public class BlockInteractListener extends FlagListener {
+
+    /**
+     * Handles explosions of ItemAdder items
+     * @param event explosion event
+     */
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    public void onExplosion(EntityExplodeEvent event) {
+        if (!EntityType.PLAYER.equals(event.getEntityType())) {
+            // Ignore non-player explosions.
+            return;
+        }
+
+        Player player = (Player) event.getEntity();
+
+        if (!player.hasPermission("XXXXXX")) {
+            // Ignore players that does not have magic XXXXXX permission.
+            return;
+        }
+
+        // Use BentoBox flag processing system to validate usage.
+        // Technically not necessary as internally it should be cancelled by BentoBox.
+
+        if (!this.checkIsland(event, player, event.getLocation(), ItemsAdderHook.ITEMS_ADDER_EXPLOSIONS)) {
+            // Remove any blocks from the explosion list if required
+            event.blockList().removeIf(block -> this.protect(player, block.getLocation()));
+            event.setCancelled(this.protect(player, event.getLocation()));
+        }
+    }
+
+    /**
+     * This method returns if the protection in given location is enabled or not.
+     * @param player Player who triggers explosion.
+     * @param location Location where explosion happens.
+     * @return {@code true} if location is protected, {@code false} otherwise.
+     */
+    private boolean protect(Player player, Location location) {
+        return BentoBox.getInstance().getIslands().getProtectedIslandAt(location)
+                .map(island -> !island.isAllowed(User.getInstance(player), ItemsAdderHook.ITEMS_ADDER_EXPLOSIONS))
+                .orElse(false);
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/hooks/ItemsAdderHook.java b/src/main/java/world/bentobox/bentobox/hooks/ItemsAdderHook.java
@@ -10,11 +10,6 @@
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.eclipse.jdt.annotation.Nullable;
@@ -24,10 +19,8 @@
 import net.kyori.adventure.text.Component;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.api.flags.clicklisteners.CycleClick;
 import world.bentobox.bentobox.api.hooks.Hook;
-import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.managers.RanksManager;
 
 /**
@@ -189,48 +182,4 @@ public static CustomBlock getInstance(String namespacedID) {
         return CustomBlock.getInstance(namespacedID);
     }
 
-    class BlockInteractListener extends FlagListener {
-
-        /**
-         * Handles explosions of ItemAdder items
-         * @param event explosion event
-         */
-        @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-        public void onExplosion(EntityExplodeEvent event)
-        {
-            if (!EntityType.PLAYER.equals(event.getEntityType())) {
-                // Ignore non-player explosions.
-                return;
-            }
-
-            Player player = (Player) event.getEntity();
-
-            if (!player.hasPermission("XXXXXX")) {
-                // Ignore players that does not have magic XXXXXX permission.
-                return;
-            }
-
-            // Use BentoBox flag processing system to validate usage.
-            // Technically not necessary as internally it should be cancelled by BentoBox.
-
-            if (!this.checkIsland(event, player, event.getLocation(), ITEMS_ADDER_EXPLOSIONS)) {
-                // Remove any blocks from the explosion list if required
-                event.blockList().removeIf(block -> this.protect(player, block.getLocation()));
-                event.setCancelled(this.protect(player, event.getLocation()));
-            }
-        }
-
-
-        /**
-         * This method returns if the protection in given location is enabled or not.
-         * @param player Player who triggers explosion.
-         * @param location Location where explosion happens.
-         * @return {@code true} if location is protected, {@code false} otherwise.
-         */
-        private boolean protect(Player player, Location location)
-        {
-            return plugin.getIslands().getProtectedIslandAt(location)
-                    .map(island -> !island.isAllowed(User.getInstance(player), ITEMS_ADDER_EXPLOSIONS)).orElse(false);
-        }
-    }
 }