Merge pull request #2791 from BentoBoxWorld/develop

Author: tastybento

build.gradle.kts

@@ -46,7 +46,7 @@ paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArt
 group = "world.bentobox" // From <groupId>
 
 // Base properties from <properties>
-val buildVersion = "3.11.1"
+val buildVersion = "3.11.2"
 val buildNumberDefault = "-LOCAL" // Local build identifier
 val snapshotSuffix = "-SNAPSHOT"  // Indicates development/snapshot version
 
@@ -86,8 +86,7 @@ val mariadbVersion = "3.0.5"
 val mysqlVersion = "8.0.27"
 val postgresqlVersion = "42.2.18"
 val hikaricpVersion = "5.0.1"
-val spigotVersion = "1.21.10-R0.1-SNAPSHOT"
-val paperVersion = "1.21.10-R0.1-SNAPSHOT"
+val paperVersion = "1.21.11-R0.1-SNAPSHOT"
 val bstatsVersion = "3.0.0"
 val vaultVersion = "1.7.1"
 val levelVersion = "2.21.3"
@@ -120,7 +119,6 @@ extra["mariadb.version"] = mariadbVersion
 extra["mysql.version"] = mysqlVersion
 extra["postgresql.version"] = postgresqlVersion
 extra["hikaricp.version"] = hikaricpVersion
-extra["spigot.version"] = spigotVersion
 extra["paper.version"] = paperVersion
 extra["bstats.version"] = bstatsVersion
 extra["vault.version"] = vaultVersion
@@ -146,6 +144,19 @@ java {
 tasks.withType<JavaCompile> {
     // Ensure UTF-8 encoding for all source files
     options.encoding = "UTF-8"
+    // Suppress all deprecation and removal warnings during compilation
+    options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal"))
+    // Set explicit Java release version for Eclipse compatibility
+    options.release.set(21)
+}
+
+tasks.compileTestJava {
+    // Ensure UTF-8 encoding for all source files
+    options.encoding = "UTF-8"
+    // Suppress all deprecation and removal warnings during compilation
+    options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal"))
+    // Set explicit Java release version for Eclipse compatibility
+    options.release.set(21)
 }
 
 
@@ -190,6 +201,7 @@ dependencies {
     // --- Test Dependencies: Only used during testing, not in production ---
     testImplementation(platform("org.junit:junit-bom:$junitVersion"))
     testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junitVersion")
     testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion")
@@ -202,9 +214,6 @@ dependencies {
     testImplementation("commons-lang:commons-lang:$commonsLangVersion")
 
     // --- Compile Only Dependencies: Provided by the server at runtime ---
-    compileOnly("org.spigotmc:spigot:$spigotVersion") {
-        exclude(group = "org.spigotmc", module = "spigot-api")
-    }
     compileOnly("org.mongodb:mongodb-driver:$mongodbVersion")
     compileOnly("com.zaxxer:HikariCP:$hikaricpVersion")
     compileOnly("com.github.MilkBowl:VaultAPI:$vaultVersion")
@@ -253,9 +262,6 @@ dependencies {
 paperweight {
     addServerDependencyTo = configurations.named(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME).map { setOf(it) }
   javaLauncher = javaToolchains.launcherFor {
-    // Example scenario:
-    // Paper 1.17.1 was originally built with JDK 16 and the bundle
-    // has not been updated to work with 21+ (but we want to compile with a 25 toolchain)
         // Use the project's configured Java version for paperweight tools (needs Java 21+)
         languageVersion = JavaLanguageVersion.of(javaVersion)
   }

src/main/java/world/bentobox/bentobox/BentoBox.java

@@ -11,7 +11,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.event.Listener;
 import org.bukkit.generator.ChunkGenerator;
-import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitTask;
 import org.eclipse.jdt.annotation.NonNull;
@@ -23,29 +22,10 @@
 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;
 import world.bentobox.bentobox.database.DatabaseSetup;
-import world.bentobox.bentobox.hooks.FancyNpcsHook;
-import world.bentobox.bentobox.hooks.ItemsAdderHook;
-import world.bentobox.bentobox.hooks.MultipaperHook;
-import world.bentobox.bentobox.hooks.MultiverseCore4Hook;
-import world.bentobox.bentobox.hooks.MultiverseCore5Hook;
-import world.bentobox.bentobox.hooks.MyWorldsHook;
-import world.bentobox.bentobox.hooks.MythicMobsHook;
-import world.bentobox.bentobox.hooks.OraxenHook;
-import world.bentobox.bentobox.hooks.SlimefunHook;
+import world.bentobox.bentobox.hooks.BentoBoxHookRegistrar;
 import world.bentobox.bentobox.hooks.VaultHook;
-import world.bentobox.bentobox.hooks.ZNPCsPlusHook;
-import world.bentobox.bentobox.hooks.placeholders.PlaceholderAPIHook;
-import world.bentobox.bentobox.listeners.BannedCommands;
-import world.bentobox.bentobox.listeners.BlockEndDragon;
-import world.bentobox.bentobox.listeners.DeathListener;
-import world.bentobox.bentobox.listeners.JoinLeaveListener;
-import world.bentobox.bentobox.listeners.PanelListenerManager;
-import world.bentobox.bentobox.listeners.PrimaryIslandListener;
-import world.bentobox.bentobox.listeners.StandardSpawnProtectionListener;
-import world.bentobox.bentobox.listeners.teleports.EntityTeleportListener;
-import world.bentobox.bentobox.listeners.teleports.PlayerTeleportListener;
+import world.bentobox.bentobox.listeners.BentoBoxListenerRegistrar;
 import world.bentobox.bentobox.managers.AddonsManager;
 import world.bentobox.bentobox.managers.BlueprintsManager;
 import world.bentobox.bentobox.managers.CommandsManager;
@@ -95,7 +75,7 @@ public class BentoBox extends JavaPlugin implements Listener {
 
     // Notifier
     private Notifier notifier;
-    
+
     // Click limiter
     private ExpiringMap<Pair<UUID, String>, Boolean> lastClick ;
 
@@ -147,7 +127,7 @@ public void onEnable(){
         }
         // Saving the config now.
         saveConfig();
-        
+
         // Set up click timeout
         lastClick = new ExpiringMap<>(getSettings().getClickCooldownMs(), TimeUnit.MILLISECONDS);
 
@@ -169,7 +149,7 @@ public void onEnable(){
         commandsManager = new CommandsManager();
 
         // Load BentoBox commands
-        new BentoBoxCommand();
+        commandsManager.registerDefaultCommands();
 
         // Start Island Worlds Manager
         islandWorldManager = new IslandWorldManager(this);
@@ -202,19 +182,9 @@ public void onEnable(){
     private void completeSetup(long loadTime) {
         final long enableStart = System.currentTimeMillis();
 
-        hooksManager.registerHook(new MultipaperHook());
-
-        hooksManager.registerHook(new VaultHook());
-
-        // FancyNpcs
-        hooksManager.registerHook(new FancyNpcsHook());
-        // ZNPCsPlus
-        hooksManager.registerHook(new ZNPCsPlusHook());
+        BentoBoxHookRegistrar hookRegistrar = new BentoBoxHookRegistrar(this);
+        hookRegistrar.registerEarlyHooks();
 
-        // MythicMobs
-        hooksManager.registerHook(new MythicMobsHook());
-
-        hooksManager.registerHook(new PlaceholderAPIHook());
         // Setup the Placeholders manager
         placeholdersManager = new PlaceholdersManager(this);
 
@@ -245,35 +215,21 @@ private void completeSetup(long loadTime) {
 
         // Register Multiverse hook - MV loads AFTER BentoBox
         // Make sure all worlds are already registered to Multiverse.
-        if (hasClass("org.mvplugins.multiverse.core.MultiverseCore")) {
-            hooksManager.registerHook(new MultiverseCore5Hook());
-        } else if (hasClass("com.onarandombox.MultiverseCore.MultiverseCore")) {
-            hooksManager.registerHook(new MultiverseCore4Hook());
-        }
-        hooksManager.registerHook(new MyWorldsHook());
+        hookRegistrar.registerWorldHooks();
         islandWorldManager.registerWorldsToMultiverse(true);
 
-        // Register Slimefun
-        hooksManager.registerHook(new SlimefunHook());
-
-        // Register ItemsAdder
-        hooksManager.registerHook(new ItemsAdderHook(this));
-        
-        // Register Oraxen
-        hooksManager.registerHook(new OraxenHook(this));
+        hookRegistrar.registerLateHooks();
 
         // TODO: re-enable after implementation
-        //hooksManager.registerHook(new DynmapHook());
         // TODO: re-enable after rework
-        //hooksManager.registerHook(new LangUtilsHook());
 
         webManager = new WebManager(this);
 
         final long enableTime = System.currentTimeMillis() - enableStart;
 
         // Show banner
         User.getInstance(Bukkit.getConsoleSender()).sendMessage("successfully-loaded",
-                TextVariables.VERSION, instance.getDescription().getVersion(),
+                TextVariables.VERSION, instance.getPluginMeta().getVersion(),
                 "[time]", String.valueOf(loadTime + enableTime));
 
         // Poll for blueprints loading to be finished - async so could be a completely variable time
@@ -300,15 +256,6 @@ private void completeSetup(long loadTime) {
         }
     }
 
-    private boolean hasClass(String className) {
-        try {
-            Class.forName(className);
-            return true;
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
-    }
-
     private void fireCriticalError(String message, String error) {
         logError("*****************CRITICAL ERROR!******************");
         logError(message);
@@ -327,30 +274,9 @@ private void fireCriticalError(String message, String error) {
      * Registers listeners.
      */
     private void registerListeners() {
-        PluginManager manager = getServer().getPluginManager();
-        // Player join events
-        manager.registerEvents(new JoinLeaveListener(this), this);
-        // Panel listener manager
-        manager.registerEvents(new PanelListenerManager(), this);
-        // Standard Nether/End spawns protection
-        manager.registerEvents(new StandardSpawnProtectionListener(this), this);
-        // Player portals
-        manager.registerEvents(new PlayerTeleportListener(this), this);
-        // Entity portals
-        manager.registerEvents(new EntityTeleportListener(this), this);
-        // End dragon blocking
-        manager.registerEvents(new BlockEndDragon(this), this);
-        // Banned visitor commands
-        manager.registerEvents(new BannedCommands(this), this);
-        // Death counter
-        manager.registerEvents(new DeathListener(this), this);
-        // MV unregister
-        manager.registerEvents(this, this);
-        // Island Delete Manager
-        islandDeletionManager = new IslandDeletionManager(this);
-        manager.registerEvents(islandDeletionManager, this);
-        // Primary Island Listener
-        manager.registerEvents(new PrimaryIslandListener(this), this);
+        BentoBoxListenerRegistrar registrar = new BentoBoxListenerRegistrar(this);
+        registrar.register();
+        islandDeletionManager = registrar.getIslandDeletionManager();
     }
 
     @Override
@@ -654,7 +580,7 @@ public void reloadConfig() {
     public boolean isShutdown() {
         return shutdown;
     }
-    
+
     /**
      * Checks if a user can click a GUI or needs to slow down
      * @param user user

src/main/java/world/bentobox/bentobox/Settings.java

@@ -11,8 +11,6 @@
 
 import org.bukkit.Material;
 
-import com.google.common.collect.ImmutableList;
-
 import world.bentobox.bentobox.api.configuration.ConfigComment;
 import world.bentobox.bentobox.api.configuration.ConfigEntry;
 import world.bentobox.bentobox.api.configuration.ConfigObject;
@@ -41,6 +39,11 @@ public class Settings implements ConfigObject {
     @ConfigEntry(path = "general.use-economy")
     private boolean useEconomy = true;
 
+    @ConfigComment("Whether to charge the blueprint bundle cost when a player resets their island.")
+    @ConfigComment("If false, only island creation will charge the cost. Default is false.")
+    @ConfigEntry(path = "general.charge-for-blueprint-on-reset")
+    private boolean chargeForBlueprintOnReset = false;
+
     /* COMMANDS */
     @ConfigComment("Console commands to run when BentoBox has loaded all worlds and addons.")
     @ConfigComment("Commands are run as the console.")
@@ -381,6 +384,14 @@ public void setUseEconomy(boolean useEconomy) {
         this.useEconomy = useEconomy;
     }
 
+    public boolean isChargeForBlueprintOnReset() {
+        return chargeForBlueprintOnReset;
+    }
+
+    public void setChargeForBlueprintOnReset(boolean chargeForBlueprintOnReset) {
+        this.chargeForBlueprintOnReset = chargeForBlueprintOnReset;
+    }
+
     public DatabaseType getDatabaseType() {
         return databaseType;
     }
@@ -1010,7 +1021,7 @@ public void setSafeSpotSearchRange(int safeSpotSearchRange) {
      * @return an immutable list of readyCommands
      */
     public List<String> getReadyCommands() {
-        return ImmutableList.copyOf(Objects.requireNonNullElse(readyCommands, Collections.emptyList()));
+        return List.copyOf(Objects.requireNonNullElse(readyCommands, Collections.emptyList()));
     }
 
     /**

src/main/java/world/bentobox/bentobox/api/addons/Addon.java

@@ -12,7 +12,6 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.logging.Logger;
-import java.util.regex.Matcher;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
@@ -306,7 +305,7 @@ public File saveResource(String jarResource, File destinationFolder, boolean rep
                     }
                     // There are two options, use the path of the resource or not
                     File outFile = new File(destinationFolder,
-                            jarResource.replaceAll("/", Matcher.quoteReplacement(File.separator)));
+                            jarResource.replace("/", File.separator));
 
                     if (noPath) {
                         outFile = new File(destinationFolder, outFile.getName());

src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java

@@ -6,11 +6,11 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.bukkit.Material;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -42,7 +42,7 @@ public class AddonClassLoader extends URLClassLoader {
     /**
      * A cache of classes that have been loaded by this class loader.
      */
-    private final Map<String, Class<?>> classes = new HashMap<>();
+    private final Map<String, Class<?>> classes = new ConcurrentHashMap<>();
     /**
      * The addon instance that was loaded by this class loader.
      */
@@ -218,28 +218,30 @@ public Class<?> findClass(String name, boolean checkGlobal) {
         if (name.startsWith("world.bentobox.bentobox")) {
             return null;
         }
-        // Check local cache first.
+        // Check local cache first. Avoid computeIfAbsent: super.findClass() triggers recursive
+        // class loading which would call findClass() again, causing ConcurrentHashMap to throw
+        // IllegalStateException: Recursive update.
         Class<?> result = classes.get(name);
+        if (result != null) {
+            return result;
+        }
+        // Check global cache for classes from other addons.
+        if (checkGlobal) {
+            result = loader.getClassByName(name);
+        }
         if (result == null) {
-            // Check global cache for classes from other addons.
-            if (checkGlobal) {
-                result = loader.getClassByName(name);
+            // Try to find the class in this addon's jar.
+            try {
+                result = super.findClass(name);
+            } catch (ClassNotFoundException | NoClassDefFoundError e) {
+                // Do nothing. The class is not in this jar.
             }
-
-            if (result == null) {
-                // Try to find the class in this addon's jar.
-                try {
-                    result = super.findClass(name);
-                } catch (ClassNotFoundException | NoClassDefFoundError e) {
-                    // Do nothing. The class is not in this jar.
-                }
-                if (result != null) {
-                    // Class found in this addon's jar, so add it to the global cache.
-                    loader.setClass(name, result);
-
-                }
+            if (result != null) {
+                // Class found in this addon's jar, so add it to the global cache.
+                loader.setClass(name, result);
             }
-            // Add the class to the local cache.
+        }
+        if (result != null) {
             classes.put(name, result);
         }
         return result;