Merge branch 'develop' of https://github.com/BentoBoxWorld/BentoBox.git into develop

tastybento · tastybento · commit bd2c2f229736 · 2025-12-20T08:15:57.000Z
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -93,6 +93,22 @@ val vaultVersion = "1.7.1"
 val levelVersion = "2.21.3"
 val placeholderapiVersion = "2.11.7"
 val myworldsVersion = "1.19.3-v1"
+val awaitilityVersion = "4.2.2"
+val mythicDistVersion = "5.9.5"
+val multiverseCore5Version = "5.0.0-SNAPSHOT"
+val multiverseCore4Version = "4.3.16"
+val langUtilsVersion = "3.2.2"
+val slimefun4Version = "RC-37"
+val itemsAdderVersion = "4.0.2-beta-release-11"
+val fancyNpcsVersion = "2.4.4"
+val znpcsplusApiVersion = "2.0.0-SNAPSHOT"
+val fancyHologramsVersion = "2.4.1"
+val commonsLangVersion = "2.6"
+val jaxbApiVersion = "2.3.0"
+val gsonRecordTypeAdapterFactoryVersion = "0.3.0"
+val jdtAnnotationVersion = "2.2.600"
+val multilibVersion = "1.1.13"
+val oraxenVersion = "1.193.1"
 
 // Store versions in extra properties for resource filtering (used in plugin.yml, config.yml)
 extra["java.version"] = javaVersion
@@ -176,59 +192,40 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junitVersion")
-    testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion") // Mocking framework
+    testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion")
     testImplementation("org.mockito:mockito-core:$mockitoVersion")
-    testImplementation("com.github.MockBukkit:MockBukkit:$mockBukkitVersion") // Bukkit mock server
-    testImplementation("org.awaitility:awaitility:4.2.2") // Async testing helper
-    testImplementation("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") // Paper API for tests
+    testImplementation("com.github.MockBukkit:MockBukkit:$mockBukkitVersion")
+    testImplementation("org.awaitility:awaitility:$awaitilityVersion")
+    testImplementation("io.papermc.paper:paper-api:$paperVersion")
     testImplementation("com.github.MilkBowl:VaultAPI:$vaultVersion")
     testImplementation("me.clip:placeholderapi:$placeholderapiVersion")
+    testImplementation("commons-lang:commons-lang:$commonsLangVersion")
 
-    // --- Provided/Compile-Only Dependencies: Available at compile time but provided by server ---
-    // These are NOT shaded into the final JAR (the server provides them at runtime)
-    //compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") // Bukkit/Spigot/Paper API
-    paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT")
-    
-    // Spigot NMS - Used for internal Minecraft code (chunk deletion and pasting)
+    // --- Compile Only Dependencies: Provided by the server at runtime ---
     compileOnly("org.spigotmc:spigot:$spigotVersion") {
-        exclude(group = "org.spigotmc", module = "spigot-api") // Already provided by Paper
+        exclude(group = "org.spigotmc", module = "spigot-api")
     }
-
-    // Optional plugins that may be installed on the server
     compileOnly("org.mongodb:mongodb-driver:$mongodbVersion")
-    compileOnly("com.zaxxer:HikariCP:$hikaricpVersion") // Database connection pooling
-    compileOnly("com.github.MilkBowl:VaultAPI:$vaultVersion") // Economy/permission API
-    compileOnly("me.clip:placeholderapi:$placeholderapiVersion") // Placeholder API
+    compileOnly("com.zaxxer:HikariCP:$hikaricpVersion")
+    compileOnly("com.github.MilkBowl:VaultAPI:$vaultVersion")
+    compileOnly("me.clip:placeholderapi:$placeholderapiVersion")
     compileOnly("com.bergerkiller.bukkit:MyWorlds:$myworldsVersion") {
         exclude(group = "org.spigotmc", module = "spigot-api")
     }
-    compileOnly("io.lumine:Mythic-Dist:5.9.5") // Mythic Mobs
-    compileOnly("org.mvplugins.multiverse.core:multiverse-core:5.0.0-SNAPSHOT")
-    compileOnly("com.onarandombox.multiversecore:multiverse-core:4.3.16") {
+    compileOnly("io.lumine:Mythic-Dist:$mythicDistVersion")
+    compileOnly("org.mvplugins.multiverse.core:multiverse-core:$multiverseCore5Version")
+    compileOnly("com.onarandombox.multiversecore:multiverse-core:$multiverseCore4Version") {
         exclude(group = "org.spigotmc", module = "spigot-api")
     }
-    compileOnly("com.github.apachezy:LangUtils:3.2.2")
-    compileOnly("com.github.Slimefun:Slimefun4:RC-37") // Slimefun custom items
-    compileOnly("dev.lone:api-itemsadder:4.0.2-beta-release-11") // ItemsAdder custom items
-    compileOnly("de.oliver:FancyNpcs:2.4.4") // NPC plugin
-    compileOnly("lol.pyr:znpcsplus-api:2.0.0-SNAPSHOT") // Alternative NPC plugin
-    compileOnly("de.oliver:FancyHolograms:2.4.1") // Hologram plugin
-    compileOnly("world.bentobox:level:2.21.3-SNAPSHOT") // BentoBox Level addon
-
-    // Apache Commons Lang - utility library
-    compileOnly("commons-lang:commons-lang:2.6")
-    testImplementation("commons-lang:commons-lang:2.6")
-
-    // --- Implementation Dependencies: Shaded into final JAR ---
-    // These are embedded in the final JAR since they're not commonly available
-    implementation("org.bstats:bstats-bukkit:$bstatsVersion") // Plugin metrics
-    implementation("javax.xml.bind:jaxb-api:2.3.0") // XML serialization
-    implementation("com.github.Marcono1234:gson-record-type-adapter-factory:0.3.0") // JSON serialization
-    implementation("org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600") // Nullability annotations
-    implementation("com.github.puregero:multilib:1.1.13") // Multi-library support
-
-    // Oraxen with custom exclusions (embed only what we need)
-    compileOnly("io.th0rgal:oraxen:1.193.1") {
+    compileOnly("com.github.apachezy:LangUtils:$langUtilsVersion")
+    compileOnly("com.github.Slimefun:Slimefun4:$slimefun4Version")
+    compileOnly("dev.lone:api-itemsadder:$itemsAdderVersion")
+    compileOnly("de.oliver:FancyNpcs:$fancyNpcsVersion")
+    compileOnly("lol.pyr:znpcsplus-api:$znpcsplusApiVersion")
+    compileOnly("de.oliver:FancyHolograms:$fancyHologramsVersion")
+    compileOnly("world.bentobox:level:$levelVersion-SNAPSHOT")
+    compileOnly("commons-lang:commons-lang:$commonsLangVersion")
+    compileOnly("io.th0rgal:oraxen:$oraxenVersion") {
         exclude(group = "me.gabytm.util", module = "actions-spigot")
         exclude(group = "org.jetbrains", module = "annotations")
         exclude(group = "com.ticxo", module = "PlayerAnimator")
@@ -238,9 +235,19 @@ dependencies {
         exclude(group = "org.bstats", module = "bstats-bukkit")
         exclude(group = "com.jeff-media", module = "custom-block-data")
         exclude(group = "com.jeff-media", module = "persistent-data-serializer")
-        exclude(group = "com.jeff_media", module = "MorePersistentDataTypes")
+        exclude(group = "com.jeff-media", module = "MorePersistentDataTypes")
         exclude(group = "gs.mclo", module = "java")
     }
+
+    // --- Implementation Dependencies: Shaded into final JAR ---
+    implementation("org.bstats:bstats-bukkit:$bstatsVersion")
+    implementation("javax.xml.bind:jaxb-api:$jaxbApiVersion")
+    implementation("com.github.Marcono1234:gson-record-type-adapter-factory:$gsonRecordTypeAdapterFactoryVersion")
+    implementation("org.eclipse.jdt:org.eclipse.jdt.annotation:$jdtAnnotationVersion")
+    implementation("com.github.puregero:multilib:$multilibVersion")
+
+    // --- Paperweight Development Bundle (Provided by plugin development tools) ---
+    paperweight.paperDevBundle(paperVersion)
 }
 
 paperweight {
diff --git a/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java b/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
@@ -218,31 +218,19 @@ public Class<?> findClass(String name, boolean checkGlobal) {
         if (name.startsWith("world.bentobox.bentobox")) {
             return null;
         }
-        // Check local cache first.
-        Class<?> result = classes.get(name);
-        if (result == null) {
-            // Check global cache for classes from other addons.
-            if (checkGlobal) {
-                result = loader.getClassByName(name);
+        return classes.computeIfAbsent(name, key -> {
+            Class<?> resolved = checkGlobal ? loader.getClassByName(key) : null;
+            if (resolved != null) {
+                return resolved;
             }
-
-            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);
-
-                }
+            try {
+                resolved = AddonClassLoader.super.findClass(key);
+                loader.setClass(key, resolved);
+                return resolved;
+            } catch (ClassNotFoundException | NoClassDefFoundError e) {
+                return null; // Not found locally.
             }
-            // Add the class to the local cache.
-            classes.put(name, result);
-        }
-        return result;
+        });
     }
 
     /**
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
@@ -62,7 +62,7 @@ public CycleClick(String id, int minRank, int maxRank) {
     public boolean onClick(Panel panel, User user2, ClickType click, int slot) {
         if (panel.getWorld().isEmpty()) {
             plugin.logError("Panel " + panel.getName()
-                    + " has no world associated with it. Please report this bug to the author.");
+            + " has no world associated with it. Please report this bug to the author.");
             return true;
         }
         // This click listener is used with TabbedPanel and SettingsTabs only
@@ -73,14 +73,17 @@ public boolean onClick(Panel panel, User user2, ClickType click, int slot) {
         this.user = user2;
         changeOccurred = false;
         // Permission prefix
-        String prefix = plugin.getIWM().getPermissionPrefix(Util.getWorld(panel.getWorld().get()));
-        String reqPerm = prefix + "settings." + id;
-        String allPerms = prefix + "settings.*";
-        if (!user.hasPermission(reqPerm) && !user.hasPermission(allPerms)
-                && !user.isOp() && !user.hasPermission(prefix + "admin.settings")) {
-            user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, reqPerm);
-            user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);
-            return true;
+        String prefix = "";
+        if (panel.getWorld().isPresent()) {
+            prefix = plugin.getIWM().getPermissionPrefix(Util.getWorld(panel.getWorld().get()));
+            String reqPerm = prefix + "settings." + id;
+            String allPerms = prefix + "settings.*";
+            if (!user.hasPermission(reqPerm) && !user.hasPermission(allPerms)
+                    && !user.isOp() && !user.hasPermission(prefix + "admin.settings")) {
+                user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, reqPerm);
+                user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);
+                return true;
+            }
         }
         // Left-clicking increases the rank required
         // Right-clicking decreases the rank required
diff --git a/src/main/java/world/bentobox/bentobox/api/user/User.java b/src/main/java/world/bentobox/bentobox/api/user/User.java
@@ -441,8 +441,7 @@ private int iteratePerms(List<String> permissions, String permPrefix, int defaul
                 String[] spl = permission.split(permPrefix);
                 if (spl.length > 1) {
                     if (!NumberUtils.isCreatable(spl[1])) {
-                        plugin.logError("Player " + player.getName() + " has permission: '" + permission
-                                + "' <-- the last part MUST be a number! Ignoring...");
+                        plugin.logError("Player " + player.getName() + " has permission: '" + permission);
                     } else {
                         int v = Integer.parseInt(spl[1]);
                         if (v < 0) {
@@ -981,7 +980,7 @@ public String toString() {
                 + (offlinePlayer != null ? "offlinePlayer=" + offlinePlayer + ", " : "")
                 + (playerUUID != null ? "playerUUID=" + playerUUID + ", " : "")
                 + (sender != null ? "sender=" + sender + ", " : "") + (addon != null ? "addon=" + addon + ", " : "")
-                + (getLocation() != null ? "getLocation()=" + getLocation() + ", " : "") + "isPlayer()=" + isPlayer()
+                + "getLocation()=" + getLocation() + "isPlayer()=" + isPlayer()
                 + "]";
     }
 
diff --git a/src/main/resources/locales/zh-CN.yml b/src/main/resources/locales/zh-CN.yml
@@ -1363,10 +1363,10 @@ protection:
       name: '&b&l放置方块'
       hint: 禁止放置方块
     PODZOL:
-      name: 树荫土生成
+      name: 灰化土转化
       description: |-
         &a 如果禁用，将防止在大树
-        &a 生长时生成树荫土
+        &a 生长时转化灰化土
     POTION_THROWING:
       name: '&b&l投掷药水'
       description: |-
