Merge pull request #2414 from BentoBoxWorld/develop

Release 2.4.0
BentoBoxWorld · Jun 30, 2024 · 4cd2c8a · 4cd2c8a
2 parents 8649afd + 59fd8d9
commit 4cd2c8a
Show file tree

Hide file tree

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

diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@
 
 [![Discord](https://img.shields.io/discord/272499714048524288.svg?logo=discord)](https://discord.bentobox.world)
 [![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/BentoBox)](https://ci.codemc.org/job/BentoBoxWorld/job/BentoBox/)
-[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BentoBox&metric=ncloc)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_BentoBox)
 [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BentoBox&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_BentoBox)
 [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BentoBox&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_BentoBox)
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BentoBox&metric=security_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_BentoBox)
@@ -112,9 +111,10 @@ repositories {
 }
 
 dependencies {
-  compileOnly 'world.bentobox:bentobox:PUT-VERSION-HERE'
+  compileOnly 'world.bentobox:bentobox:PUT-VERSION-HERE-SNAPSHOT'
 }
 ```
+**Note:** Due to a Gradle issue with versions for Maven, you need to use -SNAPSHOT at the end.
 
 ### History
 

diff --git a/pom.xml b/pom.xml
@@ -73,10 +73,10 @@
         <postgresql.version>42.2.18</postgresql.version>
         <hikaricp.version>5.0.1</hikaricp.version>
         <!-- More visible way to change dependency versions -->
-        <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.20.5-R0.1-SNAPSHOT</spigot.version>
         <!-- Might differ from the last Spigot release for short periods 
             of time -->
-        <paper.version>1.20.4-R0.1-SNAPSHOT</paper.version>
+        <paper.version>1.20.6-R0.1-SNAPSHOT</paper.version>
         <bstats.version>3.0.0</bstats.version>
         <vault.version>1.7.1</vault.version>
         <placeholderapi.version>2.10.9</placeholderapi.version>
@@ -88,7 +88,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>2.3.0</build.version>
+        <build.version>2.4.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>
@@ -145,6 +145,10 @@
     </pluginRepositories>
 
     <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
@@ -153,10 +157,6 @@
             <id>codemc-repo</id>
             <url>https://repo.codemc.org/repository/maven-public</url>
         </repository>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
         <repository>
             <id>placeholderapi-repo</id>
             <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
@@ -195,6 +195,11 @@
             <name>Lumine Releases</name>
             <url>https://mvn.lumine.io/repository/maven-public/</url>
         </repository>
+        <!-- For Multipaper -->
+        <repository>
+            <id>clojars</id>
+            <url>https://repo.clojars.org/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -223,13 +228,25 @@
             <version>3.11.1</version>
             <scope>test</scope>
         </dependency>
-         <!-- Spigot API -->
+        <!-- Spigot API -->
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
             <version>${spigot.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+             <groupId>org.spigotmc.....</groupId>
+             <artifactId>spigot</artifactId>
+             <version>1.21-R0.1-SNAPSHOT</version>
+             <scope>provided</scope>
+        </dependency>
+        <dependency>
+             <groupId>org.spigotmc....</groupId>
+             <artifactId>spigot</artifactId>
+             <version>1.20.6-R0.1-SNAPSHOT</version>
+             <scope>provided</scope>
+        </dependency>
         <dependency>
              <groupId>org.spigotmc.</groupId>
              <artifactId>spigot</artifactId>
@@ -354,16 +371,23 @@
         <dependency>
             <groupId>com.github.Slimefun</groupId>
             <artifactId>Slimefun4</artifactId>
-            <version>RC-36</version>
+            <version>RC-37</version>
             <scope>provided</scope>
         </dependency>
         <!-- ItemsAdder -->
         <dependency>
             <groupId>com.github.LoneDev6</groupId>
             <artifactId>api-itemsadder</artifactId>
-            <version>3.6.1</version>
+            <version>3.6.3-beta-14</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Multipaper -->
+        <dependency>
+            <groupId>com.github.puregero</groupId>
+            <artifactId>multilib</artifactId>
+            <version>1.1.13</version>
+            <scope>compile</scope>
+         </dependency>
     </dependencies>
 
     <build>
@@ -486,9 +510,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.4.0</version>
                 <configuration>
                     <minimizeJar>true</minimizeJar>
+                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
                     <relocations>
                         <relocation>
                             <pattern>org.bstats</pattern>
@@ -500,9 +525,13 @@
                         </relocation>
                         <relocation>
                             <pattern>io.papermc.lib</pattern>
-                            <shadedPattern>world.bentobox.bentobox.paperlib</shadedPattern> <!-- Replace this -->
+                            <shadedPattern>world.bentobox.bentobox.paperlib</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.github.puregero.multilib</pattern>
+                            <shadedPattern>world.bentobox.bentobox.multilib</shadedPattern>
                         </relocation>
-                    </relocations>
+                        </relocations>
                     <artifactSet>
                         <excludes>
                             <exclude>org.apache.maven.shared:*</exclude>

diff --git a/src/main/java/world/bentobox/bentobox/BStats.java b/src/main/java/world/bentobox/bentobox/BStats.java
@@ -11,10 +11,8 @@
 import org.bstats.charts.SimpleBarChart;
 import org.bstats.charts.SimplePie;
 import org.bstats.charts.SingleLineChart;
-import org.bukkit.Bukkit;
 
 import world.bentobox.bentobox.api.addons.GameModeAddon;
-import world.bentobox.bentobox.api.flags.Flag;
 
 /**
  * @author Poslovitch
@@ -59,7 +57,6 @@ private void registerCustomMetrics() {
         registerGameModeAddonsChart();
         registerHooksChart();
         registerPlayersPerServerChart();
-        registerFlagsDisplayModeChart();
 
         // Single Line charts
         registerIslandsCountChart();
@@ -171,27 +168,6 @@ private void registerPlayersPerServerChart() {
         }));
     }
 
-    /**
-     * Sends the "flags display mode" of all the online players.
-     * @since 1.6.0
-     */
-    private void registerFlagsDisplayModeChart() {
-        metrics.addCustomChart(new AdvancedPie("flagsDisplayMode", () -> {
-            Map<String, Integer> values = new HashMap<>();
-
-            Bukkit.getOnlinePlayers().forEach(player -> {
-                Flag.Mode mode = plugin.getPlayers().getFlagsDisplayMode(player.getUniqueId());
-                if (values.containsKey(mode.name())) {
-                    values.put(mode.name(), values.get(mode.name()) + 1);
-                } else {
-                    values.put(mode.name(), 1);
-                }
-            });
-
-            return values;
-        }));
-    }
-
     /**
      * Sends the enabled addons (except GameModeAddons) of this server as bar chart.
      * @since 1.17.1

diff --git a/src/main/java/world/bentobox/bentobox/BentoBox.java b/src/main/java/world/bentobox/bentobox/BentoBox.java
@@ -25,6 +25,7 @@
 import world.bentobox.bentobox.commands.BentoBoxCommand;
 import world.bentobox.bentobox.database.DatabaseSetup;
 import world.bentobox.bentobox.hooks.ItemsAdderHook;
+import world.bentobox.bentobox.hooks.MultipaperHook;
 import world.bentobox.bentobox.hooks.MultiverseCoreHook;
 import world.bentobox.bentobox.hooks.MyWorldsHook;
 import world.bentobox.bentobox.hooks.MythicMobsHook;
@@ -37,6 +38,7 @@
 import world.bentobox.bentobox.listeners.JoinLeaveListener;
 import world.bentobox.bentobox.listeners.PanelListenerManager;
 import world.bentobox.bentobox.listeners.PrimaryIslandListener;
+import world.bentobox.bentobox.listeners.SeedWorldMakerListener;
 import world.bentobox.bentobox.listeners.StandardSpawnProtectionListener;
 import world.bentobox.bentobox.listeners.teleports.EntityTeleportListener;
 import world.bentobox.bentobox.listeners.teleports.PlayerTeleportListener;
@@ -102,6 +104,8 @@ public class BentoBox extends JavaPlugin implements Listener {
 
     @Override
     public void onEnable(){
+        setInstance(this);
+
         if (!ServerCompatibility.getInstance().checkCompatibility().isCanLaunch()) {
             // The server's most likely incompatible.
             // Show a warning
@@ -123,7 +127,6 @@ public void onEnable(){
 
         // Save the default config from config.yml
         saveDefaultConfig();
-        setInstance(this);
         // Load Flags
         flagsManager = new FlagsManager(this);
 
@@ -184,6 +187,9 @@ public void onEnable(){
 
     private void completeSetup(long loadTime) {
         final long enableStart = System.currentTimeMillis();
+
+        hooksManager.registerHook(new MultipaperHook());
+
         hooksManager.registerHook(new VaultHook());
 
         // MythicMobs
@@ -210,20 +216,6 @@ private void completeSetup(long loadTime) {
             return;
         }
 
-        // Save islands & players data every X minutes
-        Bukkit.getScheduler().runTaskTimer(instance, () -> {
-            if (!playersManager.isSaveTaskRunning()) {
-                playersManager.saveAll(true);
-            } else {
-                getLogger().warning("Tried to start a player data save task while the previous auto save was still running!");
-            }
-            if (!islandsManager.isSaveTaskRunning()) {
-                islandsManager.saveAll(true);
-            } else {
-                getLogger().warning("Tried to start a island data save task while the previous auto save was still running!");
-            }
-        }, getSettings().getDatabaseBackupPeriod() * 20 * 60L, getSettings().getDatabaseBackupPeriod() * 20 * 60L);
-
         // Make sure all flag listeners are registered.
         flagsManager.registerListeners();
 
@@ -323,6 +315,8 @@ private void registerListeners() {
         manager.registerEvents(islandDeletionManager, this);
         // Primary Island Listener
         manager.registerEvents(new PrimaryIslandListener(this), this);
+        // Seed world chunk generator
+        manager.registerEvents(new SeedWorldMakerListener(this), this);
     }
 
     @Override
@@ -433,7 +427,7 @@ public FlagsManager getFlagsManager() {
      * @return the ranksManager
      * @deprecated Just use {@code RanksManager.getInstance()}
      */
-    @Deprecated(since = "2.0.0")
+    @Deprecated(since = "2.0.0", forRemoval = true)
     public RanksManager getRanksManager() {
         return RanksManager.getInstance();
     }

diff --git a/src/main/java/world/bentobox/bentobox/api/addons/Addon.java b/src/main/java/world/bentobox/bentobox/api/addons/Addon.java
@@ -21,11 +21,14 @@
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.event.Listener;
 
+import com.github.puregero.multilib.MultiLib;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.request.AddonRequestHandler;
 import world.bentobox.bentobox.api.flags.Flag;
 import world.bentobox.bentobox.managers.IslandsManager;
 import world.bentobox.bentobox.managers.PlayersManager;
+import world.bentobox.bentobox.util.Util;
 
 /**
  * Add-on class for BentoBox. Extend this to create an add-on. The operation
@@ -45,6 +48,10 @@ public abstract class Addon {
 
     protected Addon() {
         state = State.DISABLED;
+        if (!Util.inTest()) {
+            // If the config is updated, update the config.
+            MultiLib.onString(getPlugin(), "bentobox-config-update", v -> this.reloadConfig());
+        }
     }
 
     /**
@@ -275,7 +282,7 @@ public File saveResource(String jarResource, File destinationFolder, boolean rep
                     }
                     // There are two options, use the path of the resource or not
                     File outFile = new File(destinationFolder,
-                        jarResource.replaceAll("/", Matcher.quoteReplacement(File.separator)));
+                            jarResource.replaceAll("/", Matcher.quoteReplacement(File.separator)));
 
                     if (noPath) {
                         outFile = new File(destinationFolder, outFile.getName());
@@ -396,7 +403,7 @@ public PlayersManager getPlayers() {
     public IslandsManager getIslands() {
         return getPlugin().getIslands();
     }
-    
+
     /**
      * Get Islands Manager
      * @return Islands manager

diff --git a/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java b/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java
@@ -8,6 +8,8 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
+import com.github.puregero.multilib.MultiLib;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.util.Util;
@@ -129,7 +131,10 @@ public Optional<CompositeCommand> getAdminCommand() {
      * in-game and need to be saved.
      * @since 1.4.0
      */
-    public abstract void saveWorldSettings();
+    public void saveWorldSettings() {
+        // Inform other servers
+        MultiLib.notify("bentobox-config-update", "");
+    }
 
     /**
      * Defines if the game mode uses the latest {@link ChunkGenerator} API or 

diff --git a/src/main/java/world/bentobox/bentobox/api/addons/Pladdon.java b/src/main/java/world/bentobox/bentobox/api/addons/Pladdon.java
@@ -28,7 +28,7 @@ public void onLoad() {
         String parentFolder = getFile().getParent();
         if (parentFolder == null || !parentFolder.endsWith(ADDONS_FOLDER)) {
             // Jar is in the wrong place. Let's move it
-            moveJar();
+            //moveJar();
         }
     }
 

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java
@@ -520,11 +520,11 @@ protected boolean hasSubCommands(boolean ignoreHelp) {
 
     /**
      * Convenience method to check if a user has a team.
+     * Consider checking the island itself {@link Island#inTeam(UUID)}
      * 
      * @param world - the world to check
      * @param user  - the User
      * @return true if player is in a team
-     * @see Consider checking the island itself {@link Island#inTeam(UUID)}
      */
     protected boolean inTeam(World world, User user) {
         return plugin.getIslands().inTeam(world, user.getUniqueId());