Merge pull request #2713 from BentoBoxWorld/develop

Release 3.7.1

Author: tastybento

pom.xml

@@ -75,7 +75,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>3.7.0</build.version>
+        <build.version>3.7.1</build.version>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <server.jars>${project.basedir}/lib</server.jars>

src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeRegionsCommand.java

@@ -336,6 +336,11 @@ private void findIslands(World world, int days) {
             // Display to the user
             uniqueIslands.forEach(this::displayIsland);
 
+            // Display empty regions
+            deleteableRegions.entrySet().stream()
+                .filter(e -> e.getValue().isEmpty())
+                .forEach(e -> displayEmptyRegion(e.getKey()));
+
             if (deleteableRegions.isEmpty()) {
                 Bukkit.getScheduler().runTask(getPlugin(), () -> user.sendMessage("commands.admin.purge.none-found"));
             } else {
@@ -367,6 +372,10 @@ private void displayIsland(Island island) {
                 + " will be deleted");
     }
 
+    private void displayEmptyRegion(Pair<Integer, Integer> region) {
+        getPlugin().log("Empty region at r." + region.x + "." + region.z + " in world " + getWorld().getName() + " will be deleted (no islands)");
+    }
+
     /**
      * Formats a millisecond timestamp into a human-readable string
      * using the system's local time zone.
@@ -551,9 +560,8 @@ private Map<Pair<Integer, Integer>, Set<String>> mapIslandsToRegions(
                 }
             }
 
-            if (!ids.isEmpty()) {
-                regionToIslands.put(region, ids);
-            }
+            // Always add the region, even if ids is empty
+            regionToIslands.put(region, ids);
         }
 
         return regionToIslands;

src/main/java/world/bentobox/bentobox/managers/AddonsManager.java

@@ -147,7 +147,9 @@ public void loadAddons() {
             return;
         }
         Arrays.stream(Objects.requireNonNull(f.listFiles()))
-                .filter(x -> !x.isDirectory() && x.getName().endsWith(".jar")).forEach(this::loadAddon);
+                .filter(x -> !x.isDirectory() && x.getName().endsWith(".jar")
+                        && !x.getName().startsWith("._")
+                        ).forEach(this::loadAddon);
         plugin.log("Loaded " + getLoadedAddons().size() + " addons.");
 
         if (!getLoadedAddons().isEmpty()) {

src/main/java/world/bentobox/bentobox/nms/AbstractMetaData.java

@@ -0,0 +1,45 @@
+package world.bentobox.bentobox.nms;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import org.bukkit.block.Block;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.protocol.game.PacketPlayOutTileEntityData;
+import net.minecraft.world.level.block.entity.TileEntity;
+import world.bentobox.bentobox.BentoBox;
+
+public abstract class AbstractMetaData {
+
+    public abstract String nmsData(Block block);
+
+    protected String getData(TileEntity te, String method, String field) {
+        try {
+            // Check if the method 'j' exists
+            Method updatePacketMethod = te.getClass().getDeclaredMethod(method);
+            if (updatePacketMethod != null) {
+                // Invoke the method to get the PacketPlayOutTileEntityData object
+                updatePacketMethod.setAccessible(true);
+                Object object = updatePacketMethod.invoke(te);
+                PacketPlayOutTileEntityData packet = (PacketPlayOutTileEntityData) object;
+                //if (object instanceof PacketPlayOutTileEntityData packet) {
+                    // Access the private field for the NBTTagCompound getter in PacketPlayOutTileEntityData
+                    Field fieldC = packet.getClass().getDeclaredField(field);
+                    fieldC.setAccessible(true);
+                    NBTTagCompound nbtTag = (NBTTagCompound) fieldC.get(packet);
+        
+                    return nbtTag.toString(); // This will show what you want
+                    //} else {
+                    //    throw new ClassNotFoundException(
+                    //            object.getClass().getCanonicalName() + " is not a PacketPlayOutTileEntityData");
+                    //}
+            }
+        } catch (Exception e) {
+            System.out.println("The method '" + method + "' does not exist in the TileEntity class.");
+            e.printStackTrace();
+        }
+        return "";
+
+    }
+}

src/main/java/world/bentobox/bentobox/nms/fallback/GetMetaData.java

@@ -0,0 +1,17 @@
+package world.bentobox.bentobox.nms.fallback;
+
+import org.bukkit.block.Block;
+
+import world.bentobox.bentobox.nms.AbstractMetaData;
+
+/**
+ * Fallback
+ */
+public class GetMetaData extends AbstractMetaData {
+
+    @Override
+    public String nmsData(Block block) {
+        return ""; // We cannot read it if we have no NMS
+    }
+
+}

src/main/java/world/bentobox/bentobox/nms/v1_21_4_R0_1_SNAPSHOT/GetMetaData.java

@@ -0,0 +1,22 @@
+package world.bentobox.bentobox.nms.v1_21_4_R0_1_SNAPSHOT;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
+
+import net.minecraft.core.BlockPosition;
+import net.minecraft.world.level.block.entity.TileEntity;
+import world.bentobox.bentobox.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");
+    }
+
+}

src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/GetMetaData.java

@@ -0,0 +1,22 @@
+package world.bentobox.bentobox.nms.v1_21_5_R0_1_SNAPSHOT;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_21_R4.CraftWorld;
+
+import net.minecraft.core.BlockPosition;
+import net.minecraft.world.level.block.entity.TileEntity;
+import world.bentobox.bentobox.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");
+    }
+
+}

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

@@ -0,0 +1,22 @@
+package world.bentobox.bentobox.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.bentobox.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");
+    }
+
+}

src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/GetMetaData.java

@@ -0,0 +1,22 @@
+package world.bentobox.bentobox.nms.v1_21_7_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.bentobox.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");
+    }
+
+}

src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/GetMetaData.java

@@ -0,0 +1,22 @@
+package world.bentobox.bentobox.nms.v1_21_8_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.bentobox.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");
+    }
+
+}