Merge remote-tracking branch 'origin/develop' into master

# Conflicts: # pom.xml # src/main/java/world/bentobox/bentobox/blueprints/BlueprintPaster.java # src/main/java/world/bentobox/bentobox/database/objects/Island.java # src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java
BentoBoxWorld · Oct 4, 2022 · 1a59ca7 · 1a59ca7
2 parents 928f1eb + b263c92
commit 1a59ca7
Show file tree

Hide file tree

Showing 102 changed files with 5,380 additions and 1,358 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,11 +13,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '16'
+          java-version: '17'
       - name: Cache SonarCloud packages
         uses: actions/cache@v2
         with:

diff --git a/pom.xml b/pom.xml
@@ -63,27 +63,26 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>16</java.version>
+        <java.version>17</java.version>
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.9</powermock.version>
         <mongodb.version>3.12.8</mongodb.version>
         <!-- More visible way to change dependency versions -->
-        <spigot.version>1.18-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.19.2-R0.1-SNAPSHOT</spigot.version>
         <!-- Might differ from the last Spigot release for short periods 
             of time -->
-        <paper.version>1.16.5-R0.1-SNAPSHOT</paper.version>
+        <paper.version>1.19-R0.1-SNAPSHOT</paper.version>
         <bstats.version>2.2.1</bstats.version>
         <vault.version>1.7</vault.version>
         <placeholderapi.version>2.10.9</placeholderapi.version>
         <githubapi.version>d5f5e0bbd8</githubapi.version>
         <dynmap.version>3.0-SNAPSHOT</dynmap.version>
-        <worldedit.version>7.2.5</worldedit.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.20.1</build.version>
+        <build.version>1.21.0</build.version>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
@@ -158,13 +157,9 @@
             <id>dynmap-repo</id>
             <url>https://repo.mikeprimm.com/</url>
         </repository>
-        <repository>
-            <id>worldedit-repo</id>
-            <url>https://maven.sk89q.com/repo/</url>
-        </repository>
         <repository>
             <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
         <repository>
             <!-- This is a temporary reference as the Maven Shade plugin 
@@ -176,6 +171,11 @@
             <id>minecraft-repo</id>
             <url>https://libraries.minecraft.net/</url>
         </repository>
+        <!-- Spigot NMS required for world regeneration :( -->
+        <repository>
+            <id>nms-repo</id>
+            <url>https://repo.codemc.io/repository/nms/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -188,7 +188,7 @@
         </dependency>
         <!-- Paper API -->
         <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
+            <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
             <version>${paper.version}</version>
             <scope>provided</scope>
@@ -230,11 +230,13 @@
             <groupId>org.mongodb</groupId>
             <artifactId>mongodb-driver</artifactId>
             <version>${mongodb.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>9.1-901-1.jdbc4</version>
+            <scope>provided</scope>
         </dependency>
         <!-- Vault: as their maven repo is down, we need to get it from jitpack -->
         <!-- See https://github.com/MilkBowl/VaultAPI/issues/69 -->
@@ -258,12 +260,6 @@
             <version>${dynmap.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.sk89q.worldedit</groupId>
-            <artifactId>worldedit-core</artifactId>
-            <version>${worldedit.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- Shaded APIs -->
         <dependency>
             <groupId>com.github.TheBusyBiscuit</groupId>
@@ -346,7 +342,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <release>16</release>
+                    <release>${java.version}</release>
                     <!-- <source>${java.version}</source> <target>${java.version}</target> -->
                 </configuration>
             </plugin>
@@ -396,7 +392,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
-                    <source>16</source>
+                    <source>${java.version}</source>
                     <show>private</show>
                     <failOnError>false</failOnError>
                     <additionalJOption>-Xdoclint:none</additionalJOption>

diff --git a/src/main/java/world/bentobox/bentobox/BentoBox.java b/src/main/java/world/bentobox/bentobox/BentoBox.java
@@ -19,7 +19,6 @@
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.commands.BentoBoxCommand;
 import world.bentobox.bentobox.database.DatabaseSetup;
-import world.bentobox.bentobox.hooks.DynmapHook;
 import world.bentobox.bentobox.hooks.MultiverseCoreHook;
 import world.bentobox.bentobox.hooks.VaultHook;
 import world.bentobox.bentobox.hooks.placeholders.PlaceholderAPIHook;
@@ -28,7 +27,8 @@
 import world.bentobox.bentobox.listeners.DeathListener;
 import world.bentobox.bentobox.listeners.JoinLeaveListener;
 import world.bentobox.bentobox.listeners.PanelListenerManager;
-import world.bentobox.bentobox.listeners.PortalTeleportationListener;
+import world.bentobox.bentobox.listeners.teleports.EntityTeleportListener;
+import world.bentobox.bentobox.listeners.teleports.PlayerTeleportListener;
 import world.bentobox.bentobox.listeners.StandardSpawnProtectionListener;
 import world.bentobox.bentobox.managers.AddonsManager;
 import world.bentobox.bentobox.managers.BlueprintsManager;
@@ -227,8 +227,8 @@ private void completeSetup(long loadTime) {
         hooksManager.registerHook(new MultiverseCoreHook());
         islandWorldManager.registerWorldsToMultiverse();
 
-        // Register additional hooks
-        hooksManager.registerHook(new DynmapHook());
+        // TODO: re-enable after implementation
+        //hooksManager.registerHook(new DynmapHook());
         // TODO: re-enable after rework
         //hooksManager.registerHook(new LangUtilsHook());
 
@@ -288,8 +288,10 @@ private void registerListeners() {
         manager.registerEvents(new PanelListenerManager(), this);
         // Standard Nether/End spawns protection
         manager.registerEvents(new StandardSpawnProtectionListener(this), this);
-        // Nether portals
-        manager.registerEvents(new PortalTeleportationListener(this), this);
+        // Player portals
+        manager.registerEvents(new PlayerTeleportListener(this), this);
+        // Entity portals
+        manager.registerEvents(new EntityTeleportListener(this), this);
         // End dragon blocking
         manager.registerEvents(new BlockEndDragon(this), this);
         // Banned visitor commands

diff --git a/src/main/java/world/bentobox/bentobox/Settings.java b/src/main/java/world/bentobox/bentobox/Settings.java
@@ -314,6 +314,12 @@ public class Settings implements ConfigObject {
     @ConfigEntry(path = "island.safe-spot-search-vertical-range", since = "1.19.1")
     private int safeSpotSearchVerticalRange = 400;
 
+    @ConfigComment("By default, if the destination is not safe, the plugin will try to search for a safe spot around the destination.")
+    @ConfigComment("This allows to change the distance for searching this spot. Larger value will mean longer position search.")
+    @ConfigComment("This value is also used for valid nether portal linking between dimension.")
+    @ConfigEntry(path = "island.safe-spot-search-range", since = "1.21.0")
+    private int safeSpotSearchRange = 16;
+
     /* WEB */
     @ConfigComment("Toggle whether BentoBox can connect to GitHub to get data about updates and addons.")
     @ConfigComment("Disabling this will result in the deactivation of the update checker and of some other")
@@ -907,19 +913,65 @@ public void setMinPortalSearchRadius(int minPortalSearchRadius) {
         this.minPortalSearchRadius = minPortalSearchRadius;
     }
 
+
+    /**
+     * Gets safe spot search vertical range.
+     *
+     * @return the safe spot search vertical range
+     */
     public int getSafeSpotSearchVerticalRange() {
         return safeSpotSearchVerticalRange;
     }
 
+
+    /**
+     * Sets safe spot search vertical range.
+     *
+     * @param safeSpotSearchVerticalRange the safe spot search vertical range
+     */
     public void setSafeSpotSearchVerticalRange(int safeSpotSearchVerticalRange) {
         this.safeSpotSearchVerticalRange = safeSpotSearchVerticalRange;
     }
 
+
+    /**
+     * Is slow deletion boolean.
+     *
+     * @return the boolean
+     */
     public boolean isSlowDeletion() {
         return slowDeletion;
     }
 
+
+    /**
+     * Sets slow deletion.
+     *
+     * @param slowDeletion the slow deletion
+     */
     public void setSlowDeletion(boolean slowDeletion) {
         this.slowDeletion = slowDeletion;
     }
+
+
+    /**
+     * Gets safe spot search range.
+     *
+     * @return the safe spot search range
+     */
+    public int getSafeSpotSearchRange()
+    {
+        return safeSpotSearchRange;
+    }
+
+
+    /**
+     * Sets safe spot search range.
+     *
+     * @param safeSpotSearchRange the safe spot search range
+     */
+    public void setSafeSpotSearchRange(int safeSpotSearchRange)
+    {
+        this.safeSpotSearchRange = safeSpotSearchRange;
+    }
 }
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java
@@ -262,17 +262,44 @@ public boolean call(User user, String cmdLabel, List<String> cmdArgs) {
             user.sendMessage("general.errors.use-in-game");
             return false;
         }
-        // Check perms, but only if this isn't the console
-        if (user.isPlayer() && !user.isOp() && getPermission() != null && !getPermission().isEmpty() && !user.hasPermission(getPermission())) {
-            user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, getPermission());
+
+        if (!this.runPermissionCheck(user))
+        {
+            // Error message is displayed by permission check.
             return false;
         }
+
         // Set the user's addon context
         user.setAddon(addon);
         // Execute and trim args
         return canExecute(user, cmdLabel, cmdArgs) && execute(user, cmdLabel, cmdArgs);
     }
 
+
+    /**
+     * This method checks and returns if user has access to the called command.
+     * It also recursively checks if user has access to the all parent commands.
+     * @param user User who permission must be checked.
+     * @return {@code true} is user can execute given command, {@code false} otherwise.
+     */
+    private boolean runPermissionCheck(User user)
+    {
+        // Check perms, but only if this isn't the console
+        if (user.isPlayer() &&
+            !user.isOp() &&
+            this.getPermission() != null &&
+            !this.getPermission().isEmpty() &&
+            !user.hasPermission(this.getPermission()))
+        {
+            user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, this.getPermission());
+            return false;
+        }
+
+        // Recursive permission check to find if user has access to the parent command.
+        return this.getParent() == null || this.getParent().runPermissionCheck(user);
+    }
+
+
     /**
      * Get the current composite command based on the arguments
      * @param args - arguments
@@ -309,6 +336,14 @@ protected IslandsManager getIslands() {
         return plugin.getIslands();
     }
 
+    /**
+     * Convenience method to get the island manager
+     * @return IslandsManager
+     */
+    protected IslandsManager getIslandsManager() {
+        return plugin.getIslandsManager();
+    }
+
     /**
      * @return this command's sub-level. Top level is 0.
      * Every time a command registers with a parent, their level will be set.