Merge pull request #110 from BentoBoxWorld/1_21_6_update

1 21 6 update

Author: tastybento

pom.xml

@@ -54,15 +54,15 @@
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.21.5-R0.1-SNAPSHOT</spigot.version>
-        <paper.version>1.21.5-R0.1-SNAPSHOT</paper.version>
-        <bentobox.version>2.7.1-SNAPSHOT</bentobox.version>
+        <spigot.version>1.21.6-R0.1-SNAPSHOT</spigot.version>
+        <paper.version>1.21.6-R0.1-SNAPSHOT</paper.version>
+        <bentobox.version>3.5.0</bentobox.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>2.9.0</build.version>
+        <build.version>3.0.0</build.version>
 
         <sonar.projectKey>BentoBoxWorld_Boxed</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
@@ -183,6 +183,12 @@
             <version>${spigot.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spigotmc....</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.21.5-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.spigotmc...</groupId>
             <artifactId>spigot</artifactId>

src/main/java/world/bentobox/boxed/listeners/NewAreaListener.java

@@ -49,6 +49,7 @@
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.events.BentoBoxReadyEvent;
 import world.bentobox.bentobox.api.events.island.IslandCreatedEvent;
+import world.bentobox.bentobox.api.events.island.IslandDeleteEvent;
 import world.bentobox.bentobox.api.events.island.IslandResettedEvent;
 import world.bentobox.bentobox.database.Database;
 import world.bentobox.bentobox.database.objects.Island;
@@ -110,7 +111,10 @@ public class NewAreaListener implements Listener {
     private static String pluginPackageName;
 
     /**
-     * @param addon addon
+     * Constructor for NewAreaListener.
+     * Initializes structure files, databases, and starts the structure printer.
+     * 
+     * @param addon The Boxed addon instance.
      */
     public NewAreaListener(Boxed addon) {
         this.addon = addon;
@@ -151,7 +155,8 @@ private void runStructurePrinter() {
     }
 
     /**
-     * Build something in the queue. Structures are built one by one
+     * Builds a structure from the queue if not already pasting.
+     * Only one structure is built at a time.
      */
     private void buildStructure() {
         // Only kick off a build if there is something to build and something isn't
@@ -163,6 +168,11 @@ private void buildStructure() {
         }
     }
 
+    /**
+     * Places a structure at the specified location and updates the island structure cache.
+     * 
+     * @param item The structure record to place.
+     */
     private void placeStructure(StructureRecord item) {
         // Set the semaphore - only paste one at a time
         pasting = true;
@@ -192,9 +202,7 @@ private void placeStructure(StructureRecord item) {
     }
 
     /**
-     * Load known structures from the templates file. This makes them available for
-     * admins to use in the boxed place file. If this is not done, then no
-     * structures (templates) will be available.
+     * Loads known structures from the templates file and registers them with the server.
      * 
      * @param event BentoBoxReadyEvent
      */
@@ -217,7 +225,8 @@ public void onBentoBoxReady(BentoBoxReadyEvent event) {
     }
 
     /**
-     * Add items to the queue when they are needed due to chunk loading
+     * Adds items to the build queue when their chunk is loaded.
+     * 
      * @param e ChunkLoadEvent
      */
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
@@ -281,10 +290,10 @@ public void onPlayerMove(PlayerMoveEvent e) {
     }
 
     /**
-     * Gives a player all the advancements that have string as a named criteria
+     * Gives a player all advancements that have the specified string as a named criteria.
      * 
-     * @param player - player
-     * @param string - criteria
+     * @param player The player to award.
+     * @param string The advancement criteria string.
      */
     private void giveAdvFromCriteria(Player player, String string) {
         // Give every advancement that requires a bastion
@@ -303,10 +312,10 @@ private void giveAdvFromCriteria(Player player, String string) {
     }
 
     /**
-     * Get all the known island structures for this island
+     * Gets all known island structures for the specified island.
      * 
-     * @param islandId - island ID
-     * @return IslandStructures
+     * @param islandId The island ID.
+     * @return IslandStructures for the island.
      */
     private IslandStructures getIslandStructData(String islandId) {
         // Return from cache if it exists
@@ -320,16 +329,66 @@ private IslandStructures getIslandStructData(String islandId) {
         return struct;
     }
 
+    /**
+     * Handles island creation event and sets up structures for the new island.
+     * 
+     * @param event IslandCreatedEvent
+     */
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onIslandCreated(IslandCreatedEvent event) {
         setUpIsland(event.getIsland());
     }
 
+    /**
+     * Handles island reset event and sets up structures for the reset island.
+     * 
+     * @param event IslandResettedEvent
+     */
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onIslandReset(IslandResettedEvent event) {
         setUpIsland(event.getIsland());
     }
 
+        /**
+     * Handles island deletion event and removes all pending structures for the deleted island.
+     *
+     * @param event IslandDeletedEvent
+     */
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    public void onIslandDeleted(IslandDeleteEvent event) {
+        String deletedIslandId = event.getIsland().getUniqueId();
+
+        // Remove from in-memory cache
+        islandStructureCache.remove(deletedIslandId);
+
+        // Remove from in-memory pending structures
+        for (List<StructureRecord> records : pending.values()) {
+            records.removeIf(record -> event.getIsland().inIslandSpace(record.location()));
+        }
+        pending.values().removeIf(list -> list.isEmpty());
+
+        // Remove from pending structures in database
+        Map<Pair<Integer, Integer>, List<StructureRecord>> readyToBuild = loadToDos().getReadyToBuild();
+        boolean dbChanged = false;
+        for (List<StructureRecord> records : readyToBuild.values()) {
+            if (records.removeIf(record -> event.getIsland().inIslandSpace(record.location()))) {
+                dbChanged = true;
+            }
+        }
+
+        // Save updated pending structures if any were removed
+        if (dbChanged) {
+            ToBePlacedStructures tbd = new ToBePlacedStructures();
+            tbd.setReadyToBuild(readyToBuild);
+            toPlace.saveObjectAsync(tbd);
+        }
+    }
+
+    /**
+     * Sets up structures for the given island based on the configuration.
+     * 
+     * @param island The island to set up.
+     */
     private void setUpIsland(Island island) {
         // Check if this island is in this game
         if (!(addon.inWorld(island.getWorld()))) {
@@ -350,6 +409,13 @@ private void setUpIsland(Island island) {
 
     }
 
+    /**
+     * Places structures defined in the configuration section at the specified center location.
+     * 
+     * @param section The configuration section.
+     * @param center The center location.
+     * @param env The world environment.
+     */
     private void place(ConfigurationSection section, Location center, Environment env) {
         if (section == null) {
             return;
@@ -412,11 +478,10 @@ private void place(ConfigurationSection section, Location center, Environment en
     }
 
     /**
-     * Removes Jigsaw blocks from a placed structure. Fills underwater ruins with
-     * water.
+     * Removes Jigsaw blocks from a placed structure and fills underwater ruins with water.
      * 
-     * @param item - record of what's required
-     * @return the resulting bounding box of the structure
+     * @param item The structure record.
+     * @return The resulting bounding box of the structure.
      */
     public static BoundingBox removeJigsaw(StructureRecord item) {
         Location loc = item.location();
@@ -466,12 +531,9 @@ public static BoundingBox removeJigsaw(StructureRecord item) {
     }
 
     /**
-     * Process a structure block. Sets it to a structure void at a minimum. If the
-     * structure block has metadata indicating it is a chest, then it will fill the
-     * chest with a buried treasure loot. If it is waterlogged, then it will change
-     * the void to water.
+     * Processes a structure block, possibly spawning entities or filling chests with loot.
      * 
-     * @param b structure block
+     * @param b The structure block.
      */
     private static void processStructureBlock(Block b) {
         // I would like to read the data from the block and do something with it!
@@ -499,6 +561,13 @@ private static void processStructureBlock(Block b) {
         }
     }
 
+    /**
+     * Processes a jigsaw block, setting its final state and spawning mobs if needed.
+     * 
+     * @param b The jigsaw block.
+     * @param structureRotation The structure's rotation.
+     * @param pasteMobs Whether to spawn mobs.
+     */
     private static void processJigsaw(Block b, StructureRotation structureRotation, boolean pasteMobs) {
         try {
             String data = nmsData(b);
@@ -517,6 +586,12 @@ private static void processJigsaw(Block b, StructureRotation structureRotation,
         }
     }
 
+    /**
+     * Spawns a mob at the specified block based on the jigsaw block's pool.
+     * 
+     * @param b The block.
+     * @param bjb The BoxedJigsawBlock data.
+     */
     private static void spawnMob(Block b, BoxedJigsawBlock bjb) {
         // bjb.getPool contains a lot more than just mobs, so we have to filter it to
         // see if any mobs are in there. This list may need to grow in the future
@@ -555,12 +630,11 @@ private static void spawnMob(Block b, BoxedJigsawBlock bjb) {
     }
 
     /**
-     * Corrects the direction of a block based on the structure's rotation
+     * Corrects the direction of a block based on the structure's rotation.
      * 
-     * @param finalState - the final block state of the block, which may include a
-     *                   facing: direction
-     * @param sr         - the structure's rotation
-     * @return a rewritten blockstate with the updated direction, if required
+     * @param finalState The final block state.
+     * @param sr The structure's rotation.
+     * @return The corrected block state string.
      */
     private static String correctDirection(String finalState, StructureRotation sr) {
         if (sr.equals(StructureRotation.NONE)) {
@@ -579,11 +653,11 @@ private static String correctDirection(String finalState, StructureRotation sr)
     }
 
     /**
-     * Adjusts the direction based on the StructureRotation
+     * Adjusts the direction based on the StructureRotation.
      * 
-     * @param oldDirection the old direction to adjust
-     * @param sr           the structure rotation
-     * @return the new direction, or SELF if something weird happens
+     * @param oldDirection The old direction.
+     * @param sr The structure rotation.
+     * @return The new direction, or SELF if not applicable.
      */
     private static BlockFace getNewDirection(BlockFace oldDirection, StructureRotation sr) {
         if (sr.equals(StructureRotation.CLOCKWISE_180)) {
@@ -609,16 +683,22 @@ private static BlockFace getNewDirection(BlockFace oldDirection, StructureRotati
     }
 
     /**
-     * Looks for north, south, east, west in the blockstate.
+     * Looks for north, south, east, or west in the blockstate string.
      * 
-     * @param finalState - the final block state of the block
-     * @return direction, if found, otherwise SELF
+     * @param finalState The final block state string.
+     * @return The detected direction, or SELF if not found.
      */
     private static BlockFace getDirection(String finalState) {
         return CARDINALS.stream().filter(bf -> finalState.contains(bf.name().toLowerCase(Locale.ENGLISH))).findFirst()
                 .orElse(BlockFace.SELF);
     }
 
+    /**
+     * Gets NMS data from a block using the appropriate handler.
+     * 
+     * @param block The block.
+     * @return The NMS data string.
+     */
     private static String nmsData(Block block) {
         AbstractMetaData handler;
         try {
@@ -635,6 +715,11 @@ private static String nmsData(Block block) {
         return handler.nmsData(block);
     }
 
+    /**
+     * Loads the list of structures to be placed from the database.
+     * 
+     * @return ToBePlacedStructures instance.
+     */
     private ToBePlacedStructures loadToDos() {
         if (!toPlace.objectExists(TODO)) {
             return new ToBePlacedStructures();

src/main/java/world/bentobox/boxed/nms/v1_21_6_R0_1_SNAPSHOT/GetMetaData.java

@@ -0,0 +1,22 @@
+package world.bentobox.boxed.nms.v1_21_6_R0_1_SNAPSHOT;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_21_R5.CraftWorld;
+
+import net.minecraft.core.BlockPosition;
+import net.minecraft.world.level.block.entity.TileEntity;
+import world.bentobox.boxed.nms.AbstractMetaData;
+
+public class GetMetaData extends AbstractMetaData {
+
+    @Override
+    public String nmsData(Block block) {
+        Location w = block.getLocation();
+        CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one
+        // for 1.13+ (we have use WorldServer)
+        TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ()));
+        return getData(te, "getUpdatePacket", "tag");
+    }
+
+}