Merge pull request #2718 from BentoBoxWorld/develop

tastybento · web-flow · commit 91d18a0570c5 · 2025-08-10T17:26:38.000-07:00
Release 3.7.2
diff --git a/pom.xml b/pom.xml
@@ -75,7 +75,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>3.7.1</build.version>
+        <build.version>3.7.2</build.version>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <server.jars>${project.basedir}/lib</server.jars>
diff --git a/src/main/java/world/bentobox/bentobox/BentoBox.java b/src/main/java/world/bentobox/bentobox/BentoBox.java
@@ -22,6 +22,7 @@
 import world.bentobox.bentobox.api.configuration.Config;
 import world.bentobox.bentobox.api.events.BentoBoxReadyEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.panels.Panel;
 import world.bentobox.bentobox.api.user.Notifier;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.commands.BentoBoxCommand;
@@ -60,6 +61,7 @@
 import world.bentobox.bentobox.managers.RanksManager;
 import world.bentobox.bentobox.managers.WebManager;
 import world.bentobox.bentobox.util.ExpiringMap;
+import world.bentobox.bentobox.util.Pair;
 import world.bentobox.bentobox.util.heads.HeadGetter;
 import world.bentobox.bentobox.versions.ServerCompatibility;
 
@@ -94,7 +96,7 @@ public class BentoBox extends JavaPlugin implements Listener {
     private Notifier notifier;
     
     // Click limiter
-    private ExpiringMap<UUID, Boolean> lastClick ;
+    private ExpiringMap<Pair<UUID, String>, Boolean> lastClick ;
 
     private HeadGetter headGetter;
 
@@ -146,7 +148,7 @@ public void onEnable(){
         saveConfig();
         
         // Set up click timeout
-        lastClick = new ExpiringMap<UUID, Boolean>(getSettings().getClickCooldownMs(), TimeUnit.MILLISECONDS);
+        lastClick = new ExpiringMap<Pair<UUID, String>, Boolean>(getSettings().getClickCooldownMs(), TimeUnit.MILLISECONDS);
 
         // Start Database managers
         playersManager = new PlayersManager(this);
@@ -666,12 +668,12 @@ public boolean isShutdown() {
      * @param user user
      * @return false if they can click and the timeout is started, otherwise true.
      */
-    public boolean onTimeout(User user) {
-        if (lastClick.containsKey(user.getUniqueId())) {
+    public boolean onTimeout(User user, Panel panel) {
+        if (lastClick.containsKey(new Pair<UUID, String>(user.getUniqueId(), panel.getName()))) {
             user.notify("general.errors.slow-down");
             return true;
         }
-        lastClick.put(user.getUniqueId(), true);
+        lastClick.put(new Pair<UUID, String>(user.getUniqueId(), panel.getName()), true);
         return false;
     }
 }
diff --git a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java
@@ -60,9 +60,6 @@ public CycleClick(String id, int minRank, int maxRank) {
 
     @Override
     public boolean onClick(Panel panel, User user2, ClickType click, int slot) {
-        if (plugin.onTimeout(user2)) {
-            return true;
-        }
         if (panel.getWorld().isEmpty()) {
             plugin.logError("Panel " + panel.getName()
                     + " has no world associated with it. Please report this bug to the author.");
diff --git a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClick.java b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClick.java
@@ -40,9 +40,6 @@ public IslandToggleClick(String id) {
 
     @Override
     public boolean onClick(Panel panel, User user, ClickType click, int slot) {
-        if (plugin.onTimeout(user)) {
-            return true;
-        }
         // This click listener is used with TabbedPanel and SettingsTabs only
         TabbedPanel tp = (TabbedPanel)panel;
         SettingsTab st = (SettingsTab)tp.getActiveTab();
diff --git a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClick.java b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClick.java
@@ -33,9 +33,6 @@ public WorldToggleClick(String id) {
 
     @Override
     public boolean onClick(Panel panel, User user, ClickType click, int slot) {
-        if (plugin.onTimeout(user)) {
-            return true;
-        }
         World world = panel.getWorld().orElseThrow(); // The panel must have a world
         String reqPerm = plugin.getIWM().getPermissionPrefix(world) + "admin.world.settings." + id;
         if (!user.hasPermission(reqPerm)) {
diff --git a/src/main/java/world/bentobox/bentobox/api/panels/TabbedPanel.java b/src/main/java/world/bentobox/bentobox/api/panels/TabbedPanel.java
@@ -169,7 +169,7 @@ public void onInventoryClose(InventoryCloseEvent event) {
 
     @Override
     public void onInventoryClick(User user, InventoryClickEvent event) {
-        if (plugin.onTimeout(user)) {
+        if (plugin.onTimeout(user, this)) {
             event.setCancelled(true);
             return;
         }
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandCycleClick.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandCycleClick.java
@@ -39,10 +39,7 @@ public CommandCycleClick(CommandRankClickListener commandRankClickListener, Stri
      */
     @Override
     public boolean onClick(Panel panel, User user, ClickType click, int slot) {
-        if (plugin.onTimeout(user)) {
-            return true;
-        }
-        // Left clicking increases the rank required
+       // Left clicking increases the rank required
         // Right clicking decreases the rank required
         World world = panel.getWorld().orElse(user.getWorld());
         Island island = panel.getIsland();
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandRankClickListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandRankClickListener.java
@@ -41,9 +41,6 @@ public class CommandRankClickListener implements ClickHandler {
      */
     @Override
     public boolean onClick(Panel panel, User user, ClickType clickType, int slot) {
-        if (plugin.onTimeout(user)) {
-            return true;
-        }
         // This click listener is used with TabbedPanel and SettingsTabs only
         TabbedPanel tp = (TabbedPanel)panel;
         SettingsTab st = (SettingsTab)tp.getActiveTab();
@@ -81,6 +78,9 @@ public boolean onClick(Panel panel, User user, ClickType clickType, int slot) {
         String panelName = user.getTranslation("protection.flags.COMMAND_RANKS.name");
         if (panel.getName().equals(panelName)) {
             // This is a click on the panel
+            if (plugin.onTimeout(user, panel)) {
+                return true;
+            }
             // Slot relates to the command
             String c = getCommands(panel.getWorld().orElse(user.getWorld()), user).get(slot);
             // Apply change to panel
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoLimitClickListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoLimitClickListener.java
@@ -24,9 +24,6 @@ public class GeoLimitClickListener implements ClickHandler {
 
     @Override
     public boolean onClick(Panel panel, User user, ClickType clickType, int slot) {
-        if (BentoBox.getInstance().onTimeout(user)) {
-            return true;
-        }
         // Get the world
         if (!user.inWorld()) {
             user.sendMessage("general.errors.wrong-world");
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java
@@ -64,9 +64,6 @@ public GeoMobLimitTab(@NonNull User user, @NonNull EntityLimitTabType type, Worl
 
     @Override
     public boolean onClick(Panel panel, User user, ClickType clickType, int slot) {
-        if (plugin.onTimeout(user)) {
-            return true;
-        }
         // Case panel to Tabbed Panel to get the active page
         TabbedPanel tp = (TabbedPanel)panel;
         // Convert the slot and active page to an index
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/MobLimitClickListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/MobLimitClickListener.java
@@ -24,9 +24,6 @@ public class MobLimitClickListener implements ClickHandler {
 
     @Override
     public boolean onClick(Panel panel, User user, ClickType clickType, int slot) {
-        if (BentoBox.getInstance().onTimeout(user)) {
-            return true;
-        }
         // Get the world
         if (!user.inWorld()) {
             user.sendMessage("general.errors.wrong-world");
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListener.java
@@ -39,9 +39,6 @@ public class InvincibleVisitorsListener extends FlagListener implements ClickHan
 
     @Override
     public boolean onClick(Panel panel, User user, ClickType clickType, int slot) {
-        if (BentoBox.getInstance().onTimeout(user)) {
-            return true;
-        }
         // Get the world
         if (!user.inWorld()) {
             user.sendMessage("general.errors.wrong-world");
@@ -57,6 +54,10 @@ public boolean onClick(Panel panel, User user, ClickType clickType, int slot) {
 
         String ivPanelName = user.getTranslation("protection.flags.INVINCIBLE_VISITORS.name");
         if (panel.getName().equals(ivPanelName)) {
+            if (BentoBox.getInstance().onTimeout(user, panel)) {
+                return true;
+            }
+
             // This is a click on the IV panel
             String itemName = panel.getItems().get(slot).getName();
             DamageCause c = getEnum(user, itemName);
diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
@@ -1306,8 +1306,9 @@ public void load() throws IOException {
             if (island.isDeleted()) {
                 // These will be deleted later
                 deletedIslands.add(island.getUniqueId());
-            } // Check island distance and if incorrect stop BentoBox
-            else if (!plugin.getSettings().isOverrideSafetyCheck() && island.getWorld() != null
+            }
+            // Check island distance and if incorrect stop BentoBox
+            if (!plugin.getSettings().isOverrideSafetyCheck() && island.getWorld() != null
                     && plugin.getIWM().inWorld(island.getWorld())
                     && island.getRange() != plugin.getIWM().getIslandDistance(island.getWorld())) {
                 throw new IOException("Island distance mismatch!\n" + "World '" + island.getWorld().getName()
diff --git a/src/main/java/world/bentobox/bentobox/panels/settings/SettingsTab.java b/src/main/java/world/bentobox/bentobox/panels/settings/SettingsTab.java
@@ -257,9 +257,6 @@ public Island getIsland() {
 
     @Override
     public boolean onClick(Panel panel, User user, ClickType clickType, int slot) {
-        if (plugin.onTimeout(user)) {
-            return true;
-        }
         // Cycle the mode
         currentMode.put(user.getUniqueId(), currentMode.getOrDefault(user.getUniqueId(), Mode.BASIC).getNext());
         if (panel instanceof TabbedPanel tp) {
diff --git a/src/main/java/world/bentobox/bentobox/util/Util.java b/src/main/java/world/bentobox/bentobox/util/Util.java
@@ -53,6 +53,7 @@
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.nms.AbstractMetaData;
 import world.bentobox.bentobox.nms.PasteHandler;
 import world.bentobox.bentobox.nms.WorldRegenerator;
 
@@ -76,6 +77,8 @@ public class Util {
     private static PasteHandler pasteHandler = null;
     private static WorldRegenerator regenerator = null;
 
+    private static AbstractMetaData metaData;
+
     private Util() {}
 
     /**
@@ -740,30 +743,75 @@ public static void resetHealth(Player player) {
     public static void setRegenerator(WorldRegenerator regenerator) {
         Util.regenerator = regenerator;
     }
+    
+    private static Pair<String, String> getPrefix() {
+        // Bukkit method that was added in 2011
+        // Example value: 1.20.4-R0.1-SNAPSHOT
+        final String bukkitVersion = "v" + Bukkit.getBukkitVersion().replace('.', '_').replace('-', '_');
+        final String pluginPackageName = plugin.getClass().getPackage().getName();
+        return new Pair<String, String>(pluginPackageName + ".nms." + bukkitVersion, bukkitVersion);
+    }
+    
+    /**
+     * Generic method to get NMS handlers with fallback options
+     * @param <T> The type of handler to get
+     * @param handlerClass The class of the handler
+     * @param implName The implementation name (e.g., "PasteHandlerImpl")
+     * @param fallbackSupplier Supplier for the fallback implementation
+     * @param existingHandler The existing handler instance if any
+     * @param logPrefix Prefix for logging messages
+     * @return The handler instance
+     */
+    private static <T> T getNMSHandler(Class<T> handlerClass, 
+            String implName, 
+            java.util.function.Supplier<T> fallbackSupplier,
+            T existingHandler,
+            String logPrefix) {
+        if (existingHandler != null) {
+            return existingHandler;
+        }
+        
+        T handler;
+        try {
+            Class<?> clazz = Class.forName(getPrefix().x + "." + implName);
+            if (handlerClass.isAssignableFrom(clazz)) {
+                handler = handlerClass.cast(clazz.getConstructor().newInstance());
+            } else {
+                throw new IllegalStateException("Class " + clazz.getName() + " does not implement " + handlerClass.getSimpleName());
+            }
+        } catch (Exception e) {
+            plugin.logWarning("No " + logPrefix + " found for " + getPrefix().z + ", falling back to Bukkit API.");
+            handler = fallbackSupplier.get();
+        }
+        return handler;
+    }
+    
+    /**
+     * Get metadata decoder
+     * @return an accelerated metadata class for this server
+     */
+    public static AbstractMetaData getMetaData() {
+        if (metaData == null) {
+            metaData = getNMSHandler(AbstractMetaData.class, 
+                    "GetMetaData",
+                    () -> new world.bentobox.bentobox.nms.fallback.GetMetaData(),
+                    metaData,
+                    "GetMetaData");
+        }
+        return metaData;
+    }
 
     /**
      * Get the regenerator the plugin will use
      * @return an accelerated regenerator class for this server
      */
     public static WorldRegenerator getRegenerator() {
         if (regenerator == null) {
-            // Bukkit method that was added in 2011
-            // Example value: 1.20.4-R0.1-SNAPSHOT
-            final String bukkitVersion = "v" + Bukkit.getBukkitVersion().replace('.', '_').replace('-', '_');
-            final String pluginPackageName = plugin.getClass().getPackage().getName();
-            WorldRegenerator handler;
-            try {
-                Class<?> clazz = Class.forName(pluginPackageName + ".nms." + bukkitVersion + ".WorldRegeneratorImpl");
-                if (WorldRegenerator.class.isAssignableFrom(clazz)) {
-                    handler = (WorldRegenerator) clazz.getConstructor().newInstance();
-                } else {
-                    throw new IllegalStateException("Class " + clazz.getName() + " does not implement WorldRegenerator");
-                }
-            } catch (Exception e) {
-                plugin.logWarning("No Regenerator found for " + bukkitVersion + ", falling back to Bukkit API.");
-                handler = new world.bentobox.bentobox.nms.fallback.WorldRegeneratorImpl();
-            }
-            setRegenerator(handler);
+            regenerator = getNMSHandler(WorldRegenerator.class,
+                    "WorldRegeneratorImpl",
+                    () -> new world.bentobox.bentobox.nms.fallback.WorldRegeneratorImpl(),
+                    regenerator,
+                    "Regenerator");
         }
         return regenerator;
     }
@@ -774,37 +822,16 @@ public static WorldRegenerator getRegenerator() {
      */
     public static PasteHandler getPasteHandler() {
         if (pasteHandler == null) {
-
-            // Bukkit method that was added in 2011
-            // Example value: 1.20.4-R0.1-SNAPSHOT
-            String bukkitVersion = "v" + Bukkit.getServer().getBukkitVersion().replace('.', '_').replace('-', '_');
-            String pluginPackageName = plugin.getClass().getPackage().getName();
-            BentoBox.getInstance().log("Optimizing for " + bukkitVersion);
-            PasteHandler handler;
-            try {
-                Class<?> clazz = Class.forName(pluginPackageName + ".nms." + bukkitVersion + ".PasteHandlerImpl");
-                if (PasteHandler.class.isAssignableFrom(clazz)) {
-                    handler = (PasteHandler) clazz.getConstructor().newInstance();
-                } else {
-                    throw new IllegalStateException("Class " + clazz.getName() + " does not implement PasteHandler");
-                }
-            } catch (Exception e) {
-                plugin.logWarning("No PasteHandler found for " + bukkitVersion + ", falling back to Bukkit API.");
-                handler = new world.bentobox.bentobox.nms.fallback.PasteHandlerImpl();
-            }
-            setPasteHandler(handler);
+            BentoBox.getInstance().log("Optimizing for " + getPrefix().z);
+            pasteHandler = getNMSHandler(PasteHandler.class,
+                    "PasteHandlerImpl",
+                    () -> new world.bentobox.bentobox.nms.fallback.PasteHandlerImpl(),
+                    pasteHandler,
+                    "PasteHandler");
         }
         return pasteHandler;
     }
 
-    /**
-     * Set the paste handler the plugin will use
-     * @param pasteHandler the NMS paster
-     */
-    public static void setPasteHandler(PasteHandler pasteHandler) {
-        Util.pasteHandler = pasteHandler;
-    }
-
     /**
      * Broadcast a localized message to all players with the permission {@link Server#BROADCAST_CHANNEL_USERS}
      *
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -85,7 +85,7 @@ general:
   - '[CoFH]'
 panel:
   # Panel click cooldown. Value is in milliseconds. Prevents players spamming button presses in GUIs.
-  click-cooldown-ms: 1000
+  click-cooldown-ms: 250
   # Toggle whether panels should be closed or not when the player clicks anywhere outside of the inventory view.
   close-on-click-outside: true
   # Defines the Material of the item that fills the gaps (in the header, etc.) of most panels.
diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml
@@ -1305,8 +1305,10 @@ protection:
       name: Hive harvesting
       hint: Harvesting disabled
     HURT_TAMED_ANIMALS:
-      description: Toggle hurting. Enabled means that tamed animals can take damage.
-        Disabled means they are invincible.
+      description: |-
+        &a Toggle hurting. Enabled means 
+        &a that tamed animals can take damage.
+        &a Disabled means they are invincible.
       name: Hurt tamed animals
       hint: Tamed animal hurting disabled
     HURT_ANIMALS:

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public void onInventoryClose(InventoryCloseEvent event) {`
`169`	`169`
`170`	`170`	`@Override`
`171`	`171`	`public void onInventoryClick(User user, InventoryClickEvent event) {`
`172`		`- if (plugin.onTimeout(user)) {`
	`172`	`+ if (plugin.onTimeout(user, this)) {`
`173`	`173`	`event.setCancelled(true);`
`174`	`174`	`return;`
`175`	`175`	`}`