Merge pull request #2993 from BentoBoxWorld/feature/paper-26-2-support

feat: support Minecraft 26.2 and migrate the build to Java 25

Author: tastybento

.github/workflows/modrinth-publish.yml

@@ -97,6 +97,7 @@ jobs:
             26.1
             26.1.1
             26.1.2
+            26.2
 
           # Path to the built JAR — the Shadow plugin produces BentoBox-<version>.jar
           # Note: glob patterns are not supported; use the release tag directly.

CLAUDE.md

@@ -4,7 +4,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## Project Overview
 
-BentoBox is a Bukkit/Paper library plugin (Java 21) that provides the core platform for island-style Minecraft games (SkyBlock, AcidIsland, etc.) via an extensible addon system.
+BentoBox is a Bukkit/Paper library plugin (Java 25) that provides the core platform for island-style Minecraft games (SkyBlock, AcidIsland, etc.) via an extensible addon system.
 
 ## Build Commands
 

build.gradle.kts

@@ -3,7 +3,7 @@
  * 
  * This build script configures the compilation, testing, packaging, and publishing
  * of the BentoBox Minecraft plugin. It handles:
- * - Java 21 compilation with proper module access
+ * - Java 25 compilation with proper module access
  * - Multi-repository dependency resolution
  * - JAR shading and minimization
  * - Test execution with JUnit 5
@@ -29,7 +29,9 @@ plugins {
     id("com.gradleup.shadow") version "9.3.0"
 
     // Paperweight UserDev - simplifies development against PaperMC with proper mappings and reobfuscation
-    id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
+    // 2.0.0-SNAPSHOT (from Paper's repo, via pluginManagement in settings.gradle.kts) is required:
+    // all 26.x dev bundles are data version 8, which released paperweight (<= beta.21) cannot read.
+    id("io.papermc.paperweight.userdev") version "2.0.0-SNAPSHOT"
 
     // Sonarcube
     id("org.sonarqube") version "7.2.1.6560"
@@ -46,7 +48,7 @@ paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArt
 group = "world.bentobox" // From <groupId>
 
 // Base properties from <properties>
-val buildVersion = "3.17.1"
+val buildVersion = "3.18.0"
 val buildNumberDefault = "-LOCAL" // Local build identifier
 val snapshotSuffix = "-SNAPSHOT"  // Indicates development/snapshot version
 
@@ -77,23 +79,25 @@ version = finalRevision
 // DEPENDENCY VERSIONS
 // ============================================================================
 // Centralized version management for all external dependencies
-val javaVersion = "21"
+// Minecraft 26.1+ dev bundles and the 26.2 paper-api are Java 25 artifacts, so BentoBox now
+// compiles to Java 25 bytecode. Addons that compile against BentoBox must also move to Java 25.
+val javaVersion = "25"
 val junitVersion = "5.10.2"
 val mockitoVersion = "5.11.0"
-// Pin to a concrete JitPack tag rather than the v1.21-SNAPSHOT pointer.
-// SNAPSHOT resolution on JitPack is flaky — it sometimes advertises a
-// timestamped version in maven-metadata.xml whose corresponding .pom 404s,
-// breaking dependency resolution mid-build. Newer tags (>= v4.111) also
-// currently fail to build on JitPack because the project requires a Java 25
-// toolchain that JitPack's default image doesn't have. v4.110.0 is the most
-// recent tag with both POM and JAR available on JitPack.
-val mockBukkitVersion = "v4.110.0"
+// MockBukkit's modern, per-Minecraft-version artifacts are published to Paper's Maven repo
+// under org.mockbukkit.mockbukkit (see the testImplementation coordinate below). The closest
+// available to Paper 26.2 is the 26.1.2 line (no 26.2 build exists yet); 4.113.2 is the latest.
+val mockBukkitVersion = "4.113.2"
 val mongodbVersion = "3.12.12"
 val mariadbVersion = "3.0.5"
 val mysqlVersion = "8.0.27"
 val postgresqlVersion = "42.2.18"
 val hikaricpVersion = "5.0.1"
-val paperVersion = "1.21.11-R0.1-SNAPSHOT"
+// Compile against the latest stable 26.1.2 dev bundle. This is the newest Paper API that has a
+// matching MockBukkit release (mockbukkit-v26.1.2); MockBukkit does not yet support 26.2's new
+// registries. Minecraft 26.2 is still fully supported at runtime (see ServerCompatibility and
+// the Modrinth game-versions list); 26.2-only blocks/entities are accessed via Enums.getIfPresent.
+val paperVersion = "26.1.2.build.72-stable"
 val bstatsVersion = "3.0.0"
 val vaultVersion = "1.7.1"
 val levelVersion = "2.21.3"
@@ -145,7 +149,7 @@ extra["revision"] = finalRevision
 // ============================================================================
 // Configures Java compiler and toolchain settings
 java {
-    // Use Java 21 toolchain for compilation (enforced regardless of JVM running Gradle)
+    // Use Java 25 toolchain for compilation (enforced regardless of JVM running Gradle)
     toolchain {
         languageVersion = JavaLanguageVersion.of(javaVersion)
     }
@@ -157,7 +161,7 @@ tasks.withType<JavaCompile> {
     // 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)
+    options.release.set(25)
 }
 
 tasks.compileTestJava {
@@ -166,7 +170,7 @@ tasks.compileTestJava {
     // 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)
+    options.release.set(25)
 }
 
 
@@ -218,7 +222,7 @@ dependencies {
     testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junitVersion")
     testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion")
     testImplementation("org.mockito:mockito-core:$mockitoVersion")
-    testImplementation("com.github.MockBukkit:MockBukkit:$mockBukkitVersion")
+    testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v26.1.2:$mockBukkitVersion")
     testImplementation("org.awaitility:awaitility:$awaitilityVersion")
     testImplementation("io.papermc.paper:paper-api:$paperVersion")
     testImplementation("com.github.MilkBowl:VaultAPI:$vaultVersion")
@@ -287,7 +291,7 @@ dependencies {
 paperweight {
     addServerDependencyTo = configurations.named(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME).map { setOf(it) }
   javaLauncher = javaToolchains.launcherFor {
-        // Use the project's configured Java version for paperweight tools (needs Java 21+)
+        // Minecraft 26.1+ dev bundles require Java 25 to run the paperclip patch step.
         languageVersion = JavaLanguageVersion.of(javaVersion)
   }
 }
@@ -391,7 +395,7 @@ tasks.test {
     // Use JUnit Platform (required for JUnit 5)
     useJUnitPlatform()
 
-    // Enable Java 21 preview features and dynamic agent loading
+    // Enable Java preview features and dynamic agent loading
     jvmArgs("--enable-preview", "-XX:+EnableDynamicAgentLoading")
 
     // Add --add-opens: Required for Java 21+ to allow reflection access to restricted modules

settings.gradle.kts

@@ -2,4 +2,13 @@
  * This file was generated by the Gradle 'init' task.
  */
 
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        // Paper's repo hosts the paperweight 2.0.0-SNAPSHOT, required to read the data-version-8
+        // dev bundles used by all Minecraft 26.x releases (no released paperweight supports them).
+        maven("https://repo.papermc.io/repository/maven-public/") { name = "PaperMC" }
+    }
+}
+
 rootProject.name = "bentobox"

src/main/java/world/bentobox/bentobox/listeners/flags/protection/BucketListener.java

@@ -4,6 +4,7 @@
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Axolotl;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Fish;
 import org.bukkit.entity.MushroomCow;
 import org.bukkit.entity.Player;
@@ -13,6 +14,8 @@
 import org.bukkit.event.player.PlayerBucketFillEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 
+import com.google.common.base.Enums;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
 
@@ -24,6 +27,15 @@
  */
 public class BucketListener extends FlagListener {
 
+    /**
+     * The Sulfur Cube entity type (Minecraft 26.2), resolved at runtime so the code still
+     * compiles against earlier API versions. {@code null} when absent. Non-final so tests can
+     * inject a stand-in type (the JVM constant-folds {@code static final} fields).
+     */
+    @SuppressWarnings("java:S3008") // non-final by design; see Javadoc (test injection)
+    private static EntityType SULFUR_CUBE = Enums.getIfPresent(EntityType.class, "SULFUR_CUBE")
+            .orNull();
+
     /**
      * Prevents emptying of buckets
      * @param e - event
@@ -73,6 +85,12 @@ else if (e.getRightClicked() instanceof Axolotl &&
         {
             this.checkIsland(e, e.getPlayer(), e.getRightClicked().getLocation(), Flags.AXOLOTL_SCOOPING);
         }
+        else if (SULFUR_CUBE != null && e.getRightClicked().getType() == SULFUR_CUBE &&
+            e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.BUCKET))
+        {
+            // Sulfur Cube (26.2) is picked up with an empty bucket
+            this.checkIsland(e, e.getPlayer(), e.getRightClicked().getLocation(), Flags.BUCKET);
+        }
     }
 
 

src/main/java/world/bentobox/bentobox/listeners/flags/protection/EntityInteractListener.java

@@ -7,6 +7,7 @@
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Boat;
 import org.bukkit.entity.ChestBoat;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.entity.Villager;
@@ -20,6 +21,8 @@
 import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 
+import com.google.common.base.Enums;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
 
@@ -32,6 +35,15 @@
  */
 public class EntityInteractListener extends FlagListener {
 
+    /**
+     * The Sulfur Cube entity type (Minecraft 26.2), resolved at runtime so the code still
+     * compiles against earlier API versions. {@code null} when absent. Non-final so tests can
+     * inject a stand-in type (the JVM constant-folds {@code static final} fields).
+     */
+    @SuppressWarnings("java:S3008") // non-final by design; see Javadoc (test injection)
+    private static EntityType SULFUR_CUBE = Enums.getIfPresent(EntityType.class, "SULFUR_CUBE")
+            .orNull();
+
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled=true)
     public void onPlayerInteractAtEntity(final PlayerInteractAtEntityEvent e) {
         if (e.getRightClicked() instanceof ArmorStand) {
@@ -54,6 +66,12 @@ public void onPlayerInteractEntity(PlayerInteractEntityEvent e)
         } else if (e.getRightClicked() instanceof Allay
                 || e.getRightClicked().getType().name().equals("COPPER_GOLEM")) {
             this.checkIsland(e, p, l, Flags.ALLAY);
+        } else if (SULFUR_CUBE != null && e.getRightClicked().getType() == SULFUR_CUBE) {
+            // Sulfur Cube (26.2) absorbs the block the player is holding - treat as placing a block
+            Material hand = p.getInventory().getItemInMainHand().getType();
+            if (hand.isBlock() && !hand.isAir()) {
+                this.checkIsland(e, p, l, Flags.PLACE_BLOCKS);
+            }
         }
         checkNameTag(e, p, l);
     }

src/main/java/world/bentobox/bentobox/util/Util.java

@@ -20,6 +20,8 @@
 
 import javax.annotation.Nonnull;
 
+import com.google.common.base.Enums;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
@@ -33,6 +35,7 @@
 import org.bukkit.entity.Bat;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Flying;
 import org.bukkit.entity.IronGolem;
 import org.bukkit.entity.Monster;
@@ -83,6 +86,18 @@ public class Util {
      */
     private static final String COLOR_CHAR = "\u00A7";
 
+    /**
+     * The Sulfur Cube entity type (Minecraft 26.2), resolved at runtime so the code still
+     * compiles against earlier API versions where the constant does not exist. {@code null}
+     * when absent, in which case the {@code ==} comparisons against it are simply false.
+     * Intentionally non-final: assigned once at class load, but left non-final so tests can
+     * inject a stand-in type (the JVM constant-folds {@code static final} fields, defeating
+     * reflective injection).
+     */
+    @SuppressWarnings("java:S3008") // non-final by design; see Javadoc (test injection)
+    private static EntityType SULFUR_CUBE = Enums.getIfPresent(EntityType.class, "SULFUR_CUBE")
+            .orNull();
+
     /**
      * Use standard color code definition: {@code &<hex>}.
      */
@@ -426,8 +441,11 @@ public static boolean isHostileEntity(Entity entity) {
         // Most of hostile mobs extends Monster.
         // PufferFish is a unique fix.
 
-        return entity instanceof Monster || entity instanceof Flying || entity instanceof Slime ||
-                entity instanceof Shulker || entity instanceof EnderDragon || entity instanceof PufferFish;
+        // Sulfur Cube (26.2) is slime-like but passive, so it must not be treated as hostile
+        // even if it implements Slime at runtime.
+        return (entity instanceof Monster || entity instanceof Flying || entity instanceof Slime ||
+                entity instanceof Shulker || entity instanceof EnderDragon || entity instanceof PufferFish)
+                && (SULFUR_CUBE == null || entity.getType() != SULFUR_CUBE);
     }
 
 
@@ -456,8 +474,10 @@ public static boolean isPassiveEntity(Entity entity) {
         boolean isCopperGolem = entity.getType().name().equals("COPPER_GOLEM");
         // And the sniffer
         boolean isSniffer = entity.getType().name().equals("SNIFFER");
+        // And the Sulfur Cube (26.2): slime-like but passive
+        boolean isSulfurCube = SULFUR_CUBE != null && entity.getType() == SULFUR_CUBE;
 
-        return isPassiveByClass || isPassiveWaterMob || isCopperGolem || isSniffer;
+        return isPassiveByClass || isPassiveWaterMob || isCopperGolem || isSniffer || isSulfurCube;
     }
 
     public static boolean isTamableEntity(Entity entity) {

src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java

@@ -177,7 +177,11 @@ public enum ServerVersion {
         /**
          * @since 3.14.2
          */
-        V26_1_2(Compatibility.COMPATIBLE),;
+        V26_1_2(Compatibility.COMPATIBLE),
+        /**
+         * @since 3.18.0
+         */
+        V26_2(Compatibility.COMPATIBLE),;
 
         private final Compatibility compatibility;