Merge pull request #2765 from BentoBoxWorld/develop

Release 3.10.0

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.9.2</build.version>
+        <build.version>3.10.0</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/island/IslandGoCommand.java

@@ -151,6 +151,14 @@ private boolean checkReserved(User user, List<Island> islands) {
         }
         return false;
     }
+    
+    @Override
+    public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
+        String lastArg = !args.isEmpty() ? args.get(args.size()-1) : "";
+
+        return Optional.of(Util.tabLimit(new ArrayList<>(getNameIslandMap(user, getWorld()).keySet()), lastArg));
+
+    }
 
     /**
      * Record to store island information and whether the name refers to

src/main/java/world/bentobox/bentobox/database/json/JSONDatabaseHandler.java

@@ -56,7 +56,7 @@ public List<T> loadObjects() {
             tableFolder.mkdirs();
         }
         // Load each object from the file system, filtered, non-null
-        for (File file: Objects.requireNonNull(tableFolder.listFiles((dir, name) ->  name.toLowerCase(Locale.ENGLISH).endsWith(JSON)))) {
+        for (File file: Objects.requireNonNull(tableFolder.listFiles((dir, name) ->  name.toLowerCase(Locale.ENGLISH).endsWith(JSON) && !name.startsWith("._")))) {
             try (FileReader reader = new FileReader(file)){
                 T object = getGson().fromJson(reader, dataObject);
                 if (object != null) {

src/main/java/world/bentobox/bentobox/database/objects/Island.java

@@ -657,9 +657,7 @@ public boolean isPurgeProtected() {
     }
 
     /**
-     * Returns the island range. It is a convenience method that returns the exact
-     * same value than island range, although it has been saved into the Island
-     * object for easier access.
+     * Returns the island range. Protection range can never be bigger than this.
      * 
      * @return the island range
      * @see #getProtectionRange()
@@ -1142,6 +1140,7 @@ public void setOwner(@Nullable UUID owner) {
         this.owner = owner;
         if (owner == null) {
             log(new LogEntry.Builder(LogType.UNOWNED).build());
+            setChanged();
             return;
         }
         // Defensive code: demote any previous owner
@@ -1201,11 +1200,14 @@ public void setPurgeProtected(boolean purgeProtected) {
     }
 
     /**
-     * Sets the island range. This method should <u><strong>NEVER</strong></u> be
-     * used except for testing purposes. <br>
+     * Sets the island range. <br>
      * The range value is a copy of {@link WorldSettings#getIslandDistance()} made
-     * when the Island got created in order to allow easier access to this value and
-     * must therefore remain <u><strong>AS IS</strong></u>.
+     * when the Island got created. It should not be altered mid-game unless you set
+     *  {@link world.bentobox.bentobox.api.addons.GameModeAddon#isEnforceEqualRanges()}
+     *  to {@code false}, and also likely set {@link world.bentobox.bentobox.api.addons.GameModeAddon#isFixIslandCenter()}
+     *  to {@code false} too.
+     *  
+     *  The protection range can be set to be bigger than this, but will never report as being bigger than this.
      * 
      * @param range the range to set
      * @see #setProtectionRange(int)

src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java

@@ -53,6 +53,10 @@ public void onPlayerJoin(final PlayerJoinEvent event) {
             // plugins
             return;
         }
+        // Set the addon in the User object - required to have the right context for prefixes in translations
+        plugin.getIWM().getAddon(event.getPlayer().getWorld()).ifPresent(gm -> user.setAddon(gm));
+        
+        // Get the UUID
         UUID playerUUID = event.getPlayer().getUniqueId();
 
         // Check if player hasn't joined before

src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java

@@ -33,7 +33,7 @@ public void onInventoryClick(InventoryClickEvent event) {
 
         // Open the inventory panel that this player has open (they can only ever have one)
         if (openPanels.containsKey(user.getUniqueId()) &&
-                openPanels.get(user.getUniqueId()).getInventory().equals(event.getInventory())) {
+                openPanels.get(user.getUniqueId()).getInventory().equals(event.getClickedInventory())) {
             // Cancel the event. If they don't want it to be cancelled then the click handler(s) should
             // uncancel it. If gui was from our environment, then cancel event anyway.
             event.setCancelled(true);

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

@@ -248,6 +248,12 @@ private boolean checkSpecialCases(Event e, Player player, Block block) {
             return true;
         }
         if (Util.isVersionAtLeast("1.21.10")) {
+            // Wooden shelves
+            if (Tag.WOODEN_SHELVES.isTagged(type)) {
+                this.checkIsland(e, player, loc, Flags.BOOKSHELF);
+                return true;
+            }
+            
             // Prevent animation of copper golems. Use break blocks for now. This could potentiall have it's own flag in the future.
             if (Tag.COPPER_GOLEM_STATUES.isTagged(type)) {
                 this.checkIsland(e, player, loc, Flags.BREAK_BLOCKS);

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

@@ -248,10 +248,23 @@ public Island createIsland(@NonNull Location location) {
      */
     @Nullable
     public Island createIsland(@NonNull Location location, @Nullable UUID owner) {
-        Island island = new Island(location, owner, plugin.getIWM().getIslandProtectionRange(location.getWorld()));
+        return createIsland(location, owner, plugin.getIWM().getIslandProtectionRange(location.getWorld()));
+    }
+    
+    /**
+     * Create an island with owner, and a specified protection range. Note this does not paste blocks. It just creates
+     * the island data object.
+     * 
+     * @param location the location, not null
+     * @param owner    the island owner UUID, may be null
+     * @param protectionRange size of protection range
+     * @return Island or null if the island could not be created for some reason
+     * @since 3.10.0
+     */
+    public Island createIsland(@NonNull Location location, @Nullable UUID owner, int protectionRange) {
+        Island island = new Island(location, owner, protectionRange);
         // Game the gamemode name and prefix the uniqueId
-        String gmName = plugin.getIWM().getAddon(location.getWorld()).map(gm -> gm.getDescription().getName())
-                .orElse("");
+        String gmName = plugin.getIWM().getAddon(location.getWorld()).map(gm -> gm.getDescription().getName()).orElse("");
         island.setGameMode(gmName);
         island.setUniqueId(gmName + island.getUniqueId());
         if (islandCache.addIsland(island)) {
@@ -265,6 +278,7 @@ public Island createIsland(@NonNull Location location, @Nullable UUID owner) {
         }
         return null;
     }
+    
 
     /**
      * Deletes island.

src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java

@@ -36,30 +36,73 @@ public IslandGrid(IslandCache im) {
      * @return true if successfully added, false if island already exists, or there is an overlap
      */
     public boolean addToGrid(Island island) {
-        // Check if we know about this island already
         int minX = island.getMinX();
         int minZ = island.getMinZ();
-        IslandData islandData = new IslandData(island.getUniqueId(), minX, minZ, island.getRange());
-        if (grid.containsKey(minX)) {
-            TreeMap<Integer, IslandData> zEntry = grid.get(minX);
-            if (zEntry.containsKey(minZ)) {
-                // If it is the same island then it's okay
-                return island.getUniqueId().equals(zEntry.get(minZ).id());
-                // Island overlap, report error
-            } else {
-                // Add island
-                zEntry.put(minZ, islandData);
-                grid.put(minX, zEntry);
+        int range = island.getRange();
+        IslandData newIsland = new IslandData(island.getUniqueId(), minX, minZ, range);
+
+        // Remove this island if it is already in the grid
+        this.removeFromGrid(island);
+
+        // compute bounds for the new island (upper bounds are exclusive)
+        int newMaxX = minX + range * 2;
+        int newMaxZ = minZ + range * 2;
+
+        /*
+         * Find any existing islands that could overlap:
+         * - Any existing island with minX <= newMaxX could extend over newMinX, so we must consider
+         *   all entries with key <= newMaxX (use headMap).
+         * - For each candidate X entry, consider Z entries with minZ <= newMaxZ (use headMap).
+         * This avoids missing large islands whose minX is far left of the new island.
+         */
+        for (Entry<Integer, TreeMap<Integer, IslandData>> xEntry : grid.headMap(newMaxX, true).entrySet()) {
+            TreeMap<Integer, IslandData> zMap = xEntry.getValue();
+            for (Entry<Integer, IslandData> zEntry : zMap.headMap(newMaxZ, true).entrySet()) {
+                IslandData existingIsland = zEntry.getValue();
+                if (isOverlapping(newIsland, existingIsland)) {
+                    return false;
+                }
             }
-        } else {
-            // Add island
-            TreeMap<Integer, IslandData> zEntry = new TreeMap<>();
-            zEntry.put(minZ, islandData);
-            grid.put(minX, zEntry);
         }
+
+        // No overlaps found, add the island
+        addNewEntry(minX, minZ, newIsland);
+        return true;
+    }
+
+    /**
+     * Checks if two islands overlap
+     * @param island1 first island
+     * @param island2 second island
+     * @return true if islands overlap
+     */
+    private boolean isOverlapping(IslandData island1, IslandData island2) {
+        int island1MaxX = island1.minX() + (island1.range() * 2);
+        int island1MaxZ = island1.minZ() + (island1.range() * 2);
+        int island2MaxX = island2.minX() + (island2.range() * 2);
+        int island2MaxZ = island2.minZ() + (island2.range() * 2);
+
+        // Check if one rectangle is to the left of the other
+        if (island1MaxX <= island2.minX() || island2MaxX <= island1.minX()) {
+            return false;
+        }
+
+        // Check if one rectangle is above the other
+        if (island1MaxZ <= island2.minZ() || island2MaxZ <= island1.minZ()) {
+            return false;
+        }
+
         return true;
     }
 
+    /**
+     * Helper method to add a new entry to the grid
+     */
+    private void addNewEntry(int minX, int minZ, IslandData islandData) {
+        TreeMap<Integer, IslandData> zEntry = grid.computeIfAbsent(minX, k -> new TreeMap<>());
+        zEntry.put(minZ, islandData);
+    }
+
     /**
      * Remove island from grid
      * @param island - the island to remove

src/main/resources/locales/en-US.yml

@@ -989,11 +989,11 @@ protection:
         &a entering into boats.
       hint: No boat interaction allowed
     BOOKSHELF:
-      name: Bookshelves
+      name: Shelves
       description: |-
-        &a Allow to place books
-        &a or to take books.
-      hint: cannot place a book or take a book.
+        &a Allow to place item
+        &a or to take item.
+      hint: cannot place an item or take an item.
     BREAK_BLOCKS:
       description: Toggle breaking
       name: Break blocks