chore: Remove things marked as for removal

.github/workflows/announce-release-on-discord.yml

@@ -2,6 +2,7 @@ name: Announce release on discord
 on:
   release:
     types: [published]
+
 jobs:
   send_announcement:
     runs-on: ubuntu-latest
@@ -11,7 +12,7 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
           DISCORD_USERNAME: PlotSquared Release
           DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png
-        uses: Ilshidur/action-discord@08d9328877d6954120eef2b07abbc79249bb6210 # ratchet:Ilshidur/action-discord@0.3.2
+        uses: Ilshidur/action-discord@0.3.2
         with:
           args: |
             "<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"

.github/workflows/build-pr.yml

@@ -1,5 +1,7 @@
 name: Build PR
+
 on: [ pull_request ]
+
 jobs:
   build_pr:
     if: github.repository_owner == 'IntellectualSites'
@@ -11,7 +13,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
+        uses: gradle/wrapper-validation-action@v1
       - name: Setup Java
         uses: actions/setup-java@v3
         with:

.github/workflows/build.yml

@@ -1,8 +1,10 @@
 name: build
+
 on:
   push:
     branches:
       - v7
+
 jobs:
   build:
     if: github.repository_owner == 'IntellectualSites'
@@ -11,7 +13,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
+        uses: gradle/wrapper-validation-action@v1
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
@@ -42,14 +44,9 @@ jobs:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
       - name: Publish core javadoc
-<<<<<<< HEAD
        # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
         if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
         uses: cpina/github-action-push-to-another-repository@main
-=======
-        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
-        uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
->>>>>>> v6
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
         with:
@@ -62,7 +59,7 @@ jobs:
       - name: Publish bukkit javadoc
        # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
         if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
-        uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
+        uses: cpina/github-action-push-to-another-repository@main
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
         with:

.github/workflows/codeql.yml

@@ -1,4 +1,5 @@
 name: "CodeQL"
+
 on:
   push:
     branches: [ v7 ]
@@ -14,18 +15,23 @@ jobs:
       actions: read
       contents: read
       security-events: write
+
     strategy:
       fail-fast: false
       matrix:
         language: [ 'java' ]
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
+
       - name: Autobuild
-        uses: github/codeql-action/autobuild@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
+        uses: github/codeql-action/autobuild@v2
+
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
+        uses: github/codeql-action/analyze@v2

.github/workflows/release-drafter.yml

@@ -1,4 +1,5 @@
 name: draft release
+
 on:
   push:
     branches:
@@ -7,6 +8,7 @@ on:
     types: [ opened, reopened, synchronize ]
   pull_request_target:
     types: [ opened, reopened, synchronize ]
+
 jobs:
   update_release_draft:
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

@@ -72,8 +72,6 @@ import com.plotsquared.core.configuration.Storage;
 import com.plotsquared.core.configuration.caption.ChatFormatter;
 import com.plotsquared.core.configuration.file.YamlConfiguration;
 import com.plotsquared.core.database.DBFunc;
-import com.plotsquared.core.events.RemoveRoadEntityEvent;
-import com.plotsquared.core.events.Result;
 import com.plotsquared.core.generator.GeneratorWrapper;
 import com.plotsquared.core.generator.IndependentPlotGenerator;
 import com.plotsquared.core.generator.SingleWorldGenerator;
@@ -112,7 +110,6 @@ import com.plotsquared.core.uuid.CacheUUIDService;
 import com.plotsquared.core.uuid.UUIDPipeline;
 import com.plotsquared.core.uuid.offline.OfflineModeUUIDService;
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import io.papermc.lib.PaperLib;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
@@ -821,7 +818,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                         if (entity.hasMetadata("ps-tmp-teleport")) {
                                             continue;
                                         }
-                                        this.removeRoadEntity(entity, iterator);
+                                        iterator.remove();
+                                        entity.remove();
                                     }
                                     continue;
                                 }
@@ -834,7 +832,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                     if (entity.hasMetadata("ps-tmp-teleport")) {
                                         continue;
                                     }
-                                    this.removeRoadEntity(entity, iterator);
+                                    iterator.remove();
+                                    entity.remove();
                                 }
                             }
                             continue;
@@ -844,7 +843,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                         case "DROPPED_ITEM":
                             if (Settings.Enabled_Components.KILL_ROAD_ITEMS
                                     && plotArea.getOwnedPlotAbs(BukkitUtil.adapt(entity.getLocation())) == null) {
-                                this.removeRoadEntity(entity, iterator);
+                                entity.remove();
                             }
                             // dropped item
                             continue;
@@ -875,7 +874,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                                 if (entity.hasMetadata("ps-tmp-teleport")) {
                                                     continue;
                                                 }
-                                                this.removeRoadEntity(entity, iterator);
+                                                iterator.remove();
+                                                entity.remove();
                                             }
                                         }
                                     }
@@ -980,7 +980,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                                 if (entity.hasMetadata("ps-tmp-teleport")) {
                                                     continue;
                                                 }
-                                                this.removeRoadEntity(entity, iterator);
+                                                iterator.remove();
+                                                entity.remove();
                                             }
                                         }
                                     } else {
@@ -991,7 +992,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                             if (entity.hasMetadata("ps-tmp-teleport")) {
                                                 continue;
                                             }
-                                            this.removeRoadEntity(entity, iterator);
+                                            iterator.remove();
+                                            entity.remove();
                                         }
                                     }
                                 }
@@ -1005,17 +1007,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         }), TaskTime.seconds(1L));
     }
 
-    private void removeRoadEntity(Entity entity, Iterator<Entity> entityIterator) {
-        RemoveRoadEntityEvent event = eventDispatcher.callRemoveRoadEntity(BukkitAdapter.adapt(entity));
-
-        if (event.getEventResult() == Result.DENY) {
-            return;
-        }
-
-        entityIterator.remove();
-        entity.remove();
-    }
-
     @Override
     public @Nullable
     final ChunkGenerator getDefaultWorldGenerator(

Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java

@@ -101,26 +101,50 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             this.noGravity = true;
         }
         switch (entity.getType().toString()) {
-            case "BOAT" -> {
+            case "BOAT":
                 Boat boat = (Boat) entity;
                 this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
                 return;
-            }
-            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
-                    "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER",
-                    "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION",
-                    "THROWN_EXP_BOTTLE", "WITHER_SKULL", "UNKNOWN", "SPECTRAL_ARROW", "SHULKER_BULLET", "DRAGON_FIREBALL", "AREA_EFFECT_CLOUD",
-                    "TRIDENT", "LLAMA_SPIT" -> {
+            case "ARROW":
+            case "EGG":
+            case "ENDER_CRYSTAL":
+            case "ENDER_PEARL":
+            case "ENDER_SIGNAL":
+            case "EXPERIENCE_ORB":
+            case "FALLING_BLOCK":
+            case "FIREBALL":
+            case "FIREWORK":
+            case "FISHING_HOOK":
+            case "LEASH_HITCH":
+            case "LIGHTNING":
+            case "MINECART":
+            case "MINECART_COMMAND":
+            case "MINECART_MOB_SPAWNER":
+            case "MINECART_TNT":
+            case "PLAYER":
+            case "PRIMED_TNT":
+            case "SLIME":
+            case "SMALL_FIREBALL":
+            case "SNOWBALL":
+            case "MINECART_FURNACE":
+            case "SPLASH_POTION":
+            case "THROWN_EXP_BOTTLE":
+            case "WITHER_SKULL":
+            case "UNKNOWN":
+            case "SPECTRAL_ARROW":
+            case "SHULKER_BULLET":
+            case "DRAGON_FIREBALL":
+            case "AREA_EFFECT_CLOUD":
+            case "TRIDENT":
+            case "LLAMA_SPIT":
                 // Do this stuff later
                 return;
-            }
             // MISC //
-            case "DROPPED_ITEM" -> {
+            case "DROPPED_ITEM":
                 Item item = (Item) entity;
                 this.stack = item.getItemStack();
                 return;
-            }
-            case "ITEM_FRAME" -> {
+            case "ITEM_FRAME":
                 this.x = Math.floor(this.getX());
                 this.y = Math.floor(this.getY());
                 this.z = Math.floor(this.getZ());
@@ -128,8 +152,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 this.dataByte = getOrdinal(Rotation.values(), itemFrame.getRotation());
                 this.stack = itemFrame.getItem().clone();
                 return;
-            }
-            case "PAINTING" -> {
+            case "PAINTING":
                 this.x = Math.floor(this.getX());
                 this.y = Math.floor(this.getY());
                 this.z = Math.floor(this.getZ());
@@ -142,17 +165,20 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 }
                 this.dataString = art.name();
                 return;
-            }
             // END MISC //
             // INVENTORY HOLDER //
-            case "MINECART_CHEST", "MINECART_HOPPER" -> {
+            case "MINECART_CHEST":
+            case "MINECART_HOPPER":
                 storeInventory((InventoryHolder) entity);
                 return;
-            }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case "HORSE", "DONKEY", "LLAMA", "MULE", "SKELETON_HORSE" -> {
+            case "HORSE":
+            case "DONKEY":
+            case "LLAMA":
+            case "MULE":
+            case "SKELETON_HORSE":
                 AbstractHorse horse = (AbstractHorse) entity;
                 this.horse = new HorseStats();
                 this.horse.jump = horse.getJumpStrength();
@@ -168,17 +194,16 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 storeLiving(horse);
                 storeInventory(horse);
                 return;
-            }
             // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT" -> {
+            case "WOLF":
+            case "OCELOT":
                 storeTameable((Tameable) entity);
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
-            }
             // END TAMEABLE //
             //todo fix sheep
-            case "SHEEP" -> {
+            case "SHEEP":
                 Sheep sheep = (Sheep) entity;
                 if (sheep.isSheared()) {
                     this.dataByte = (byte) 1;
@@ -189,20 +214,23 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 storeAgeable(sheep);
                 storeLiving(sheep);
                 return;
-            }
-            case "VILLAGER", "CHICKEN", "COW", "MUSHROOM_COW", "PIG", "TURTLE", "POLAR_BEAR" -> {
+            case "VILLAGER":
+            case "CHICKEN":
+            case "COW":
+            case "MUSHROOM_COW":
+            case "PIG":
+            case "TURTLE":
+            case "POLAR_BEAR":
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
-            }
-            case "RABBIT" -> {
+            case "RABBIT":
                 this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
-            }
             // END AGEABLE //
-            case "ARMOR_STAND" -> {
+            case "ARMOR_STAND":
                 ArmorStand stand = (ArmorStand) entity;
                 this.inventory =
                         new ItemStack[]{stand.getItemInHand().clone(), stand.getHelmet().clone(),
@@ -210,30 +238,37 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                                 stand.getBoots().clone()};
                 storeLiving(stand);
                 this.stand = new ArmorStandStats();
+
                 EulerAngle head = stand.getHeadPose();
                 this.stand.head[0] = (float) head.getX();
                 this.stand.head[1] = (float) head.getY();
                 this.stand.head[2] = (float) head.getZ();
+
                 EulerAngle body = stand.getBodyPose();
                 this.stand.body[0] = (float) body.getX();
                 this.stand.body[1] = (float) body.getY();
                 this.stand.body[2] = (float) body.getZ();
+
                 EulerAngle leftLeg = stand.getLeftLegPose();
                 this.stand.leftLeg[0] = (float) leftLeg.getX();
                 this.stand.leftLeg[1] = (float) leftLeg.getY();
                 this.stand.leftLeg[2] = (float) leftLeg.getZ();
+
                 EulerAngle rightLeg = stand.getRightLegPose();
                 this.stand.rightLeg[0] = (float) rightLeg.getX();
                 this.stand.rightLeg[1] = (float) rightLeg.getY();
                 this.stand.rightLeg[2] = (float) rightLeg.getZ();
+
                 EulerAngle leftArm = stand.getLeftArmPose();
                 this.stand.leftArm[0] = (float) leftArm.getX();
                 this.stand.leftArm[1] = (float) leftArm.getY();
                 this.stand.leftArm[2] = (float) leftArm.getZ();
+
                 EulerAngle rightArm = stand.getRightArmPose();
                 this.stand.rightArm[0] = (float) rightArm.getX();
                 this.stand.rightArm[1] = (float) rightArm.getY();
                 this.stand.rightArm[2] = (float) rightArm.getZ();
+
                 if (stand.hasArms()) {
                     this.stand.arms = true;
                 }
@@ -247,37 +282,52 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                     this.stand.small = true;
                 }
                 return;
-            }
-            case "ENDERMITE" -> {
+            case "ENDERMITE":
                 return;
-            }
-            case "BAT" -> {
+            case "BAT":
                 if (((Bat) entity).isAwake()) {
                     this.dataByte = (byte) 1;
                 } else {
                     this.dataByte = (byte) 0;
                 }
                 return;
-            }
-            case "ENDER_DRAGON" -> {
+            case "ENDER_DRAGON":
                 EnderDragon entity1 = (EnderDragon) entity;
                 this.dataByte = (byte) entity1.getPhase().ordinal();
                 return;
-            }
-            case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN",
-                    "ZOMBIFIED_PIGLIN", "PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH",
-                    "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN" -> {
+            case "SKELETON":
+            case "WITHER_SKELETON":
+            case "GUARDIAN":
+            case "ELDER_GUARDIAN":
+            case "GHAST":
+            case "MAGMA_CUBE":
+            case "SQUID":
+            case "PIG_ZOMBIE":
+            case "HOGLIN":
+            case "ZOMBIFIED_PIGLIN":
+            case "PIGLIN":
+            case "PIGLIN_BRUTE":
+            case "ZOMBIE":
+            case "WITHER":
+            case "WITCH":
+            case "SPIDER":
+            case "CAVE_SPIDER":
+            case "SILVERFISH":
+            case "GIANT":
+            case "ENDERMAN":
+            case "CREEPER":
+            case "BLAZE":
+            case "SHULKER":
+            case "SNOWMAN":
                 storeLiving((LivingEntity) entity);
                 return;
-            }
-            case "IRON_GOLEM" -> {
+            case "IRON_GOLEM":
                 if (((IronGolem) entity).isPlayerCreated()) {
                     this.dataByte = (byte) 1;
                 } else {
                     this.dataByte = (byte) 0;
                 }
                 storeLiving((LivingEntity) entity);
-            }
                 // END LIVING //
         }
     }
@@ -415,15 +465,20 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         }
         Entity entity;
         switch (this.getType().toString()) {
-            case "DROPPED_ITEM" -> {
+            case "DROPPED_ITEM":
                 return world.dropItem(location, this.stack);
-            }
-            case "PLAYER", "LEASH_HITCH" -> {
+            case "PLAYER":
+            case "LEASH_HITCH":
                 return null;
-            }
-            case "ITEM_FRAME" -> entity = world.spawn(location, ItemFrame.class);
-            case "PAINTING" -> entity = world.spawn(location, Painting.class);
-            default -> entity = world.spawnEntity(location, this.getType());
+            case "ITEM_FRAME":
+                entity = world.spawn(location, ItemFrame.class);
+                break;
+            case "PAINTING":
+                entity = world.spawn(location, Painting.class);
+                break;
+            default:
+                entity = world.spawnEntity(location, this.getType());
+                break;
         }
         if (this.depth == 0) {
             return entity;
@@ -451,46 +506,72 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             entity.setGravity(false);
         }
         switch (entity.getType().toString()) {
-            case "BOAT" -> {
+            case "BOAT":
                 Boat boat = (Boat) entity;
                 boat.setWoodType(TreeSpecies.values()[dataByte]);
                 return entity;
-            }
-            case "SLIME" -> {
+            case "SLIME":
                 ((Slime) entity).setSize(this.dataByte);
                 return entity;
-            }
-            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
-                    "FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND",
-                    "MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL",
-                    "SPLASH_POTION", "THROWN_EXP_BOTTLE", "SPECTRAL_ARROW", "SHULKER_BULLET", "AREA_EFFECT_CLOUD",
-                    "DRAGON_FIREBALL", "WITHER_SKULL", "MINECART_FURNACE", "LLAMA_SPIT", "TRIDENT", "UNKNOWN" -> {
+            case "ARROW":
+            case "EGG":
+            case "ENDER_CRYSTAL":
+            case "ENDER_PEARL":
+            case "ENDER_SIGNAL":
+            case "DROPPED_ITEM":
+            case "EXPERIENCE_ORB":
+            case "FALLING_BLOCK":
+            case "FIREBALL":
+            case "FIREWORK":
+            case "FISHING_HOOK":
+            case "LEASH_HITCH":
+            case "LIGHTNING":
+            case "MINECART":
+            case "MINECART_COMMAND":
+            case "MINECART_MOB_SPAWNER":
+            case "MINECART_TNT":
+            case "PLAYER":
+            case "PRIMED_TNT":
+            case "SMALL_FIREBALL":
+            case "SNOWBALL":
+            case "SPLASH_POTION":
+            case "THROWN_EXP_BOTTLE":
+            case "SPECTRAL_ARROW":
+            case "SHULKER_BULLET":
+            case "AREA_EFFECT_CLOUD":
+            case "DRAGON_FIREBALL":
+            case "WITHER_SKULL":
+            case "MINECART_FURNACE":
+            case "LLAMA_SPIT":
+            case "TRIDENT":
+            case "UNKNOWN":
                 // Do this stuff later
                 return entity;
-            }
             // MISC //
-            case "ITEM_FRAME" -> {
+            case "ITEM_FRAME":
                 ItemFrame itemframe = (ItemFrame) entity;
                 itemframe.setRotation(Rotation.values()[this.dataByte]);
                 itemframe.setItem(this.stack);
                 return entity;
-            }
-            case "PAINTING" -> {
+            case "PAINTING":
                 Painting painting = (Painting) entity;
                 painting.setFacingDirection(BlockFace.values()[this.dataByte], true);
                 painting.setArt(Art.getByName(this.dataString), true);
                 return entity;
-            }
             // END MISC //
             // INVENTORY HOLDER //
-            case "MINECART_CHEST", "MINECART_HOPPER" -> {
+            case "MINECART_CHEST":
+            case "MINECART_HOPPER":
                 restoreInventory((InventoryHolder) entity);
                 return entity;
-            }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case "HORSE", "LLAMA", "SKELETON_HORSE", "DONKEY", "MULE" -> {
+            case "HORSE":
+            case "LLAMA":
+            case "SKELETON_HORSE":
+            case "DONKEY":
+            case "MULE":
                 AbstractHorse horse = (AbstractHorse) entity;
                 horse.setJumpStrength(this.horse.jump);
                 if (horse instanceof ChestedHorse) {
@@ -505,16 +586,15 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 restoreLiving(horse);
                 restoreInventory(horse);
                 return entity;
-            }
             // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT" -> {
+            case "WOLF":
+            case "OCELOT":
                 restoreTameable((Tameable) entity);
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
             // END AGEABLE //
-            case "SHEEP" -> {
+            case "SHEEP":
                 Sheep sheep = (Sheep) entity;
                 if (this.dataByte == 1) {
                     sheep.setSheared(true);
@@ -525,22 +605,25 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 restoreAgeable(sheep);
                 restoreLiving(sheep);
                 return sheep;
-            }
-            case "VILLAGER", "CHICKEN", "COW", "TURTLE", "POLAR_BEAR", "MUSHROOM_COW", "PIG" -> {
+            case "VILLAGER":
+            case "CHICKEN":
+            case "COW":
+            case "TURTLE":
+            case "POLAR_BEAR":
+            case "MUSHROOM_COW":
+            case "PIG":
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
             // END AGEABLE //
-            case "RABBIT" -> {
+            case "RABBIT":
                 if (this.dataByte != 0) {
                     ((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
                 }
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
-            case "ARMOR_STAND" -> {
+            case "ARMOR_STAND":
                 // CHECK positions
                 ArmorStand stand = (ArmorStand) entity;
                 if (this.inventory[0] != null) {
@@ -610,38 +693,56 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 }
                 restoreLiving(stand);
                 return stand;
-            }
-            case "BAT" -> {
+            case "BAT":
                 if (this.dataByte != 0) {
                     ((Bat) entity).setAwake(true);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
-            case "ENDER_DRAGON" -> {
+            case "ENDER_DRAGON":
                 if (this.dataByte != 0) {
                     ((EnderDragon) entity).setPhase(EnderDragon.Phase.values()[this.dataByte]);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
-            case "ENDERMITE", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", "PIGLIN", "ZOMBIFIED_PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SNOWMAN", "SHULKER", "GUARDIAN", "ELDER_GUARDIAN", "SKELETON", "WITHER_SKELETON" -> {
+            case "ENDERMITE":
+            case "GHAST":
+            case "MAGMA_CUBE":
+            case "SQUID":
+            case "PIG_ZOMBIE":
+            case "HOGLIN":
+            case "PIGLIN":
+            case "ZOMBIFIED_PIGLIN":
+            case "PIGLIN_BRUTE":
+            case "ZOMBIE":
+            case "WITHER":
+            case "WITCH":
+            case "SPIDER":
+            case "CAVE_SPIDER":
+            case "SILVERFISH":
+            case "GIANT":
+            case "ENDERMAN":
+            case "CREEPER":
+            case "BLAZE":
+            case "SNOWMAN":
+            case "SHULKER":
+            case "GUARDIAN":
+            case "ELDER_GUARDIAN":
+            case "SKELETON":
+            case "WITHER_SKELETON":
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
-            case "IRON_GOLEM" -> {
+            case "IRON_GOLEM":
                 if (this.dataByte != 0) {
                     ((IronGolem) entity).setPlayerCreated(true);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
-            default -> {
+            default:
                 if (Settings.DEBUG) {
                     LOGGER.info("Could not identify entity: {}", entity.getType());
                 }
                 return entity;
-            }
             // END LIVING
         }
     }

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java

@@ -185,12 +185,6 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         world.setWaterAnimalSpawnLimit(limit);
     }
 
-    /**
-     * The entire method is deprecated, but kept for compatibility with versions lower than or equal to 1.16.2.
-     * The method will be removed in future versions, because WorldEdit and FastAsyncWorldEdit only support the latest point
-     * release.
-     */
-    @Deprecated(forRemoval = true, since = "6.11.0")
     @Override
     public void generateNoise(
             @NotNull final WorldInfo worldInfo,

Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java

@@ -72,7 +72,6 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Dispenser;
-import org.bukkit.block.data.type.Farmland;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Player;
@@ -100,7 +99,6 @@ import org.bukkit.event.block.BlockSpreadEvent;
 import org.bukkit.event.block.CauldronLevelChangeEvent;
 import org.bukkit.event.block.EntityBlockFormEvent;
 import org.bukkit.event.block.LeavesDecayEvent;
-import org.bukkit.event.block.MoistureChangeEvent;
 import org.bukkit.event.block.SpongeAbsorbEvent;
 import org.bukkit.event.world.StructureGrowEvent;
 import org.bukkit.projectiles.BlockProjectileSource;
@@ -742,41 +740,6 @@ public class BlockEventListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onMoistureChange(MoistureChangeEvent event) {
-        Block block = event.getBlock();
-        Location location = BukkitUtil.adapt(block.getLocation());
-        PlotArea area = location.getPlotArea();
-
-        if (area == null) {
-            return;
-        }
-
-        Plot plot = area.getOwnedPlot(location);
-
-        if (plot == null) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (block.getBlockData() instanceof Farmland farmland && event.getNewState().getBlockData() instanceof Farmland newFarmland) {
-            int currentMoisture = farmland.getMoisture();
-            int newMoisture = newFarmland.getMoisture();
-
-            // farmland gets moisturizes
-            if (newMoisture > currentMoisture) {
-                return;
-            }
-
-            if (plot.getFlag(SoilDryFlag.class)) {
-                return;
-            }
-
-            plot.debug("Soil could not dry because soil-dry = false");
-            event.setCancelled(true);
-        }
-    }
-
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onChange(BlockFromToEvent event) {
         Block fromBlock = event.getBlock();

Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java

@@ -145,37 +145,54 @@ public class EntityEventListener implements Listener {
         }
         CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
         switch (reason.toString()) {
-            case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
+            case "DISPENSE_EGG":
+            case "EGG":
+            case "OCELOT_BABY":
+            case "SPAWNER_EGG":
                 if (!area.isSpawnEggs()) {
                     event.setCancelled(true);
                     return;
                 }
-            }
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
-                    "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
+                break;
+            case "REINFORCEMENTS":
+            case "NATURAL":
+            case "MOUNT":
+            case "PATROL":
+            case "RAID":
+            case "SHEARED":
+            case "SILVERFISH_BLOCK":
+            case "ENDER_PEARL":
+            case "TRAP":
+            case "VILLAGE_DEFENSE":
+            case "VILLAGE_INVASION":
+            case "BEEHIVE":
+            case "CHUNK_GEN":
                 if (!area.isMobSpawning()) {
                     event.setCancelled(true);
                     return;
                 }
-            }
-            case "BREEDING" -> {
+                break;
+            case "BREEDING":
                 if (!area.isSpawnBreeding()) {
                     event.setCancelled(true);
                     return;
                 }
-            }
-            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
+                break;
+            case "BUILD_IRONGOLEM":
+            case "BUILD_SNOWMAN":
+            case "BUILD_WITHER":
+            case "CUSTOM":
                 if (!area.isSpawnCustom() && entity.getType() != EntityType.ARMOR_STAND) {
                     event.setCancelled(true);
                     return;
                 }
-            }
-            case "SPAWNER" -> {
+                break;
+            case "SPAWNER":
                 if (!area.isMobSpawnerSpawning()) {
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
         }
         Plot plot = area.getOwnedPlotAbs(location);
         if (plot == null) {

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java

@@ -178,41 +178,59 @@ public class PaperListener implements Listener {
         }
         CreatureSpawnEvent.SpawnReason reason = event.getReason();
         switch (reason.toString()) {
-            case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
+            case "DISPENSE_EGG":
+            case "EGG":
+            case "OCELOT_BABY":
+            case "SPAWNER_EGG":
                 if (!area.isSpawnEggs()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-            }
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
+                break;
+            case "REINFORCEMENTS":
+            case "NATURAL":
+            case "MOUNT":
+            case "PATROL":
+            case "RAID":
+            case "SHEARED":
+            case "SILVERFISH_BLOCK":
+            case "ENDER_PEARL":
+            case "TRAP":
+            case "VILLAGE_DEFENSE":
+            case "VILLAGE_INVASION":
+            case "BEEHIVE":
+            case "CHUNK_GEN":
                 if (!area.isMobSpawning()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-            }
-            case "BREEDING" -> {
+                break;
+            case "BREEDING":
                 if (!area.isSpawnBreeding()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-            }
-            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
+                break;
+            case "BUILD_IRONGOLEM":
+            case "BUILD_SNOWMAN":
+            case "BUILD_WITHER":
+            case "CUSTOM":
                 if (!area.isSpawnCustom() && event.getType() != EntityType.ARMOR_STAND) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-            }
-            case "SPAWNER" -> {
+                break;
+            case "SPAWNER":
                 if (!area.isMobSpawnerSpawning()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
         }
         Plot plot = location.getOwnedPlotAbs();
         if (plot == null) {

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java

@@ -273,7 +273,8 @@ public class PlayerEventListener implements Listener {
         Plot plot = plotPlayer.getCurrentPlot();
         // Check WorldEdit
         switch (parts[0]) {
-            case "up", "worldedit:up" -> {
+            case "up":
+            case "worldedit:up":
                 if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !plotPlayer.hasPermission(
                         Permission.PERMISSION_ADMIN_BUILD_OTHER,
                         true
@@ -282,7 +283,6 @@ public class PlayerEventListener implements Listener {
                     return;
                 }
         }
-        }
         if (plot == null && !area.isRoadFlags()) {
             return;
         }
@@ -1114,13 +1114,13 @@ public class PlayerEventListener implements Listener {
         Location location = BukkitUtil.adapt(block.getLocation());
         Action action = event.getAction();
         switch (action) {
-            case PHYSICAL -> {
+            case PHYSICAL: {
                 eventType = PlayerBlockEventType.TRIGGER_PHYSICAL;
                 blocktype1 = BukkitAdapter.asBlockType(block.getType());
+                break;
             }
-
             //todo rearrange the right click code. it is all over the place.
-            case RIGHT_CLICK_BLOCK -> {
+            case RIGHT_CLICK_BLOCK: {
                 Material blockType = block.getType();
                 eventType = PlayerBlockEventType.INTERACT_BLOCK;
                 blocktype1 = BukkitAdapter.asBlockType(block.getType());
@@ -1142,17 +1142,22 @@ public class PlayerEventListener implements Listener {
 
                 // in the following, lb needs to have the material of the item in hand i.e. type
                 switch (type.toString()) {
-                    case "REDSTONE", "STRING", "PUMPKIN_SEEDS", "MELON_SEEDS", "COCOA_BEANS", "WHEAT_SEEDS", "BEETROOT_SEEDS",
-                            "SWEET_BERRIES", "GLOW_BERRIES" -> {
+                    case "REDSTONE":
+                    case "STRING":
+                    case "PUMPKIN_SEEDS":
+                    case "MELON_SEEDS":
+                    case "COCOA_BEANS":
+                    case "WHEAT_SEEDS":
+                    case "BEETROOT_SEEDS":
+                    case "SWEET_BERRIES":
+                    case "GLOW_BERRIES":
                         return;
-                    }
-                    default -> {
+                    default:
                         //eventType = PlayerBlockEventType.PLACE_BLOCK;
                         if (type.isBlock()) {
                             return;
                         }
                 }
-                }
                 if (PaperLib.isPaper()) {
                     if (MaterialTags.SPAWN_EGGS.isTagged(type) || Material.EGG.equals(type)) {
                         eventType = PlayerBlockEventType.SPAWN_MOB;
@@ -1184,8 +1189,9 @@ public class PlayerEventListener implements Listener {
                     eventType = PlayerBlockEventType.READ;
                     break;
                 }
+                break;
             }
-            case LEFT_CLICK_BLOCK -> {
+            case LEFT_CLICK_BLOCK: {
                 Material blockType = block.getType();
 
                 // todo: when the code above is rearranged, it would be great to beautify this as well.
@@ -1196,11 +1202,11 @@ public class PlayerEventListener implements Listener {
 
                 eventType = PlayerBlockEventType.INTERACT_BLOCK;
                 blocktype1 = BukkitAdapter.asBlockType(block.getType());
+                break;
             }
-            default -> {
+            default:
                 return;
         }
-        }
         if (this.worldEdit != null && pp.getAttribute("worldedit")) {
             if (event.getMaterial() == Material.getMaterial(this.worldEdit.getConfiguration().wandItem)) {
                 return;

Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/MVdWPlaceholders.java

@@ -52,7 +52,7 @@ public class MVdWPlaceholders {
 
     @Subscribe
     public void onNewPlaceholder(final PlaceholderRegistry.@NonNull PlaceholderAddedEvent event) {
-        this.addPlaceholder(event.placeholder());
+        this.addPlaceholder(event.getPlaceholder());
     }
 
     private void addPlaceholder(final @NonNull Placeholder placeholder) {

Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java

@@ -54,6 +54,7 @@ public class BukkitPlayerManager extends PlayerManager<BukkitPlayer, Player> {
 
     @NonNull
     @Override
+    @SuppressWarnings("deprecation")
     public BukkitPlayer getPlayer(final @NonNull Player object) {
         if (object.getUniqueId().version() == 2) { // not a real player
             return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, object, false, this.permissionHandler);

Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java

@@ -110,9 +110,9 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
      */
     public void setChunk(@NonNull ChunkWrapper wrap) {
         chunk = null;
-        world = wrap.world();
-        chunkX = wrap.x();
-        chunkZ = wrap.z();
+        world = wrap.world;
+        chunkX = wrap.x;
+        chunkZ = wrap.z;
     }
 
     @Override

Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java

@@ -124,7 +124,7 @@ public class BukkitSetupUtils extends SetupUtils {
     public String setupWorld(PlotAreaBuilder builder) {
         this.updateGenerators(false);
         ConfigurationNode[] steps = builder.settingsNodesWrapper() == null ?
-                new ConfigurationNode[0] : builder.settingsNodesWrapper().settingsNodes();
+                new ConfigurationNode[0] : builder.settingsNodesWrapper().getSettingsNodes();
         String world = builder.worldName();
         PlotAreaType type = builder.plotAreaType();
         String worldPath = "worlds." + builder.worldName();

Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java

@@ -111,8 +111,8 @@ public class SQLiteUUIDService implements UUIDService, Consumer<List<UUIDMapping
         try (final PreparedStatement statement = getConnection()
                 .prepareStatement("INSERT OR REPLACE INTO `usercache` (`uuid`, `username`) VALUES(?, ?)")) {
             for (final UUIDMapping mapping : uuidWrappers) {
-                statement.setString(1, mapping.uuid().toString());
-                statement.setString(2, mapping.username());
+                statement.setString(1, mapping.getUuid().toString());
+                statement.setString(2, mapping.getUsername());
                 statement.executeUpdate();
             }
         } catch (SQLException e) {

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at contact<at>intellectualsites.com. All
+reported by contacting the project team at contact@intellectualsites.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java

@@ -136,9 +136,13 @@ public class SimpleBackupManager implements BackupManager {
         return this.backupLimit;
     }
 
-    private record PlotCacheKey(
-            Plot plot
-    ) {
+    private static final class PlotCacheKey {
+
+        private final Plot plot;
+
+        private PlotCacheKey(Plot plot) {
+            this.plot = plot;
+        }
 
         @Override
         public boolean equals(final Object o) {

Core/src/main/java/com/plotsquared/core/command/Area.java

@@ -55,7 +55,6 @@ import com.plotsquared.core.util.TabCompletions;
 import com.plotsquared.core.util.WorldUtil;
 import com.plotsquared.core.util.task.RunnableVal3;
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.EditSessionBuilder;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.entity.Player;
@@ -233,9 +232,10 @@ public class Area extends SubCommand {
                 try (final ClipboardWriter clipboardWriter = BuiltInClipboardFormat.SPONGE_SCHEMATIC.getWriter(new FileOutputStream(
                         file))) {
                     final BlockArrayClipboard clipboard = new BlockArrayClipboard(selectedRegion);
-                    EditSessionBuilder editSessionBuilder = WorldEdit.getInstance().newEditSessionBuilder();
-                    editSessionBuilder.world(selectedRegion.getWorld());
-                    final EditSession editSession = editSessionBuilder.build();
+                    final EditSession editSession = WorldEdit
+                            .getInstance()
+                            .getEditSessionFactory()
+                            .getEditSession(selectedRegion.getWorld(), -1);
                     final ForwardExtentCopy forwardExtentCopy =
                             new ForwardExtentCopy(editSession, selectedRegion, clipboard, selectedRegion.getMinimumPoint());
                     forwardExtentCopy.setCopyingBiomes(true);

Core/src/main/java/com/plotsquared/core/command/Auto.java

@@ -35,7 +35,6 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.services.plots.AutoQuery;
 import com.plotsquared.core.services.plots.AutoService;
 import com.plotsquared.core.util.EconHandler;
 import com.plotsquared.core.util.EventDispatcher;
@@ -327,7 +326,7 @@ public class Auto extends SubCommand {
         }
 
         List<Plot> plots = this.servicePipeline
-                .pump(new AutoQuery(player, null, sizeX, sizeZ, plotarea))
+                .pump(new AutoService.AutoQuery(player, null, sizeX, sizeZ, plotarea))
                 .through(AutoService.class)
                 .getResult();
 

Core/src/main/java/com/plotsquared/core/command/Clear.java

@@ -107,7 +107,9 @@ public class Clear extends Command {
             }
             BackupManager.backup(player, plot, () -> {
                 final long start = System.currentTimeMillis();
-                boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> TaskManager.runTask(() -> {
+                boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> {
+                    plot.getPlotModificationManager().unlink();
+                    TaskManager.runTask(() -> {
                         plot.removeRunning();
                         // If the state changes, then mark it as no longer done
                         if (DoneFlag.isDone(plot)) {
@@ -135,7 +137,8 @@ public class Clear extends Command {
                                         .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
                                         .build()
                         );
-                }));
+                    });
+                });
                 if (!result) {
                     player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
                 } else {

Core/src/main/java/com/plotsquared/core/command/Cluster.java

@@ -46,7 +46,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeoutException;
@@ -78,7 +77,8 @@ public class Cluster extends SubCommand {
         }
         String sub = args[0].toLowerCase();
         switch (sub) {
-            case "l", "list" -> {
+            case "l":
+            case "list": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LIST)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -133,7 +133,8 @@ public class Cluster extends SubCommand {
                 }
                 return true;
             }
-            case "c", "create" -> {
+            case "c":
+            case "create": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_CREATE)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -268,7 +269,9 @@ public class Cluster extends SubCommand {
                 );
                 return true;
             }
-            case "disband", "del", "delete" -> {
+            case "disband":
+            case "del":
+            case "delete": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_DELETE)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -327,7 +330,8 @@ public class Cluster extends SubCommand {
                 ));
                 return true;
             }
-            case "res", "resize" -> {
+            case "res":
+            case "resize": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -448,7 +452,9 @@ public class Cluster extends SubCommand {
                 player.sendMessage(TranslatableCaption.of("cluster.cluster_resized"));
                 return true;
             }
-            case "add", "inv", "invite" -> {
+            case "add":
+            case "inv":
+            case "invite": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INVITE)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -517,7 +523,9 @@ public class Cluster extends SubCommand {
                         });
                 return true;
             }
-            case "k", "remove", "kick" -> {
+            case "k":
+            case "remove":
+            case "kick": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_KICK)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -597,7 +605,8 @@ public class Cluster extends SubCommand {
                         });
                 return true;
             }
-            case "quit", "leave" -> {
+            case "quit":
+            case "leave": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LEAVE)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -658,7 +667,7 @@ public class Cluster extends SubCommand {
                 removePlayerPlots(cluster, uuid, player.getLocation().getWorldName());
                 return true;
             }
-            case "members" -> {
+            case "members": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_HELPERS)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -719,7 +728,9 @@ public class Cluster extends SubCommand {
                         });
                 return true;
             }
-            case "spawn", "home", "tp" -> {
+            case "spawn":
+            case "home":
+            case "tp": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_TP)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -767,7 +778,10 @@ public class Cluster extends SubCommand {
                 player.sendMessage(TranslatableCaption.of("cluster.cluster_teleporting"));
                 return true;
             }
-            case "i", "info", "show", "information" -> {
+            case "i":
+            case "info":
+            case "show":
+            case "information": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INFO)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -814,7 +828,11 @@ public class Cluster extends SubCommand {
                                 player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
                             } else {
                                 final String owner;
-                                owner = Objects.requireNonNullElse(username, "unknown");
+                                if (username == null) {
+                                    owner = "unknown";
+                                } else {
+                                    owner = username;
+                                }
                                 String name = cluster.getName();
                                 String size = (cluster.getP2().getX() - cluster.getP1().getX() + 1) + "x" + (
                                         cluster.getP2().getY() - cluster.getP1().getY() + 1);
@@ -832,7 +850,9 @@ public class Cluster extends SubCommand {
                         });
                 return true;
             }
-            case "sh", "setspawn", "sethome" -> {
+            case "sh":
+            case "setspawn":
+            case "sethome": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_SETHOME)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),

Core/src/main/java/com/plotsquared/core/command/Command.java

@@ -559,10 +559,9 @@ public abstract class Command {
 
     public Collection<Command> tab(PlotPlayer<?> player, String[] args, boolean space) {
         switch (args.length) {
-            case 0 -> {
+            case 0:
                 return this.allCommands;
-            }
-            case 1 -> {
+            case 1:
                 String arg = args[0].toLowerCase();
                 if (space) {
                     Command cmd = getCommand(arg);
@@ -581,8 +580,7 @@ public abstract class Command {
                     }
                     return commands;
                 }
-            }
-            default -> {
+            default:
                 Command cmd = getCommand(args[0]);
                 if (cmd != null) {
                     return cmd.tab(player, Arrays.copyOfRange(args, 1, args.length), space);
@@ -591,7 +589,6 @@ public abstract class Command {
                 }
         }
     }
-    }
 
     @Override
     public String toString() {

Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java

@@ -75,13 +75,11 @@ public class DebugRoadRegen extends SubCommand {
         }
         String kind = args[0].toLowerCase();
         switch (kind) {
-            case "plot" -> {
+            case "plot":
                 return regenPlot(player);
-            }
-            case "region" -> {
+            case "region":
                 return regenRegion(player, Arrays.copyOfRange(args, 1, args.length));
-            }
-            default -> {
+            default:
                 player.sendMessage(
                         TranslatableCaption.of("commandconfig.command_syntax"),
                         TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
@@ -89,7 +87,6 @@ public class DebugRoadRegen extends SubCommand {
                 return false;
         }
     }
-    }
 
     public boolean regenPlot(PlotPlayer<?> player) {
         Location location = player.getLocation();

Core/src/main/java/com/plotsquared/core/command/Help.java

@@ -60,10 +60,9 @@ public class Help extends Command {
             RunnableVal2<Command, CommandResult> whenDone
     ) {
         switch (args.length) {
-            case 0 -> {
+            case 0:
                 return displayHelp(player, null, 0);
-            }
-            case 1 -> {
+            case 1:
                 if (MathMan.isInteger(args[0])) {
                     try {
                         return displayHelp(player, null, Integer.parseInt(args[0]));
@@ -73,8 +72,7 @@ public class Help extends Command {
                 } else {
                     return displayHelp(player, args[0], 1);
                 }
-            }
-            case 2 -> {
+            case 2:
                 if (MathMan.isInteger(args[1])) {
                     try {
                         return displayHelp(player, args[0], Integer.parseInt(args[1]));
@@ -83,8 +81,8 @@ public class Help extends Command {
                     }
                 }
                 return CompletableFuture.completedFuture(false);
-            }
-            default -> sendUsage(player);
+            default:
+                sendUsage(player);
         }
         return CompletableFuture.completedFuture(true);
     }

Core/src/main/java/com/plotsquared/core/command/Inbox.java

@@ -85,24 +85,24 @@ public class Inbox extends SubCommand {
         for (int x = page * 12; x < max; x++) {
             PlotComment comment = comments[x];
             Component commentColored;
-            if (player.getName().equals(comment.senderName())) {
+            if (player.getName().equals(comment.senderName)) {
                 commentColored = MINI_MESSAGE
                         .deserialize(
                                 TranslatableCaption.of("list.comment_list_by_lister").getComponent(player),
-                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment())))
+                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment)))
                         );
             } else {
                 commentColored = MINI_MESSAGE
                         .deserialize(
                                 TranslatableCaption.of("list.comment_list_by_other").getComponent(player),
-                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment())))
+                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment)))
                         );
             }
             TagResolver resolver = TagResolver.builder()
                     .tag("number", Tag.inserting(Component.text(x)))
-                    .tag("world", Tag.inserting(Component.text(comment.world())))
-                    .tag("plot_id", Tag.inserting(Component.text(comment.id().getX() + ";" + comment.id().getY())))
-                    .tag("commenter", Tag.inserting(Component.text(comment.senderName())))
+                    .tag("world", Tag.inserting(Component.text(comment.world)))
+                    .tag("plot_id", Tag.inserting(Component.text(comment.id.getX() + ";" + comment.id.getY())))
+                    .tag("commenter", Tag.inserting(Component.text(comment.senderName)))
                     .tag("comment", Tag.inserting(commentColored))
                     .build();
             builder.append(MINI_MESSAGE
@@ -137,7 +137,7 @@ public class Inbox extends SubCommand {
                                 int unread = 0;
                                 for (PlotComment comment : value) {
                                     total++;
-                                    if (comment.timestamp() > CommentManager
+                                    if (comment.timestamp > CommentManager
                                             .getTimestamp(player, inbox.toString())) {
                                         unread++;
                                     }
@@ -190,7 +190,7 @@ public class Inbox extends SubCommand {
         final int page;
         if (args.length > 1) {
             switch (args[1].toLowerCase()) {
-                case "delete" -> {
+                case "delete":
                     if (!inbox.canModify(plot, player)) {
                         player.sendMessage(TranslatableCaption.of("comment.no_perm_inbox_modify"));
                         return false;
@@ -225,6 +225,7 @@ public class Inbox extends SubCommand {
                         );
                         return false;
                     }
+
                     if (!inbox.getComments(plot, new RunnableVal<>() {
                         @Override
                         public void run(List<PlotComment> value) {
@@ -241,7 +242,7 @@ public class Inbox extends SubCommand {
                             if (success) {
                                 player.sendMessage(
                                         TranslatableCaption.of("comment.comment_removed_success"),
-                                        TagResolver.resolver("value", Tag.inserting(Component.text(comment.comment())))
+                                        TagResolver.resolver("value", Tag.inserting(Component.text(comment.comment)))
                                 );
                             } else {
                                 player.sendMessage(
@@ -253,8 +254,7 @@ public class Inbox extends SubCommand {
                         return false;
                     }
                     return true;
-                }
-                case "clear" -> {
+                case "clear":
                     if (!inbox.canModify(plot, player)) {
                         player.sendMessage(TranslatableCaption.of("comment.no_perm_inbox_modify"));
                     }
@@ -268,8 +268,7 @@ public class Inbox extends SubCommand {
                         plot.getPlotCommentContainer().removeComments(comments);
                     }
                     return true;
-                }
-                default -> {
+                default:
                     try {
                         page = Integer.parseInt(args[1]);
                     } catch (NumberFormatException ignored) {
@@ -277,7 +276,6 @@ public class Inbox extends SubCommand {
                         return false;
                     }
             }
-            }
         } else {
             page = 1;
         }

Core/src/main/java/com/plotsquared/core/command/ListCmd.java

@@ -474,20 +474,20 @@ public class ListCmd extends SubCommand {
                         final List<UUIDMapping> names = PlotSquared.get().getImpromptuUUIDPipeline().getNames(plot.getOwners())
                                 .get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS);
                         for (final UUIDMapping uuidMapping : names) {
-                            PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.uuid());
+                            PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.getUuid());
                             TagResolver resolver = TagResolver.builder()
                                 .tag("prefix", Tag.inserting(Component.text(prefix)))
-                                .tag("player", Tag.inserting(Component.text(uuidMapping.username())))
+                                .tag("player", Tag.inserting(Component.text(uuidMapping.getUsername())))
                                 .build();
                         if (pp != null) {
                             builder.append(MINI_MESSAGE.deserialize(online, resolver));
-                            } else if (uuidMapping.username().equalsIgnoreCase("unknown")) {
+                            } else if (uuidMapping.getUsername().equalsIgnoreCase("unknown")) {
                                 TagResolver unknownResolver = TagResolver.resolver(
                                         "info.unknown",
                                         Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
                                 );
                                 builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
-                            } else if (uuidMapping.uuid().equals(DBFunc.EVERYONE)) {
+                            } else if (uuidMapping.getUuid().equals(DBFunc.EVERYONE)) {
                                 TagResolver everyoneResolver = TagResolver.resolver(
                                         "info.everyone",
                                         Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(player))

Core/src/main/java/com/plotsquared/core/command/Purge.java

@@ -90,8 +90,12 @@ public class Purge extends SubCommand {
                 return false;
             }
             switch (split[0].toLowerCase()) {
-                case "world", "w" -> world = split[1];
-                case "area", "a" -> {
+                case "world":
+                case "w":
+                    world = split[1];
+                    break;
+                case "area":
+                case "a":
                     area = this.plotAreaManager.getPlotAreaByString(split[1]);
                     if (area == null) {
                         player.sendMessage(
@@ -100,8 +104,9 @@ public class Purge extends SubCommand {
                         );
                         return false;
                     }
-                }
-                case "plotid", "id" -> {
+                    break;
+                case "plotid":
+                case "id":
                     try {
                         id = PlotId.fromString(split[1]);
                     } catch (IllegalArgumentException ignored) {
@@ -111,8 +116,9 @@ public class Purge extends SubCommand {
                         );
                         return false;
                     }
-                }
-                case "owner", "o" -> {
+                    break;
+                case "owner":
+                case "o":
                     UUIDMapping ownerMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
                     if (ownerMapping == null) {
                         player.sendMessage(
@@ -121,9 +127,10 @@ public class Purge extends SubCommand {
                         );
                         return false;
                     }
-                    owner = ownerMapping.uuid();
-                }
-                case "shared", "s" -> {
+                    owner = ownerMapping.getUuid();
+                    break;
+                case "shared":
+                case "s":
                     UUIDMapping addedMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
                     if (addedMapping == null) {
                         player.sendMessage(
@@ -132,16 +139,25 @@ public class Purge extends SubCommand {
                         );
                         return false;
                     }
-                    added = addedMapping.uuid();
-                }
-                case "clear", "c", "delete", "d", "del" -> clear = Boolean.parseBoolean(split[1]);
-                case "unknown", "?", "u" -> unknown = Boolean.parseBoolean(split[1]);
-                default -> {
+                    added = addedMapping.getUuid();
+                    break;
+                case "clear":
+                case "c":
+                case "delete":
+                case "d":
+                case "del":
+                    clear = Boolean.parseBoolean(split[1]);
+                    break;
+                case "unknown":
+                case "?":
+                case "u":
+                    unknown = Boolean.parseBoolean(split[1]);
+                    break;
+                default:
                     sendUsage(player);
                     return false;
             }
         }
-        }
         final HashSet<Plot> toDelete = new HashSet<>();
         for (Plot plot : PlotQuery.newQuery().whereBasePlot()) {
             if (world != null && !plot.getWorldName().equalsIgnoreCase(world)) {
@@ -220,8 +236,9 @@ public class Purge extends SubCommand {
                             try {
                                 ids.add(plot.temp);
                                 if (finalClear) {
-                                    plot.getPlotModificationManager().clear(false, true, player,
-                                            () -> LOGGER.info("Plot {} cleared by purge", plot.getId()));
+                                    plot.getPlotModificationManager().clear(false, true, player, () -> {
+                                        LOGGER.info("Plot {} cleared by purge", plot.getId());
+                                    });
                                 } else {
                                     plot.getPlotModificationManager().removeSign();
                                 }

Core/src/main/java/com/plotsquared/core/command/Template.java

@@ -156,9 +156,9 @@ public class Template extends SubCommand {
              ZipOutputStream zos = new ZipOutputStream(fos)) {
 
             for (FileBytes file : files) {
-                ZipEntry ze = new ZipEntry(file.path());
+                ZipEntry ze = new ZipEntry(file.path);
                 zos.putNextEntry(ze);
-                zos.write(file.data());
+                zos.write(file.data);
             }
             zos.closeEntry();
         }

Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java

@@ -35,21 +35,34 @@ import java.util.Map;
  * the component GUI
  */
 @SerializableAs("preset")
-public record ComponentPreset(
-        ClassicPlotManagerComponent component,
-        String pattern,
-        double cost,
-        String permission,
-        String displayName,
-        List<String> description,
-        ItemType icon
-) implements ConfigurationSerializable {
+public class ComponentPreset implements ConfigurationSerializable {
+
+    private final ClassicPlotManagerComponent component;
+    private final String pattern;
+    private final double cost;
+    private final String permission;
+    private final String displayName;
+    private final List<String> description;
+    private final ItemType icon;
+
+    public ComponentPreset(
+            ClassicPlotManagerComponent component, String pattern, double cost,
+            String permission, String displayName, List<String> description, final ItemType icon
+    ) {
+        this.component = component;
+        this.pattern = pattern;
+        this.cost = cost;
+        this.permission = permission;
+        this.displayName = displayName;
+        this.description = description;
+        this.icon = icon;
+    }
 
     @SuppressWarnings("unchecked")
     public static ComponentPreset deserialize(final @NonNull Map<String, Object> map) {
         final ClassicPlotManagerComponent classicPlotManagerComponent = ClassicPlotManagerComponent
                 .fromString(map.getOrDefault("component", "").toString()).orElseThrow(() ->
-                        new IllegalArgumentException("The preset in components.yml needs a valid target component, got: " + map.get("component")));
+                        new IllegalArgumentException("The preset needs a valid target component"));
         final String pattern = map.getOrDefault("pattern", "").toString();
         final double cost = Double.parseDouble(map.getOrDefault("cost", "0.0").toString());
         final String permission = map.getOrDefault("permission", "").toString();
@@ -61,6 +74,34 @@ public record ComponentPreset(
         );
     }
 
+    public ClassicPlotManagerComponent getComponent() {
+        return this.component;
+    }
+
+    public String getPattern() {
+        return this.pattern;
+    }
+
+    public double getCost() {
+        return this.cost;
+    }
+
+    public String getPermission() {
+        return this.permission;
+    }
+
+    public String getDisplayName() {
+        return this.displayName;
+    }
+
+    public List<String> getDescription() {
+        return this.description;
+    }
+
+    public ItemType getIcon() {
+        return this.icon;
+    }
+
     @Override
     public Map<String, Object> serialize() {
         final Map<String, Object> map = new HashMap<>();

Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java

@@ -165,8 +165,8 @@ public class ComponentPresetManager {
 
         final List<ComponentPreset> allowedPresets = new ArrayList<>(this.presets.size());
         for (final ComponentPreset componentPreset : this.presets) {
-            if (!componentPreset.permission().isEmpty() && !player.hasPermission(
-                    componentPreset.permission()
+            if (!componentPreset.getPermission().isEmpty() && !player.hasPermission(
+                    componentPreset.getPermission()
             )) {
                 continue;
             }
@@ -200,30 +200,30 @@ public class ComponentPresetManager {
                     return false;
                 }
 
-                final Pattern pattern = PatternUtil.parse(null, componentPreset.pattern(), false);
+                final Pattern pattern = PatternUtil.parse(null, componentPreset.getPattern(), false);
                 if (pattern == null) {
                     getPlayer().sendMessage(TranslatableCaption.of("preset.preset_invalid"));
                     return false;
                 }
 
-                if (componentPreset.cost() > 0.0D) {
+                if (componentPreset.getCost() > 0.0D) {
                     if (!econHandler.isEnabled(plot.getArea())) {
                         getPlayer().sendMessage(
                                 TranslatableCaption.of("preset.economy_disabled"),
-                                TagResolver.resolver("preset", Tag.inserting(Component.text(componentPreset.displayName())))
+                                TagResolver.resolver("preset", Tag.inserting(Component.text(componentPreset.getDisplayName())))
                         );
                         return false;
                     }
-                    if (econHandler.getMoney(getPlayer()) < componentPreset.cost()) {
+                    if (econHandler.getMoney(getPlayer()) < componentPreset.getCost()) {
                         getPlayer().sendMessage(TranslatableCaption.of("preset.preset_cannot_afford"));
                         return false;
                     } else {
-                        econHandler.withdrawMoney(getPlayer(), componentPreset.cost());
+                        econHandler.withdrawMoney(getPlayer(), componentPreset.getCost());
                         getPlayer().sendMessage(
                                 TranslatableCaption.of("economy.removed_balance"),
                                 TagResolver.resolver(
                                         "money",
-                                        Tag.inserting(Component.text(econHandler.format(componentPreset.cost())))
+                                        Tag.inserting(Component.text(econHandler.format(componentPreset.getCost())))
                                 )
                         );
                     }
@@ -235,7 +235,7 @@ public class ComponentPresetManager {
                     queue.setCompleteTask(plot::removeRunning);
                     for (Plot current : plot.getConnectedPlots()) {
                         current.getPlotModificationManager().setComponent(
-                                componentPreset.component().name(),
+                                componentPreset.getComponent().name(),
                                 pattern,
                                 player,
                                 queue
@@ -252,32 +252,32 @@ public class ComponentPresetManager {
         for (int i = 0; i < allowedPresets.size(); i++) {
             final ComponentPreset preset = allowedPresets.get(i);
             final List<String> lore = new ArrayList<>();
-            if (preset.cost() > 0) {
+            if (preset.getCost() > 0) {
                 if (!this.econHandler.isEnabled(plot.getArea())) {
                     lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
                             TranslatableCaption.of("preset.preset_lore_economy_disabled").getComponent(player))));
                 } else {
                     lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
                             TranslatableCaption.of("preset.preset_lore_cost").getComponent(player),
-                            TagResolver.resolver("cost", Tag.inserting(Component.text(String.format("%.2f", preset.cost()))))
+                            TagResolver.resolver("cost", Tag.inserting(Component.text(String.format("%.2f", preset.getCost()))))
                     )));
                 }
             }
             lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
                     TranslatableCaption.of("preset.preset_lore_component").getComponent(player),
                     TagResolver.builder()
-                            .tag("component", Tag.inserting(Component.text(preset.component().name().toLowerCase())))
+                            .tag("component", Tag.inserting(Component.text(preset.getComponent().name().toLowerCase())))
                             .tag("prefix", Tag.inserting(TranslatableCaption.of("core.prefix").toComponent(player)))
                             .build()
             )));
             lore.removeIf(String::isEmpty);
-            lore.addAll(preset.description());
+            lore.addAll(preset.getDescription());
             plotInventory.setItem(
                     i,
                     new PlotItemStack(
-                            preset.icon().getId().replace("minecraft:", ""),
+                            preset.getIcon().getId().replace("minecraft:", ""),
                             1,
-                            preset.displayName(),
+                            preset.getDisplayName(),
                             lore.toArray(new String[0])
                     )
             );

Core/src/main/java/com/plotsquared/core/database/SQLManager.java

@@ -2400,13 +2400,13 @@ public class SQLManager implements AbstractDB {
                 if (plot != null) {
                     statement.setString(1, plot.getArea().toString());
                     statement.setInt(2, plot.getId().hashCode());
-                    statement.setString(3, comment.comment());
-                    statement.setString(4, comment.inbox());
-                    statement.setString(5, comment.senderName());
+                    statement.setString(3, comment.comment);
+                    statement.setString(4, comment.inbox);
+                    statement.setString(5, comment.senderName);
                 } else {
-                    statement.setString(1, comment.comment());
-                    statement.setString(2, comment.inbox());
-                    statement.setString(3, comment.senderName());
+                    statement.setString(1, comment.comment);
+                    statement.setString(2, comment.inbox);
+                    statement.setString(3, comment.senderName);
                 }
             }
 
@@ -2518,10 +2518,10 @@ public class SQLManager implements AbstractDB {
             public void set(PreparedStatement statement) throws SQLException {
                 statement.setString(1, plot.getArea().toString());
                 statement.setInt(2, plot.getId().hashCode());
-                statement.setString(3, comment.comment());
-                statement.setString(4, comment.inbox());
-                statement.setInt(5, (int) (comment.timestamp() / 1000));
-                statement.setString(6, comment.senderName());
+                statement.setString(3, comment.comment);
+                statement.setString(4, comment.inbox);
+                statement.setInt(5, (int) (comment.timestamp / 1000));
+                statement.setString(6, comment.senderName);
             }
 
             @Override
@@ -3414,10 +3414,15 @@ public class SQLManager implements AbstractDB {
         }
     }
 
-    private record LegacySettings(
-            int id,
-            PlotSettings settings
-    ) {
+    private static class LegacySettings {
+
+        public final int id;
+        public final PlotSettings settings;
+
+        public LegacySettings(int id, PlotSettings settings) {
+            this.id = id;
+            this.settings = settings;
+        }
 
     }
 

Core/src/main/java/com/plotsquared/core/events/EntityEvent.java

@@ -1,63 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.events;
-
-import com.sk89q.worldedit.entity.Entity;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-/**
- * @since TODO
- */
-public abstract class EntityEvent {
-
-    private final Entity entity;
-
-    private String name;
-
-    /**
-     * @since 6.11.0
-     */
-    public EntityEvent(Entity entity) {
-        this.entity = entity;
-    }
-
-    /**
-     * Obtain the entity involved in the event
-     *
-     * @return Entity
-     * @since 6.11.0
-     */
-    public Entity getEntity() {
-        return this.entity;
-    }
-
-    /**
-     * Obtain the event's class name
-     *
-     * @return the event class name
-     * @since 6.11.0
-     */
-    @NonNull public String getEventName() {
-        if (this.name == null) {
-            this.name = this.getClass().getSimpleName();
-        }
-        return this.name;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/events/RemoveRoadEntityEvent.java

@@ -1,50 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.events;
-
-import com.sk89q.worldedit.entity.Entity;
-
-/**
- * @since 6.11.0
- */
-public class RemoveRoadEntityEvent extends EntityEvent implements CancellablePlotEvent {
-
-    private Result eventResult;
-
-    /**
-     * RemoveRoadEntityEvent: Called when an entity on road is removed.
-     *
-     * @param entity The entity to remove
-     * @since 6.11.0
-     */
-    public RemoveRoadEntityEvent(Entity entity) {
-        super(entity);
-    }
-
-    @Override
-    public Result getEventResult() {
-        return this.eventResult;
-    }
-
-    @Override
-    public void setEventResult(Result eventResult) {
-        this.eventResult = eventResult;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java

@@ -185,39 +185,31 @@ public abstract class SquarePlotManager extends GridPlotManager {
                 return null;
             }
             switch (hash) {
-                case 8 -> {
+                case 8:
                     // north
                     return plot.isMerged(Direction.NORTH) ? id : null;
-                }
-                case 4 -> {
+                case 4:
                     // east
                     return plot.isMerged(Direction.EAST) ? id : null;
-                }
-                case 2 -> {
+                case 2:
                     // south
                     return plot.isMerged(Direction.SOUTH) ? id : null;
-                }
-                case 1 -> {
+                case 1:
                     // west
                     return plot.isMerged(Direction.WEST) ? id : null;
-                }
-                case 12 -> {
+                case 12:
                     // northeast
                     return plot.isMerged(Direction.NORTHEAST) ? id : null;
-                }
-                case 6 -> {
+                case 6:
                     // southeast
                     return plot.isMerged(Direction.SOUTHEAST) ? id : null;
-                }
-                case 3 -> {
+                case 3:
                     // southwest
                     return plot.isMerged(Direction.SOUTHWEST) ? id : null;
-                }
-                case 9 -> {
+                case 9:
                     // northwest
                     return plot.isMerged(Direction.NORTHWEST) ? id : null;
             }
-            }
         } catch (Exception ignored) {
             LOGGER.error("Invalid plot / road width in settings.yml for world: {}", squarePlotWorld.getWorldName());
         }

Core/src/main/java/com/plotsquared/core/listener/PlotListener.java

@@ -341,14 +341,14 @@ public class PlotListener {
             }
 
             TimedFlag.Timed<Integer> feed = plot.getFlag(FeedFlag.class);
-            if (feed.interval() != 0 && feed.value() != 0) {
+            if (feed.getInterval() != 0 && feed.getValue() != 0) {
                 feedRunnable
-                        .put(player.getUUID(), new Interval(feed.interval(), feed.value(), 20));
+                        .put(player.getUUID(), new Interval(feed.getInterval(), feed.getValue(), 20));
             }
             TimedFlag.Timed<Integer> heal = plot.getFlag(HealFlag.class);
-            if (heal.interval() != 0 && heal.value() != 0) {
+            if (heal.getInterval() != 0 && heal.getValue() != 0) {
                 healRunnable
-                        .put(player.getUUID(), new Interval(heal.interval(), heal.value(), 20));
+                        .put(player.getUUID(), new Interval(heal.getInterval(), heal.getValue(), 20));
             }
             return true;
         }

Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java

@@ -21,11 +21,17 @@ package com.plotsquared.core.location;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.StringMan;
 
-public record ChunkWrapper(
-        String world,
-        int x,
-        int z
-) {
+public class ChunkWrapper {
+
+    public final int x;
+    public final int z;
+    public final String world;
+
+    public ChunkWrapper(String world, int x, int z) {
+        this.world = world;
+        this.x = x;
+        this.z = z;
+    }
 
     @Override
     public int hashCode() {

Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java

@@ -215,11 +215,17 @@ public final class BlockBucket implements ConfigurationSerializable {
         return result;
     }
 
-    private record Range(
-            int min,
-            int max,
-            boolean automatic
-    ) {
+    private static final class Range {
+
+        private final int min;
+        private final int max;
+        private final boolean automatic;
+
+        public Range(int min, int max, boolean automatic) {
+            this.min = min;
+            this.max = max;
+            this.automatic = automatic;
+        }
 
         public int getWeight() {
             return max - min;
@@ -229,6 +235,46 @@ public final class BlockBucket implements ConfigurationSerializable {
             return num <= max && num >= min;
         }
 
+        public int getMin() {
+            return this.min;
+        }
+
+        public int getMax() {
+            return this.max;
+        }
+
+        public boolean equals(final Object o) {
+            if (o == this) {
+                return true;
+            }
+            if (!(o instanceof final Range other)) {
+                return false;
+            }
+            if (this.getMin() != other.getMin()) {
+                return false;
+            }
+            if (this.getMax() != other.getMax()) {
+                return false;
+            }
+            if (this.isAutomatic() != other.isAutomatic()) {
+                return false;
+            }
+            return true;
+        }
+
+        public int hashCode() {
+            final int PRIME = 59;
+            int result = 1;
+            result = result * PRIME + this.getMin();
+            result = result * PRIME + this.getMax();
+            result = result * PRIME + (this.isAutomatic() ? 79 : 97);
+            return result;
+        }
+
+        public boolean isAutomatic() {
+            return this.automatic;
+        }
+
     }
 
 }

Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java

@@ -222,6 +222,17 @@ public final class PlotModificationManager {
         if (isDelete) {
             this.removeSign();
         }
+        PlotUnlinkEvent event = PlotSquared.get().getEventDispatcher()
+                .callUnlink(
+                        this.plot.getArea(),
+                        this.plot,
+                        true,
+                        !isDelete,
+                        isDelete ? PlotUnlinkEvent.REASON.DELETE : PlotUnlinkEvent.REASON.CLEAR
+                );
+        if (event.getEventResult() != Result.DENY && this.unlinkPlot(event.isCreateRoad(), event.isCreateSign())) {
+            PlotSquared.get().getEventDispatcher().callPostUnlink(plot, event.getReason());
+        }
         final PlotManager manager = this.plot.getArea().getPlotManager();
         Runnable run = new Runnable() {
             @Override
@@ -272,21 +283,7 @@ public final class PlotModificationManager {
                 manager.clearPlot(current, this, actor, null);
             }
         };
-        PlotUnlinkEvent event = PlotSquared.get().getEventDispatcher()
-                .callUnlink(
-                        this.plot.getArea(),
-                        this.plot,
-                        true,
-                        !isDelete,
-                        isDelete ? PlotUnlinkEvent.REASON.DELETE : PlotUnlinkEvent.REASON.CLEAR
-                );
-        if (event.getEventResult() != Result.DENY) {
-            if (this.unlinkPlot(event.isCreateRoad(), event.isCreateSign(), run)) {
-                PlotSquared.get().getEventDispatcher().callPostUnlink(plot, event.getReason());
-            }
-        } else {
         run.run();
-        }
         return true;
     }
 
@@ -326,23 +323,7 @@ public final class PlotModificationManager {
      * @return success/!cancelled
      */
     public boolean unlinkPlot(final boolean createRoad, final boolean createSign) {
-        return unlinkPlot(createRoad, createSign, null);
-    }
-
-    /**
-     * Unlink the plot and all connected plots.
-     *
-     * @param createRoad whether to recreate road
-     * @param createSign whether to recreate signs
-     * @param whenDone   Task to run when unlink is complete
-     * @return success/!cancelled
-     * @since 6.10.9
-     */
-    public boolean unlinkPlot(final boolean createRoad, final boolean createSign, final Runnable whenDone) {
         if (!this.plot.isMerged()) {
-            if (whenDone != null) {
-                whenDone.run();
-            }
             return false;
         }
         final Set<Plot> plots = this.plot.getConnectedPlots();
@@ -387,17 +368,14 @@ public final class PlotModificationManager {
                     current.getPlotModificationManager().setSign(PlayerManager.resolveName(current.getOwnerAbs()).getComponent(
                             LocaleHolder.console()));
                 }
-                if (whenDone != null) {
-                    TaskManager.runTask(whenDone);
-                }
             }));
-        } else if (whenDone != null) {
-            queue.setCompleteTask(whenDone);
         }
         if (createRoad) {
             manager.finishPlotUnlink(ids, queue);
         }
+        if (queue != null) {
             queue.enqueue();
+        }
         return true;
     }
 

Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java

@@ -113,12 +113,13 @@ public class PlotSettings {
         this.position = position;
     }
 
+    @SuppressWarnings({"UnstableApiUsage"})
     public List<PlotComment> getComments(String inbox) {
         if (this.comments == null) {
             return Collections.emptyList();
         }
 
-        return this.comments.stream().filter(comment -> comment.inbox().equals(inbox))
+        return this.comments.stream().filter(comment -> comment.inbox.equals(inbox))
                 .collect(ImmutableList.toImmutableList());
     }
 

Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java

@@ -58,7 +58,7 @@ public class CommentManager {
                         if (value != null) {
                             int num = 0;
                             for (PlotComment comment : value) {
-                                if (comment.timestamp() > getTimestamp(player, inbox.toString())) {
+                                if (comment.timestamp > getTimestamp(player, inbox.toString())) {
                                     num++;
                                 }
                             }

Core/src/main/java/com/plotsquared/core/plot/comment/PlotComment.java

@@ -20,13 +20,25 @@ package com.plotsquared.core.plot.comment;
 
 import com.plotsquared.core.plot.PlotId;
 
-public record PlotComment(
-        String world,
-        PlotId id,
-        String comment,
-        String senderName,
-        String inbox,
+public class PlotComment {
+
+    public final String comment;
+    public final String inbox;
+    public final String senderName;
+    public final PlotId id;
+    public final String world;
+    public final long timestamp;
+
+    public PlotComment(
+            String world, PlotId id, String comment, String senderName, String inbox,
             long timestamp
     ) {
+        this.world = world;
+        this.id = id;
+        this.comment = comment;
+        this.senderName = senderName;
+        this.inbox = inbox;
+        this.timestamp = timestamp;
+    }
 
 }

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java

@@ -57,16 +57,25 @@ public class DenyTeleportFlag extends PlotFlag<DenyTeleportFlag.DeniedGroup, Den
         }
         final boolean result;
         switch (value) {
-            case TRUSTED -> result = !plot.getTrusted().contains(player.getUUID());
-            case MEMBERS -> result = !plot.getMembers().contains(player.getUUID());
-            case NONMEMBERS -> result = plot.isAdded(player.getUUID());
-            case NONTRUSTED -> result =
+            case TRUSTED:
+                result = !plot.getTrusted().contains(player.getUUID());
+                break;
+            case MEMBERS:
+                result = !plot.getMembers().contains(player.getUUID());
+                break;
+            case NONMEMBERS:
+                result = plot.isAdded(player.getUUID());
+                break;
+            case NONTRUSTED:
+                result =
                         plot.getTrusted().contains(player.getUUID()) || plot.isOwner(player.getUUID());
-            case NONOWNERS -> result = plot.isOwner(player.getUUID());
-            default -> {
+                break;
+            case NONOWNERS:
+                result = plot.isOwner(player.getUUID());
+                break;
+            default:
                 return true;
         }
-        }
         return result || player.hasPermission("plots.admin.entry.denied");
     }
 

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FeedFlag.java

@@ -60,7 +60,7 @@ public class FeedFlag extends TimedFlag<Integer, FeedFlag> {
 
     @Override
     protected Integer mergeValue(Integer other) {
-        return this.getValue().value() + other;
+        return this.getValue().getValue() + other;
     }
 
     @Override

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java

@@ -68,11 +68,14 @@ public class FlyFlag extends PlotFlag<FlyFlag.FlyStatus, FlyFlag> {
 
     @Override
     protected FlyFlag flagOf(final @NonNull FlyStatus value) {
-        return switch (value) {
-            case ENABLED -> FLIGHT_FLAG_ENABLED;
-            case DISABLED -> FLIGHT_FLAG_DISABLED;
-            default -> FLIGHT_FLAG_DEFAULT;
-        };
+        switch (value) {
+            case ENABLED:
+                return FLIGHT_FLAG_ENABLED;
+            case DISABLED:
+                return FLIGHT_FLAG_DISABLED;
+            default:
+                return FLIGHT_FLAG_DEFAULT;
+        }
     }
 
     @Override

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HealFlag.java

@@ -60,7 +60,7 @@ public class HealFlag extends TimedFlag<Integer, HealFlag> {
 
     @Override
     protected Integer mergeValue(Integer other) {
-        return this.getValue().value() + other;
+        return this.getValue().getValue() + other;
     }
 
     @Override

Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java

@@ -76,10 +76,23 @@ public abstract class TimedFlag<T, F extends PlotFlag<TimedFlag.Timed<T>, F>>
         return getValue().toString();
     }
 
-    public record Timed<T>(
-            int interval,
-            T value
-    ) {
+    public static final class Timed<T> {
+
+        private final int interval;
+        private final T value;
+
+        public Timed(int interval, T value) {
+            this.interval = interval;
+            this.value = value;
+        }
+
+        public int getInterval() {
+            return interval;
+        }
+
+        public T getValue() {
+            return value;
+        }
 
         @Override
         public String toString() {

Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java

@@ -203,7 +203,7 @@ public abstract class QueueCoordinator {
      * @return success or not
      * @deprecated Biomes now take XYZ, see {@link #setBiome(int, int, int, BiomeType)}
      *         <br>
-     *         Scheduled for removal once we drop the support for versions not supporting 3D biomes, 1.18 and earlier.
+     *         Scheduled for removal once we drop the support for versions not supporting 3D biomes.
      */
     @Deprecated(forRemoval = true, since = "6.0.0")
     public abstract boolean setBiome(int x, int z, @NonNull BiomeType biome);

Core/src/main/java/com/plotsquared/core/queue/subscriber/DefaultProgressSubscriber.java

@@ -36,7 +36,6 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import javax.annotation.Nullable;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -93,7 +92,11 @@ public class DefaultProgressSubscriber implements ProgressSubscriber {
         this.actor = actor;
         this.interval = TaskTime.ms(interval);
         this.wait = TaskTime.ms(wait);
-        this.caption = Objects.requireNonNullElseGet(caption, () -> TranslatableCaption.of("working.progress"));
+        if (caption == null) {
+            this.caption = TranslatableCaption.of("working.progress");
+        } else {
+            this.caption = caption;
+        }
     }
 
     @Override

Core/src/main/java/com/plotsquared/core/services/plots/AutoQuery.java

@@ -1,94 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.services.plots;
-
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.plot.PlotId;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-/**
- * Crate a new auto query
- *
- * @param player   Player to claim for
- * @param startId  Plot ID to start searching from
- * @param sizeX    Number of plots along the X axis
- * @param sizeZ    Number of plots along the Z axis
- * @param plotArea Plot area to search in
- */
-public record AutoQuery(
-        @NonNull PlotPlayer<?> player,
-        @Nullable PlotId startId,
-        int sizeX,
-        int sizeZ,
-        @NonNull PlotArea plotArea
-) {
-
-    /**
-     * Get the player that the plots are meant for
-     *
-     * @return Player
-     */
-    @Override
-    public @NonNull PlotPlayer<?> player() {
-        return this.player;
-    }
-
-    /**
-     * Get the plot ID to start searching from
-     *
-     * @return Start ID
-     */
-    @Override
-    public @Nullable PlotId startId() {
-        return this.startId;
-    }
-
-    /**
-     * Get the number of plots along the X axis
-     *
-     * @return Number of plots along the X axis
-     */
-    @Override
-    public int sizeX() {
-        return this.sizeX;
-    }
-
-    /**
-     * Get the number of plots along the Z axis
-     *
-     * @return Number of plots along the Z axis
-     */
-    @Override
-    public int sizeZ() {
-        return this.sizeZ;
-    }
-
-    /**
-     * Get the plot area to search in
-     *
-     * @return Plot area
-     */
-    @Override
-    public @NonNull PlotArea plotArea() {
-        return this.plotArea;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/services/plots/AutoService.java

@@ -21,7 +21,9 @@ package com.plotsquared.core.services.plots;
 import cloud.commandframework.services.types.Service;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotAreaType;
 import com.plotsquared.core.plot.PlotId;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -32,12 +34,88 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 
-public interface AutoService extends Service<AutoQuery, List<Plot>> {
+public interface AutoService extends Service<AutoService.AutoQuery, List<Plot>> {
 
     Cache<PlotId, Plot> plotCandidateCache = CacheBuilder.newBuilder()
             .expireAfterWrite(20, TimeUnit.SECONDS).build();
     Object plotLock = new Object();
 
+    final class AutoQuery {
+
+        private final PlotPlayer<?> player;
+        private final PlotId startId;
+        private final int sizeX;
+        private final int sizeZ;
+        private final PlotArea plotArea;
+
+        /**
+         * Crate a new auto query
+         *
+         * @param player   Player to claim for
+         * @param startId  Plot ID to start searching from
+         * @param sizeX    Number of plots along the X axis
+         * @param sizeZ    Number of plots along the Z axis
+         * @param plotArea Plot area to search in
+         */
+        public AutoQuery(
+                final @NonNull PlotPlayer<?> player, final @Nullable PlotId startId,
+                final int sizeX, final int sizeZ, final @NonNull PlotArea plotArea
+        ) {
+            this.player = player;
+            this.startId = startId;
+            this.sizeX = sizeX;
+            this.sizeZ = sizeZ;
+            this.plotArea = plotArea;
+        }
+
+        /**
+         * Get the player that the plots are meant for
+         *
+         * @return Player
+         */
+        public @NonNull PlotPlayer<?> getPlayer() {
+            return this.player;
+        }
+
+        /**
+         * Get the plot ID to start searching from
+         *
+         * @return Start ID
+         */
+        public @Nullable PlotId getStartId() {
+            return this.startId;
+        }
+
+        /**
+         * Get the number of plots along the X axis
+         *
+         * @return Number of plots along the X axis
+         */
+        public int getSizeX() {
+            return this.sizeX;
+        }
+
+        /**
+         * Get the number of plots along the Z axis
+         *
+         * @return Number of plots along the Z axis
+         */
+        public int getSizeZ() {
+            return this.sizeZ;
+        }
+
+        /**
+         * Get the plot area to search in
+         *
+         * @return Plot area
+         */
+        public @NonNull PlotArea getPlotArea() {
+            return this.plotArea;
+        }
+
+    }
+
+
     final class DefaultAutoService implements AutoService {
 
         @Override
@@ -47,16 +125,17 @@ public interface AutoService extends Service<AutoQuery, List<Plot>> {
 
     }
 
+
     final class SinglePlotService implements AutoService, Predicate<AutoQuery> {
 
         @Nullable
         @Override
         public List<Plot> handle(@NonNull AutoQuery autoQuery) {
             Plot plot;
-            PlotId nextId = autoQuery.startId();
+            PlotId nextId = autoQuery.getStartId();
             do {
                 synchronized (plotLock) {
-                    plot = autoQuery.plotArea().getNextFreePlot(autoQuery.player(), nextId);
+                    plot = autoQuery.getPlotArea().getNextFreePlot(autoQuery.getPlayer(), nextId);
                     if (plot != null && plotCandidateCache.getIfPresent(plot.getId()) == null) {
                         plotCandidateCache.put(plot.getId(), plot);
                         return Collections.singletonList(plot);
@@ -72,11 +151,12 @@ public interface AutoService extends Service<AutoQuery, List<Plot>> {
 
         @Override
         public boolean test(final @NonNull AutoQuery autoQuery) {
-            return autoQuery.sizeX() == 1 && autoQuery.sizeZ() == 1;
+            return autoQuery.sizeX == 1 && autoQuery.sizeZ == 1;
         }
 
     }
 
+
     final class MultiPlotService implements AutoService, Predicate<AutoQuery> {
 
         @Override
@@ -86,14 +166,14 @@ public interface AutoService extends Service<AutoQuery, List<Plot>> {
             while (true) {
                 synchronized (plotLock) {
                     final PlotId start =
-                            autoQuery.plotArea().getMeta("lastPlot", PlotId.of(0, 0)).getNextId();
+                            autoQuery.getPlotArea().getMeta("lastPlot", PlotId.of(0, 0)).getNextId();
                     final PlotId end = PlotId.of(
-                            start.getX() + autoQuery.sizeX() - 1,
-                            start.getY() + autoQuery.sizeZ() - 1
+                            start.getX() + autoQuery.getSizeX() - 1,
+                            start.getY() + autoQuery.getSizeZ() - 1
                     );
                     final List<Plot> plots =
-                            autoQuery.plotArea().canClaim(autoQuery.player(), start, end);
-                    autoQuery.plotArea().setMeta("lastPlot", start); // set entry point for next try
+                            autoQuery.getPlotArea().canClaim(autoQuery.getPlayer(), start, end);
+                    autoQuery.getPlotArea().setMeta("lastPlot", start); // set entry point for next try
                     if (plots != null && !plots.isEmpty()) {
                         for (final Plot plot : plots) {
                             if (plotCandidateCache.getIfPresent(plot.getId()) != null) {
@@ -109,7 +189,7 @@ public interface AutoService extends Service<AutoQuery, List<Plot>> {
 
         @Override
         public boolean test(final @NonNull AutoQuery autoQuery) {
-            return autoQuery.plotArea().getType() != PlotAreaType.PARTIAL;
+            return autoQuery.getPlotArea().getType() != PlotAreaType.PARTIAL;
         }
 
     }

Core/src/main/java/com/plotsquared/core/setup/SettingsNodeStep.java

@@ -48,10 +48,10 @@ public class SettingsNodeStep implements SetupStep {
     ) {
         this.configurationNode = configurationNode;
         this.id = id;
-        if (wrapper.settingsNodes().length > id + 1) {
-            this.next = new SettingsNodeStep(wrapper.settingsNodes()[id + 1], id + 1, wrapper);
+        if (wrapper.getSettingsNodes().length > id + 1) {
+            this.next = new SettingsNodeStep(wrapper.getSettingsNodes()[id + 1], id + 1, wrapper);
         } else {
-            this.next = wrapper.afterwards();
+            this.next = wrapper.getAfterwards();
         }
     }
 

Core/src/main/java/com/plotsquared/core/setup/SettingsNodesWrapper.java

@@ -23,10 +23,15 @@ import com.plotsquared.core.configuration.ConfigurationNode;
 /**
  * This class wraps an array of {@link ConfigurationNode}s.
  */
-public record SettingsNodesWrapper(
-        ConfigurationNode[] settingsNodes,
-        SetupStep afterwards
-) {
+public class SettingsNodesWrapper {
+
+    private final ConfigurationNode[] settingsNodes;
+    private final SetupStep afterwards;
+
+    public SettingsNodesWrapper(final ConfigurationNode[] settingsNodes, final SetupStep afterwards) {
+        this.settingsNodes = settingsNodes;
+        this.afterwards = afterwards;
+    }
 
     /**
      * Returns the first step of this wrapper or the step or the
@@ -38,4 +43,12 @@ public record SettingsNodesWrapper(
         return this.settingsNodes.length == 0 ? this.afterwards : new SettingsNodeStep(this.settingsNodes[0], 0, this);
     }
 
+    public ConfigurationNode[] getSettingsNodes() {
+        return this.settingsNodes;
+    }
+
+    public SetupStep getAfterwards() {
+        return this.afterwards;
+    }
+
 }

Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java

@@ -45,7 +45,6 @@ import com.plotsquared.core.events.PlotFlagRemoveEvent;
 import com.plotsquared.core.events.PlotMergeEvent;
 import com.plotsquared.core.events.PlotRateEvent;
 import com.plotsquared.core.events.PlotUnlinkEvent;
-import com.plotsquared.core.events.RemoveRoadEntityEvent;
 import com.plotsquared.core.events.TeleportCause;
 import com.plotsquared.core.events.post.PostPlayerAutoPlotEvent;
 import com.plotsquared.core.events.post.PostPlotChangeOwnerEvent;
@@ -72,7 +71,6 @@ import com.plotsquared.core.plot.flag.types.BlockTypeWrapper;
 import com.plotsquared.core.plot.world.SinglePlotArea;
 import com.plotsquared.core.util.task.TaskManager;
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
@@ -300,12 +298,6 @@ public class EventDispatcher {
         return event;
     }
 
-    public RemoveRoadEntityEvent callRemoveRoadEntity(Entity entity) {
-        RemoveRoadEntityEvent event = new RemoveRoadEntityEvent(entity);
-        eventBus.post(event);
-        return event;
-    }
-
     public void doJoinTask(final PlotPlayer<?> player) {
         if (player == null) {
             return; //possible future warning message to figure out where we are retrieving null
@@ -359,13 +351,11 @@ public class EventDispatcher {
             }
         }
         switch (type) {
-            case TELEPORT_OBJECT -> {
+            case TELEPORT_OBJECT:
                 return false;
-            }
-            case READ -> {
+            case READ:
                 return true;
-            }
-            case INTERACT_BLOCK -> {
+            case INTERACT_BLOCK: {
                 if (plot == null) {
                     final List<BlockTypeWrapper> use = area.getRoadFlag(UseFlag.class);
                     for (final BlockTypeWrapper blockTypeWrapper : use) {
@@ -400,7 +390,7 @@ public class EventDispatcher {
                 }
                 return false;
             }
-            case TRIGGER_PHYSICAL -> {
+            case TRIGGER_PHYSICAL: {
                 if (plot == null) {
                     final List<BlockTypeWrapper> use = area.getRoadFlag(UseFlag.class);
                     for (final BlockTypeWrapper blockTypeWrapper : use) {
@@ -432,7 +422,7 @@ public class EventDispatcher {
                         false
                 );
             }
-            case SPAWN_MOB -> {
+            case SPAWN_MOB: {
                 if (plot == null) {
                     return player.hasPermission(
                             Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
@@ -474,7 +464,7 @@ public class EventDispatcher {
                 }
                 return false;
             }
-            case PLACE_MISC -> {
+            case PLACE_MISC: {
                 if (plot == null) {
                     return player.hasPermission(
                             Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
@@ -516,7 +506,7 @@ public class EventDispatcher {
                 }
                 return false;
             }
-            case PLACE_VEHICLE -> {
+            case PLACE_VEHICLE:
                 if (plot == null) {
                     return player.hasPermission(
                             Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
@@ -528,9 +518,8 @@ public class EventDispatcher {
                     );
                 }
                 return plot.getFlag(VehiclePlaceFlag.class);
-            }
-            default -> {
-            }
+            default:
+                break;
         }
         return true;
     }

Core/src/main/java/com/plotsquared/core/util/FileBytes.java

@@ -18,9 +18,14 @@
  */
 package com.plotsquared.core.util;
 
-public record FileBytes(
-        String path,
-        byte[] data
-) {
+public class FileBytes {
+
+    public final String path;
+    public final byte[] data;
+
+    public FileBytes(String path, byte[] data) {
+        this.path = path;
+        this.data = data;
+    }
 
 }

Core/src/main/java/com/plotsquared/core/util/PlayerManager.java

@@ -98,7 +98,7 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
                             consumer.accept(null, throwable);
                         } else {
                             for (final UUIDMapping uuid : uuids) {
-                                result.add(uuid.uuid());
+                                result.add(uuid.getUuid());
                             }
                             consumer.accept(result, null);
                         }
@@ -136,7 +136,7 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
         try {
             for (final UUIDMapping mapping : PlotSquared.get().getImpromptuUUIDPipeline()
                     .getNames(players).get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS)) {
-                users.add(Component.text(mapping.username()));
+                users.add(Component.text(mapping.getUsername()));
             }
         } catch (final Exception e) {
             e.printStackTrace();
@@ -200,7 +200,7 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
             final UUIDMapping uuidMapping =
                     PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(owner);
             if (uuidMapping != null) {
-                name = uuidMapping.username();
+                name = uuidMapping.getUsername();
             } else {
                 name = null;
             }

Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java

@@ -491,10 +491,6 @@ public abstract class SchematicHandler {
         return null;
     }
 
-    /**
-     * The legacy web interface is deprecated for removal in favor of Arkitektonika.
-     */
-    @Deprecated(forRemoval = true, since = "6.11.0")
     public List<String> getSaves(UUID uuid) {
         String rawJSON;
         try {

Core/src/main/java/com/plotsquared/core/util/TabCompletions.java

@@ -238,8 +238,8 @@ public final class TabCompletions {
                         PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately();
                 players = new ArrayList<>(mappings.size());
                 for (final UUIDMapping mapping : mappings) {
-                    if (uuidFilter.test(mapping.uuid())) {
-                        players.add(mapping.username());
+                    if (uuidFilter.test(mapping.getUuid())) {
+                        players.add(mapping.getUsername());
                     }
                 }
                 cachedCompletionValues.put(cacheIdentifier, players);

Core/src/main/java/com/plotsquared/core/util/WorldUtil.java

@@ -231,10 +231,6 @@ public abstract class WorldUtil {
      */
     public abstract void refreshChunk(int x, int z, String world);
 
-    /**
-     * The legacy web interface is deprecated for removal in favor of Arkitektonika.
-     */
-    @Deprecated(forRemoval = true, since = "6.11.0")
     public void upload(
             final @NonNull Plot plot,
             final @Nullable UUID uuid,

Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java

@@ -300,9 +300,17 @@ public final class PlaceholderRegistry {
     /**
      * Event called when a new {@link Placeholder} has been added
      */
-    public record PlaceholderAddedEvent(
-            Placeholder placeholder
-    ) {
+    public static class PlaceholderAddedEvent {
+
+        private final Placeholder placeholder;
+
+        public PlaceholderAddedEvent(Placeholder placeholder) {
+            this.placeholder = placeholder;
+        }
+
+        public Placeholder getPlaceholder() {
+            return this.placeholder;
+        }
 
     }
 

Core/src/main/java/com/plotsquared/core/uuid/CacheUUIDService.java

@@ -67,8 +67,8 @@ public class CacheUUIDService implements UUIDService, Consumer<List<UUIDMapping>
     @Override
     public void accept(final @NonNull List<@NonNull UUIDMapping> uuidMappings) {
         for (final UUIDMapping mapping : uuidMappings) {
-            this.uuidCache.put(mapping.uuid(), mapping);
-            this.usernameCache.put(mapping.username(), mapping);
+            this.uuidCache.put(mapping.getUuid(), mapping);
+            this.usernameCache.put(mapping.getUsername(), mapping);
         }
     }
 

Core/src/main/java/com/plotsquared/core/uuid/UUIDMapping.java

@@ -20,14 +20,45 @@ package com.plotsquared.core.uuid;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 
+import java.util.Objects;
 import java.util.UUID;
 
 /**
  * A pair consisting of a UUID and a username
  */
-public record UUIDMapping(
-        @NonNull UUID uuid,
-        @NonNull String username
-) {
+public class UUIDMapping {
+
+    private final UUID uuid;
+    private final String username;
+
+    public UUIDMapping(final @NonNull UUID uuid, final @NonNull String username) {
+        this.uuid = uuid;
+        this.username = username;
+    }
+
+    public @NonNull String getUsername() {
+        return this.username;
+    }
+
+    public @NonNull UUID getUuid() {
+        return this.uuid;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final UUIDMapping that = (UUIDMapping) o;
+        return uuid.equals(that.uuid) && username.equals(that.username);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(uuid, username);
+    }
 
 }

Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java

@@ -157,7 +157,7 @@ public class UUIDPipeline {
                     TimeUnit.MILLISECONDS
             );
             if (mappings.size() == 1) {
-                return mappings.get(0).uuid();
+                return mappings.get(0).getUuid();
             }
         } catch (InterruptedException | ExecutionException e) {
             e.printStackTrace();
@@ -182,7 +182,7 @@ public class UUIDPipeline {
         try {
             final List<UUIDMapping> mappings = this.getNames(Collections.singletonList(uuid)).get(timeout, TimeUnit.MILLISECONDS);
             if (mappings.size() == 1) {
-                return mappings.get(0).username();
+                return mappings.get(0).getUsername();
             }
         } catch (InterruptedException | ExecutionException e) {
             e.printStackTrace();
@@ -209,7 +209,7 @@ public class UUIDPipeline {
                         uuid.accept(null, throwable);
                     } else {
                         if (!uuids.isEmpty()) {
-                            uuid.accept(uuids.get(0).uuid(), null);
+                            uuid.accept(uuids.get(0).getUuid(), null);
                         } else {
                             uuid.accept(null, null);
                         }
@@ -231,7 +231,7 @@ public class UUIDPipeline {
                         username.accept(null, throwable);
                     } else {
                         if (!uuids.isEmpty()) {
-                            username.accept(uuids.get(0).username(), null);
+                            username.accept(uuids.get(0).getUsername(), null);
                         } else {
                             username.accept(null, null);
                         }
@@ -296,7 +296,7 @@ public class UUIDPipeline {
             if (service.canBeSynchronous()) {
                 final List<UUIDMapping> completedRequests = service.getNames(remainingRequests);
                 for (final UUIDMapping mapping : completedRequests) {
-                    remainingRequests.remove(mapping.uuid());
+                    remainingRequests.remove(mapping.getUuid());
                 }
                 mappings.addAll(completedRequests);
             } else {
@@ -311,7 +311,7 @@ public class UUIDPipeline {
             for (final UUIDService service : serviceList) {
                 final List<UUIDMapping> completedRequests = service.getNames(remainingRequests);
                 for (final UUIDMapping mapping : completedRequests) {
-                    remainingRequests.remove(mapping.uuid());
+                    remainingRequests.remove(mapping.getUuid());
                 }
                 mappings.addAll(completedRequests);
                 if (remainingRequests.isEmpty()) {
@@ -365,7 +365,7 @@ public class UUIDPipeline {
             if (service.canBeSynchronous()) {
                 final List<UUIDMapping> completedRequests = service.getUUIDs(remainingRequests);
                 for (final UUIDMapping mapping : completedRequests) {
-                    remainingRequests.remove(mapping.username());
+                    remainingRequests.remove(mapping.getUsername());
                 }
                 mappings.addAll(completedRequests);
             } else {
@@ -380,7 +380,7 @@ public class UUIDPipeline {
             for (final UUIDService service : serviceList) {
                 final List<UUIDMapping> completedRequests = service.getUUIDs(remainingRequests);
                 for (final UUIDMapping mapping : completedRequests) {
-                    remainingRequests.remove(mapping.username());
+                    remainingRequests.remove(mapping.getUsername());
                 }
                 mappings.addAll(completedRequests);
                 if (remainingRequests.isEmpty()) {

build.gradle.kts

@@ -74,7 +74,7 @@ subprojects {
     }
 
     dependencies {
-        implementation(platform("com.intellectualsites.bom:bom-newest:1.24"))
+        implementation(platform("com.intellectualsites.bom:bom-newest:1.22"))
     }
 
     dependencies {
@@ -155,7 +155,7 @@ subprojects {
                             id.set("NotMyFault")
                             name.set("Alexander Brandes")
                             organization.set("IntellectualSites")
-                            email.set("contact(at)notmyfault.dev")
+                            email.set("contact@notmyfault.dev")
                         }
                         developer {
                             id.set("SirYwell")

gradle/libs.versions.toml

@@ -11,17 +11,17 @@ essentialsx = "2.19.7"
 mvdwapi = "3.1.1"
 
 # Third party
-prtree = "2.0.1"
+prtree = "2.0.0"
 aopalliance = "1.0"
-cloud-services = "1.8.2"
-arkitektonika = "2.1.2"
+cloud-services = "1.8.0"
+arkitektonika = "2.1.1"
 squirrelid = "0.3.1"
 
 # Gradle plugins
 shadow = "7.1.2"
 grgit = "4.1.1"
-spotless = "6.16.0"
-nexus = "1.2.0"
+spotless = "6.13.0"
+nexus = "1.1.0"
 
 [libraries]
 # Platform expectations

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

renovate.json

@@ -4,7 +4,6 @@
     "config:base",
     ":semanticCommitsDisabled"
   ],
-  "labels": ["dependencies"],
-  "rebaseWhen": "conflicted",
-  "schedule": ["on the first day of the week"]
+  "labels": ["Renovate"],
+  "rebaseWhen": "conflicted"
 }