Update to latest BentoBox 1.12 API changes.

Author: BONNe

pom.xml

@@ -69,7 +69,7 @@
         <mongodb.version>3.8.0</mongodb.version>
         <!-- More visible way to change dependency versions -->
         <spigot.version>1.13.2-R0.1-SNAPSHOT</spigot.version>
-        <bstats.version>1.5</bstats.version>
+        <bstats.version>1.7</bstats.version>
         <vault.version>1.7</vault.version>
         <placeholderapi.version>2.10.4</placeholderapi.version>
         <mvdwplaceholderapi.version>master-SNAPSHOT</mvdwplaceholderapi.version>
@@ -81,7 +81,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-1.13.2-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.11.1</build.version>
+        <build.version>1.12.0</build.version>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->

src/main/java/world/bentobox/bentobox/BStats.java

@@ -14,6 +14,8 @@
  */
 public class BStats {
 
+    private static final int BSTATS_ID = 3555;
+
     private final BentoBox plugin;
     private Metrics metrics;
 
@@ -30,7 +32,7 @@ public class BStats {
 
     void registerMetrics() {
         if (metrics == null) {
-            metrics = new Metrics(plugin);
+            metrics = new Metrics(plugin, BSTATS_ID);
             registerCustomMetrics();
         }
     }
@@ -133,7 +135,8 @@ private void registerPlayersPerServerChart() {
             else if (players <= 30) return "11-30";
             else if (players <= 50) return "31-50";
             else if (players <= 100) return "51-100";
-            else if (players <= 200) return "101-200";
+            else if (players <= 150) return "101-150";
+            else if (players <= 200) return "151-200";
             else return "201+";
         }));
     }

src/main/java/world/bentobox/bentobox/BentoBox.java

@@ -195,10 +195,8 @@ public void onEnable(){
             flagsManager.registerListeners();
 
             // Load metrics
-            if (settings.isMetrics()) {
-                metrics = new BStats(this);
-                metrics.registerMetrics();
-            }
+             metrics = new BStats(this);
+             metrics.registerMetrics();
 
             // Register Multiverse hook - MV loads AFTER BentoBox
             // Make sure all worlds are already registered to Multiverse.

src/main/java/world/bentobox/bentobox/Settings.java

@@ -19,7 +19,7 @@
 @ConfigComment("This configuration file contains settings that mainly apply to or manage the following elements:")
 @ConfigComment(" * Data storage")
 @ConfigComment(" * Gamemodes (commands, ...)")
-@ConfigComment(" * Internet connectivity (metrics, web-based content-enriched features, ...)")
+@ConfigComment(" * Internet connectivity (web-based content-enriched features, ...)")
 @ConfigComment("")
 @ConfigComment("Note that this configuration file is dynamic:")
 @ConfigComment(" * It gets updated with the newest settings and comments after BentoBox loaded its settings from it.")
@@ -93,6 +93,10 @@ public class Settings implements ConfigObject {
     @ConfigEntry(path = "general.database.backup-period")
     private int databaseBackupPeriod = 5;
 
+    @ConfigComment("Enable SSL connection to MongoDB, MariaDB, MySQL and PostgreSQL databases.")
+    @ConfigEntry(path = "general.database.use-ssl", since = "1.12.0")
+    private boolean useSSL = false;
+
     @ConfigComment("Allow FTB Autonomous Activator to work (will allow a pseudo player [CoFH] to place and break blocks and hang items)")
     @ConfigComment("Add other fake player names here if required")
     @ConfigEntry(path = "general.fakeplayers", experimental = true)
@@ -223,12 +227,6 @@ public class Settings implements ConfigObject {
     private boolean autoOwnershipTransferIgnoreRanks = false;
 
     /* WEB */
-    @ConfigComment("BentoBox uses bStats.org to get global data about the plugin to help improving it.")
-    @ConfigComment("bStats has nearly no effect on your server's performance and the sent data is completely")
-    @ConfigComment("anonymous so please consider twice if you really want to disable it.")
-    @ConfigEntry(path = "web.metrics")
-    private boolean metrics = true;
-
     @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")
     @ConfigComment("features that rely on the data downloaded from the GitHub API.")
@@ -252,14 +250,6 @@ public class Settings implements ConfigObject {
     // ---------------------------------------------
     // Getters and setters
 
-    public boolean isMetrics() {
-        return metrics;
-    }
-
-    public void setMetrics(boolean metrics) {
-        this.metrics = metrics;
-    }
-
     public String getDefaultLanguage() {
         return defaultLanguage;
     }
@@ -296,6 +286,24 @@ public int getDatabasePort() {
         return databasePort;
     }
 
+    /**
+     * This method returns the useSSL value.
+     * @return the value of useSSL.
+     * @since 1.12.0
+     */
+    public boolean isUseSSL() {
+        return useSSL;
+    }
+
+    /**
+     * This method sets the useSSL value.
+     * @param useSSL the useSSL new value.
+     * @since 1.12.0
+     */
+    public void setUseSSL(boolean useSSL) {
+        this.useSSL = useSSL;
+    }
+
     public void setDatabasePort(int databasePort) {
         this.databasePort = databasePort;
     }

src/main/java/world/bentobox/bentobox/api/addons/Addon.java

@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.file.StandardCopyOption;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -270,7 +271,7 @@ public File saveResource(String jarResource, File destinationFolder, boolean rep
                     // Make any dirs that need to be made
                     outFile.getParentFile().mkdirs();
                     if (!outFile.exists() || replace) {
-                        java.nio.file.Files.copy(in, outFile.toPath());
+                        java.nio.file.Files.copy(in, outFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
                     }
                     return outFile;
                 }

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java

@@ -10,6 +10,8 @@
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
+import world.bentobox.bentobox.api.events.island.IslandEvent;
+import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
@@ -72,6 +74,14 @@ private void deletePlayer(User user, UUID targetUUID) {
         Island oldIsland = getIslands().getIsland(getWorld(), targetUUID);
         Vector vector = null;
         if (oldIsland != null) {
+            // Fire island preclear event
+            IslandEvent.builder()
+            .involvedPlayer(user.getUniqueId())
+            .reason(Reason.PRECLEAR)
+            .island(oldIsland)
+            .oldIsland(oldIsland)
+            .location(oldIsland.getCenter())
+            .build();
             // Check if player is online and on the island
             User target = User.getInstance(targetUUID);
             // Remove them from this island (it still exists and will be deleted later)

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommand.java

@@ -72,6 +72,8 @@ private void setSpawn(User user, Island i) {
         }
         getIslands().setSpawn(i);
         i.setSpawnPoint(World.Environment.NORMAL, user.getLocation());
+        // Set the island's range to the full island space because it is spawn
+        i.setProtectionRange(i.getRange());
         user.sendMessage("commands.admin.setspawn.success");
     }
 }

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminVersionCommand.java

@@ -9,7 +9,7 @@
 public class AdminVersionCommand extends CompositeCommand {
 
     public AdminVersionCommand(CompositeCommand adminCommand) {
-        super(adminCommand, "version", "v");
+        super(adminCommand, "version", "v", "ver");
     }
 
     @Override

src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommand.java

@@ -57,7 +57,7 @@ public boolean execute(User user, String label, List<String> args) {
                 TeamEvent.builder()
                 .island(island)
                 .reason(TeamEvent.Reason.KICK)
-                .involvedPlayer(targetUUID)
+                .involvedPlayer(m)
                 .admin(true)
                 .build();
             }

src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java

@@ -9,6 +9,7 @@
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
+import world.bentobox.bentobox.api.events.island.IslandEvent;
 import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
@@ -115,11 +116,21 @@ private void selectBundle(@NonNull User user, @NonNull String label) {
     }
 
     private boolean resetIsland(User user, String name) {
-        // Reset the island
-        user.sendMessage("commands.island.create.creating-island");
         // Get the player's old island
         Island oldIsland = getIslands().getIsland(getWorld(), user);
 
+        // Fire island preclear event
+        IslandEvent.builder()
+        .involvedPlayer(user.getUniqueId())
+        .reason(Reason.PRECLEAR)
+        .island(oldIsland)
+        .oldIsland(oldIsland)
+        .location(oldIsland.getCenter())
+        .build();
+        
+        // Reset the island
+        user.sendMessage("commands.island.create.creating-island");
+
         // Kick all island members (including the owner)
         kickMembers(oldIsland);