Migrate config .github/renovate.json

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,7 +27,6 @@ body:
       description: Which server version are you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
-        - '1.21.4'
         - '1.21.3'
         - '1.21.1'
         - '1.20.6'

.github/workflows/build.yml

@@ -29,18 +29,18 @@ jobs:
           fi
       - name: Publish Release
         if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
-        run: ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
+        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
         env:
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
       - name: Publish Snapshot
         if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-        run: ./gradlew publishAllPublicationsToMavenCentralRepository
+        run: ./gradlew publishToSonatype
         env:
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
       - name: Publish core javadoc
         if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
         uses: cpina/github-action-push-to-another-repository@main

.github/workflows/label-merge-conflicts.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Label conflicting PRs
-        uses: eps1lon/actions-label-merge-conflict@v3.0.3
+        uses: eps1lon/actions-label-merge-conflict@v3.0.2
         with:
           dirtyLabel: "unresolved-merge-conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

Bukkit/build.gradle.kts

@@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 repositories {
     maven {
         name = "PlaceholderAPI"
-        url = uri("https://repo.extendedclip.com/releases/")
+        url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/")
     }
 
     maven {
@@ -39,9 +39,7 @@ dependencies {
     }
     compileOnly(libs.placeholderapi)
     compileOnly(libs.luckperms)
-    compileOnly(libs.essentialsx) {
-        exclude(group = "org.spigotmc")
-    }
+    compileOnly(libs.essentialsx)
     compileOnly(libs.mvdwapi) { isTransitive = false }
 
     // Other libraries
@@ -103,7 +101,7 @@ tasks {
     withType<Javadoc> {
         val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
-        opt.links("https://jd.papermc.io/paper/1.20.4/")
+        opt.links("https://jd.papermc.io/paper/1.20/")
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
         opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
         opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())

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

@@ -252,11 +252,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         return Bukkit.getVersion();
     }
 
-    @Override
-    public @NonNull String serverBrand() {
-        return Bukkit.getName();
-    }
-
     @Override
     @SuppressWarnings("deprecation") // Paper deprecation
     public void onEnable() {
@@ -794,23 +789,22 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                     if (entity.getMetadata("ps_custom_spawned").stream().anyMatch(MetadataValue::asBoolean)) {
                         continue;
                     }
-                    // TODO: use (type) pattern matching when targeting java 21
                     switch (entity.getType().toString()) {
                         case "EGG":
-                        case "FISHING_HOOK", "FISHING_BOBBER":
-                        case "ENDER_SIGNAL", "EYE_OF_ENDER":
+                        case "FISHING_HOOK":
+                        case "ENDER_SIGNAL":
                         case "AREA_EFFECT_CLOUD":
                         case "EXPERIENCE_ORB":
-                        case "LEASH_HITCH", "LEASH_KNOT":
-                        case "FIREWORK", "FIREWORK_ROCKET":
-                        case "LIGHTNING", "LIGHTNING_BOLT":
+                        case "LEASH_HITCH":
+                        case "FIREWORK":
+                        case "LIGHTNING":
                         case "WITHER_SKULL":
                         case "UNKNOWN":
                         case "PLAYER":
                             // non moving / unmovable
                             continue;
-                        case "THROWN_EXP_BOTTLE", "EXPERIENCE_BOTTLE":
-                        case "SPLASH_POTION", "POTION":
+                        case "THROWN_EXP_BOTTLE":
+                        case "SPLASH_POTION":
                         case "SNOWBALL":
                         case "SHULKER_BULLET":
                         case "SPECTRAL_ARROW":
@@ -842,11 +836,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                         case "TNT_MINECART":
                         case "CHEST_BOAT":
                         case "BOAT":
-                        case "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT",
-                             "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT":
-                        case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT",
-                             "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT",
-                             "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT":
                             if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
                                 com.plotsquared.core.location.Location location = BukkitUtil.adapt(entity.getLocation());
                                 Plot plot = location.getPlot();
@@ -875,14 +864,14 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                         case "SMALL_FIREBALL":
                         case "FIREBALL":
                         case "DRAGON_FIREBALL":
-                        case "DROPPED_ITEM", "ITEM":
+                        case "DROPPED_ITEM":
                             if (Settings.Enabled_Components.KILL_ROAD_ITEMS
                                     && plotArea.getOwnedPlotAbs(BukkitUtil.adapt(entity.getLocation())) == null) {
                                 this.removeRoadEntity(entity, iterator);
                             }
                             // dropped item
                             continue;
-                        case "PRIMED_TNT", "TNT":
+                        case "PRIMED_TNT":
                         case "FALLING_BLOCK":
                             // managed elsewhere
                             continue;
@@ -960,7 +949,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                         case "HORSE":
                         case "IRON_GOLEM":
                         case "MAGMA_CUBE":
-                        case "MUSHROOM_COW", "MOOSHROOM":
+                        case "MUSHROOM_COW":
                         case "OCELOT":
                         case "PIG":
                         case "PIG_ZOMBIE":
@@ -969,7 +958,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                         case "SILVERFISH":
                         case "SKELETON":
                         case "SLIME":
-                        case "SNOWMAN", "SNOW_GOLEM":
+                        case "SNOWMAN":
                         case "SPIDER":
                         case "SQUID":
                         case "VILLAGER":
@@ -1182,9 +1171,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
     @Override
     public @NonNull String serverNativePackage() {
         final String name = Bukkit.getServer().getClass().getPackage().getName();
-        String ver = name.substring(name.lastIndexOf('.') + 1);
-        // org.bukkit.craftbukkit is no longer suffixed by a version
-        return ver.equals("craftbukkit") ? "" : ver;
+        return name.substring(name.lastIndexOf('.') + 1);
     }
 
     @Override

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

@@ -25,6 +25,7 @@ import org.bukkit.Art;
 import org.bukkit.DyeColor;
 import org.bukkit.Location;
 import org.bukkit.Rotation;
+import org.bukkit.TreeSpecies;
 import org.bukkit.World;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.AbstractHorse;
@@ -33,7 +34,6 @@ import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Bat;
 import org.bukkit.entity.Boat;
 import org.bukkit.entity.Breedable;
-import org.bukkit.entity.ChestBoat;
 import org.bukkit.entity.ChestedHorse;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Entity;
@@ -44,6 +44,7 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Rabbit;
 import org.bukkit.entity.Sheep;
+import org.bukkit.entity.Slime;
 import org.bukkit.entity.Tameable;
 import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.InventoryHolder;
@@ -102,19 +103,11 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             this.noGravity = true;
         }
         switch (entity.getType().toString()) {
-            case "BOAT", "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT",
-                 "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT" -> {
+            case "BOAT" -> {
                 Boat boat = (Boat) entity;
-                this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType());
+                this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
                 return;
             }
-            case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT",
-                 "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT",
-                 "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT" -> {
-                ChestBoat boat = (ChestBoat) entity;
-                this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType());
-                storeInventory(boat);
-            }
             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",
@@ -124,7 +117,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 return;
             }
             // MISC //
-            case "DROPPED_ITEM", "ITEM" -> {
+            case "DROPPED_ITEM" -> {
                 Item item = (Item) entity;
                 this.stack = item.getItemStack();
                 return;
@@ -154,14 +147,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             }
             // END MISC //
             // INVENTORY HOLDER //
-            case "MINECART_CHEST", "CHEST_MINECART", "MINECART_HOPPER", "HOPPER_MINECART" -> {
+            case "MINECART_CHEST", "MINECART_HOPPER" -> {
                 storeInventory((InventoryHolder) entity);
                 return;
             }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case "CAMEL", "HORSE", "DONKEY", "LLAMA", "TRADER_LLAMA", "MULE", "SKELETON_HORSE", "ZOMBIE_HORSE" -> {
+            case "HORSE", "DONKEY", "LLAMA", "MULE", "SKELETON_HORSE" -> {
                 AbstractHorse horse = (AbstractHorse) entity;
                 this.horse = new HorseStats();
                 this.horse.jump = horse.getJumpStrength();
@@ -179,13 +172,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 return;
             }
             // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT", "CAT", "PARROT" -> {
+            case "WOLF", "OCELOT" -> {
                 storeTameable((Tameable) entity);
                 storeBreedable((Breedable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
             }
             // END TAMEABLE //
+            //todo fix sheep
             case "SHEEP" -> {
                 Sheep sheep = (Sheep) entity;
                 if (sheep.isSheared()) {
@@ -193,7 +187,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 } else {
                     this.dataByte = (byte) 0;
                 }
-                this.dataByte2 = getOrdinal(DyeColor.values(), sheep.getColor());
+                this.dataByte2 = sheep.getColor().getDyeData();
                 storeBreedable(sheep);
                 storeLiving(sheep);
                 return;
@@ -274,7 +268,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             }
             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", "SNOW_GOLEM" -> {
+                    "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN" -> {
                 storeLiving((LivingEntity) entity);
                 return;
             }
@@ -456,7 +450,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         }
         Entity entity;
         switch (this.getType().toString()) {
-            case "DROPPED_ITEM", "ITEM" -> {
+            case "DROPPED_ITEM" -> {
                 return world.dropItem(location, this.stack);
             }
             case "PLAYER", "LEASH_HITCH" -> {
@@ -492,25 +486,15 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             entity.setGravity(false);
         }
         switch (entity.getType().toString()) {
-            case "BOAT", "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT",
-                 "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT" -> {
+            case "BOAT" -> {
                 Boat boat = (Boat) entity;
-                boat.setBoatType(Boat.Type.values()[dataByte]);
+                boat.setWoodType(TreeSpecies.values()[dataByte]);
                 return entity;
             }
-            case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT",
-                 "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT",
-                 "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT" -> {
-                ChestBoat boat = (ChestBoat) entity;
-                boat.setBoatType(Boat.Type.values()[dataByte]);
-                restoreInventory(boat);
-                return entity;
-            }
-            // SLIME is not even stored
-            /* 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",
@@ -534,14 +518,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             }
             // END MISC //
             // INVENTORY HOLDER //
-            case "MINECART_CHEST", "CHEST_MINECART", "MINECART_HOPPER", "HOPPER_MINECART" -> {
+            case "MINECART_CHEST", "MINECART_HOPPER" -> {
                 restoreInventory((InventoryHolder) entity);
                 return entity;
             }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case "CAMEL", "HORSE", "DONKEY", "LLAMA", "TRADER_LLAMA", "MULE", "SKELETON_HORSE", "ZOMBIE_HORSE" -> {
+            case "HORSE", "LLAMA", "SKELETON_HORSE", "DONKEY", "MULE" -> {
                 AbstractHorse horse = (AbstractHorse) entity;
                 horse.setJumpStrength(this.horse.jump);
                 if (horse instanceof ChestedHorse) {
@@ -558,7 +542,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 return entity;
             }
             // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT", "CAT", "PARROT" -> {
+            case "WOLF", "OCELOT" -> {
                 restoreTameable((Tameable) entity);
                 restoreBreedable((Breedable) entity);
                 restoreLiving((LivingEntity) entity);
@@ -571,7 +555,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                     sheep.setSheared(true);
                 }
                 if (this.dataByte2 != 0) {
-                    sheep.setColor(DyeColor.values()[this.dataByte2]);
+                    sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
                 }
                 restoreBreedable(sheep);
                 restoreLiving(sheep);

Bukkit/src/main/java/com/plotsquared/bukkit/inject/PermissionModule.java

@@ -22,20 +22,12 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import com.plotsquared.bukkit.permissions.BukkitPermissionHandler;
-import com.plotsquared.bukkit.permissions.BukkitRangedPermissionResolver;
-import com.plotsquared.bukkit.permissions.LuckPermsRangedPermissionResolver;
 import com.plotsquared.bukkit.permissions.VaultPermissionHandler;
-import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.permissions.PermissionHandler;
-import com.plotsquared.core.permissions.RangedPermissionResolver;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 
 public class PermissionModule extends AbstractModule {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PermissionModule.class.getSimpleName());
-
     @Provides
     @Singleton
     PermissionHandler providePermissionHandler() {
@@ -48,18 +40,4 @@ public class PermissionModule extends AbstractModule {
         return new BukkitPermissionHandler();
     }
 
-    @Provides
-    @Singleton
-    RangedPermissionResolver provideRangedPermissionResolver() {
-        if (Settings.Permissions.USE_LUCKPERMS_RANGE_RESOLVER) {
-            if (Bukkit.getPluginManager().isPluginEnabled("LuckPerms")) {
-                LOGGER.info("Using experimental LuckPerms ranged permission resolver");
-                return new LuckPermsRangedPermissionResolver();
-            }
-            LOGGER.warn("Enabled LuckPerms ranged permission resolver, but LuckPerms is not installed. " +
-                    "Falling back to default Bukkit ranged permission resolver");
-        }
-        return new BukkitRangedPermissionResolver();
-    }
-
 }

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

@@ -28,6 +28,7 @@ import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
 import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.SculkSensorInteractFlag;
 import com.plotsquared.core.util.PlotFlagUtil;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
@@ -41,11 +42,31 @@ import org.bukkit.event.block.BlockReceiveGameEvent;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 
 @SuppressWarnings("unused")
 public class BlockEventListener117 implements Listener {
 
+    private static final Set<Material> COPPER_OXIDIZING = Set.of(
+            Material.COPPER_BLOCK,
+            Material.EXPOSED_COPPER,
+            Material.WEATHERED_COPPER,
+            Material.OXIDIZED_COPPER,
+            Material.CUT_COPPER,
+            Material.EXPOSED_CUT_COPPER,
+            Material.WEATHERED_CUT_COPPER,
+            Material.OXIDIZED_CUT_COPPER,
+            Material.CUT_COPPER_STAIRS,
+            Material.EXPOSED_CUT_COPPER_STAIRS,
+            Material.WEATHERED_CUT_COPPER_STAIRS,
+            Material.OXIDIZED_CUT_COPPER_STAIRS,
+            Material.CUT_COPPER_SLAB,
+            Material.EXPOSED_CUT_COPPER_SLAB,
+            Material.WEATHERED_CUT_COPPER_SLAB,
+            Material.OXIDIZED_CUT_COPPER_SLAB
+    );
+
     @Inject
     public BlockEventListener117() {
     }
@@ -113,7 +134,7 @@ public class BlockEventListener117 implements Listener {
     public void onBlockFertilize(BlockFertilizeEvent event) {
         Block block = event.getBlock();
         List<org.bukkit.block.BlockState> blocks = event.getBlocks();
-        Location location = BukkitUtil.adapt(block.getLocation());
+        Location location = BukkitUtil.adapt(blocks.get(0).getLocation());
 
         PlotArea area = location.getPlotArea();
         if (area == null) {
@@ -163,7 +184,7 @@ public class BlockEventListener117 implements Listener {
         if (plot == null) {
             return;
         }
-        if (event.getNewState().getType().name().contains("COPPER")) {
+        if (COPPER_OXIDIZING.contains(event.getNewState().getType())) {
             if (!plot.getFlag(CopperOxideFlag.class)) {
                 plot.debug("Copper could not oxide because copper-oxide = false");
                 event.setCancelled(true);

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

@@ -42,7 +42,6 @@ import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.PlotFlagUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.util.Enums;
 import com.sk89q.worldedit.world.block.BlockType;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Material;
@@ -58,7 +57,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Vehicle;
-import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -80,17 +78,10 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
 
 @SuppressWarnings("unused")
 public class EntityEventListener implements Listener {
 
-    private static final Particle EXPLOSION_HUGE = Objects.requireNonNull(Enums.findByValue(
-            Particle.class,
-            "EXPLOSION_EMITTER",
-            "EXPLOSION_HUGE"
-    ));
-
     private final BukkitPlatform platform;
     private final PlotAreaManager plotAreaManager;
     private final EventDispatcher eventDispatcher;
@@ -161,8 +152,8 @@ public class EntityEventListener implements Listener {
                 }
             }
             case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
-                 "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL",
-                 "FROZEN", "SPELL", "DEFAULT" -> {
+                    "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL",
+                    "FROZEN", "SPELL", "DEFAULT" -> {
                 if (!area.isMobSpawning()) {
                     event.setCancelled(true);
                     return;
@@ -323,7 +314,7 @@ public class EntityEventListener implements Listener {
                 if (this.lastRadius != 0) {
                     List<Entity> nearby = event.getEntity().getNearbyEntities(this.lastRadius, this.lastRadius, this.lastRadius);
                     for (Entity near : nearby) {
-                        if (near instanceof TNTPrimed || near instanceof ExplosiveMinecart) {
+                        if (near instanceof TNTPrimed || near.getType().equals(EntityType.MINECART_TNT)) {
                             if (!near.hasMetadata("plot")) {
                                 near.setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot));
                             }
@@ -347,7 +338,7 @@ public class EntityEventListener implements Listener {
         event.setCancelled(true);
         //Spawn Explosion Particles when enabled in settings
         if (Settings.General.ALWAYS_SHOW_EXPLOSIONS) {
-            event.getLocation().getWorld().spawnParticle(EXPLOSION_HUGE, event.getLocation(), 0);
+            event.getLocation().getWorld().spawnParticle(Particle.EXPLOSION_HUGE, event.getLocation(), 0);
         }
     }
 

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

@@ -31,10 +31,8 @@ import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.EnderCrystal;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Item;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -134,7 +132,7 @@ public class EntitySpawnListener implements Listener {
         Plot plot = location.getOwnedPlotAbs();
         EntityType type = entity.getType();
         if (plot == null) {
-            if (entity instanceof Item) {
+            if (type == EntityType.DROPPED_ITEM) {
                 if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                     event.setCancelled(true);
                 }
@@ -156,7 +154,7 @@ public class EntitySpawnListener implements Listener {
         if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
             event.setCancelled(true);
         }
-        if (entity instanceof EnderCrystal || type == EntityType.ARMOR_STAND) {
+        if (type == EntityType.ENDER_CRYSTAL || type == EntityType.ARMOR_STAND) {
             if (BukkitEntityUtil.checkEntity(entity, plot)) {
                 event.setCancelled(true);
             }

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

@@ -29,7 +29,6 @@ import com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent;
 import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent;
 import com.google.inject.Inject;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.command.Command;
 import com.plotsquared.core.command.MainCommand;
 import com.plotsquared.core.configuration.Settings;
@@ -39,7 +38,6 @@ import com.plotsquared.core.permissions.Permission;
 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.flag.FlagContainer;
 import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
@@ -49,13 +47,10 @@ import com.plotsquared.core.plot.flag.implementations.TileDropFlag;
 import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.PlotFlagUtil;
-import io.papermc.paper.event.entity.EntityMoveEvent;
-import io.papermc.paper.event.world.StructuresLocateEvent;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Chunk;
-import org.bukkit.NamespacedKey;
 import org.bukkit.block.Block;
 import org.bukkit.block.TileState;
 import org.bukkit.entity.Entity;
@@ -63,7 +58,6 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Slime;
-import org.bukkit.event.Cancellable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -84,9 +78,6 @@ import java.util.regex.Pattern;
 @SuppressWarnings("unused")
 public class PaperListener implements Listener {
 
-    private static final NamespacedKey ITEM = NamespacedKey.minecraft("item");
-    private static final NamespacedKey FISHING_BOBBER = NamespacedKey.minecraft("fishing_bobber");
-
     private final PlotAreaManager plotAreaManager;
     private Chunk lastChunk;
 
@@ -113,38 +104,8 @@ public class PaperListener implements Listener {
         if (!Settings.Paper_Components.ENTITY_PATHING) {
             return;
         }
-        handleEntityMovement(event, event.getEntity().getLocation(), event.getLoc());
-    }
-
-    @EventHandler
-    public void onEntityPathfind(SlimePathfindEvent event) {
-        if (!Settings.Paper_Components.ENTITY_PATHING) {
-            return;
-        }
-        Slime slime = event.getEntity();
-
-        Block b = slime.getTargetBlockExact(4);
-        if (b == null) {
-            return;
-        }
-
-        handleEntityMovement(event, event.getEntity().getLocation(),  b.getLocation());
-    }
-
-    @EventHandler
-    public void onEntityMove(EntityMoveEvent event) {
-        if (!Settings.Paper_Components.ENTITY_MOVEMENT) {
-            return;
-        }
-        if (!event.hasExplicitlyChangedBlock()) {
-            return;
-        }
-        handleEntityMovement(event, event.getFrom(), event.getTo());
-    }
-
-    private static void handleEntityMovement(Cancellable event, org.bukkit.Location from, org.bukkit.Location target) {
-        Location toLoc = BukkitUtil.adapt(target);
-        Location fromLoc = BukkitUtil.adapt(from);
+        Location toLoc = BukkitUtil.adapt(event.getLoc());
+        Location fromLoc = BukkitUtil.adapt(event.getEntity().getLocation());
         PlotArea tarea = toLoc.getPlotArea();
         if (tarea == null) {
             return;
@@ -163,10 +124,52 @@ public class PaperListener implements Listener {
             event.setCancelled(true);
             return;
         }
-        if (tplot == null || tplot.getId().equals(fplot.getId())) {
+        if (tplot == null || tplot.getId().hashCode() == fplot.getId().hashCode()) {
             return;
         }
-        if (fplot.isMerged() && fplot.getConnectedPlots().contains(tplot)) {
+        if (fplot.isMerged() && fplot.getConnectedPlots().contains(fplot)) {
+            return;
+        }
+        event.setCancelled(true);
+    }
+
+    @EventHandler
+    public void onEntityPathfind(SlimePathfindEvent event) {
+        if (!Settings.Paper_Components.ENTITY_PATHING) {
+            return;
+        }
+        Slime slime = event.getEntity();
+
+        Block b = slime.getTargetBlockExact(4);
+        if (b == null) {
+            return;
+        }
+
+        Location toLoc = BukkitUtil.adapt(b.getLocation());
+        Location fromLoc = BukkitUtil.adapt(event.getEntity().getLocation());
+        PlotArea tarea = toLoc.getPlotArea();
+        if (tarea == null) {
+            return;
+        }
+        PlotArea farea = fromLoc.getPlotArea();
+        if (farea == null) {
+            return;
+        }
+
+        if (tarea != farea) {
+            event.setCancelled(true);
+            return;
+        }
+        Plot tplot = toLoc.getPlot();
+        Plot fplot = fromLoc.getPlot();
+        if (tplot == null ^ fplot == null) {
+            event.setCancelled(true);
+            return;
+        }
+        if (tplot == null || tplot.getId().hashCode() == fplot.getId().hashCode()) {
+            return;
+        }
+        if (fplot.isMerged() && fplot.getConnectedPlots().contains(fplot)) {
             return;
         }
         event.setCancelled(true);
@@ -235,7 +238,7 @@ public class PaperListener implements Listener {
         if (plot == null) {
             EntityType type = event.getType();
             // PreCreatureSpawnEvent **should** not be called for DROPPED_ITEM, just for the sake of consistency
-            if (type.getKey().equals(ITEM)) {
+            if (type == EntityType.DROPPED_ITEM) {
                 if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                     event.setCancelled(true);
                 }
@@ -361,7 +364,7 @@ public class PaperListener implements Listener {
                 event.setCancelled(true);
             }
         } else if (!plot.isAdded(pp.getUUID())) {
-            if (entity.getType().getKey().equals(FISHING_BOBBER)) {
+            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
                 if (plot.getFlag(FishingFlag.class)) {
                     return;
                 }
@@ -461,21 +464,6 @@ public class PaperListener implements Listener {
         }
     }
 
-    /**
-     * Don't let the server die when populating cartographers (villager offering maps) in classic plot worlds
-     * (as those don't generate POIs)
-     */
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-    public void onStructuresLocate(StructuresLocateEvent event) {
-        if (!PlotSquared.get().getPlotAreaManager().hasPlotArea(event.getWorld().getName())) {
-            return;
-        }
-        final PlotArea area = PlotSquared.get().getPlotAreaManager().getPlotAreaByString(event.getWorld().getName());
-        if (area != null && area.getType() == PlotAreaType.NORMAL) {
-            event.setCancelled(true);
-        }
-    }
-
     private boolean getBooleanFlagValue(
             @NonNull FlagContainer container,
             @NonNull Class<? extends BooleanFlag<?>> flagClass,

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

@@ -88,8 +88,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
+import org.bukkit.block.data.Waterlogged;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Boat;
@@ -374,7 +376,7 @@ public class PlayerEventListener implements Listener {
 
     @EventHandler
     public void onVehicleEntityCollision(VehicleEntityCollisionEvent e) {
-        if (e.getVehicle() instanceof Boat) {
+        if (e.getVehicle().getType() == EntityType.BOAT) {
             Location location = BukkitUtil.adapt(e.getEntity().getLocation());
             if (location.isPlotArea()) {
                 if (e.getEntity() instanceof Player) {
@@ -591,18 +593,14 @@ public class PlayerEventListener implements Listener {
                     return;
                 }
                 Plot plot = area.getPlot(location);
-                if (plot != null && !plot.equals(lastPlot)) {
+                if (plot != null) {
                     final boolean result = DenyTeleportFlag.allowsTeleport(pp, plot);
                     // there is one possibility to still allow teleportation:
                     // to is identical to the plot's home location, and untrusted-visit is true
                     // i.e. untrusted-visit can override deny-teleport
                     // this is acceptable, because otherwise it wouldn't make sense to have both flags set
                     if (result || (plot.getFlag(UntrustedVisitFlag.class) && plot.getHomeSynchronous().equals(BukkitUtil.adaptComplete(to)))) {
-                        // returns false if the player is not allowed to enter the plot (if they are denied, for example)
-                        // don't let the move event cancel the entry after teleport, but rather catch and cancel early (#4647)
-                        if (!plotListener.plotEntry(pp, plot)) {
-                            event.setCancelled(true);
-                        }
+                        plotListener.plotEntry(pp, plot);
                     } else {
                         pp.sendMessage(
                                 TranslatableCaption.of("deny.no_enter"),
@@ -1372,7 +1370,22 @@ public class PlayerEventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBucketEmpty(PlayerBucketEmptyEvent event) {
-        final Block block = event.getBlock();
+        BlockFace bf = event.getBlockFace();
+        // Note: a month after Bukkit 1.14.4 released, they added the API method
+        // PlayerBucketEmptyEvent#getBlock(), which returns the block the
+        // bucket contents is going to be placed at. Currently we determine this
+        // block ourselves to retain compatibility with 1.13.
+        final Block block;
+        // if the block can be waterlogged, the event might waterlog the block
+        // sometimes
+        if (event.getBlockClicked().getBlockData() instanceof Waterlogged waterlogged
+                && !waterlogged.isWaterlogged() && event.getBucket() != Material.LAVA_BUCKET) {
+            block = event.getBlockClicked();
+        } else {
+            block = event.getBlockClicked().getLocation()
+                    .add(bf.getModX(), bf.getModY(), bf.getModZ())
+                    .getBlock();
+        }
         Location location = BukkitUtil.adapt(block.getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {

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

@@ -35,7 +35,7 @@ import com.plotsquared.core.util.PlotFlagUtil;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.FishHook;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
@@ -134,7 +134,7 @@ public class ProjectileEventListener implements Listener {
                 event.setCancelled(true);
             }
         } else if (!plot.isAdded(pp.getUUID())) {
-            if (entity instanceof FishHook) {
+            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
                 if (plot.getFlag(FishingFlag.class)) {
                     return;
                 }
@@ -194,7 +194,7 @@ public class ProjectileEventListener implements Listener {
                 return;
             }
             if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(
-                    ProjectilesFlag.class) || (entity instanceof FishHook && plot.getFlag(
+                    ProjectilesFlag.class) || (entity.getType().equals(EntityType.FISHING_HOOK) && plot.getFlag(
                     FishingFlag.class))) {
                 return;
             }

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

@@ -49,14 +49,9 @@ public class SingleWorldListener implements Listener {
             this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
         } catch (NoSuchMethodException ignored) {
             try {
-                String chunkStatus = PlotSquared.platform().serverVersion()[1] < 21
-                        ? "net.minecraft.world.level.chunk" + ".ChunkStatus"
-                        : "net.minecraft.world.level.chunk.status.ChunkStatus";
-                ReflectionUtils.RefClass classChunkStatus = getRefClass(chunkStatus);
+                ReflectionUtils.RefClass classChunkStatus = getRefClass("net.minecraft.world.level.chunk.ChunkStatus");
                 this.objChunkStatusFull = classChunkStatus.getRealClass().getField("n").get(null);
-                this.methodGetHandleChunk = classCraftChunk
-                        .getMethod("getHandle", classChunkStatus.getRealClass())
-                        .getRealMethod();
+                this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle", classChunkStatus.getRealClass()).getRealMethod();
             } catch (NoSuchMethodException ex) {
                 throw new RuntimeException(ex);
             }

Bukkit/src/main/java/com/plotsquared/bukkit/permissions/BukkitRangedPermissionResolver.java

@@ -1,107 +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.bukkit.permissions;
-
-import com.plotsquared.bukkit.player.BukkitPlayer;
-import com.plotsquared.core.permissions.RangedPermissionResolver;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.util.MathMan;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.Set;
-import java.util.stream.IntStream;
-
-public class BukkitRangedPermissionResolver implements RangedPermissionResolver {
-
-    private static boolean CHECK_EFFECTIVE = true;
-
-    @Override
-    public @NonNegative int getPermissionRange(
-            final @NonNull PlotPlayer<?> generic,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            @NonNegative final int range
-    ) {
-        if (!(generic instanceof BukkitPlayer player)) {
-            throw new IllegalArgumentException("PlotPlayer is not a BukkitPlayer");
-        }
-        if (hasWildcardRange(player, stub, worldContext)) {
-            return INFINITE_RANGE_VALUE;
-        }
-        int max = 0;
-        if (CHECK_EFFECTIVE) {
-            boolean hasAny = false;
-            String stubPlus = stub + ".";
-            final Set<PermissionAttachmentInfo> effective = player.getPlatformPlayer().getEffectivePermissions();
-            if (!effective.isEmpty()) {
-                for (PermissionAttachmentInfo attach : effective) {
-                    // Ignore all "false" permissions
-                    if (!attach.getValue()) {
-                        continue;
-                    }
-                    String permStr = attach.getPermission();
-                    if (permStr.startsWith(stubPlus)) {
-                        hasAny = true;
-                        String end = permStr.substring(stubPlus.length());
-                        if (MathMan.isInteger(end)) {
-                            int val = Integer.parseInt(end);
-                            if (val > range) {
-                                return val;
-                            }
-                            if (val > max) {
-                                max = val;
-                            }
-                        }
-                    }
-                }
-                if (hasAny) {
-                    return max;
-                }
-                // Workaround
-                for (PermissionAttachmentInfo attach : effective) {
-                    String permStr = attach.getPermission();
-                    if (permStr.startsWith("plots.") && !permStr.equals("plots.use")) {
-                        return max;
-                    }
-                }
-                CHECK_EFFECTIVE = false;
-            }
-        }
-        for (int i = range; i > 0; i--) {
-            if (player.hasPermission(worldContext, stub + "." + i)) {
-                return i;
-            }
-        }
-        return max;
-    }
-
-    @Override
-    public @NonNull IntStream streamFullPermissionRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            @NonNegative final int range
-    ) {
-        return IntStream.of(getPermissionRange(player, stub, worldContext, range));
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/permissions/LuckPermsRangedPermissionResolver.java

@@ -1,95 +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.bukkit.permissions;
-
-import com.plotsquared.core.permissions.RangedPermissionResolver;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.util.MathMan;
-import net.luckperms.api.LuckPerms;
-import net.luckperms.api.context.ImmutableContextSet;
-import net.luckperms.api.model.user.User;
-import net.luckperms.api.node.NodeType;
-import net.luckperms.api.node.types.PermissionNode;
-import net.luckperms.api.query.QueryOptions;
-import org.bukkit.Bukkit;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.Objects;
-import java.util.stream.IntStream;
-
-public class LuckPermsRangedPermissionResolver implements RangedPermissionResolver {
-
-    private final LuckPerms luckPerms;
-
-    public LuckPermsRangedPermissionResolver() {
-        this.luckPerms = Objects.requireNonNull(
-                Bukkit.getServicesManager().getRegistration(LuckPerms.class),
-                "LuckPerms is not available"
-        ).getProvider();
-    }
-
-    @Override
-    public @NonNegative int getPermissionRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            final @NonNegative int range
-    ) {
-        // no need to use LuckPerms for basic checks
-        if (this.hasWildcardRange(player, stub, worldContext)) {
-            return INFINITE_RANGE_VALUE;
-        }
-        return this.streamFullPermissionRange(player, stub, worldContext, range)
-                .sorted()
-                .reduce((first, second) -> second)
-                .orElse(0);
-    }
-
-    @NonNull
-    public IntStream streamFullPermissionRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            @NonNegative final int range
-    ) {
-        final User user = this.luckPerms.getUserManager().getUser(player.getUUID());
-        if (user == null) {
-            throw new IllegalStateException("Luckperms User is null - is the Player online? (UUID: %s)".formatted(player.getUUID()));
-        }
-        final QueryOptions queryOptions = worldContext == null ?
-                QueryOptions.nonContextual() :
-                QueryOptions.contextual(ImmutableContextSet.of("world", worldContext));
-        return user.resolveInheritedNodes(queryOptions).stream()
-                // only support normal permission nodes (regex permission nodes would be a pita to support)
-                .filter(NodeType.PERMISSION::matches)
-                .map(node -> ((PermissionNode) node).getPermission())
-                // check that the node actually has additional data after the stub
-                .filter(permission -> permission.startsWith(stub + "."))
-                // extract the raw data after the stub
-                .map(permission -> permission.substring(stub.length() + 1))
-                // check if data is integer and parse
-                .filter(MathMan::isInteger)
-                .mapToInt(Integer::parseInt)
-                // only use values that are positive
-                .filter(value -> value > -1);
-    }
-
-}

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

@@ -24,12 +24,14 @@ import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.events.TeleportCause;
 import com.plotsquared.core.location.Location;
+import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.permissions.PermissionHandler;
 import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.PlotWeather;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EventDispatcher;
+import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.WorldUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.extension.platform.Actor;
@@ -45,11 +47,13 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventException;
 import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.RegisteredListener;
 import org.bukkit.potion.PotionEffectType;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
+import java.util.Set;
 import java.util.UUID;
 
 import static com.sk89q.worldedit.world.gamemode.GameModes.ADVENTURE;
@@ -146,13 +150,77 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         }
     }
 
+    @SuppressWarnings("StringSplitter")
     @Override
     @NonNegative
     public int hasPermissionRange(
             final @NonNull String stub,
             @NonNegative final int range
     ) {
-        return PlotSquared.platform().rangedPermissionResolver().getPermissionRange(this, stub, null, range);
+        if (hasPermission(Permission.PERMISSION_ADMIN.toString())) {
+            return Integer.MAX_VALUE;
+        }
+        final String[] nodes = stub.split("\\.");
+        final StringBuilder n = new StringBuilder();
+        // Wildcard check from less specific permission to more specific permission
+        for (int i = 0; i < (nodes.length - 1); i++) {
+            n.append(nodes[i]).append(".");
+            if (!stub.equals(n + Permission.PERMISSION_STAR.toString())) {
+                if (hasPermission(n + Permission.PERMISSION_STAR.toString())) {
+                    return Integer.MAX_VALUE;
+                }
+            }
+        }
+        // Wildcard check for the full permission
+        if (hasPermission(stub + ".*")) {
+            return Integer.MAX_VALUE;
+        }
+        // Permission value cache for iterative check
+        int max = 0;
+        if (CHECK_EFFECTIVE) {
+            boolean hasAny = false;
+            String stubPlus = stub + ".";
+            final Set<PermissionAttachmentInfo> effective = player.getEffectivePermissions();
+            if (!effective.isEmpty()) {
+                for (PermissionAttachmentInfo attach : effective) {
+                    // Ignore all "false" permissions
+                    if (!attach.getValue()) {
+                        continue;
+                    }
+                    String permStr = attach.getPermission();
+                    if (permStr.startsWith(stubPlus)) {
+                        hasAny = true;
+                        String end = permStr.substring(stubPlus.length());
+                        if (MathMan.isInteger(end)) {
+                            int val = Integer.parseInt(end);
+                            if (val > range) {
+                                return val;
+                            }
+                            if (val > max) {
+                                max = val;
+                            }
+                        }
+                    }
+                }
+                if (hasAny) {
+                    return max;
+                }
+                // Workaround
+                for (PermissionAttachmentInfo attach : effective) {
+                    String permStr = attach.getPermission();
+                    if (permStr.startsWith("plots.") && !permStr.equals("plots.use")) {
+                        return max;
+                    }
+                }
+                CHECK_EFFECTIVE = false;
+            }
+        }
+        for (int i = range; i > 0; i--) {
+            if (hasPermission(stub + "." + i)) {
+                return i;
+            }
+        }
+        return max;
     }
 
     @Override

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

@@ -30,8 +30,6 @@ import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.world.World;
 import io.papermc.lib.PaperLib;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.plugin.Plugin;
@@ -43,8 +41,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
@@ -59,8 +55,6 @@ import java.util.function.Consumer;
  **/
 public final class BukkitChunkCoordinator extends ChunkCoordinator {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitChunkCoordinator.class.getSimpleName());
-
     private final List<ProgressSubscriber> progressSubscribers = new LinkedList<>();
 
     private final Queue<BlockVector2> requestedChunks;
@@ -76,7 +70,6 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
     private final AtomicInteger expectedSize;
     private final AtomicInteger loadingChunks = new AtomicInteger();
     private final boolean forceSync;
-    private final boolean shouldGen;
 
     private int batchSize;
     private PlotSquaredTask task;
@@ -94,8 +87,7 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
             @Assisted final @NonNull Consumer<Throwable> throwableConsumer,
             @Assisted("unloadAfter") final boolean unloadAfter,
             @Assisted final @NonNull Collection<ProgressSubscriber> progressSubscribers,
-            @Assisted("forceSync") final boolean forceSync,
-            @Assisted("shouldGen") final boolean shouldGen
+            @Assisted("forceSync") final boolean forceSync
     ) {
         this.requestedChunks = new LinkedBlockingQueue<>(requestedChunks);
         this.availableChunks = new LinkedBlockingQueue<>();
@@ -111,7 +103,6 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
         this.bukkitWorld = Bukkit.getWorld(world.getName());
         this.progressSubscribers.addAll(progressSubscribers);
         this.forceSync = forceSync;
-        this.shouldGen = shouldGen;
     }
 
     @Override
@@ -221,28 +212,18 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
      * Requests a batch of chunks to be loaded
      */
     private void requestBatch() {
-        for (int i = 0; i < this.batchSize && this.requestedChunks.peek() != null; i++) {
+        BlockVector2 chunk;
+        for (int i = 0; i < this.batchSize && (chunk = this.requestedChunks.poll()) != null; i++) {
             // This required PaperLib to be bumped to version 1.0.4 to mark the request as urgent
-            final BlockVector2 chunk = this.requestedChunks.poll();
             loadingChunks.incrementAndGet();
             PaperLib
-                    .getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), shouldGen, true)
-                    .orTimeout(10L, TimeUnit.SECONDS)
+                    .getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), true, true)
                     .whenComplete((chunkObject, throwable) -> {
                         loadingChunks.decrementAndGet();
                         if (throwable != null) {
-                            if (throwable instanceof TimeoutException) {
-                                LOGGER.warn("Timed out awaiting chunk load {}", chunk);
-                                this.requestedChunks.offer(chunk);
-                            } else {
-                                LOGGER.error("Failed to load chunk {}", chunk, throwable);
-                                // We want one less because this couldn't be processed
-                                this.expectedSize.decrementAndGet();
-                            }
-                        } else if (chunkObject == null) {
-                            if (shouldGen) {
-                                LOGGER.error("Null chunk returned for chunk at {}", chunk);
-                            }
+                            throwable.printStackTrace();
+                            // We want one less because this couldn't be processed
+                            this.expectedSize.decrementAndGet();
                         } else if (PlotSquared.get().isMainThread(Thread.currentThread())) {
                             this.processChunk(chunkObject);
                         } else {

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

@@ -62,28 +62,19 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
     private static final SideEffectSet EDGE_LIGHTING_SIDE_EFFECT_SET;
 
     static {
-        NO_SIDE_EFFECT_SET = enableNetworkIfNeeded()
-                .with(SideEffect.LIGHTING, SideEffect.State.OFF)
-                .with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
-        EDGE_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
-                .with(SideEffect.UPDATE, SideEffect.State.ON)
-                .with(SideEffect.NEIGHBORS, SideEffect.State.ON);
-        LIGHTING_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
-                .with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
-        EDGE_LIGHTING_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
-                .with(SideEffect.UPDATE, SideEffect.State.ON)
-                .with(SideEffect.NEIGHBORS, SideEffect.State.ON);
-    }
-
-    // make sure block changes are sent
-    private static SideEffectSet enableNetworkIfNeeded() {
-        SideEffect network;
-        try {
-            network = SideEffect.valueOf("NETWORK");
-        } catch (IllegalArgumentException ignored) {
-            return SideEffectSet.none();
-        }
-        return SideEffectSet.none().with(network, SideEffect.State.ON);
+        NO_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.LIGHTING, SideEffect.State.OFF).with(
+                SideEffect.NEIGHBORS,
+                SideEffect.State.OFF
+        );
+        EDGE_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
+                SideEffect.NEIGHBORS,
+                SideEffect.State.ON
+        );
+        LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
+        EDGE_LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
+                SideEffect.NEIGHBORS,
+                SideEffect.State.ON
+        );
     }
 
     private org.bukkit.World bukkitWorld;
@@ -238,7 +229,6 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                         .unloadAfter(isUnloadAfter())
                         .withProgressSubscribers(getProgressSubscribers())
                         .forceSync(isForceSync())
-                        .shouldGen(isShouldGen())
                         .build();
         return super.enqueue();
     }

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

@@ -49,7 +49,6 @@ import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Firework;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.entity.EntityDamageEvent;
@@ -342,7 +341,8 @@ public class BukkitEntityUtil {
         }
         //disable the firework damage. too much of a headache to support at the moment.
         if (vplot != null) {
-            if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause && damager instanceof Firework) {
+            if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause
+                    && damager.getType() == EntityType.FIREWORK) {
                 return false;
             }
         }

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

@@ -262,11 +262,6 @@ public class BukkitUtil extends WorldUtil {
         });
     }
 
-    @Override
-    public boolean isSmallBlock(Location location) {
-        return adapt(location).getBlock().getBoundingBox().getHeight() < 0.25;
-    }
-
     @Override
     @NonNegative
     public int getHighestBlockSynchronous(final @NonNull String world, final int x, final int z) {

Core/src/main/java/com/plotsquared/core/PlotPlatform.java

@@ -31,7 +31,6 @@ import com.plotsquared.core.generator.IndependentPlotGenerator;
 import com.plotsquared.core.inject.annotations.DefaultGenerator;
 import com.plotsquared.core.location.World;
 import com.plotsquared.core.permissions.PermissionHandler;
-import com.plotsquared.core.permissions.RangedPermissionResolver;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.world.PlotAreaManager;
@@ -121,14 +120,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
      */
     @NonNull String serverImplementation();
 
-    /**
-     * Gets the server brand name
-     *
-     * @return server brand
-     * @since 7.5.3
-     */
-    @NonNull String serverBrand();
-
     /**
      * Gets the native server code package prefix.
      *
@@ -350,10 +341,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
         return injector().getInstance(PermissionHandler.class);
     }
 
-    default @NonNull RangedPermissionResolver rangedPermissionResolver() {
-        return injector().getInstance(RangedPermissionResolver.class);
-    }
-
     /**
      * Get the {@link ServicePipeline} implementation
      *

Core/src/main/java/com/plotsquared/core/PlotSquared.java

@@ -206,8 +206,7 @@ public class PlotSquared {
         GlobalFlagContainer.setup();
 
         try {
-            String ver = this.platform.serverNativePackage();
-            new ReflectionUtils(ver.isEmpty() ? null : ver);
+            new ReflectionUtils(this.platform.serverNativePackage());
             try {
                 URL logurl = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
                 this.jarFile = new File(
@@ -215,7 +214,7 @@ public class PlotSquared {
                                 logurl.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
                                 .getPath());
             } catch (URISyntaxException | SecurityException e) {
-                LOGGER.error(e);
+                e.printStackTrace();
                 this.jarFile = new File(this.platform.getDirectory().getParentFile(), "PlotSquared.jar");
                 if (!this.jarFile.exists()) {
                     this.jarFile = new File(
@@ -239,7 +238,7 @@ public class PlotSquared {
             copyFile("skyblock.template", Settings.Paths.TEMPLATES);
             showDebug();
         } catch (Throwable e) {
-            LOGGER.error(e);
+            e.printStackTrace();
         }
     }
 

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

@@ -144,7 +144,6 @@ public class Buy extends Command {
             plot.getPlotModificationManager().setSign(player.getName());
             player.sendMessage(
                     TranslatableCaption.of("working.claimed"),
-                    TagResolver.resolver("world", Tag.inserting(Component.text(plot.getArea().getWorldName()))),
                     TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
             );
             this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);

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

@@ -131,7 +131,6 @@ public class Clear extends Command {
                     player.sendMessage(
                             TranslatableCaption.of("working.clearing_done"),
                             TagResolver.builder()
-                                    .tag("world", Tag.inserting(Component.text(plot.getArea().getWorldName())))
                                     .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
                                     .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
                                     .build()

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

@@ -24,7 +24,6 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.player.PlotPlayer;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
 
@@ -99,14 +98,6 @@ public enum CommandCategory implements Caption {
         return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
     }
 
-    @Override
-    public @NonNull Component toComponent(
-            @NonNull final LocaleHolder localeHolder,
-            final @NonNull TagResolver @NonNull ... tagResolvers
-    ) {
-        return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
-    }
-
     /**
      * Checks if a player has access to this command category
      *

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

@@ -86,8 +86,7 @@ public class DebugPaste extends SubCommand {
                 b.append("# WorldEdit implementation:\n");
                 b.append(PlotSquared.platform().worldEditImplementations()).append("\n\n");
                 b.append("# Server Information\n");
-                b.append("Server Version: ").append(PlotSquared.platform().serverBrand()).append(": ")
-                        .append(PlotSquared.platform().serverImplementation()).append("\n")
+                b.append("Server Version: ").append(PlotSquared.platform().serverImplementation())
                         .append("\n");
                 b.append("online_mode: ").append(!Settings.UUID.OFFLINE).append(';')
                         .append(!Settings.UUID.OFFLINE).append('\n');

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

@@ -124,7 +124,6 @@ public class Delete extends SubCommand {
                                 "amount",
                                 Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
                         ),
-                        TagResolver.resolver("world", Tag.inserting(Component.text(plotArea.getWorldName()))),
                         TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
                 );
                 eventDispatcher.callPostDelete(plot);

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

@@ -113,34 +113,38 @@ public class Help extends Command {
             }
             if (cat == null && page == 0) {
                 TextComponent.Builder builder = Component.text();
-                builder.append(TranslatableCaption.of("help.help_header").toComponent(player));
+                builder.append(MINI_MESSAGE.deserialize(TranslatableCaption.of("help.help_header").getComponent(player)));
                 for (CommandCategory c : CommandCategory.values()) {
                     if (!c.canAccess(player)) {
                         continue;
                     }
-                    builder.append(Component.newline());
-                    builder.append(TranslatableCaption.of("help.help_info_item").toComponent(
-                            player, TagResolver.builder()
-                                    .tag("command", Tag.inserting(Component.text("/plot help")))
-                                    .tag("category", Tag.inserting(Component.text(c.name().toLowerCase())))
-                                    .tag("category_desc", Tag.inserting(c.toComponent(player)))
-                                    .build()
-                    ));
+                    builder.append(Component.newline()).append(MINI_MESSAGE
+                            .deserialize(
+                                    TranslatableCaption.of("help.help_info_item").getComponent(player),
+                                    TagResolver.builder()
+                                            .tag("command", Tag.inserting(Component.text("/plot help")))
+                                            .tag("category", Tag.inserting(Component.text(c.name().toLowerCase())))
+                                            .tag("category_desc", Tag.inserting(c.toComponent(player)))
+                                            .build()
+                            ));
                 }
-                builder.append(Component.newline());
-                builder.append(TranslatableCaption.of("help.help_info_item").toComponent(
-                        player, TagResolver.builder()
-                                .tag("command", Tag.inserting(Component.text("/plot help")))
-                                .tag("category", Tag.inserting(Component.text("all")))
-                                .tag(
-                                        "category_desc", Tag.inserting(TranslatableCaption
-                                                .of("help.help_display_all_commands")
-                                                .toComponent(player))
-                                )
-                                .build()
-                ));
-                builder.append(Component.newline());
-                builder.append(TranslatableCaption.of("help.help_footer").toComponent(player));
+                builder.append(Component.newline()).append(MINI_MESSAGE
+                        .deserialize(
+                                TranslatableCaption.of("help.help_info_item").getComponent(player),
+                                TagResolver.builder()
+                                        .tag("command", Tag.inserting(Component.text("/plot help")))
+                                        .tag("category", Tag.inserting(Component.text("all")))
+                                        .tag(
+                                                "category_desc",
+                                                Tag.inserting(TranslatableCaption
+                                                        .of("help.help_display_all_commands")
+                                                        .toComponent(player))
+                                        )
+                                        .build()
+                        ));
+                builder.append(Component.newline()).append(MINI_MESSAGE.deserialize(TranslatableCaption
+                        .of("help.help_footer")
+                        .getComponent(player)));
                 player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.asComponent())));
                 return true;
             }

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

@@ -44,13 +44,8 @@ import org.apache.logging.log4j.Logger;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 /**
  * PlotSquared command class.
  */
@@ -152,7 +147,8 @@ public class MainCommand extends Command {
                 try {
                     injector.getInstance(command);
                 } catch (final Exception e) {
-                    LOGGER.error("Failed to register command {}", command.getCanonicalName(), e);
+                    LOGGER.error("Failed to register command {}", command.getCanonicalName());
+                    e.printStackTrace();
                 }
             }
 
@@ -240,171 +236,111 @@ public class MainCommand extends Command {
             RunnableVal3<Command, Runnable, Runnable> confirm,
             RunnableVal2<Command, CommandResult> whenDone
     ) {
-        prepareArguments(new CommandExecutionData(player, args, confirm, whenDone, null))
-                .thenCompose(executionData -> {
-                    if (executionData.isEmpty()) {
-                        return CompletableFuture.completedFuture(false);
+        // Optional command scope //
+        Location location = null;
+        Plot plot = null;
+        boolean tp = false;
+        if (args.length >= 2) {
+            PlotArea area = player.getApplicablePlotArea();
+            Plot newPlot = Plot.fromString(area, args[0]);
+            if (newPlot != null && (player instanceof ConsolePlayer || newPlot.getArea()
+                    .equals(area) || player.hasPermission(Permission.PERMISSION_ADMIN)
+                    || player.hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO))
+                    && !newPlot.isDenied(player.getUUID())) {
+                final Location newLoc;
+                if (newPlot.getArea() instanceof SinglePlotArea) {
+                    newLoc = newPlot.isLoaded() ? newPlot.getCenterSynchronous() : Location.at("", 0, 0, 0);
+                } else {
+                    newLoc = newPlot.getCenterSynchronous();
+                }
+                if (player.canTeleport(newLoc)) {
+                    // Save meta
+                    try (final MetaDataAccess<Location> locationMetaDataAccess
+                                 = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
+                        location = locationMetaDataAccess.get().orElse(null);
+                        locationMetaDataAccess.set(newLoc);
                     }
-                    var data = executionData.get();
-                    try {
-                        return super.execute(data.player(), data.args(), data.confirm(), data.whenDone());
-                    } catch (CommandException e) {
-                        throw e;
-                    } catch (Throwable e) {
-                        LOGGER.error("A error occurred while executing plot command", e);
-                        String message = e.getMessage();
-                        if (message != null) {
-                            data.player().sendMessage(
-                                    TranslatableCaption.of("errors.error"),
-                                    TagResolver.resolver("value", Tag.inserting(Component.text(message)))
-                            );
-                        } else {
-                            data.player().sendMessage(
-                                    TranslatableCaption.of("errors.error_console"));
-                        }
-                    } finally {
-                        if (data.postCommandData() != null) {
-                            resetCommandScope(data.player(), data.postCommandData());
-                        }
+                    try (final MetaDataAccess<Plot> plotMetaDataAccess
+                                 = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
+                        plot = plotMetaDataAccess.get().orElse(null);
+                        plotMetaDataAccess.set(newPlot);
                     }
-                    return CompletableFuture.completedFuture(true);
-                });
+                    tp = true;
+                } else {
+                    player.sendMessage(TranslatableCaption.of("border.denied"));
+                    return CompletableFuture.completedFuture(false);
+                }
+                // Trim command
+                args = Arrays.copyOfRange(args, 1, args.length);
+            }
+            if (args.length >= 2 && !args[0].isEmpty() && args[0].charAt(0) == '-') {
+                if ("f".equals(args[0].substring(1))) {
+                    confirm = new RunnableVal3<>() {
+                        @Override
+                        public void run(Command cmd, Runnable success, Runnable failure) {
+                            if (area != null && PlotSquared.platform().econHandler().isEnabled(area)) {
+                                PlotExpression priceEval =
+                                        area.getPrices().get(cmd.getFullId());
+                                double price = priceEval != null ? priceEval.evaluate(0d) : 0d;
+                                if (price != 0d
+                                        && PlotSquared.platform().econHandler().getMoney(player) < price) {
+                                    if (failure != null) {
+                                        failure.run();
+                                    }
+                                    return;
+                                }
+                            }
+                            if (success != null) {
+                                success.run();
+                            }
+                        }
+                    };
+                    args = Arrays.copyOfRange(args, 1, args.length);
+                } else {
+                    player.sendMessage(TranslatableCaption.of("errors.invalid_command_flag"));
+                    return CompletableFuture.completedFuture(false);
+                }
+            }
+        }
+        try {
+            super.execute(player, args, confirm, whenDone);
+        } catch (CommandException e) {
+            throw e;
+        } catch (Throwable e) {
+            e.printStackTrace();
+            String message = e.getMessage();
+            if (message != null) {
+                player.sendMessage(
+                        TranslatableCaption.of("errors.error"),
+                        TagResolver.resolver("value", Tag.inserting(Component.text(message)))
+                );
+            } else {
+                player.sendMessage(
+                        TranslatableCaption.of("errors.error_console"));
+            }
+        }
+        // Reset command scope //
+        if (tp && !(player instanceof ConsolePlayer)) {
+            try (final MetaDataAccess<Location> locationMetaDataAccess
+                         = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
+                if (location == null) {
+                    locationMetaDataAccess.remove();
+                } else {
+                    locationMetaDataAccess.set(location);
+                }
+            }
+            try (final MetaDataAccess<Plot> plotMetaDataAccess
+                         = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
+                if (plot == null) {
+                    plotMetaDataAccess.remove();
+                } else {
+                    plotMetaDataAccess.set(plot);
+                }
+            }
+        }
         return CompletableFuture.completedFuture(true);
     }
 
-    private CompletableFuture<Optional<CommandExecutionData>> prepareArguments(CommandExecutionData data) {
-        if (data.args().length >= 2) {
-            PlotArea area = data.player().getApplicablePlotArea();
-            Plot newPlot = Plot.fromString(area, data.args()[0]);
-            return preparePlotArgument(newPlot, data, area)
-                    .thenApply(d -> d.flatMap(x -> prepareFlagArgument(x, area)));
-        } else {
-            return CompletableFuture.completedFuture(Optional.of(data));
-        }
-    }
-
-    private CompletableFuture<Optional<CommandExecutionData>> preparePlotArgument(@Nullable Plot newPlot,
-                                                                        @Nonnull CommandExecutionData data,
-                                                                                  @Nullable PlotArea area) {
-        if (newPlot != null && (data.player() instanceof ConsolePlayer
-                || (area != null && area.equals(newPlot.getArea()))
-                || data.player().hasPermission(Permission.PERMISSION_ADMIN)
-                || data.player().hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO))
-                && !newPlot.isDenied(data.player().getUUID())) {
-            return fetchPlotCenterLocation(newPlot)
-                    .thenApply(newLoc -> {
-                        if (!data.player().canTeleport(newLoc)) {
-                            data.player().sendMessage(TranslatableCaption.of("border.denied"));
-                            return Optional.empty();
-                        }
-                        // Save meta
-                        var originalCommandMeta = setCommandScope(data.player(), new TemporaryCommandMeta(newLoc, newPlot));
-                        return Optional.of(new CommandExecutionData(
-                                data.player(),
-                                Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
-                                data.confirm(),
-                                data.whenDone(),
-                                originalCommandMeta
-                        ));
-                    });
-        }
-        return CompletableFuture.completedFuture(Optional.of(data));
-    }
-
-    private Optional<CommandExecutionData> prepareFlagArgument(@Nonnull CommandExecutionData data, @Nonnull PlotArea area) {
-        if (data.args().length >= 2 && !data.args()[0].isEmpty() && data.args()[0].charAt(0) == '-') {
-            if ("f".equals(data.args()[0].substring(1))) {
-                return Optional.of(new CommandExecutionData(
-                        data.player(),
-                        Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
-                        createForcedConfirmation(data.player(), area),
-                        data.whenDone(),
-                        data.postCommandData()
-                ));
-            } else {
-                data.player().sendMessage(TranslatableCaption.of("errors.invalid_command_flag"));
-                return Optional.empty();
-            }
-        }
-        return Optional.of(data);
-    }
-
-    private CompletableFuture<Location> fetchPlotCenterLocation(Plot plot) {
-        if (plot.getArea() instanceof SinglePlotArea && !plot.isLoaded()) {
-            return CompletableFuture.completedFuture(Location.at("", 0, 0, 0));
-        }
-        CompletableFuture<Location> future = new CompletableFuture<>();
-        plot.getCenter(future::complete);
-        return future;
-    }
-
-    private @Nonnull RunnableVal3<Command, Runnable, Runnable> createForcedConfirmation(@Nonnull PlotPlayer<?> player,
-                                                                                        @Nullable PlotArea area) {
-        return new RunnableVal3<>() {
-            @Override
-            public void run(Command cmd, Runnable success, Runnable failure) {
-                if (area != null && PlotSquared.platform().econHandler().isEnabled(area)
-                        && Optional.of(area.getPrices().get(cmd.getFullId()))
-                        .map(priceEval -> priceEval.evaluate(0d))
-                        .filter(price -> price != 0d)
-                        .filter(price -> PlotSquared.platform().econHandler().getMoney(player) < price)
-                        .isPresent()) {
-                    if (failure != null) {
-                        failure.run();
-                    }
-                    return;
-                }
-                if (success != null) {
-                    success.run();
-                }
-            }
-        };
-    }
-
-    private @Nonnull TemporaryCommandMeta setCommandScope(@Nonnull PlotPlayer<?> player, @Nonnull TemporaryCommandMeta commandMeta) {
-        Objects.requireNonNull(commandMeta.location());
-        Objects.requireNonNull(commandMeta.plot());
-        Location location;
-        Plot plot;
-        try (final MetaDataAccess<Location> locationMetaDataAccess
-                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
-            location = locationMetaDataAccess.get().orElse(null);
-            locationMetaDataAccess.set(commandMeta.location());
-        }
-        try (final MetaDataAccess<Plot> plotMetaDataAccess
-                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
-            plot = plotMetaDataAccess.get().orElse(null);
-            plotMetaDataAccess.set(commandMeta.plot());
-        }
-        return new TemporaryCommandMeta(location, plot);
-    }
-
-    private void resetCommandScope(@Nonnull PlotPlayer<?> player, @Nonnull TemporaryCommandMeta commandMeta) {
-        try (final MetaDataAccess<Location> locationMetaDataAccess
-                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
-            if (commandMeta.location() == null) {
-                locationMetaDataAccess.remove();
-            } else {
-                locationMetaDataAccess.set(commandMeta.location());
-            }
-        }
-        try (final MetaDataAccess<Plot> plotMetaDataAccess
-                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
-            if (commandMeta.plot() == null) {
-                plotMetaDataAccess.remove();
-            } else {
-                plotMetaDataAccess.set(commandMeta.plot());
-            }
-        }
-    }
-
-    private record CommandExecutionData(@Nonnull PlotPlayer<?> player, @Nonnull String[] args,
-                    @Nonnull RunnableVal3<Command, Runnable, Runnable> confirm,
-                    @Nonnull RunnableVal2<Command, CommandResult> whenDone,
-                    @Nullable TemporaryCommandMeta postCommandData) {}
-
-    private record TemporaryCommandMeta(@Nullable Location location, @Nullable Plot plot) {}
-
     @Override
     public boolean canExecute(PlotPlayer<?> player, boolean message) {
         return true;

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

@@ -56,13 +56,9 @@ public class Music extends SubCommand {
             .asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
                     "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
                     "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
-                    "music_disc_pigstep", "music_disc_5", "music_disc_relic", "music_disc_creator",
-                    "music_disc_creator_music_box", "music_disc_precipice"
+                    "music_disc_pigstep", "music_disc_5", "music_disc_relic"
             );
 
-    // make sure all discs and the bedrock ("cancel") fit into the inventory
-    private static final int INVENTORY_ROWS = (int) Math.ceil((DISCS.size() + 1) / 9.0);
-
     private final InventoryUtil inventoryUtil;
     private final EventDispatcher eventDispatcher;
 
@@ -97,7 +93,7 @@ public class Music extends SubCommand {
         PlotInventory inv = new PlotInventory(
                 this.inventoryUtil,
                 player,
-                INVENTORY_ROWS,
+                2,
                 TranslatableCaption.of("plotjukebox.jukebox_header").getComponent(player)
         ) {
             @Override

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

@@ -117,8 +117,8 @@ public class Remove extends SubCommand {
             }
             if (count == 0) {
                 player.sendMessage(
-                        TranslatableCaption.of("member.player_not_removed"),
-                        TagResolver.resolver("player", Tag.inserting(Component.text(args[0])))
+                        TranslatableCaption.of("errors.invalid_player"),
+                        TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
                 );
             } else {
                 player.sendMessage(

Core/src/main/java/com/plotsquared/core/configuration/Config.java

@@ -26,7 +26,6 @@ import org.apache.logging.log4j.Logger;
 
 import java.io.File;
 import java.io.PrintWriter;
-import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -373,7 +372,6 @@ public class Config {
      */
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.FIELD, ElementType.TYPE})
-    @Documented
     public @interface Comment {
 
         String[] value();

Core/src/main/java/com/plotsquared/core/configuration/Settings.java

@@ -525,8 +525,8 @@ public class Settings extends Config {
     public static final class Limit {
 
         @Comment("Should the limit be global (over multiple worlds)")
-        public static boolean GLOBAL = false;
-
+        public static boolean GLOBAL =
+                false;
         @Comment({"The max range of integer permissions to check for, e.g. 'plots.plot.127' or 'plots.set.flag.mob-cap.127'",
                 "The value covers the permission range to check, you need to assign the permission to players/groups still",
                 "Modifying the value does NOT change the amount of plots players can claim"})
@@ -582,8 +582,6 @@ public class Settings extends Config {
         public static boolean PER_WORLD_VISIT = false;
         @Comment("Search merged plots for having multiple owners when using the visit command")
         public static boolean VISIT_MERGED_OWNERS = true;
-        @Comment("Allows to teleport based on block size instead to spawn on the highest block at the home command")
-        public static boolean SIZED_BASED = true;
 
     }
 
@@ -653,8 +651,6 @@ public class Settings extends Config {
         public static boolean PAPER_LISTENERS = true;
         @Comment("Prevent entities from leaving plots")
         public static boolean ENTITY_PATHING = true;
-        @Comment("Prevent entities from leaving plots, even by pushing or pulling")
-        public static boolean ENTITY_MOVEMENT = false;
         @Comment(
                 "Cancel entity spawns when the chunk is loaded if the PlotArea's mob spawning is off")
         public static boolean CANCEL_CHUNK_SPAWN = true;
@@ -737,7 +733,6 @@ public class Settings extends Config {
 
         @Comment("If \"instabreak\" should consider the used tool.")
         public static boolean INSTABREAK_CONSIDER_TOOL = false;
-
     }
 
     @Comment({"Enable or disable parts of the plugin",
@@ -831,17 +826,4 @@ public class Settings extends Config {
 
     }
 
-    @Comment({"Permission-Resolver specific settings"})
-    public static final class Permissions {
-
-        @Comment({
-                "use the new LuckPerms resolver for ranged permissions (e.g., plots.plot.<number>).",
-                "in contrary to the default resolver, this resolver can handle inheritance of permissions.",
-                "e.g. if the player has multiple matching permissions, for example, due to multiple group memberships " +
-                        "(plots.plot.5 & plots.plot.15), this resolver would use 15 as the limit as opposed to the previous 5."
-        })
-        public static boolean USE_LUCKPERMS_RANGE_RESOLVER = false;
-
-    }
-
 }

Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java

@@ -20,7 +20,6 @@ package com.plotsquared.core.configuration.caption;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
@@ -45,16 +44,6 @@ public interface Caption {
      */
     @NonNull Component toComponent(@NonNull LocaleHolder localeHolder);
 
-    /**
-     * Get the Adventure {@link ComponentLike} for this caption while applying custom {@link TagResolver}
-     * (apart from the default {@code core.prefix})
-     * @param localeHolder Local holder
-     * @param tagResolvers custom tag resolvers to replace placeholders / parameters
-     * @return {@link ComponentLike}
-     * @since TODO
-     */
-    @NonNull Component toComponent(@NonNull LocaleHolder localeHolder, @NonNull TagResolver @NonNull... tagResolvers);
-
     @NonNull String toString();
 
 }

Core/src/main/java/com/plotsquared/core/configuration/caption/StaticCaption.java

@@ -21,7 +21,6 @@ package com.plotsquared.core.configuration.caption;
 import com.google.common.base.Preconditions;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 public final class StaticCaption implements Caption {
@@ -52,14 +51,6 @@ public final class StaticCaption implements Caption {
         return MiniMessage.miniMessage().deserialize(this.value);
     }
 
-    @Override
-    public @NonNull Component toComponent(
-            @NonNull final LocaleHolder localeHolder,
-            final @NonNull TagResolver @NonNull ... tagResolvers
-    ) {
-        return MiniMessage.miniMessage().deserialize(this.value, tagResolvers);
-    }
-
     @Override
     public @NonNull String toString() {
         return "StaticCaption(" + value + ")";

Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java

@@ -27,7 +27,6 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
@@ -97,23 +96,13 @@ public final class TranslatableCaption implements NamespacedCaption {
 
     @Override
     public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) {
-        return this.toComponent(localeHolder, new TagResolver[0]);
-    }
-
-    @Override
-    public @NonNull Component toComponent(
-            @NonNull final LocaleHolder localeHolder,
-            final @NonNull TagResolver @NonNull ... tagResolvers
-    ) {
         if (getKey().equals("core.prefix")) {
             return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
         }
-        TagResolver[] finalResolvers = Arrays.copyOf(tagResolvers, tagResolvers.length + 1);
-        finalResolvers[finalResolvers.length - 1] = TagResolver.resolver(
+        return MiniMessage.miniMessage().deserialize(getComponent(localeHolder), TagResolver.resolver(
                 "prefix",
                 Tag.inserting(TranslatableCaption.of("core.prefix").toComponent(localeHolder))
-        );
-        return MiniMessage.miniMessage().deserialize(getComponent(localeHolder), finalResolvers);
+        ));
     }
 
     @Override

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

@@ -432,7 +432,6 @@ public class HybridUtils {
                 if (!UPDATE) {
                     Iterator<BlockVector2> iter = chunks.iterator();
                     QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
-                    queue.setShouldGen(false);
                     while (iter.hasNext()) {
                         BlockVector2 chunk = iter.next();
                         iter.remove();
@@ -475,7 +474,6 @@ public class HybridUtils {
                                     Iterator<BlockVector2> iterator = chunks.iterator();
                                     if (chunks.size() >= 32) {
                                         QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
-                                        queue.setShouldGen(false);
                                         for (int i = 0; i < 32; i++) {
                                             final BlockVector2 chunk = iterator.next();
                                             iterator.remove();
@@ -489,7 +487,6 @@ public class HybridUtils {
                                         return null;
                                     }
                                     QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
-                                    queue.setShouldGen(false);
                                     while (!chunks.isEmpty()) {
                                         final BlockVector2 chunk = iterator.next();
                                         iterator.remove();
@@ -505,6 +502,7 @@ public class HybridUtils {
                                 return;
                             }
                         } catch (Exception e) {
+                            e.printStackTrace();
                             Iterator<BlockVector2> iterator = HybridUtils.regions.iterator();
                             BlockVector2 loc = iterator.next();
                             iterator.remove();
@@ -512,8 +510,7 @@ public class HybridUtils {
                                     "Error! Could not update '{}/region/r.{}.{}.mca' (Corrupt chunk?)",
                                     area.getWorldHash(),
                                     loc.getX(),
-                                    loc.getZ(),
-                                    e
+                                    loc.getZ()
                             );
                         }
                         TaskManager.runTaskLater(task, TaskTime.seconds(1L));
@@ -561,7 +558,7 @@ public class HybridUtils {
                                 try {
                                     plotworld.setupSchematics();
                                 } catch (SchematicHandler.UnsupportedFormatException e) {
-                                    LOGGER.error(e);
+                                    e.printStackTrace();
                                 }
                             });
                 });

Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorFactory.java

@@ -40,8 +40,7 @@ public interface ChunkCoordinatorFactory {
             final @NonNull Consumer<Throwable> throwableConsumer,
             @Assisted("unloadAfter") final boolean unloadAfter,
             final @NonNull Collection<ProgressSubscriber> progressSubscribers,
-            @Assisted("forceSync") final boolean forceSync,
-            @Assisted("shouldGen") final boolean shouldGen
+            @Assisted("forceSync") final boolean forceSync
     );
 
 }

Core/src/main/java/com/plotsquared/core/permissions/RangedPermissionResolver.java

@@ -1,126 +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.permissions;
-
-import com.plotsquared.core.player.PlotPlayer;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.stream.IntStream;
-
-/**
- * Represents a resolver for ranged permissions. Return values depend on the actual implementation (see Bukkit module).
- * <br>
- * Even though this interface is not linked to platform implementations by design, implementation-specific details are added to
- * the Javadocs.
- *
- * @since TODO
- */
-public interface RangedPermissionResolver {
-
-    int INFINITE_RANGE_VALUE = Integer.MAX_VALUE;
-
-    /**
-     * Gets the applicable range value of a player for a specific permission stub
-     * ({@code plots.plot} would check for {@code plots.plot.<numeric>}).
-     * <br>
-     * The standard bukkit implementation would return the lowest numeric value, while the LuckPerms specific resolver would
-     * try returning the highest possible value.
-     *
-     * @param player       the permission holder
-     * @param stub         the permission stub to check against
-     * @param worldContext the optional world context of the action requiring the range
-     * @param range        the maximum permission range to check against (for the default bukkit resolver)
-     * @return the applicable range value of the player for the given permission stub
-     * @since TODO
-     */
-    @NonNegative
-    int getPermissionRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            final @NonNegative int range
-    );
-
-    /**
-     * Gets a stream of all applicable permission range values for the given stub. The stream is unordered by default. If a
-     * specific order is needed, use the stateful {@link IntStream#sorted()} operation.
-     * <br>
-     * The standard bukkit implementation will only return a stream containing a single value equal to
-     * {@link #getPermissionRange(PlotPlayer, String, String, int)}. For LuckPerms, all applicable node values will be in the
-     * stream.
-     *
-     * @param player       the permission holder
-     * @param stub         the permission stub to check against
-     * @param worldContext the optional world context of the action requiring the range
-     * @param range        the maximum permission range to check against (for the default bukkit resolver)
-     * @return a stream of all applicable permission range values for the given stub
-     * @since TODO
-     */
-    @NonNull
-    IntStream streamFullPermissionRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            final @NonNegative int range
-    );
-
-    /**
-     * Checks if the given player has a wildcard range for the given permission stub.
-     * <br>
-     * For example, if checking for the stub {@code plots.plot}, this method would check for:
-     * <ul>
-     *     <li>{@code *}</li>
-     *     <li>{@code plots.admin}</li>
-     *     <li>{@code plots.plot.*}</li>
-     *     <li>{@code plots.*}</li>
-     * </ul>
-     *
-     * @param player       the permission holder
-     * @param stub         the permission stub to check against
-     * @param worldContext the optional world context of the action requiring the range
-     * @return {@code true} if the player has a wildcard range for the given permission stub, else {@code false}
-     * @since TODO
-     */
-    default boolean hasWildcardRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext
-    ) {
-        if (player.hasPermission(Permission.PERMISSION_STAR) ||
-                player.hasPermission(Permission.PERMISSION_ADMIN) ||
-                player.hasPermission(worldContext, stub + ".*")) {
-            return true;
-        }
-        String node = stub;
-        while (true) {
-            int lastIndex = node.lastIndexOf('.');
-            if (lastIndex == -1) {
-                break;
-            }
-            node = node.substring(0, lastIndex);
-            if (player.hasPermission(worldContext, node + ".*")) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java

@@ -444,7 +444,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     /**
      * Get this player's UUID.
-     * <p>=== !IMPORTANT ===</p>
+     * === !IMPORTANT ===<br>
      * The UUID is dependent on the mode chosen in the settings.yml and may not be the same as Bukkit has
      * (especially if using an old version of Bukkit that does not support UUIDs)
      *

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

@@ -1407,9 +1407,6 @@ public class Plot {
                 );
             }
             Location location = toHomeLocation(bottom, home);
-            if (Settings.Teleport.SIZED_BASED && this.worldUtil.isSmallBlock(location) && this.worldUtil.isSmallBlock(location.add(0,1,0))) {
-                return location;
-            }
             if (!this.worldUtil.getBlockSynchronous(location).getBlockType().getMaterial().isAir()) {
                 location = location.withY(
                         Math.max(1 + this.worldUtil.getHighestBlockSynchronous(
@@ -1443,21 +1440,15 @@ public class Plot {
             }
             Location bottom = this.getBottomAbs();
             Location location = toHomeLocation(bottom, home);
-            if (Settings.Teleport.SIZED_BASED && this.worldUtil.isSmallBlock(location) && this.worldUtil.isSmallBlock(location.add(0,1,0))) {
-                result.accept(location);
-            } else {
-                this.worldUtil.getBlock(location, block -> {
-
-                    if (!block.getBlockType().getMaterial().isAir()) {
-                        this.worldUtil.getHighestBlock(this.getWorldName(), location.getX(), location.getZ(),
-                                y -> result.accept(location.withY(Math.max(1 + y, bottom.getY())))
-                        );
-                    } else {
-                        result.accept(location);
-                    }
-                });
-            }
-
+            this.worldUtil.getBlock(location, block -> {
+                if (!block.getBlockType().getMaterial().isAir()) {
+                    this.worldUtil.getHighestBlock(this.getWorldName(), location.getX(), location.getZ(),
+                            y -> result.accept(location.withY(Math.max(1 + y, bottom.getY())))
+                    );
+                } else {
+                    result.accept(location);
+                }
+            });
         }
     }
 
@@ -1717,7 +1708,6 @@ public class Plot {
         }
         player.sendMessage(
                 TranslatableCaption.of("working.claimed"),
-                TagResolver.resolver("world", Tag.inserting(Component.text(this.getWorldName()))),
                 TagResolver.resolver("plot", Tag.inserting(Component.text(this.getId().toString())))
         );
         if (teleport) {

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

@@ -52,7 +52,6 @@ public class ChunkCoordinatorBuilder {
     private int initialBatchSize = Settings.QUEUE.INITIAL_BATCH_SIZE;
     private boolean unloadAfter = true;
     private boolean forceSync = false;
-    private boolean shouldGen = true;
 
     @Inject
     public ChunkCoordinatorBuilder(@NonNull ChunkCoordinatorFactory chunkCoordinatorFactory) {
@@ -204,19 +203,6 @@ public class ChunkCoordinatorBuilder {
         return this;
     }
 
-    /**
-     * Set whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported
-     * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation
-     * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper).
-     *
-     * @param shouldGen should generate new chunks or not
-     * @since 7.5.0
-     */
-    public @NonNull ChunkCoordinatorBuilder shouldGen(final boolean shouldGen) {
-        this.shouldGen = shouldGen;
-        return this;
-    }
-
     public @NonNull ChunkCoordinatorBuilder withProgressSubscriber(ProgressSubscriber progressSubscriber) {
         this.progressSubscribers.add(progressSubscriber);
         return this;
@@ -248,8 +234,7 @@ public class ChunkCoordinatorBuilder {
                         this.throwableConsumer,
                         this.unloadAfter,
                         this.progressSubscribers,
-                        this.forceSync,
-                        this.shouldGen
+                        this.forceSync
                 );
     }
 

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

@@ -51,7 +51,6 @@ public class DelegateQueueCoordinator extends QueueCoordinator {
 
         if (parent != null) {
             this.setForceSync(parent.isForceSync());
-            this.setShouldGen(parent.isShouldGen());
         }
     }
 

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

@@ -45,7 +45,6 @@ public abstract class QueueCoordinator {
 
     private final AtomicBoolean enqueued = new AtomicBoolean();
     private boolean forceSync = false;
-    private boolean shouldGen = true;
     @Nullable
     private Object chunkObject;
     @SuppressWarnings({"unused", "FieldCanBeLocal"})
@@ -111,30 +110,6 @@ public abstract class QueueCoordinator {
         this.forceSync = forceSync;
     }
 
-
-    /**
-     * Get whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported
-     * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation
-     * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper).
-     *
-     * @since 7.5.0
-     */
-    public boolean isShouldGen() {
-        return shouldGen;
-    }
-
-    /**
-     * Set whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported
-     * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation
-     * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper).
-     *
-     * @param shouldGen should generate new chunks or not
-     * @since 7.5.0
-     */
-    public void setShouldGen(boolean shouldGen) {
-        this.shouldGen = shouldGen;
-    }
-
     /**
      * Get the Chunk Object set to the queue
      *

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

@@ -177,13 +177,6 @@ public abstract class WorldUtil {
      */
     public abstract void getBlock(@NonNull Location location, @NonNull Consumer<BlockState> result);
 
-    /**
-     * Checks if the block smaller as a slab
-     * @param location Block location
-     * @return true if it smaller as a slab
-     */
-    public abstract boolean isSmallBlock(@NonNull Location location);
-
     /**
      * Get the block at a given location (synchronously)
      *

Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java

@@ -25,24 +25,30 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.util.StringMan;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.jetbrains.annotations.NotNull;
 
 public class HelpObject implements ComponentLike {
 
+    static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
+
     private final Component rendered;
 
     public HelpObject(final Command command, final String label, final PlotPlayer<?> audience) {
-        this.rendered = TranslatableCaption.of("help.help_item").toComponent(audience, TagResolver.builder()
-                .tag("usage", Tag.inserting(Component.text(command.getUsage().replace("{label}", label))))
-                .tag("alias", Tag.inserting(Component.text(
-                        command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ")
-                )))
-                .tag("desc", Tag.inserting(command.getDescription().toComponent(audience)))
-                .tag("arguments", Tag.inserting(Component.text(buildArgumentList(command.getRequiredArguments()))))
-                .tag("label", Tag.inserting(Component.text(label)))
-                .build());
+        rendered = MINI_MESSAGE.deserialize(
+                TranslatableCaption.of("help.help_item").getComponent(audience),
+                TagResolver.builder()
+                        .tag("usage", Tag.inserting(Component.text(command.getUsage().replace("{label}", label))))
+                        .tag("alias", Tag.inserting(Component.text(
+                                command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ")
+                        )))
+                        .tag("desc", Tag.inserting(command.getDescription().toComponent(audience)))
+                        .tag("arguments", Tag.inserting(Component.text(buildArgumentList(command.getRequiredArguments()))))
+                        .tag("label", Tag.inserting(Component.text(label)))
+                        .build()
+        );
     }
 
     private String buildArgumentList(final Argument<?>[] arguments) {

Core/src/main/resources/lang/messages_en.json

@@ -390,11 +390,11 @@
   "info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
   "info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
   "working.generating_component": "<prefix><gold>Started generating component from your settings.</gold>",
-  "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
-  "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
+  "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
+  "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
   "working.plot_not_claimed": "<prefix><gray>Plot not claimed.</gray>",
   "working.plot_is_claimed": "<prefix><gray>This plot is already claimed.</gray>",
-  "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><world>;<plot></gold><dark_aqua>.</dark_aqua>",
+  "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><plot></gold><dark_aqua>.</dark_aqua>",
   "working.progress": "<prefix><gray>Current progress: </gray><gold><progress></gold><gray>%</gray>",
   "working.component_complete": "<prefix><gold>Component generation has finished for plot <plot>.</gold>",
   "list.comment_list_header_paged": "<gray>(Page </gray><gold><cur></gold><gray>/</gray><gold><max></gold><gray>) </gray><gold>List of <amount> comment(s):</gold>",

build.gradle.kts

@@ -1,6 +1,5 @@
 import com.diffplug.gradle.spotless.SpotlessPlugin
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
-import com.vanniktech.maven.publish.SonatypeHost
 import groovy.json.JsonSlurper
 import xyz.jpenilla.runpaper.task.RunServer
 import java.net.URI
@@ -8,12 +7,13 @@ import java.net.URI
 plugins {
     java
     `java-library`
+    `maven-publish`
     signing
 
     alias(libs.plugins.shadow)
     alias(libs.plugins.spotless)
     alias(libs.plugins.grgit)
-    alias(libs.plugins.publish)
+    alias(libs.plugins.nexus)
 
     eclipse
     idea
@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.4-SNAPSHOT"
+version = "7.4.1-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -41,6 +41,16 @@ subprojects {
     repositories {
         mavenCentral()
 
+        maven {
+            name = "Sonatype OSS"
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
+
+        maven {
+            name = "Sonatype OSS (S01)"
+            url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+        }
+
         maven {
             name = "Jitpack"
             url = uri("https://jitpack.io")
@@ -58,7 +68,7 @@ subprojects {
     apply {
         plugin<JavaPlugin>()
         plugin<JavaLibraryPlugin>()
-        plugin<com.vanniktech.maven.publish.MavenPublishPlugin>()
+        plugin<MavenPublishPlugin>()
         plugin<ShadowPlugin>()
         plugin<SpotlessPlugin>()
         plugin<SigningPlugin>()
@@ -69,8 +79,8 @@ subprojects {
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.13.0")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.0")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.11.3")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.3")
     }
 
     plugins.withId("java") {
@@ -97,6 +107,11 @@ subprojects {
         }
     }
 
+    java {
+        withSourcesJar()
+        withJavadocJar()
+    }
+
     val javaComponent = components["java"] as AdhocComponentWithVariants
     javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
         skip()
@@ -112,67 +127,66 @@ subprojects {
         }
     }
 
-    mavenPublishing {
-        coordinates(
-            groupId = "$group",
-            artifactId = project.name,
-            version = "${project.version}",
-        )
+    publishing {
+        publications {
+            create<MavenPublication>("maven") {
+                from(components["java"])
 
-        pom {
-            name.set(project.name)
-            description.set("PlotSquared, a land and world management plugin for Minecraft.")
-            url.set("https://github.com/IntellectualSites/PlotSquared")
+                pom {
 
-            licenses {
-                license {
-                    name.set("GNU General Public License, Version 3.0")
-                    url.set("https://www.gnu.org/licenses/gpl-3.0.html")
-                    distribution.set("repo")
+                    name.set(project.name + " " + project.version)
+                    description.set("PlotSquared, a land and world management plugin for Minecraft.")
+                    url.set("https://github.com/IntellectualSites/PlotSquared")
+
+                    licenses {
+                        license {
+                            name.set("GNU General Public License, Version 3.0")
+                            url.set("https://www.gnu.org/licenses/gpl-3.0.html")
+                            distribution.set("repo")
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id.set("Sauilitired")
+                            name.set("Alexander Söderberg")
+                            organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
+                        }
+                        developer {
+                            id.set("NotMyFault")
+                            name.set("Alexander Brandes")
+                            organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
+                            email.set("contact(at)notmyfault.dev")
+                        }
+                        developer {
+                            id.set("SirYwell")
+                            name.set("Hannes Greule")
+                            organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
+                        }
+                        developer {
+                            id.set("dordsor21")
+                            name.set("dordsor21")
+                            organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
+                        }
+                    }
+
+                    scm {
+                        url.set("https://github.com/IntellectualSites/PlotSquared")
+                        connection.set("scm:git:https://github.com/IntellectualSites/PlotSquared.git")
+                        developerConnection.set("scm:git:git@github.com:IntellectualSites/PlotSquared.git")
+                        tag.set("${project.version}")
+                    }
+
+                    issueManagement {
+                        system.set("GitHub")
+                        url.set("https://github.com/IntellectualSites/PlotSquared/issues")
+                    }
                 }
             }
-
-            developers {
-                developer {
-                    id.set("Sauilitired")
-                    name.set("Alexander Söderberg")
-                    organization.set("IntellectualSites")
-                    organizationUrl.set("https://github.com/IntellectualSites")
-                }
-                developer {
-                    id.set("NotMyFault")
-                    name.set("Alexander Brandes")
-                    organization.set("IntellectualSites")
-                    organizationUrl.set("https://github.com/IntellectualSites")
-                    email.set("contact(at)notmyfault.dev")
-                }
-                developer {
-                    id.set("SirYwell")
-                    name.set("Hannes Greule")
-                    organization.set("IntellectualSites")
-                    organizationUrl.set("https://github.com/IntellectualSites")
-                }
-                developer {
-                    id.set("dordsor21")
-                    name.set("dordsor21")
-                    organization.set("IntellectualSites")
-                    organizationUrl.set("https://github.com/IntellectualSites")
-                }
-            }
-
-            scm {
-                url.set("https://github.com/IntellectualSites/PlotSquared")
-                connection.set("scm:git:https://github.com/IntellectualSites/PlotSquared.git")
-                developerConnection.set("scm:git:git@github.com:IntellectualSites/PlotSquared.git")
-                tag.set("${project.version}")
-            }
-
-            issueManagement {
-                system.set("GitHub")
-                url.set("https://github.com/IntellectualSites/PlotSquared/issues")
-            }
-
-            publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
         }
     }
 
@@ -180,6 +194,7 @@ subprojects {
 
         compileJava {
             options.compilerArgs.add("-parameters")
+            options.isDeprecation = true
             options.encoding = "UTF-8"
         }
 
@@ -202,18 +217,27 @@ subprojects {
     }
 }
 
+nexusPublishing {
+    this.repositories {
+        sonatype {
+            nexusUrl.set(URI.create("https://s01.oss.sonatype.org/service/local/"))
+            snapshotRepositoryUrl.set(URI.create("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
+        }
+    }
+}
+
 tasks.getByName<Jar>("jar") {
     enabled = false
 }
 
-val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5")
+val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1", "1.21.3")
 tasks {
     register("cacheLatestFaweArtifact") {
         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
         val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>)
                 .map { it as Map<*, *> }
                 .map { it["fileName"] as String }
-                .first { it -> it.contains("Paper") }
+                .first { it -> it.contains("Bukkit") }
         project.ext["faweArtifact"] = artifact
     }
 

gradle/libs.versions.toml

@@ -2,41 +2,41 @@
 # Platform expectations
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.9.3"
-checkerqual = "3.49.3"
+spotbugs = "4.8.6"
+checkerqual = "3.48.2"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.21.0"
-adventure-bukkit = "4.4.0"
+adventure = "4.17.0"
+adventure-bukkit = "4.3.4"
 log4j = "2.19.0"
 
 # Plugins
 worldedit = "7.2.20"
-fawe = "2.13.0"
+fawe = "2.12.0"
 placeholderapi = "2.11.6"
-luckperms = "5.5"
-essentialsx = "2.21.1"
+luckperms = "5.4"
+essentialsx = "2.20.1"
 mvdwapi = "3.1.1"
 
 # Third party
 prtree = "2.0.1"
 aopalliance = "1.0"
 cloud-services = "1.8.4"
-arkitektonika = "2.1.4"
+arkitektonika = "2.1.3"
 squirrelid = "0.3.2"
-paster = "1.1.7"
+paster = "1.1.6"
 bstats = "3.1.0"
 paperlib = "1.0.8"
-informative-annotations = "1.6"
+informative-annotations = "1.5"
 vault = "1.7.1"
-serverlib = "2.3.7"
+serverlib = "2.3.6"
 
 # Gradle plugins
-shadow = "8.3.6"
+shadow = "8.3.5"
 grgit = "4.1.1"
-spotless = "7.0.4"
-publish = "0.32.0"
+spotless = "6.25.0"
+nexus = "2.0.0"
 runPaper = "2.3.1"
 
 [libraries]
@@ -81,5 +81,5 @@ serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.re
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
-publish = { id = "com.vanniktech.maven.publish", version.ref = "publish" }
+nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
 runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +115,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +206,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -213,7 +214,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell