Merge pull request #2706 from BentoBoxWorld/purge-improvements

Purge improvements

Author: tastybento

pom.xml

@@ -66,6 +66,7 @@
         <paper.version>1.21.7-R0.1-SNAPSHOT</paper.version>
         <bstats.version>3.0.0</bstats.version>
         <vault.version>1.7.1</vault.version>
+        <level.version>2.21.3</level.version>
         <placeholderapi.version>2.10.9</placeholderapi.version>
         <githubapi.version>d5f5e0bbd8</githubapi.version>
         <myworlds.version>1.19.3-v1</myworlds.version>
@@ -74,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.6.1</build.version>
+        <build.version>3.7.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>
@@ -200,6 +201,11 @@
             <id>matteodev</id>
             <url>https://maven.devs.beer/</url>
         </repository>
+        <!-- BentoBox Addons -->
+        <repository>
+            <id>bentoboxworld</id>
+            <url>https://repo.codemc.org/repository/bentoboxworld/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -409,6 +415,13 @@
             <version>2.4.1</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Level -->
+        <dependency>
+            <groupId>world.bentobox</groupId>
+            <artifactId>level</artifactId>
+            <version>${level.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -293,6 +293,12 @@ public class Settings implements ConfigObject {
     @ConfigComment("resulting amount of chunks that must be loaded to fulfill the process, which often causes the server to hang out.")
     @ConfigEntry(path = "island.paste-speed")
     private int pasteSpeed = 64;
+    
+    @ConfigComment("Island Level Purge Protection")
+    @ConfigComment("Islands above this level will not be purged even if they are old. Requires the Level Addon.")
+    @ConfigComment("If the Level addon is not present, this will not be checked.")
+    @ConfigEntry(path = "island.purge-level")
+    private int islandPurgeLevel = 10;
 
     @ConfigComment("Island deletion: Number of chunks per world to regenerate per second.")
     @ConfigComment("If there is a nether and end then 3x this number will be regenerated per second.")
@@ -1075,4 +1081,18 @@ public void setClickCooldownMs(long clickCooldownMs) {
         this.clickCooldownMs = clickCooldownMs;
     }
 
+    /**
+     * @return the islandPurgeLevel
+     */
+    public int getIslandPurgeLevel() {
+        return islandPurgeLevel;
+    }
+
+    /**
+     * @param islandPurgeLevel the islandPurgeLevel to set
+     */
+    public void setIslandPurgeLevel(int islandPurgeLevel) {
+        this.islandPurgeLevel = islandPurgeLevel;
+    }
+
 }

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

@@ -47,6 +47,7 @@ public void setup() {
         new AdminPurgeStopCommand(this);
         new AdminPurgeUnownedCommand(this);
         new AdminPurgeProtectCommand(this);
+        new AdminPurgeRegionsCommand(this);
     }
 
     @Override
@@ -167,7 +168,7 @@ CompletableFuture<Set<String>> getOldIslands(int days) {
             user.sendMessage("commands.admin.purge.total-islands", TextVariables.NUMBER, String.valueOf(list.size()));
             Set<String> oldIslands = new HashSet<>();
             list.stream()
-                .filter(i -> !i.isSpawn()).filter(i -> !i.getPurgeProtected())
+                .filter(i -> !i.isSpawn()).filter(i -> !i.isPurgeProtected())
                 .filter(i -> i.getWorld() != null) // to handle currently unloaded world islands
                     .filter(i -> i.getWorld().equals(this.getWorld())) // Island needs to be in this world
                     .filter(Island::isOwned) // The island needs to be owned

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

@@ -41,8 +41,8 @@ public boolean canExecute(User user, String label, List<String> args) {
 
     @Override
     public boolean execute(User user, String label, List<String> args) {
-        island.setPurgeProtected(!island.getPurgeProtected());
-        if (island.getPurgeProtected()) {
+        island.setPurgeProtected(!island.isPurgeProtected());
+        if (island.isPurgeProtected()) {
             user.sendMessage("commands.admin.purge.protect.protecting");
         } else {
             user.sendMessage("commands.admin.purge.protect.unprotecting");