Merge pull request #470 from BentoBoxWorld/develop

Version 1.22.1

Author: tastybento

CLAUDE.md

@@ -0,0 +1,56 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Commands
+
+```bash
+# Build
+mvn clean package
+
+# Run all tests
+mvn test
+
+# Run a single test class
+mvn test -Dtest=TestClassName
+
+# Run a single test method
+mvn test -Dtest=TestClassName#methodName
+
+# Full verify with coverage (JaCoCo)
+mvn verify
+```
+
+## Project Overview
+
+AOneBlock is a BentoBox GameModeAddon for Minecraft. Players start on a single magic block in the sky; mining that block cycles through 18+ sequential phases (Plains, Underground, Ocean, Jungle, etc.), each with its own blocks, mobs, and chest loot. The plugin extends `GameModeAddon` from BentoBox and hooks into the Bukkit event system.
+
+## Key Architecture
+
+**Entry point:** `AOneBlock.java` — registers listeners, commands, generators, and the `OneBlocksManager`.
+
+**Phase system (`oneblocks/`):**
+- `OneBlocksManager` — loads phase YAML files from `src/main/resources/phases/`, tracks per-island block counts, handles phase transitions, and resolves what block/mob/chest appears next.
+- `OneBlockPhase` — represents a single phase with its block pool, mob pool, and chest tables.
+- `OneBlockObject` — a single block-pool entry (can be a vanilla block, custom block, or mob spawn).
+- `customblock/` — adapters for custom block types (ItemsAdder, Mob, raw BlockData).
+
+**Data persistence:** `OneBlockIslands` (in `dataobjects/`) is stored via BentoBox's database abstraction. It tracks block count, phase name, and hologram state per island.
+
+**Listeners (`listeners/`):** Handle the magic block break event (core gameplay loop), boss bar updates, hologram placement, island join/leave hooks, and protection flags.
+
+**Events (`events/`):** `MagicBlockEvent`, `MagicBlockPhaseEvent`, and `BlockClearEvent` are fired during gameplay so other plugins can react.
+
+**Commands:**
+- Player: `/ob` (`PlayerCommand`) — sub-commands: count, phases, actionbar, bossbar, respawnblock, setcount
+- Admin: `/oba` (`AdminCommand`) — sub-commands: setchest, sanitycheck, setcount
+
+**World generation:** `ChunkGeneratorWorld` generates the empty void world with the single starter block.
+
+**GUI:** `PhasesPanel` provides a clickable phase browser.
+
+## Testing
+
+All tests extend `CommonTestSetup`, which sets up a MockBukkit server, mocks BentoBox and its managers (islands, players, worlds), and tears everything down after each test. Use Mockito and the repository's `world.bentobox.aoneblock.WhiteBox` helper for injecting state into private fields.
+
+Phase YAML files under `src/main/resources/phases/` are loaded at startup; tests that exercise `OneBlocksManager` need those resources on the classpath (they are by default via Maven's test resource path).

pom.xml

@@ -56,16 +56,17 @@
         <mockito.version>5.11.0</mockito.version>
         <mock-bukkit.version>v1.21-SNAPSHOT</mock-bukkit.version>
         <!-- More visible way how to change dependency versions -->
-        <bentobox.version>2.7.1-SNAPSHOT</bentobox.version>
+        <bentobox.version>3.10.0</bentobox.version>
         <items-adder.version>4.0.10</items-adder.version>
+        <nexo.version>1.8.0</nexo.version>
         <level.version>2.6.2</level.version>
         <bank.version>1.3.0</bank.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.22.0</build.version>
+        <build.version>1.22.1</build.version>
         <!-- SonarCloud -->
         <sonar.projectKey>BentoBoxWorld_AOneBlock</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
@@ -123,51 +124,75 @@
 
 
     <repositories>
+        <!-- MockBukkit (com.github.*) snapshots live here -->
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
+            <releases><enabled>true</enabled></releases>
+            <snapshots><enabled>true</enabled></snapshots>
         </repository>
+        <!-- BentoBox, Level, Bank releases -->
         <repository>
-          <id>papermc</id>
-          <url>https://repo.papermc.io/repository/maven-public/</url>
+            <id>bentoboxworld</id>
+            <url>https://repo.codemc.org/repository/bentoboxworld/</url>
+            <releases><enabled>true</enabled></releases>
+            <snapshots><enabled>false</enabled></snapshots>
         </repository>
+        <!-- Paper API snapshots -->
         <repository>
-            <id>minecraft-repo</id>
-            <url>https://libraries.minecraft.net/</url>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+            <releases><enabled>true</enabled></releases>
+            <snapshots><enabled>true</enabled></snapshots>
         </repository>
+        <!-- ItemsAdder API -->
         <repository>
-            <id>bentoboxworld</id>
-            <url>https://repo.codemc.org/repository/bentoboxworld/</url>
-        </repository>        
+            <id>matteodev</id>
+            <url>https://maven.devs.beer/</url>
+            <releases><enabled>true</enabled></releases>
+            <snapshots><enabled>false</enabled></snapshots>
+        </repository>
+        <!-- Nexo API -->
         <repository>
-            <id>codemc</id>
-            <url>https://repo.codemc.org/repository/maven-snapshots/</url>
+            <id>nexomc</id>
+            <url>https://repo.nexomc.com/releases/</url>
+            <releases><enabled>true</enabled></releases>
+            <snapshots><enabled>false</enabled></snapshots>
         </repository>
+        <!-- General Maven public mirror -->
         <repository>
             <id>codemc-repo</id>
             <url>https://repo.codemc.org/repository/maven-public/</url>
+            <releases><enabled>true</enabled></releases>
+            <snapshots><enabled>false</enabled></snapshots>
         </repository>
+        <!-- Mojang/Minecraft libraries (releases only) -->
         <repository>
-            <id>jitpack-repo</id>
-            <url>https://jitpack.io</url>
+            <id>minecraft-repo</id>
+            <url>https://libraries.minecraft.net/</url>
+            <releases><enabled>true</enabled></releases>
+            <snapshots><enabled>false</enabled></snapshots>
         </repository>
-         <repository>
-            <id>matteodev</id>
-            <url>https://maven.devs.beer/</url>
+        <!-- CodeMC snapshots (BentoBox CI builds if needed) -->
+        <repository>
+            <id>codemc</id>
+            <url>https://repo.codemc.org/repository/maven-snapshots/</url>
+            <releases><enabled>false</enabled></releases>
+            <snapshots><enabled>true</enabled></snapshots>
         </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>com.github.MockBukkit</groupId>
             <artifactId>MockBukkit</artifactId>
-            <version>v1.21-SNAPSHOT</version>
+            <version>${mock-bukkit.version}</version>
             <scope>test</scope>
          </dependency>
         <dependency>
           <groupId>io.papermc.paper</groupId>
           <artifactId>paper-api</artifactId>
-          <version>1.21.10-R0.1-SNAPSHOT</version>
+          <version>1.21.11-R0.1-SNAPSHOT</version>
           <scope>provided</scope>
         </dependency>
         <!-- Apache Commons Text -->
@@ -185,7 +210,6 @@
             <scope>provided</scope>
         </dependency>
         <!-- Mockito (Unit testing) -->
-        <!-- Mockito (Unit testing) This goes at the top to ensure the dependencies are accurate. -->
         <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
@@ -235,6 +259,18 @@
             <version>${items-adder.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.nexomc</groupId>
+            <artifactId>nexo</artifactId>
+            <version>${nexo.version}</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -302,6 +338,11 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.5.4</version>
                 <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                        <include>**/*Test?.java</include>
+                        <include>**/*Test??.java</include>
+                    </includes>
                     <argLine>
                         --add-opens java.base/java.lang=ALL-UNNAMED
                         --add-opens java.base/java.math=ALL-UNNAMED

src/main/java/world/bentobox/aoneblock/AOneBlock.java

@@ -24,11 +24,13 @@
 import world.bentobox.aoneblock.listeners.InfoListener;
 import world.bentobox.aoneblock.listeners.ItemsAdderListener;
 import world.bentobox.aoneblock.listeners.JoinLeaveListener;
+import world.bentobox.aoneblock.listeners.NexoListener;
 import world.bentobox.aoneblock.listeners.NoBlockHandler;
 import world.bentobox.aoneblock.listeners.StartSafetyListener;
 import world.bentobox.aoneblock.oneblocks.OneBlockCustomBlockCreator;
 import world.bentobox.aoneblock.oneblocks.OneBlocksManager;
 import world.bentobox.aoneblock.oneblocks.customblock.ItemsAdderCustomBlock;
+import world.bentobox.aoneblock.oneblocks.customblock.NexoCustomBlock;
 import world.bentobox.aoneblock.requests.IslandStatsHandler;
 import world.bentobox.aoneblock.requests.LocationStatsHandler;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
@@ -53,6 +55,8 @@ public class AOneBlock extends GameModeAddon {
     private static final String THE_END = "_the_end";
     /** Whether ItemsAdder is present on the server */
     private boolean hasItemsAdder = false;
+    /** Whether Nexo is present on the server */
+    private boolean hasNexo = false;
 
     /** The addon settings */
     private Settings settings;
@@ -116,6 +120,13 @@ public void onLoad() {
             OneBlockCustomBlockCreator.register("itemsadder", ItemsAdderCustomBlock::fromMap);
             hasItemsAdder = true;
         }
+        // Check if Nexo exists, if yes register listener
+        if (Bukkit.getPluginManager().getPlugin("Nexo") != null) {
+            registerListener(new NexoListener(this));
+            OneBlockCustomBlockCreator.register(NexoCustomBlock::fromId);
+            OneBlockCustomBlockCreator.register("nexo", NexoCustomBlock::fromMap);
+            hasNexo = true;
+        }
         // Save the default config from config.yml
         saveDefaultConfig();
         // Load settings from config.yml. This will check if there are any issues with
@@ -398,6 +409,13 @@ public boolean hasItemsAdder() {
         return hasItemsAdder;
     }
 
+    /**
+     * @return true if Nexo is on the server
+     */
+    public boolean hasNexo() {
+        return hasNexo;
+    }
+
     /**
      * Set the addon's world. Used only for testing.
      * @param world world

src/main/java/world/bentobox/aoneblock/commands/admin/AdminSanityCheck.java

@@ -42,7 +42,7 @@ public boolean canExecute(User user, String label, List<String> args) {
         // Check phase
         Optional<OneBlockPhase> opPhase = addon.getOneBlockManager().getPhase(args.getFirst().toUpperCase());
         if (opPhase.isEmpty()) {
-            user.sendMessage("aoneblock.commands.admin.setchest.unknown-phase");
+            user.sendMessage("aoneblock.commands.admin.sanity.unknown-phase");
             return false;
         } else {
             phase = opPhase.get();
@@ -59,7 +59,7 @@ public boolean execute(User user, String label, List<String> args) {
             addon.getOneBlockManager().getProbs(phase);
         }
         if (user.isPlayer()) {
-            user.sendMessage("aoneblock.commands.admin.setchest.see-console");
+            user.sendMessage("aoneblock.commands.admin.sanity.see-console");
         }
         return true;
     }