fix: allow cauldron in use flag to behave as expected

.github/renovate.json

@@ -2,8 +2,7 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:recommended",
-    ":semanticCommitsDisabled",
-    "schedule:earlyMondays"
+    ":semanticCommitsDisabled"
   ],
   "automerge": true,
   "labels": [

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

@@ -11,7 +11,7 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
           DISCORD_USERNAME: PlotSquared Release
           DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@0.3.2
         with:
           args: |
             "<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"

.github/workflows/build-pr.yml

@@ -9,11 +9,11 @@ jobs:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v4
       - name: Setup Java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 21

.github/workflows/build.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v4
       - name: Setup Java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 21

.github/workflows/codeql.yml

@@ -20,17 +20,17 @@ jobs:
         language: [ 'java' ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 21
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v4
+        uses: github/codeql-action/autobuild@v3
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v4
+        uses: github/codeql-action/analyze@v3

Bukkit/build.gradle.kts

@@ -17,19 +17,6 @@ repositories {
     }
 }
 
-// Make sure we control the exact version of paper being included, while dropping spigot + bukkit
-configurations.all {
-    exclude("org.bukkit")
-    exclude("org.spigotmc")
-
-    resolutionStrategy.eachDependency {
-        if (requested.group == "io.papermc.paper" && requested.name == "paper-api") {
-            useVersion(checkNotNull(libs.paper.orNull?.version))
-            because("specific paper version is required to prevent binary incompatibilities on older versions")
-        }
-    }
-}
-
 dependencies {
     api(projects.plotsquaredCore)
 
@@ -41,13 +28,20 @@ dependencies {
     implementation(libs.paperlib)
 
     // Plugins
-    compileOnly(libs.worldeditBukkit)
+    compileOnly(libs.worldeditBukkit) {
+        exclude(group = "org.bukkit")
+        exclude(group = "org.spigotmc")
+    }
     compileOnly(libs.faweBukkit) { isTransitive = false }
     testImplementation(libs.faweBukkit) { isTransitive = false }
-    compileOnly(libs.vault)
+    compileOnly(libs.vault) {
+        exclude(group = "org.bukkit")
+    }
     compileOnly(libs.placeholderapi)
     compileOnly(libs.luckperms)
-    compileOnly(libs.essentialsx)
+    compileOnly(libs.essentialsx) {
+        exclude(group = "org.spigotmc")
+    }
     compileOnly(libs.mvdwapi) { isTransitive = false }
 
     // Other libraries
@@ -80,7 +74,7 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination")
     relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
     relocate("org.bstats", "com.plotsquared.metrics")
-    relocate("org.enginehub.squirrelid", "com.plotsquared.squirrelid")
+    relocate("org.enginehub", "com.plotsquared.squirrelid")
     relocate("org.khelekore.prtree", "com.plotsquared.prtree")
     relocate("com.google.inject", "com.plotsquared.google")
     relocate("org.aopalliance", "com.plotsquared.core.aopalliance")

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

@@ -837,8 +837,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                         case "HOPPER_MINECART":
                         case "MINECART_MOB_SPAWNER":
                         case "SPAWNER_MINECART":
-                        case "END_CRYSTAL":
-                        case "ENDER_CRYSTAL": // Backwards compatibility for 1.20.4
+                        case "ENDER_CRYSTAL":
                         case "MINECART_TNT":
                         case "TNT_MINECART":
                         case "CHEST_BOAT":
@@ -956,8 +955,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                         case "ENDERMITE":
                         case "ENDER_DRAGON":
                         case "GHAST":
-                        case "HAPPY_GHAST": // 1.21.6+
-                        case "GHASTLING": // 1.21.6+
                         case "GIANT":
                         case "GUARDIAN":
                         case "HORSE":

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

@@ -115,7 +115,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType());
                 storeInventory(boat);
             }
-            case "ARROW", "EGG", "END_CRYSTAL", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
+            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
                     "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER",
                     "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION",
                     "THROWN_EXP_BOTTLE", "WITHER_SKULL", "UNKNOWN", "SPECTRAL_ARROW", "SHULKER_BULLET", "DRAGON_FIREBALL", "AREA_EFFECT_CLOUD",
@@ -272,7 +272,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 this.dataByte = (byte) entity1.getPhase().ordinal();
                 return;
             }
-            case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "HAPPY_GHAST", "GHASTLING", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN",
+            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" -> {
                 storeLiving((LivingEntity) entity);
@@ -511,7 +511,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 ((Slime) entity).setSize(this.dataByte);
                 return entity;
             } */
-            case "ARROW", "EGG", "END_CRYSTAL", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
+            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
                     "FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND",
                     "MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL",
                     "SPLASH_POTION", "THROWN_EXP_BOTTLE", "SPECTRAL_ARROW", "SHULKER_BULLET", "AREA_EFFECT_CLOUD",
@@ -676,7 +676,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }
-            case "ENDERMITE", "GHAST", "HAPPY_GHAST", "GHASTLING", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", "PIGLIN", "ZOMBIFIED_PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SNOWMAN", "SHULKER", "GUARDIAN", "ELDER_GUARDIAN", "SKELETON", "WITHER_SKELETON" -> {
+            case "ENDERMITE", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", "PIGLIN", "ZOMBIFIED_PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SNOWMAN", "SHULKER", "GUARDIAN", "ELDER_GUARDIAN", "SKELETON", "WITHER_SKELETON" -> {
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }

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

@@ -90,7 +90,12 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         this.plotGenerator = generator;
         this.platformGenerator = this;
         this.populators = new ArrayList<>();
+        int minecraftMinorVersion = PlotSquared.platform().serverVersion()[1];
+        if (minecraftMinorVersion >= 17) {
             this.populators.add(new BlockStatePopulator(this.plotGenerator));
+        } else {
+            this.populators.add(new LegacyBlockStatePopulator(this.plotGenerator));
+        }
         this.full = true;
         this.useNewGenerationMethods = PlotSquared.platform().serverVersion()[1] >= 19;
         this.biomeProvider = new BukkitPlotBiomeProvider();

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

@@ -36,7 +36,6 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Random;
 
-@Deprecated(since = "TODO")
 final class LegacyBlockStatePopulator extends BlockPopulator {
 
     private final IndependentPlotGenerator plotGenerator;

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

@@ -160,7 +160,7 @@ public class EntityEventListener implements Listener {
                     return;
                 }
             }
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SILVERFISH_BLOCK", "ENDER_PEARL",
+            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
                  "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL",
                  "FROZEN", "SPELL", "DEFAULT" -> {
                 if (!area.isMobSpawning()) {

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

@@ -202,7 +202,7 @@ public class PaperListener implements Listener {
                     return;
                 }
             }
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SILVERFISH_BLOCK", "ENDER_PEARL", "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
+            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
                 if (!area.isMobSpawning()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);

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

@@ -79,7 +79,6 @@ import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.util.Enums;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import io.papermc.lib.PaperLib;
@@ -160,7 +159,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -185,15 +183,6 @@ public class PlayerEventListener implements Listener {
             Material.WRITABLE_BOOK,
             Material.WRITTEN_BOOK
     );
-
-    /**
-     * The correct EntityType for End Crystal, determined once at class loading time.
-     * Tries END_CRYSTAL first (1.21+), falls back to ENDER_CRYSTAL (1.20.4 and older).
-     */
-    private static final EntityType END_CRYSTAL_ENTITY_TYPE = Objects.requireNonNull(
-            Enums.findByValue(EntityType.class, "END_CRYSTAL", "ENDER_CRYSTAL")
-    );
-
     private static final Set<String> DYES;
 
     static {
@@ -1324,17 +1313,6 @@ public class PlayerEventListener implements Listener {
                     //Allow all players to eat while also allowing the block place event to be fired
                     return;
                 }
-                // Process creature spawning of armor stands & end crystals here if spawned by the player in order to be able to
-                // reset the player's hand item if spawning needs to be cancelled.
-                if (type == Material.ARMOR_STAND || type == Material.END_CRYSTAL) {
-                    Plot plot = location.getOwnedPlotAbs();
-                    EntityType entityType = type == Material.ARMOR_STAND ? EntityType.ARMOR_STAND : END_CRYSTAL_ENTITY_TYPE;
-                    if (BukkitEntityUtil.checkEntity(entityType, plot)) {
-                        event.setCancelled(true);
-                        break;
-                    }
-                }
-                // Continue with normal place event checks
                 if (type == Material.ARMOR_STAND) {
                     location = BukkitUtil.adapt(block.getRelative(event.getBlockFace()).getLocation());
                     eventType = PlayerBlockEventType.PLACE_MISC;

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

@@ -47,7 +47,6 @@ import org.bukkit.event.entity.LingeringPotionSplashEvent;
 import org.bukkit.event.entity.PotionSplashEvent;
 import org.bukkit.event.entity.ProjectileHitEvent;
 import org.bukkit.event.entity.ProjectileLaunchEvent;
-import org.bukkit.event.player.PlayerEggThrowEvent;
 import org.bukkit.projectiles.BlockProjectileSource;
 import org.bukkit.projectiles.ProjectileSource;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -158,26 +157,14 @@ public class ProjectileEventListener implements Listener {
 
     @EventHandler
     public void onProjectileHit(ProjectileHitEvent event) {
-        if (cancelProjectileHit(event.getEntity())) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler
-    public void onPlayerEggThrow(PlayerEggThrowEvent event) {
-        if (cancelProjectileHit(event.getEgg())) {
-            event.setHatching(false);
-        }
-    }
-
-    private boolean cancelProjectileHit(Projectile entity) {
+        Projectile entity = event.getEntity();
         Location location = BukkitUtil.adapt(entity.getLocation());
         if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) {
-            return false;
+            return;
         }
         PlotArea area = location.getPlotArea();
         if (area == null) {
-            return false;
+            return;
         }
         Plot plot = area.getPlot(location);
         ProjectileSource shooter = entity.getShooter();
@@ -185,14 +172,15 @@ public class ProjectileEventListener implements Listener {
             if (!((Player) shooter).isOnline()) {
                 if (plot != null) {
                     if (plot.isAdded(((Player) shooter).getUniqueId()) || plot.getFlag(ProjectilesFlag.class)) {
-                        return false;
+                        return;
                     }
                 } else if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true)) {
-                    return false;
+                    return;
                 }
 
                 entity.remove();
-                return true;
+                event.setCancelled(true);
+                return;
             }
 
             PlotPlayer<?> pp = BukkitUtil.adapt((Player) shooter);
@@ -201,36 +189,38 @@ public class ProjectileEventListener implements Listener {
                         Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED
                 )) {
                     entity.remove();
-                    return true;
+                    event.setCancelled(true);
                 }
-                return false;
+                return;
             }
             if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(
                     ProjectilesFlag.class) || (entity instanceof FishHook && plot.getFlag(
                     FishingFlag.class))) {
-                return false;
+                return;
             }
             entity.remove();
-            return true;
+            event.setCancelled(true);
+            return;
         }
         if (!(shooter instanceof Entity) && shooter != null) {
             if (plot == null) {
                 entity.remove();
-                return true;
+                event.setCancelled(true);
+                return;
             }
             Location sLoc =
                     BukkitUtil.adapt(((BlockProjectileSource) shooter).getBlock().getLocation());
             if (!area.contains(sLoc.getX(), sLoc.getZ())) {
                 entity.remove();
-                return true;
+                event.setCancelled(true);
+                return;
             }
             Plot sPlot = area.getOwnedPlotAbs(sLoc);
             if (sPlot == null || !PlotHandler.sameOwners(plot, sPlot)) {
                 entity.remove();
-                return true;
+                event.setCancelled(true);
             }
         }
-        return false;
     }
 
 }

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

@@ -52,7 +52,6 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Objects;
 import java.util.function.Consumer;
 
 public class BukkitQueueCoordinator extends BasicQueueCoordinator {
@@ -211,13 +210,8 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                             BaseBlock block = getWorld().getBlock(blockVector3).toBaseBlock(tag);
                             getWorld().setBlock(blockVector3, block, getSideEffectSet(SideEffectState.NONE));
                         } catch (WorldEditException ignored) {
-                            StateWrapper.INSTANCE.restore(
-                                    getWorld().getName(),
-                                    blockVector3.getX(),
-                                    blockVector3.getY(),
-                                    blockVector3.getZ(),
-                                    tag
-                            );
+                            StateWrapper sw = new StateWrapper(tag);
+                            sw.restoreTag(getWorld().getName(), blockVector3.getX(), blockVector3.getY(), blockVector3.getZ());
                         }
                     });
                 }
@@ -301,7 +295,9 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
             existing.setBlockData(blockData, false);
             if (block.hasNbtData()) {
                 CompoundTag tag = block.getNbtData();
-                StateWrapper.INSTANCE.restore(existing, Objects.requireNonNull(tag));
+                StateWrapper sw = new StateWrapper(tag);
+
+                sw.restoreTag(existing);
             }
         }
     }

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

@@ -34,8 +34,6 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.generator.LimitedRegion;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.Objects;
-
 /**
  * Wraps a {@link LimitedRegion} inside a {@link com.plotsquared.core.queue.QueueCoordinator} so it can be written to.
  *
@@ -46,6 +44,7 @@ public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + LimitedRegionWrapperQueue.class.getSimpleName());
 
     private final LimitedRegion limitedRegion;
+    private boolean useOtherRestoreTagMethod = false;
 
     /**
      * @since 6.9.0
@@ -65,11 +64,20 @@ public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
         boolean result = setBlock(x, y, z, id.toImmutableState());
         if (result && id.hasNbtData()) {
             CompoundTag tag = id.getNbtData();
+            StateWrapper sw = new StateWrapper(tag);
             try {
-                StateWrapper.INSTANCE.restore(limitedRegion.getBlockState(x, y, z).getBlock(), Objects.requireNonNull(tag));
+                if (useOtherRestoreTagMethod && getWorld() != null) {
+                    sw.restoreTag(getWorld().getName(), x, y, z);
+                } else {
+                    sw.restoreTag(limitedRegion.getBlockState(x, y, z).getBlock());
+                }
             } catch (IllegalArgumentException e) {
                 LOGGER.error("Error attempting to populate tile entity into the world at location {},{},{}", x, y, z, e);
                 return false;
+            } catch (IllegalStateException e) {
+                useOtherRestoreTagMethod = true;
+                LOGGER.warn("IllegalStateException attempting to populate tile entity into the world at location {},{},{}. " +
+                        "Possibly on <=1.17.1, switching to secondary method.", x, y, z, e);
             }
         }
         return result;
@@ -105,8 +113,9 @@ public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
 
     @Override
     public boolean setTile(final int x, final int y, final int z, @NonNull final CompoundTag tag) {
+        StateWrapper sw = new StateWrapper(tag);
         try {
-            return StateWrapper.INSTANCE.restore(limitedRegion.getBlockState(x, y, z).getBlock(), tag);
+            return sw.restoreTag(limitedRegion.getBlockState(x, y, z).getBlock());
         } catch (IllegalArgumentException e) {
             LOGGER.error("Error attempting to populate tile entity into the world at location {},{},{}", x, y, z, e);
             return false;

Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java

@@ -27,8 +27,6 @@ import com.plotsquared.core.util.WorldUtil;
 import com.sk89q.jnbt.CompoundTag;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.Objects;
-
 /**
  * Schematic Handler.
  */
@@ -41,8 +39,8 @@ public class BukkitSchematicHandler extends SchematicHandler {
     }
 
     @Override
-    public boolean restoreTile(QueueCoordinator queue, CompoundTag tag, int x, int y, int z) {
-        return StateWrapper.INSTANCE.restore(Objects.requireNonNull(queue.getWorld()).getName(), x, y, z, tag);
+    public boolean restoreTile(QueueCoordinator queue, CompoundTag ct, int x, int y, int z) {
+        return new StateWrapper(ct).restoreTag(queue.getWorld().getName(), x, y, z);
     }
 
 }

Bukkit/src/main/java/com/plotsquared/bukkit/schematic/NbtGsonSerializer.java

@@ -1,80 +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.schematic;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import com.sk89q.jnbt.ByteArrayTag;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.IntArrayTag;
-import com.sk89q.jnbt.ListTag;
-import com.sk89q.jnbt.LongArrayTag;
-import com.sk89q.jnbt.Tag;
-
-import java.lang.reflect.Type;
-
-final class NbtGsonSerializer implements JsonSerializer<Tag> {
-
-    @Override
-    public JsonElement serialize(final Tag src, final Type typeOfSrc, final JsonSerializationContext context) {
-        if (src instanceof CompoundTag compoundTag) {
-            JsonObject object = new JsonObject();
-            compoundTag.getValue().forEach((s, tag) -> object.add(s, context.serialize(tag)));
-            return object;
-        }
-        if (src instanceof ListTag listTag) {
-            JsonArray array = new JsonArray();
-            listTag.getValue().forEach(tag -> array.add(context.serialize(tag)));
-            return array;
-        }
-        if (src instanceof ByteArrayTag byteArrayTag) {
-            JsonArray array = new JsonArray();
-            for (final byte b : byteArrayTag.getValue()) {
-                array.add(b);
-            }
-            return array;
-        }
-        if (src instanceof IntArrayTag intArrayTag) {
-            JsonArray array = new JsonArray();
-            for (final int i : intArrayTag.getValue()) {
-                array.add(i);
-            }
-            return array;
-        }
-        if (src instanceof LongArrayTag longArrayTag) {
-            JsonArray array = new JsonArray();
-            for (final long l : longArrayTag.getValue()) {
-                array.add(l);
-            }
-            return array;
-        }
-        if (src.getValue() instanceof Number number) {
-            return new JsonPrimitive(number);
-        }
-        if (src.getValue() instanceof String string) {
-            return new JsonPrimitive(string);
-        }
-        throw new IllegalArgumentException("Don't know how to serialize " + src);
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java

@@ -18,71 +18,332 @@
  */
 package com.plotsquared.bukkit.schematic;
 
+import com.destroystokyo.paper.profile.PlayerProfile;
+import com.destroystokyo.paper.profile.ProfileProperty;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.PlotSquared;
+import com.sk89q.jnbt.ByteTag;
 import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.jnbt.ListTag;
+import com.sk89q.jnbt.ShortTag;
+import com.sk89q.jnbt.StringTag;
+import com.sk89q.jnbt.Tag;
+import com.sk89q.worldedit.blocks.BaseItemStack;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.world.item.ItemType;
 import io.papermc.lib.PaperLib;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.DyeColor;
 import org.bukkit.World;
+import org.bukkit.block.Banner;
 import org.bukkit.block.Block;
+import org.bukkit.block.Container;
+import org.bukkit.block.Sign;
+import org.bukkit.block.Skull;
+import org.bukkit.block.banner.Pattern;
+import org.bukkit.block.banner.PatternType;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.jetbrains.annotations.ApiStatus;
 
-@ApiStatus.Internal
-public sealed interface StateWrapper permits StateWrapperSpigot, StateWrapper.Factory.NoopStateWrapper {
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.UUID;
 
-    StateWrapper INSTANCE = Factory.createStateWrapper();
+public class StateWrapper {
 
-    boolean restore(final @NonNull Block block, final @NonNull CompoundTag data);
+    public CompoundTag tag;
 
-    default boolean restore(final String worldName, final int x, final int y, final int z, final CompoundTag data) {
-        final World world = BukkitUtil.getWorld(worldName);
+    private boolean paperErrorTextureSent = false;
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapper.class.getSimpleName());
+
+    public StateWrapper(CompoundTag tag) {
+        this.tag = tag;
+    }
+
+    public static String jsonToColourCode(String str) {
+        str = str.replace("{\"extra\":", "").replace("],\"text\":\"\"}", "]")
+                .replace("[{\"color\":\"black\",\"text\":\"", "&0")
+                .replace("[{\"color\":\"dark_blue\",\"text\":\"", "&1")
+                .replace("[{\"color\":\"dark_green\",\"text\":\"", "&2")
+                .replace("[{\"color\":\"dark_aqua\",\"text\":\"", "&3")
+                .replace("[{\"color\":\"dark_red\",\"text\":\"", "&4")
+                .replace("[{\"color\":\"dark_purple\",\"text\":\"", "&5")
+                .replace("[{\"color\":\"gold\",\"text\":\"", "&6")
+                .replace("[{\"color\":\"gray\",\"text\":\"", "&7")
+                .replace("[{\"color\":\"dark_gray\",\"text\":\"", "&8")
+                .replace("[{\"color\":\"blue\",\"text\":\"", "&9")
+                .replace("[{\"color\":\"green\",\"text\":\"", "&a")
+                .replace("[{\"color\":\"aqua\",\"text\":\"", "&b")
+                .replace("[{\"color\":\"red\",\"text\":\"", "&c")
+                .replace("[{\"color\":\"light_purple\",\"text\":\"", "&d")
+                .replace("[{\"color\":\"yellow\",\"text\":\"", "&e")
+                .replace("[{\"color\":\"white\",\"text\":\"", "&f")
+                .replace("[{\"obfuscated\":true,\"text\":\"", "&k")
+                .replace("[{\"bold\":true,\"text\":\"", "&l")
+                .replace("[{\"strikethrough\":true,\"text\":\"", "&m")
+                .replace("[{\"underlined\":true,\"text\":\"", "&n")
+                .replace("[{\"italic\":true,\"text\":\"", "&o").replace("[{\"color\":\"black\",", "&0")
+                .replace("[{\"color\":\"dark_blue\",", "&1")
+                .replace("[{\"color\":\"dark_green\",", "&2")
+                .replace("[{\"color\":\"dark_aqua\",", "&3").replace("[{\"color\":\"dark_red\",", "&4")
+                .replace("[{\"color\":\"dark_purple\",", "&5").replace("[{\"color\":\"gold\",", "&6")
+                .replace("[{\"color\":\"gray\",", "&7").replace("[{\"color\":\"dark_gray\",", "&8")
+                .replace("[{\"color\":\"blue\",", "&9").replace("[{\"color\":\"green\",", "&a")
+                .replace("[{\"color\":\"aqua\",", "&b").replace("[{\"color\":\"red\",", "&c")
+                .replace("[{\"color\":\"light_purple\",", "&d").replace("[{\"color\":\"yellow\",", "&e")
+                .replace("[{\"color\":\"white\",", "&f").replace("[{\"obfuscated\":true,", "&k")
+                .replace("[{\"bold\":true,", "&l").replace("[{\"strikethrough\":true,", "&m")
+                .replace("[{\"underlined\":true,", "&n").replace("[{\"italic\":true,", "&o")
+                .replace("{\"color\":\"black\",\"text\":\"", "&0")
+                .replace("{\"color\":\"dark_blue\",\"text\":\"", "&1")
+                .replace("{\"color\":\"dark_green\",\"text\":\"", "&2")
+                .replace("{\"color\":\"dark_aqua\",\"text\":\"", "&3")
+                .replace("{\"color\":\"dark_red\",\"text\":\"", "&4")
+                .replace("{\"color\":\"dark_purple\",\"text\":\"", "&5")
+                .replace("{\"color\":\"gold\",\"text\":\"", "&6")
+                .replace("{\"color\":\"gray\",\"text\":\"", "&7")
+                .replace("{\"color\":\"dark_gray\",\"text\":\"", "&8")
+                .replace("{\"color\":\"blue\",\"text\":\"", "&9")
+                .replace("{\"color\":\"green\",\"text\":\"", "&a")
+                .replace("{\"color\":\"aqua\",\"text\":\"", "&b")
+                .replace("{\"color\":\"red\",\"text\":\"", "&c")
+                .replace("{\"color\":\"light_purple\",\"text\":\"", "&d")
+                .replace("{\"color\":\"yellow\",\"text\":\"", "&e")
+                .replace("{\"color\":\"white\",\"text\":\"", "&f")
+                .replace("{\"obfuscated\":true,\"text\":\"", "&k")
+                .replace("{\"bold\":true,\"text\":\"", "&l")
+                .replace("{\"strikethrough\":true,\"text\":\"", "&m")
+                .replace("{\"underlined\":true,\"text\":\"", "&n")
+                .replace("{\"italic\":true,\"text\":\"", "&o").replace("{\"color\":\"black\",", "&0")
+                .replace("{\"color\":\"dark_blue\",", "&1").replace("{\"color\":\"dark_green\",", "&2")
+                .replace("{\"color\":\"dark_aqua\",", "&3").replace("{\"color\":\"dark_red\",", "&4")
+                .replace("{\"color\":\"dark_purple\",", "&5").replace("{\"color\":\"gold\",", "&6")
+                .replace("{\"color\":\"gray\",", "&7").replace("{\"color\":\"dark_gray\",", "&8")
+                .replace("{\"color\":\"blue\",", "&9").replace("{\"color\":\"green\",", "&a")
+                .replace("{\"color\":\"aqua\",", "&b").replace("{\"color\":\"red\",", "&c")
+                .replace("{\"color\":\"light_purple\",", "&d").replace("{\"color\":\"yellow\",", "&e")
+                .replace("{\"color\":\"white\",", "&f").replace("{\"obfuscated\":true,", "&k")
+                .replace("{\"bold\":true,", "&l").replace("{\"strikethrough\":true,", "&m")
+                .replace("{\"underlined\":true,", "&n").replace("{\"italic\":true,", "&o")
+                .replace("\"color\":\"black\",\"text\":\"", "&0")
+                .replace("\"color\":\"dark_blue\",\"text\":\"", "&1")
+                .replace("\"color\":\"dark_green\",\"text\":\"", "&2")
+                .replace("\"color\":\"dark_aqua\",\"text\":\"", "&3")
+                .replace("\"color\":\"dark_red\",\"text\":\"", "&4")
+                .replace("\"color\":\"dark_purple\",\"text\":\"", "&5")
+                .replace("\"color\":\"gold\",\"text\":\"", "&6")
+                .replace("\"color\":\"gray\",\"text\":\"", "&7")
+                .replace("\"color\":\"dark_gray\",\"text\":\"", "&8")
+                .replace("\"color\":\"blue\",\"text\":\"", "&9")
+                .replace("\"color\":\"green\",\"text\":\"", "&a")
+                .replace("\"color\":\"aqua\",\"text\":\"", "&b")
+                .replace("\"color\":\"red\",\"text\":\"", "&c")
+                .replace("\"color\":\"light_purple\",\"text\":\"", "&d")
+                .replace("\"color\":\"yellow\",\"text\":\"", "&e")
+                .replace("\"color\":\"white\",\"text\":\"", "&f")
+                .replace("\"obfuscated\":true,\"text\":\"", "&k")
+                .replace("\"bold\":true,\"text\":\"", "&l")
+                .replace("\"strikethrough\":true,\"text\":\"", "&m")
+                .replace("\"underlined\":true,\"text\":\"", "&n")
+                .replace("\"italic\":true,\"text\":\"", "&o").replace("\"color\":\"black\",", "&0")
+                .replace("\"color\":\"dark_blue\",", "&1").replace("\"color\":\"dark_green\",", "&2")
+                .replace("\"color\":\"dark_aqua\",", "&3").replace("\"color\":\"dark_red\",", "&4")
+                .replace("\"color\":\"dark_purple\",", "&5").replace("\"color\":\"gold\",", "&6")
+                .replace("\"color\":\"gray\",", "&7").replace("\"color\":\"dark_gray\",", "&8")
+                .replace("\"color\":\"blue\",", "&9").replace("\"color\":\"green\",", "&a")
+                .replace("\"color\":\"aqua\",", "&b").replace("\"color\":\"red\",", "&c")
+                .replace("\"color\":\"light_purple\",", "&d").replace("\"color\":\"yellow\",", "&e")
+                .replace("\"color\":\"white\",", "&f").replace("\"obfuscated\":true,", "&k")
+                .replace("\"bold\":true,", "&l").replace("\"strikethrough\":true,", "&m")
+                .replace("\"underlined\":true,", "&n").replace("\"italic\":true,", "&o")
+                .replace("[{\"text\":\"", "&0").replace("{\"text\":\"", "&0").replace("\"},", "")
+                .replace("\"}]", "").replace("\"}", "");
+        str = ChatColor.translateAlternateColorCodes('&', str);
+        return str;
+    }
+
+    /**
+     * Restore the TileEntity data to the given world at the given coordinates.
+     *
+     * @param worldName World name
+     * @param x         x position
+     * @param y         y position
+     * @param z         z position
+     * @return true if successful
+     */
+    public boolean restoreTag(String worldName, int x, int y, int z) {
+        World world = BukkitUtil.getWorld(worldName);
         if (world == null) {
             return false;
         }
-        return this.restore(world.getBlockAt(x, y, z), data);
+        return restoreTag(world.getBlockAt(x, y, z));
     }
 
-    @ApiStatus.Internal
-    final class Factory {
+    /**
+     * Restore the TileEntity data to the given block
+     *
+     * @param block Block to restore to
+     * @return true if successful
+     */
+    @SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
+    public boolean restoreTag(@NonNull Block block) {
+        if (this.tag == null) {
+            return false;
+        }
+        org.bukkit.block.BlockState state = block.getState();
+        switch (getId()) {
+            case "chest", "beacon", "brewingstand", "dispenser", "dropper", "furnace", "hopper", "shulkerbox" -> {
+                if (!(state instanceof Container container)) {
+                    return false;
+                }
+                List<Tag> itemsTag = this.tag.getListTag("Items").getValue();
+                Inventory inv = container.getSnapshotInventory();
+                for (Tag itemTag : itemsTag) {
+                    CompoundTag itemComp = (CompoundTag) itemTag;
+                    ItemType type = ItemType.REGISTRY.get(itemComp.getString("id").toLowerCase());
+                    if (type == null) {
+                        continue;
+                    }
+                    int count = itemComp.getByte("Count");
+                    int slot = itemComp.getByte("Slot");
+                    CompoundTag tag = (CompoundTag) itemComp.getValue().get("tag");
+                    BaseItemStack baseItemStack = new BaseItemStack(type, tag, count);
+                    ItemStack itemStack = BukkitAdapter.adapt(baseItemStack);
+                    inv.setItem(slot, itemStack);
+                }
+                container.update(true, false);
+                return true;
+            }
+            case "sign" -> {
+                if (state instanceof Sign sign) {
+                    sign.setLine(0, jsonToColourCode(tag.getString("Text1")));
+                    sign.setLine(1, jsonToColourCode(tag.getString("Text2")));
+                    sign.setLine(2, jsonToColourCode(tag.getString("Text3")));
+                    sign.setLine(3, jsonToColourCode(tag.getString("Text4")));
+                    state.update(true);
+                    return true;
+                }
+                return false;
+            }
+            case "skull" -> {
+                if (state instanceof Skull skull) {
+                    CompoundTag skullOwner = ((CompoundTag) this.tag.getValue().get("SkullOwner"));
+                    if (skullOwner == null) {
+                        return true;
+                    }
+                    String player = skullOwner.getString("Name");
 
-        private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapper.class.getSimpleName());
-
-        private static final String INITIALIZATION_ERROR_TEMPLATE = """
-                Failed to initialize StateWrapper: {}
-                Block-/Tile-Entities, pasted by schematics for example, won't be updated with their respective block data. This affects things like sign text, banner patterns, skulls, etc.
-                Try updating your Server Software, PlotSquared and WorldEdit / FastAsyncWorldEdit first. If the issue persists, report it on the issue tracker.
-                """;
-
-        private static StateWrapper createStateWrapper() {
-            int[] serverVersion = PlotSquared.platform().serverVersion();
-            if (PaperLib.isPaper() && (serverVersion[1] == 21 && serverVersion[2] >= 5) || serverVersion[1] > 21) {
+                    if (player != null && !player.isEmpty()) {
                         try {
-                    return new StateWrapperPaper1_21_5();
+                            skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
+                            skull.update(true);
                         } catch (Exception e) {
-                    LOGGER.error("Failed to initialize Paper-specific state wrapper, falling back to Spigot", e);
+                            e.printStackTrace();
                         }
-            }
-            try {
-                return new StateWrapperSpigot();
-            } catch (Exception e) {
-                LOGGER.error(INITIALIZATION_ERROR_TEMPLATE, StateWrapperSpigot.class.getSimpleName(), e);
-            }
-            return new NoopStateWrapper();
+                        return true;
                     }
 
+                    final CompoundTag properties = (CompoundTag) skullOwner.getValue().get("Properties");
+                    if (properties == null) {
+                        return false;
+                    }
+                    final ListTag textures = properties.getListTag("textures");
+                    if (textures.getValue().isEmpty()) {
+                        return false;
+                    }
+                    final CompoundTag textureCompound = (CompoundTag) textures.getValue().get(0);
+                    if (textureCompound == null) {
+                        return false;
+                    }
+                    String textureValue = textureCompound.getString("Value");
+                    if (textureValue == null) {
+                        return false;
+                    }
+                    if (!PaperLib.isPaper()) {
+                        if (!paperErrorTextureSent) {
+                            paperErrorTextureSent = true;
+                            LOGGER.error("Failed to populate skull data in your road schematic - This is a Spigot limitation.");
+                        }
+                        return false;
+                    }
+                    final PlayerProfile profile = Bukkit.createProfile(UUID.randomUUID());
+                    profile.setProperty(new ProfileProperty("textures", textureValue));
+                    skull.setPlayerProfile(profile);
+                    skull.update(true);
+                    return true;
 
-        @ApiStatus.Internal
-        static final class NoopStateWrapper implements StateWrapper {
-
-            @Override
-            public boolean restore(final @NonNull Block block, final @NonNull CompoundTag data) {
+                }
+                return false;
+            }
+            case "banner" -> {
+                if (state instanceof Banner banner) {
+                    List<Tag> patterns = this.tag.getListTag("Patterns").getValue();
+                    if (patterns == null || patterns.isEmpty()) {
+                        return false;
+                    }
+                    banner.setPatterns(patterns.stream().map(t -> (CompoundTag) t).map(compoundTag -> {
+                        DyeColor color = DyeColor.getByWoolData((byte) compoundTag.getInt("Color"));
+                        PatternType patternType = PatternType.getByIdentifier(compoundTag.getString("Pattern"));
+                        if (color == null || patternType == null) {
+                            return null;
+                        }
+                        return new Pattern(color, patternType);
+                    }).filter(Objects::nonNull).toList());
+                    banner.update(true);
+                    return true;
+                }
+                return false;
+            }
+        }
         return false;
     }
 
+    public String getId() {
+        String tileid = this.tag.getString("id").toLowerCase();
+        if (tileid.startsWith("minecraft:")) {
+            tileid = tileid.replace("minecraft:", "");
+        }
+        return tileid;
     }
 
+    public List<CompoundTag> serializeInventory(ItemStack[] items) {
+        List<CompoundTag> tags = new ArrayList<>();
+        for (int i = 0; i < items.length; ++i) {
+            if (items[i] != null) {
+                Map<String, Tag> tagData = serializeItem(items[i]);
+                tagData.put("Slot", new ByteTag((byte) i));
+                tags.add(new CompoundTag(tagData));
+            }
+        }
+        return tags;
+    }
+
+    public Map<String, Tag> serializeItem(ItemStack item) {
+        Map<String, Tag> data = new HashMap<>();
+        data.put("id", new StringTag(item.getType().name()));
+        data.put("Damage", new ShortTag(item.getDurability()));
+        data.put("Count", new ByteTag((byte) item.getAmount()));
+        if (!item.getEnchantments().isEmpty()) {
+            List<CompoundTag> enchantmentList = new ArrayList<>();
+            for (Entry<Enchantment, Integer> entry : item.getEnchantments().entrySet()) {
+                Map<String, Tag> enchantment = new HashMap<>();
+                enchantment.put("id", new StringTag(entry.getKey().toString()));
+                enchantment.put("lvl", new ShortTag(entry.getValue().shortValue()));
+                enchantmentList.add(new CompoundTag(enchantment));
+            }
+            Map<String, Tag> auxData = new HashMap<>();
+            auxData.put("ench", new ListTag(CompoundTag.class, enchantmentList));
+            data.put("tag", new CompoundTag(auxData));
+        }
+        return data;
     }
 
 }

Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapperPaper1_21_5.java

@@ -1,155 +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.schematic;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonSyntaxException;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.Tag;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bukkit.DyeColor;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.Sign;
-import org.bukkit.block.sign.Side;
-import org.bukkit.block.sign.SignSide;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-import java.lang.invoke.MethodHandle;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-final class StateWrapperPaper1_21_5 extends StateWrapperSpigot {
-
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapperPaper1_21_5.class.getSimpleName());
-
-    private static final Gson GSON = new GsonBuilder().registerTypeHierarchyAdapter(Tag.class, new NbtGsonSerializer()).create();
-    private static Object KYORI_GSON_SERIALIZER = null;
-    private static MethodHandle GSON_SERIALIZER_DESERIALIZE_TREE = null;
-    private static MethodHandle BUKKIT_SIGN_SIDE_LINE_SET = null;
-
-    public StateWrapperPaper1_21_5() {
-        super();
-        try {
-            initializeSignHack();
-            LOGGER.info("Using {} for block data population", StateWrapperPaper1_21_5.class.getSimpleName());
-        } catch (Throwable e) {
-            throw new RuntimeException("Failed to initialize sign hack", e);
-        }
-    }
-
-    @Override
-    public void postEntityStateLoad(final @NonNull BlockState blockState, final @NonNull CompoundTag data) throws Throwable {
-        // signs need special handling during generation
-        if (blockState instanceof Sign sign) {
-            if (data.getValue().get("front_text") instanceof CompoundTag textTag) {
-                setSignTextHack(sign.getSide(Side.FRONT), textTag);
-            }
-            if (data.getValue().get("back_text") instanceof CompoundTag textTag) {
-                setSignTextHack(sign.getSide(Side.BACK), textTag);
-            }
-        }
-    }
-
-    @Override
-    public Logger logger() {
-        return StateWrapperPaper1_21_5.LOGGER;
-    }
-
-    /**
-     * Set sign content on the bukkit tile entity. The server does not load sign content applied via the main logic
-     * (CraftBlockEntity#load), as the SignEntity needs to have a valid ServerLevel assigned to it.
-     * That's not possible on worldgen; therefore, this hack has to be used additionally.
-     * <br />
-     * Modern sign content (non-plain-text sign lines) require Paper.
-     *
-     * @param side The sign side to apply data onto.
-     * @param text The compound tag containing the data for the sign side ({@code front_text} / {@code back_text})
-     * @throws Throwable if something went wrong when reflectively updating the sign.
-     */
-    private static void setSignTextHack(SignSide side, CompoundTag text) throws Throwable {
-        if (text.containsKey("color")) {
-            //noinspection UnstableApiUsage
-            side.setColor(DyeColor.legacyValueOf(text.getString("color").toUpperCase(Locale.ROOT)));
-        }
-        if (text.containsKey("has_glowing_text")) {
-            side.setGlowingText(text.getByte("has_glowing_text") == 1);
-        }
-        List<Tag> lines = text.getList("messages");
-        if (lines != null) {
-            for (int i = 0; i < Math.min(lines.size(), 3); i++) {
-                Tag line = lines.get(i);
-                Object content = line.getValue();
-                // Minecraft uses mixed lists / arrays in their sign texts. One line can be a complex component, whereas
-                // the following line could simply be a string. Those simpler lines are represented as `{"": ""}` (only in
-                // SNBT those will be shown as a standard string).
-                if (line instanceof CompoundTag compoundTag && compoundTag.getValue().containsKey("")) {
-                    content = compoundTag.getValue().get("");
-                }
-                // absolute garbage way to try to handle stringified components (pre 1.21.5)
-                else if (content instanceof String contentAsString && (contentAsString.startsWith("{") || contentAsString.startsWith("["))) {
-                    try {
-                        content = JsonParser.parseString(contentAsString);
-                    } catch (JsonSyntaxException e) {
-                        // well, it wasn't JSON after all
-                    }
-                }
-
-                // serializes the line content from JNBT to Gson JSON objects, passes that to adventure and deserializes
-                // into an adventure component.
-                // pass all possible types of content into the deserializer (Strings, Compounds, Arrays), even though Strings
-                // could be set directly via Sign#setLine(int, String). The overhead is minimal, the serializer can handle
-                // strings - and we don't have to use the deprecated method.
-                BUKKIT_SIGN_SIDE_LINE_SET.invoke(
-                        side, i, GSON_SERIALIZER_DESERIALIZE_TREE.invoke(
-                                KYORI_GSON_SERIALIZER,
-                                content instanceof JsonElement ? content : GSON.toJsonTree(content)
-                        )
-                );
-            }
-        }
-    }
-
-    private static void initializeSignHack() throws Throwable {
-        char[] dontObfuscate = new char[]{
-                'n', 'e', 't', '.', 'k', 'y', 'o', 'r', 'i', '.', 'a', 'd', 'v', 'e', 'n', 't', 'u', 'r', 'e', '.',
-                't', 'e', 'x', 't', '.', 's', 'e', 'r', 'i', 'a', 'l', 'i', 'z', 'e', 'r', '.', 'g', 's', 'o', 'n', '.',
-                'G', 's', 'o', 'n', 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 'S', 'e', 'r', 'i', 'a', 'l', 'i', 'z', 'e', 'r'
-        };
-        Class<?> gsonComponentSerializerClass = Class.forName(new String(dontObfuscate));
-        KYORI_GSON_SERIALIZER = Arrays.stream(gsonComponentSerializerClass.getMethods())
-                .filter(method -> method.getName().equals("gson"))
-                .findFirst()
-                .orElseThrow().invoke(null);
-        GSON_SERIALIZER_DESERIALIZE_TREE = LOOKUP.unreflect(Arrays
-                .stream(gsonComponentSerializerClass.getMethods())
-                .filter(method -> method.getName().equals("deserializeFromTree") && method.getParameterCount() == 1)
-                .findFirst()
-                .orElseThrow());
-        BUKKIT_SIGN_SIDE_LINE_SET = LOOKUP.unreflect(Arrays.stream(SignSide.class.getMethods())
-                .filter(method -> method.getName().equals("line") && method.getParameterCount() == 2)
-                .findFirst()
-                .orElseThrow());
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapperSpigot.java

@@ -1,210 +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.schematic;
-
-import com.plotsquared.core.util.ReflectionUtils;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
-import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
-import com.sk89q.worldedit.extension.platform.NoCapablePlatformException;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bukkit.Bukkit;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.reflect.Method;
-import java.util.function.Consumer;
-
-sealed class StateWrapperSpigot implements StateWrapper permits StateWrapperPaper1_21_5 {
-
-    private static final boolean FORCE_UPDATE_STATE = true;
-    private static final boolean UPDATE_TRIGGER_PHYSICS = false;
-    private static final String CRAFTBUKKIT_PACKAGE = Bukkit.getServer().getClass().getPackageName();
-
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapperSpigot.class.getSimpleName());
-    static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
-
-    private static BukkitImplAdapter ADAPTER = null;
-    private static Class<?> LIN_TAG_CLASS = null;
-    private static Class<?> JNBT_TAG_CLASS = null;
-    private static Class<?> CRAFT_BLOCK_ENTITY_STATE_CLASS = null;
-    private static MethodHandle PAPERWEIGHT_ADAPTER_FROM_NATIVE = null;
-    private static MethodHandle CRAFT_BLOCK_ENTITY_STATE_LOAD_DATA = null;
-    private static MethodHandle CRAFT_BLOCK_ENTITY_STATE_UPDATE = null;
-    private static MethodHandle TO_LIN_TAG = null;
-
-    public StateWrapperSpigot() {
-        try {
-            findNbtCompoundClassType(clazz -> LIN_TAG_CLASS = clazz, clazz -> JNBT_TAG_CLASS = clazz);
-            ReflectionUtils.RefClass worldEditPluginRefClass = ReflectionUtils.getRefClass(WorldEditPlugin.class);
-            WorldEditPlugin worldEditPlugin = (WorldEditPlugin) worldEditPluginRefClass
-                    .getMethod("getInstance")
-                    .of(null)
-                    .call();
-            ADAPTER = (BukkitImplAdapter) worldEditPluginRefClass
-                    .getMethod("getBukkitImplAdapter")
-                    .of(worldEditPlugin)
-                    .call();
-            PAPERWEIGHT_ADAPTER_FROM_NATIVE = findPaperweightAdapterFromNativeMethodHandle(
-                    ADAPTER.getClass(), LIN_TAG_CLASS, JNBT_TAG_CLASS
-            );
-            TO_LIN_TAG = findToLinTagMethodHandle(LIN_TAG_CLASS);
-        } catch (NoSuchMethodException | ClassNotFoundException | IllegalAccessException | NoCapablePlatformException e) {
-            throw new RuntimeException("Failed to access required WorldEdit methods", e);
-        }
-        try {
-            CRAFT_BLOCK_ENTITY_STATE_CLASS = Class.forName(CRAFTBUKKIT_PACKAGE + ".block.CraftBlockEntityState");
-            CRAFT_BLOCK_ENTITY_STATE_LOAD_DATA = findCraftBlockEntityStateLoadDataMethodHandle(CRAFT_BLOCK_ENTITY_STATE_CLASS);
-            CRAFT_BLOCK_ENTITY_STATE_UPDATE = findCraftBlockEntityStateUpdateMethodHandle(CRAFT_BLOCK_ENTITY_STATE_CLASS);
-        } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
-            throw new RuntimeException("Failed to initialize required native method accessors", e);
-        }
-    }
-
-    @Override
-    public boolean restore(final @NonNull Block block, final @NonNull CompoundTag data) {
-        try {
-            final BlockState blockState = block.getState();
-            if (!CRAFT_BLOCK_ENTITY_STATE_CLASS.isAssignableFrom(blockState.getClass())) {
-                return false;
-            }
-            // get native tag
-            Object nativeTag = PAPERWEIGHT_ADAPTER_FROM_NATIVE.invoke(
-                    ADAPTER,
-                    LIN_TAG_CLASS == null ? data : TO_LIN_TAG.invoke(data)
-            );
-            // load block entity data
-            CRAFT_BLOCK_ENTITY_STATE_LOAD_DATA.invoke(blockState, nativeTag);
-
-            postEntityStateLoad(blockState, data);
-
-            CRAFT_BLOCK_ENTITY_STATE_UPDATE.invoke(blockState, FORCE_UPDATE_STATE, UPDATE_TRIGGER_PHYSICS);
-        } catch (Throwable e) {
-            logger().error("Failed to update tile entity", e);
-        }
-        return false;
-    }
-
-    public void postEntityStateLoad(final @NonNull BlockState blockState, final @NonNull CompoundTag data) throws Throwable {
-
-    }
-
-    public Logger logger() {
-        return StateWrapperSpigot.LOGGER;
-    }
-
-    /**
-     * Initialize the used NBT tag class. For modern FAWE and WE that'll be Lin - for older ones JNBT.
-     *
-     * @throws ClassNotFoundException if neither can be found.
-     */
-    private static void findNbtCompoundClassType(Consumer<Class<?>> linClass, Consumer<Class<?>> jnbtClass) throws
-            ClassNotFoundException {
-        try {
-            linClass.accept(Class.forName("org.enginehub.linbus.tree.LinTag"));
-        } catch (ClassNotFoundException e) {
-            jnbtClass.accept(Class.forName("com.sk89q.jnbt.Tag"));
-        }
-    }
-
-    /**
-     * Finds the {@code toLinTag} method on the {@code ToLinTag} interface, if lin-bus is available in the classpath.
-     * <br />
-     * Required to access the underlying lin tag of the used JNBT tag by PlotSquared, so it can be converted into the platforms
-     * native tag later.
-     *
-     * @param linTagClass {@code Tag} class of lin-bus, or {@code null} if not available.
-     * @return the MethodHandle for {@code toLinTag}, or {@code null} if lin-bus is not available in the classpath.
-     * @throws ClassNotFoundException if the {@code ToLinTag} class could not be found.
-     * @throws NoSuchMethodException  if no {@code toLinTag} method exists.
-     * @throws IllegalAccessException shouldn't happen.
-     */
-    private static MethodHandle findToLinTagMethodHandle(Class<?> linTagClass) throws ClassNotFoundException,
-            NoSuchMethodException, IllegalAccessException {
-        if (linTagClass == null) {
-            return null;
-        }
-        return LOOKUP.findVirtual(
-                Class.forName("org.enginehub.linbus.tree.ToLinTag"),
-                "toLinTag",
-                MethodType.methodType(linTagClass)
-        );
-    }
-
-    /**
-     * Find the method (handle) to convert from native (= WE/FAWE) NBT tags to minecraft NBT tags.
-     * <br />
-     * Depending on the used version of WE/FAWE, this differs:
-     * <ul>
-     *     <li>On WE/FAWE version pre LinBus introduction: {@code fromNative(org.sk89q.jnbt.Tag)}</li>
-     *     <li>On WE versions post LinBus introduction: {@code fromNative(org.enginehub.linbus.tree.LinTag)}</li>
-     *     <li>On FAWE versions post LinBus introduction: {@code fromNativeLin(org.enginehub.linbus.tree.LinTag)}</li>
-     * </ul>
-     *
-     * @param adapterClass The bukkit adapter implementation class
-     * @param linTagClass  The lin-bus {@code Tag} class, if existing - otherwise {@code null}
-     * @param jnbtTagClass The jnbt {@code Tag} class, if lin-bus was not found in classpath - otherwise {@code null}
-     * @return the method.
-     * @throws IllegalAccessException shouldn't happen as private lookup is used.
-     * @throws NoSuchMethodException  if the method couldn't be found.
-     */
-    private static MethodHandle findPaperweightAdapterFromNativeMethodHandle(
-            Class<?> adapterClass, Class<?> linTagClass, Class<?> jnbtTagClass
-    ) throws IllegalAccessException, NoSuchMethodException {
-        final MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(adapterClass, LOOKUP);
-        if (jnbtTagClass != null) {
-            // usage of JNBT = identical method signatures for WE and FAWE
-            return lookup.findVirtual(adapterClass, "fromNative", MethodType.methodType(Object.class, jnbtTagClass));
-        }
-        try {
-            // FAWE
-            return lookup.findVirtual(adapterClass, "fromNativeLin", MethodType.methodType(Object.class, linTagClass));
-        } catch (NoSuchMethodException e) {
-            // WE
-            return lookup.findVirtual(adapterClass, "fromNative", MethodType.methodType(Object.class, linTagClass));
-        }
-    }
-
-    private static MethodHandle findCraftBlockEntityStateLoadDataMethodHandle(Class<?> craftBlockEntityStateClass) throws
-            NoSuchMethodException, IllegalAccessException, ClassNotFoundException {
-        for (final Method method : craftBlockEntityStateClass.getMethods()) {
-            if (method.getName().equals("loadData") && method.getParameterCount() == 1) {
-                return LOOKUP.unreflect(method);
-            }
-        }
-        throw new NoSuchMethodException("Couldn't find #loadData(CompoundTag) in " + craftBlockEntityStateClass.getName());
-    }
-
-    private static MethodHandle findCraftBlockEntityStateUpdateMethodHandle(Class<?> craftBlockEntityStateClass) throws
-            NoSuchMethodException, IllegalAccessException, ClassNotFoundException {
-        for (final Method method : craftBlockEntityStateClass.getMethods()) {
-            if (method.getReturnType().equals(Boolean.TYPE) && method.getParameterCount() == 2 &&
-                    method.getParameterTypes()[0] == Boolean.TYPE && method.getParameterTypes()[1] == Boolean.TYPE) {
-                return LOOKUP.unreflect(method);
-            }
-        }
-        throw new NoSuchMethodException("Couldn't find method for #update(boolean, boolean) in " + craftBlockEntityStateClass.getName());
-    }
-
-}

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

@@ -354,17 +354,13 @@ public class BukkitEntityUtil {
     }
 
     public static boolean checkEntity(Entity entity, Plot plot) {
-        return checkEntity(entity.getType(), plot);
-    }
-
-    public static boolean checkEntity(EntityType type, Plot plot) {
         if (plot == null || !plot.hasOwner() || plot.getFlags().isEmpty() && plot.getArea()
                 .getFlagContainer().getFlagMap().isEmpty()) {
             return false;
         }
 
         final com.sk89q.worldedit.world.entity.EntityType entityType =
-                BukkitAdapter.adapt(type);
+                BukkitAdapter.adapt(entity.getType());
 
         if (EntityCategories.PLAYER.contains(entityType)) {
             return false;

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

@@ -18,8 +18,6 @@
  */
 package com.plotsquared.core.backup;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.io.IOException;
@@ -32,14 +30,12 @@ import java.nio.file.Path;
  */
 public class Backup {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Backup.class.getSimpleName());
-
     private final BackupProfile owner;
     private final long creationTime;
     @Nullable
     private final Path file;
 
-    Backup(final BackupProfile owner, final long creationTime, @Nullable final Path file) {
+    Backup(final BackupProfile owner, final long creationTime, final Path file) {
         this.owner = owner;
         this.creationTime = creationTime;
         this.file = file;
@@ -53,7 +49,7 @@ public class Backup {
             try {
                 Files.deleteIfExists(file);
             } catch (final IOException e) {
-                LOGGER.error("Error deleting backup at {}", file, e);
+                e.printStackTrace();
             }
         }
     }

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

@@ -21,15 +21,14 @@ package com.plotsquared.core.backup;
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.exception.PlotSquaredException;
+import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.schematic.Schematic;
 import com.plotsquared.core.util.SchematicHandler;
 import com.plotsquared.core.util.task.RunnableVal;
 import com.plotsquared.core.util.task.TaskManager;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -52,7 +51,7 @@ import java.util.concurrent.CompletableFuture;
  */
 public class PlayerBackupProfile implements BackupProfile {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlayerBackupProfile.class.getSimpleName());
+    static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
 
     private final UUID owner;
     private final Plot plot;
@@ -88,7 +87,7 @@ public class PlayerBackupProfile implements BackupProfile {
                 Files.createDirectory(path);
             }
         } catch (final Exception e) {
-            LOGGER.error("Error resolving {} from {}", child, parent, e);
+            e.printStackTrace();
         }
         return path;
     }
@@ -105,7 +104,7 @@ public class PlayerBackupProfile implements BackupProfile {
                     try {
                         Files.createDirectories(path);
                     } catch (IOException e) {
-                        LOGGER.error("Error creating directory {}", path, e);
+                        e.printStackTrace();
                         return Collections.emptyList();
                     }
                 }
@@ -118,11 +117,11 @@ public class PlayerBackupProfile implements BackupProfile {
                             backups.add(
                                     new Backup(this, basicFileAttributes.creationTime().toMillis(), file));
                         } catch (IOException e) {
-                            LOGGER.error("Error getting attributes for file {} to create backup", file, e);
+                            e.printStackTrace();
                         }
                     });
                 } catch (IOException e) {
-                    LOGGER.error("Error walking files from {}", path, e);
+                    e.printStackTrace();
                 }
                 backups.sort(Comparator.comparingLong(Backup::getCreationTime).reversed());
                 return (this.backupCache = backups);
@@ -134,7 +133,7 @@ public class PlayerBackupProfile implements BackupProfile {
     public void destroy() {
         this.listBackups().whenCompleteAsync((backups, error) -> {
             if (error != null) {
-                LOGGER.error("Error while listing backups", error);
+                error.printStackTrace();
             }
             backups.forEach(Backup::delete);
             this.backupCache = null;
@@ -142,12 +141,10 @@ public class PlayerBackupProfile implements BackupProfile {
     }
 
     public @NonNull Path getBackupDirectory() {
-        return resolve(
-                resolve(
+        return resolve(resolve(
                 resolve(backupManager.getBackupPath(), Objects.requireNonNull(plot.getArea().toString(), "plot area id")),
                 Objects.requireNonNull(plot.getId().toDashSeparatedString(), "plot id")
-                ), Objects.requireNonNull(owner.toString(), "owner")
-        );
+        ), Objects.requireNonNull(owner.toString(), "owner"));
     }
 
     @Override
@@ -159,8 +156,7 @@ public class PlayerBackupProfile implements BackupProfile {
                     backups.get(backups.size() - 1).delete();
                 }
                 final List<Plot> plots = Collections.singletonList(plot);
-                final boolean result = this.schematicHandler.exportAll(
-                        plots, getBackupDirectory().toFile(),
+                final boolean result = this.schematicHandler.exportAll(plots, getBackupDirectory().toFile(),
                         "%world%-%id%-" + System.currentTimeMillis(), () ->
                                 future.complete(new Backup(this, System.currentTimeMillis(), null))
                 );
@@ -184,7 +180,7 @@ public class PlayerBackupProfile implements BackupProfile {
                 try {
                     schematic = this.schematicHandler.getSchematic(backup.getFile().toFile());
                 } catch (SchematicHandler.UnsupportedFormatException e) {
-                    LOGGER.error("Unsupported format for backup {}", backup.getFile(), e);
+                    e.printStackTrace();
                 }
                 if (schematic == null) {
                     future.completeExceptionally(new IllegalArgumentException(
@@ -204,9 +200,10 @@ public class PlayerBackupProfile implements BackupProfile {
                                     if (value) {
                                         future.complete(null);
                                     } else {
-                                        future.completeExceptionally(new PlotSquaredException(
+                                        future.completeExceptionally(new RuntimeException(MINI_MESSAGE.escapeTags(
                                                 TranslatableCaption
-                                                        .of("schematics.schematic_paste_failed")));
+                                                        .of("schematics.schematic_paste_failed")
+                                                        .getComponent(ConsolePlayer.getConsole()))));
                                     }
                                 }
                             }

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

@@ -32,8 +32,6 @@ import com.plotsquared.core.util.task.TaskManager;
 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.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -49,7 +47,6 @@ import java.util.concurrent.TimeUnit;
 @Singleton
 public class SimpleBackupManager implements BackupManager {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SimpleBackupManager.class.getSimpleName());
     private final Path backupPath;
     private final boolean automaticBackup;
     private final int backupLimit;
@@ -115,12 +112,7 @@ public class SimpleBackupManager implements BackupManager {
                                 TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
                         );
                     }
-                    LOGGER.error(
-                            "Error creating backup for plot {};{} and player {}",
-                            plot.getArea(),
-                            plot.getId(),
-                            player == null ? "null" : player.getName(), throwable
-                    );
+                    throwable.printStackTrace();
                 } else {
                     if (player != null) {
                         player.sendMessage(TranslatableCaption.of("backups.backup_automatic_finished"));
@@ -136,7 +128,6 @@ public class SimpleBackupManager implements BackupManager {
         return this.automaticBackup;
     }
 
-    @NonNull
     public Path getBackupPath() {
         return this.backupPath;
     }

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

@@ -21,6 +21,7 @@ package com.plotsquared.core.command;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -57,7 +58,8 @@ public class Alias extends SubCommand {
             return false;
         }
 
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -24,7 +24,6 @@ import com.plotsquared.core.backup.BackupProfile;
 import com.plotsquared.core.backup.NullBackupProfile;
 import com.plotsquared.core.backup.PlayerBackupProfile;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.exception.PlotSquaredException;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -33,8 +32,6 @@ import com.plotsquared.core.util.task.RunnableVal3;
 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.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.nio.file.Files;
@@ -60,8 +57,6 @@ import java.util.stream.Stream;
         permission = "plots.backup")
 public final class Backup extends Command {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Backup.class.getSimpleName());
-
     private final BackupManager backupManager;
 
     @Inject
@@ -331,28 +326,19 @@ public final class Backup extends Command {
             if (backupProfile instanceof NullBackupProfile) {
                 player.sendMessage(
                         TranslatableCaption.of("backups.backup_impossible"),
-                        TagResolver.resolver(
-                                "plot", Tag.inserting(
+                        TagResolver.resolver("plot", Tag.inserting(
                                 TranslatableCaption.of("generic.generic_other").toComponent(player)
-                                )
-                        )
+                        ))
                 );
             } else {
                 backupProfile.listBackups().whenComplete((backups, throwable) -> {
                     if (throwable != null) {
-                        Component reason;
-                        if (throwable instanceof PlotSquaredException pe) {
-                            reason = pe.getCaption().toComponent(player);
-                        } else {
-                            reason = Component.text(throwable.getMessage());
-                        }
                         player.sendMessage(
                                 TranslatableCaption.of("backups.backup_load_failure"),
-                                TagResolver.resolver("reason", Tag.inserting(reason))
+                                TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
                         );
-                        LOGGER.error("Error loading player ({}) backup", player.getName(), throwable);
-                        return;
-                    }
+                        throwable.printStackTrace();
+                    } else {
                         if (number < 1 || number > backups.size()) {
                             player.sendMessage(
                                     TranslatableCaption.of("backups.backup_impossible"),
@@ -378,8 +364,7 @@ public final class Backup extends Command {
                                         )
                                 );
                             } else {
-                            CmdConfirm.addPending(
-                                    player, "/plot backup load " + number,
+                                CmdConfirm.addPending(player, "/plot backup load " + number,
                                         () -> backupProfile.restoreBackup(backup, player)
                                                 .whenComplete((n, error) -> {
                                                     if (error != null) {
@@ -397,6 +382,7 @@ public final class Backup extends Command {
                                 );
                             }
                         }
+                    }
                 });
             }
         }

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

@@ -20,7 +20,6 @@ package com.plotsquared.core.command;
 
 import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlayerBuyPlotEvent;
 import com.plotsquared.core.events.Result;
@@ -85,9 +84,8 @@ public class Buy extends Command {
         checkTrue(plot.hasOwner(), TranslatableCaption.of("info.plot_unowned"));
         checkTrue(!plot.isOwner(player.getUUID()), TranslatableCaption.of("economy.cannot_buy_own"));
         Set<Plot> plots = plot.getConnectedPlots();
-        int plotCount = Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plot.getWorldName());
         checkTrue(
-                plotCount + plots.size() <= player.getAllowedPlots(),
+                player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
                 TranslatableCaption.of("permission.cant_claim_more_plots"),
                 TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
         );

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

@@ -26,6 +26,7 @@ import com.plotsquared.core.events.PlayerClaimPlotEvent;
 import com.plotsquared.core.events.PlotMergeEvent;
 import com.plotsquared.core.events.Result;
 import com.plotsquared.core.location.Direction;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.MetaDataAccess;
 import com.plotsquared.core.player.PlayerMetaDataKeys;
@@ -71,7 +72,8 @@ public class Claim extends SubCommand {
         if (args.length >= 1) {
             schematic = args[0];
         }
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -88,7 +90,7 @@ public class Claim extends SubCommand {
         boolean force = event.getEventResult() == Result.FORCE;
         int currentPlots = Settings.Limit.GLOBAL ?
                 player.getPlotCount() :
-                player.getPlotCount(plot.getWorldName());
+                player.getPlotCount(location.getWorldName());
 
         final PlotArea area = plot.getArea();
 

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

@@ -68,8 +68,8 @@ public class Continue extends SubCommand {
             return false;
         }
         int size = plot.getConnectedPlots().size();
-        int plotCount = Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plot.getWorldName());
-        if (!Settings.Done.COUNTS_TOWARDS_LIMIT && (player.getAllowedPlots() < plotCount + size)) {
+        if (!Settings.Done.COUNTS_TOWARDS_LIMIT && (player.getAllowedPlots()
+                < player.getPlotCount() + size)) {
             player.sendMessage(
                     TranslatableCaption.of("permission.cant_claim_more_plots"),
                     TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))

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

@@ -19,6 +19,7 @@
 package com.plotsquared.core.command;
 
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -36,7 +37,8 @@ public class Copy extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        Plot plot1 = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot1 = location.getPlotAbs();
         if (plot1 == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -22,6 +22,7 @@ import com.google.inject.Inject;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.generator.HybridPlotWorld;
 import com.plotsquared.core.generator.HybridUtils;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import net.kyori.adventure.text.Component;
@@ -46,7 +47,8 @@ public class CreateRoadSchematic extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -55,7 +57,7 @@ public class CreateRoadSchematic extends SubCommand {
             player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
             return false;
         }
-        if (!(plot.getArea() instanceof HybridPlotWorld)) {
+        if (!(location.getPlotArea() instanceof HybridPlotWorld)) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
         }
         this.hybridUtils.setupRoadSchematic(plot);

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

@@ -22,6 +22,7 @@ import com.google.inject.Inject;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.generator.HybridPlotManager;
 import com.plotsquared.core.generator.HybridUtils;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
@@ -56,7 +57,8 @@ public class DebugRoadRegen extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (args.length < 1) {
             player.sendMessage(
                     TranslatableCaption.of("commandconfig.command_syntax"),
@@ -90,7 +92,8 @@ public class DebugRoadRegen extends SubCommand {
     }
 
     public boolean regenPlot(PlotPlayer<?> player) {
-        PlotArea area = player.getContextualPlotArea();
+        Location location = player.getLocation();
+        PlotArea area = location.getPlotArea();
         if (area == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
             return false;
@@ -145,10 +148,10 @@ public class DebugRoadRegen extends SubCommand {
             return false;
         }
 
-        PlotArea area = player.getContextualPlotArea();
+        Location location = player.getLocation();
+        PlotArea area = location.getPlotArea();
         if (area == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
-            return false;
         }
         Plot plot = player.getCurrentPlot();
         PlotManager manager = area.getPlotManager();

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

@@ -23,6 +23,7 @@ import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.Result;
 import com.plotsquared.core.events.TeleportCause;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -60,7 +61,8 @@ public class Delete extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        final Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        final Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -90,7 +92,7 @@ public class Delete extends SubCommand {
         final java.util.Set<Plot> plots = plot.getConnectedPlots();
         final int currentPlots = Settings.Limit.GLOBAL ?
                 player.getPlotCount() :
-                player.getPlotCount(plot.getWorldName());
+                player.getPlotCount(location.getWorldName());
         Runnable run = () -> {
             if (plot.getRunning() > 0) {
                 player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));

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

@@ -70,7 +70,8 @@ public class Deny extends SubCommand {
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
 
-        final Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        final Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -26,6 +26,7 @@ import com.plotsquared.core.events.PlotDoneEvent;
 import com.plotsquared.core.events.PlotFlagAddEvent;
 import com.plotsquared.core.events.Result;
 import com.plotsquared.core.generator.HybridUtils;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -60,7 +61,8 @@ public class Done extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        final Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        final Plot plot = location.getPlotAbs();
         if ((plot == null) || !plot.hasOwner()) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -73,7 +73,7 @@ public class Download extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        String world = player.getCurrentPlot().getWorldName();
+        String world = player.getLocation().getWorldName();
         if (!this.plotAreaManager.hasPlotArea(world)) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
             return false;

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

@@ -27,6 +27,7 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlotFlagAddEvent;
 import com.plotsquared.core.events.PlotFlagRemoveEvent;
 import com.plotsquared.core.events.Result;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -178,7 +179,8 @@ public final class FlagCommand extends Command {
      * @return {@code true} if the player is allowed to modify the flags at their current location
      */
     private static boolean checkRequirements(final @NonNull PlotPlayer<?> player) {
-        final Plot plot = player.getCurrentPlot();
+        final Location location = player.getLocation();
+        final Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -342,7 +344,7 @@ public final class FlagCommand extends Command {
         if (plotFlag == null) {
             return;
         }
-        Plot plot = player.getCurrentPlot();
+        Plot plot = player.getLocation().getPlotAbs();
         PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
@@ -407,7 +409,7 @@ public final class FlagCommand extends Command {
         if (plotFlag == null) {
             return;
         }
-        Plot plot = player.getCurrentPlot();
+        Plot plot = player.getLocation().getPlotAbs();
         PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
@@ -417,7 +419,7 @@ public final class FlagCommand extends Command {
             return;
         }
         boolean force = event.getEventResult() == Result.FORCE;
-        final PlotFlag localFlag = player.getCurrentPlot().getFlagContainer()
+        final PlotFlag localFlag = player.getLocation().getPlotAbs().getFlagContainer()
                 .getFlag(event.getFlag().getClass());
         if (!force) {
             for (String entry : args[1].split(",")) {
@@ -442,7 +444,7 @@ public final class FlagCommand extends Command {
             return;
         }
         boolean result =
-                player.getCurrentPlot().setFlag(localFlag.merge(parsed.getValue()));
+                player.getLocation().getPlotAbs().setFlag(localFlag.merge(parsed.getValue()));
         if (!result) {
             player.sendMessage(TranslatableCaption.of("flag.flag_not_added"));
             return;
@@ -482,7 +484,7 @@ public final class FlagCommand extends Command {
         if (flag == null) {
             return;
         }
-        final Plot plot = player.getCurrentPlot();
+        final Plot plot = player.getLocation().getPlotAbs();
         final PlotFlag<?, ?> flagWithOldValue = plot.getFlagContainer().getFlag(flag.getClass());
         PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(flag, plot);
         if (event.getEventResult() == Result.DENY) {
@@ -685,7 +687,7 @@ public final class FlagCommand extends Command {
                             .build()
             );
             // Default value
-            final String defaultValue = player.getCurrentPlot().getArea().getFlagContainer()
+            final String defaultValue = player.getLocation().getPlotArea().getFlagContainer()
                     .getFlagErased(plotFlag.getClass()).toString();
             player.sendMessage(
                     TranslatableCaption.of("flag.flag_info_default_value"),

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

@@ -101,10 +101,6 @@ public class Grant extends Command {
                                     );
                                 } else {
                                     access.set(access.get().orElse(0) + 1);
-                                    player.sendMessage(
-                                            TranslatableCaption.of("grants.added"),
-                                            TagResolver.resolver("grants", Tag.inserting(Component.text(access.get().orElse(0))))
-                                    );
                                 }
                             }
                         } else {
@@ -177,14 +173,8 @@ public class Grant extends Command {
                 commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList()));
             }
             return commands;
-        } else if (args.length == 2) {
-            final String subcommand = args[0].toLowerCase();
-            if ((subcommand.equals("add") && player.hasPermission(Permission.PERMISSION_GRANT_ADD)) ||
-                (subcommand.equals("check") && player.hasPermission(Permission.PERMISSION_GRANT_CHECK))) {
-                return TabCompletions.completePlayers(player, args[1], Collections.emptyList());
         }
-        }
-        return Collections.emptyList();
+        return TabCompletions.completePlayers(player, String.join(",", args).trim(), Collections.emptyList());
     }
 
 }

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

@@ -20,6 +20,7 @@ package com.plotsquared.core.command;
 
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.Caption;
+import com.plotsquared.core.configuration.caption.StaticCaption;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
 import com.plotsquared.core.permissions.Permission;
@@ -130,9 +131,13 @@ public class Info extends SubCommand {
             info = getCaption(arg);
             if (info == null) {
                 if (Settings.Ratings.USE_LIKES) {
-                    player.sendMessage(TranslatableCaption.of("info.plot_info_categories.use_likes"));
+                    player.sendMessage(StaticCaption.of(
+                            "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
+                                    + "&aowner&7, " + " &alikes"));
                 } else {
-                    player.sendMessage(TranslatableCaption.of("info.plot_info_categories.use_rating"));
+                    player.sendMessage(StaticCaption.of(
+                            "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
+                                    + "&aowner&7, " + " &arating"));
                 }
                 return false;
             }

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

@@ -65,7 +65,8 @@ public class Kick extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlot();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -123,7 +124,7 @@ public class Kick extends SubCommand {
                         );
                         return;
                     }
-                    Location spawn = this.worldUtil.getSpawn(plot.getWorldName());
+                    Location spawn = this.worldUtil.getSpawn(location.getWorldName());
                     player2.sendMessage(TranslatableCaption.of("kick.you_got_kicked"));
                     if (plot.equals(spawn.getPlot())) {
                         Location newSpawn = this.worldUtil.getSpawn(this.plotAreaManager.getAllWorlds()[0]);
@@ -147,7 +148,8 @@ public class Kick extends SubCommand {
 
     @Override
     public Collection<Command> tab(final PlotPlayer<?> player, final String[] args, final boolean space) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             return Collections.emptyList();
         }

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

@@ -150,8 +150,8 @@ public class ListCmd extends SubCommand {
             page = 0;
         }
 
-        PlotArea area = player.getContextualPlotArea();
-        String world = area != null ? area.getWorldName() : "";
+        String world = player.getLocation().getWorldName();
+        PlotArea area = player.getApplicablePlotArea();
         String arg = args[0].toLowerCase();
         final boolean[] sort = new boolean[]{true};
 

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

@@ -68,6 +68,11 @@ public class Load extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, final String[] args) {
+        final String world = player.getLocation().getWorldName();
+        if (!this.plotAreaManager.hasPlotArea(world)) {
+            player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
+            return false;
+        }
         final Plot plot = player.getCurrentPlot();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));

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

@@ -275,7 +275,7 @@ public class MainCommand extends Command {
     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], data.player());
+            Plot newPlot = Plot.fromString(area, data.args()[0]);
             return preparePlotArgument(newPlot, data, area)
                     .thenApply(d -> d.flatMap(x -> prepareFlagArgument(x, area)));
         } else {
@@ -283,35 +283,24 @@ public class MainCommand extends Command {
         }
     }
 
-    private CompletableFuture<Optional<CommandExecutionData>> preparePlotArgument(
-            @Nullable Plot newPlot,
+    private CompletableFuture<Optional<CommandExecutionData>> preparePlotArgument(@Nullable Plot newPlot,
                                                                         @Nonnull CommandExecutionData data,
-            @Nullable PlotArea area
-    ) {
-        if (newPlot == null) {
-            return CompletableFuture.completedFuture(Optional.of(data));
-        }
-        final PlotPlayer<?> player = data.player();
-        final boolean isAdmin = player instanceof ConsolePlayer || player.hasPermission(Permission.PERMISSION_ADMIN);
-        final boolean isDenied = newPlot.isDenied(player.getUUID());
-        if (!isAdmin) {
-            if (isDenied) {
-                throw new CommandException(TranslatableCaption.of("deny.cannot_interact"));
-            }
-            if (area != null && area.equals(newPlot.getArea()) && !player.hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO)) {
-                return CompletableFuture.completedFuture(Optional.of(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 (!player.canTeleport(newLoc)) {
-                        player.sendMessage(TranslatableCaption.of("border.denied"));
+                        if (!data.player().canTeleport(newLoc)) {
+                            data.player().sendMessage(TranslatableCaption.of("border.denied"));
                             return Optional.empty();
                         }
                         // Save meta
-                    var originalCommandMeta = setCommandScope(player, new TemporaryCommandMeta(newLoc, newPlot));
+                        var originalCommandMeta = setCommandScope(data.player(), new TemporaryCommandMeta(newLoc, newPlot));
                         return Optional.of(new CommandExecutionData(
-                            player,
+                                data.player(),
                                 Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
                                 data.confirm(),
                                 data.whenDone(),
@@ -319,6 +308,8 @@ public class MainCommand extends Command {
                         ));
                     });
         }
+        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) == '-') {

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

@@ -20,6 +20,7 @@ package com.plotsquared.core.command;
 
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.TeleportCause;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 
@@ -35,7 +36,8 @@ public class Middle extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] arguments) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlot();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -20,6 +20,7 @@ package com.plotsquared.core.command;
 
 import com.google.inject.Inject;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -54,7 +55,8 @@ public class Move extends SubCommand {
             RunnableVal3<Command, Runnable, Runnable> confirm,
             RunnableVal2<Command, CommandResult> whenDone
     ) {
-        Plot plot1 = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot1 = location.getPlotAbs();
         if (plot1 == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return CompletableFuture.completedFuture(false);

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

@@ -23,6 +23,7 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlotFlagAddEvent;
 import com.plotsquared.core.events.PlotFlagRemoveEvent;
 import com.plotsquared.core.events.Result;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -56,7 +57,7 @@ public class Music extends SubCommand {
                     "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_tears", "music_disc_lava_chicken"
+                    "music_disc_creator_music_box", "music_disc_precipice"
             );
 
     // make sure all discs and the bedrock ("cancel") fit into the inventory
@@ -73,7 +74,8 @@ public class Music extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        final Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        final Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -21,6 +21,7 @@ package com.plotsquared.core.command;
 import com.google.inject.Inject;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -55,7 +56,8 @@ public class Remove extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -130,7 +132,8 @@ public class Remove extends SubCommand {
 
     @Override
     public Collection<Command> tab(final PlotPlayer<?> player, final String[] args, final boolean space) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             return Collections.emptyList();
         }

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

@@ -22,6 +22,7 @@ import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.PlotPlayer;
@@ -101,7 +102,8 @@ public class SchematicCmd extends SubCommand {
                     );
                     break;
                 }
-                final Plot plot = player.getCurrentPlot();
+                Location loc = player.getLocation();
+                final Plot plot = loc.getPlotAbs();
                 if (plot == null) {
                     player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
                     return false;
@@ -245,7 +247,8 @@ public class SchematicCmd extends SubCommand {
                     player.sendMessage(TranslatableCaption.of("error.task_in_process"));
                     return false;
                 }
-                Plot plot = player.getCurrentPlot();
+                Location location = player.getLocation();
+                Plot plot = location.getPlotAbs();
                 if (plot == null) {
                     player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
                     return false;

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

@@ -78,7 +78,7 @@ public class Set extends SubCommand {
 
             @Override
             public boolean set(PlotPlayer<?> player, final Plot plot, String value) {
-                final PlotArea plotArea = player.getContextualPlotArea();
+                final PlotArea plotArea = player.getLocation().getPlotArea();
                 if (plotArea == null) {
                     return false;
                 }

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

@@ -19,6 +19,7 @@
 package com.plotsquared.core.command;
 
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -31,7 +32,8 @@ public abstract class SetCommand extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -19,6 +19,7 @@
 package com.plotsquared.core.command;
 
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -43,7 +44,8 @@ public class Swap extends SubCommand {
             RunnableVal3<Command, Runnable, Runnable> confirm,
             RunnableVal2<Command, CommandResult> whenDone
     ) {
-        Plot plot1 = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot1 = location.getPlotAbs();
         if (plot1 == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return CompletableFuture.completedFuture(false);
@@ -77,10 +79,8 @@ public class Swap extends SubCommand {
         String p1 = plot1.toString();
         String p2 = plot2.toString();
 
-        return plot1.getPlotModificationManager().move(
-                plot2, player, () -> {
-                }, true
-        ).thenApply(result -> {
+        return plot1.getPlotModificationManager().move(plot2, player, () -> {
+        }, true).thenApply(result -> {
             if (result) {
                 player.sendMessage(
                         TranslatableCaption.of("swap.swap_success"),

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

@@ -22,6 +22,7 @@ import com.google.inject.Inject;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlotUnlinkEvent;
 import com.plotsquared.core.events.Result;
+import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -50,7 +51,8 @@ public class Unlink extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        final Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        final Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -51,7 +51,7 @@ public interface Caption {
      * @param localeHolder Local holder
      * @param tagResolvers custom tag resolvers to replace placeholders / parameters
      * @return {@link ComponentLike}
-     * @since 7.5.4
+     * @since TODO
      */
     @NonNull Component toComponent(@NonNull LocaleHolder localeHolder, @NonNull TagResolver @NonNull... tagResolvers);
 

Core/src/main/java/com/plotsquared/core/exception/PlotSquaredException.java

@@ -1,62 +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.exception;
-
-import com.plotsquared.core.configuration.caption.Caption;
-import com.plotsquared.core.configuration.caption.LocaleHolder;
-
-/**
- * Internal use only. Used to allow adventure captions to be used in an exception
- *
- * @since 7.5.7
- */
-public final class PlotSquaredException extends RuntimeException {
-
-    private final Caption caption;
-
-    /**
-     * Create a new instance with the given caption
-     *
-     * @param caption caption
-     */
-    public PlotSquaredException(Caption caption) {
-        this.caption = caption;
-    }
-
-    /**
-     * Create a new instance with the given caption and cause
-     *
-     * @param caption caption
-     * @param cause   cause
-     */
-    public PlotSquaredException(Caption caption, Exception cause) {
-        super(cause);
-        this.caption = caption;
-    }
-
-    @Override
-    public String getMessage() {
-        return caption.getComponent(LocaleHolder.console());
-    }
-
-    public Caption getCaption() {
-        return caption;
-    }
-
-}

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

@@ -290,7 +290,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
      *
      * @return the plot the player is standing on or null if standing on a road or not in a {@link PlotArea}
      */
-    public @Nullable Plot getCurrentPlot() {
+    public Plot getCurrentPlot() {
         try (final MetaDataAccess<Plot> lastPlotAccess =
                      this.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
             if (lastPlotAccess.get().orElse(null) == null && !Settings.Enabled_Components.EVENTS) {
@@ -319,7 +319,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
      */
     public int getPlotCount() {
         if (!Settings.Limit.GLOBAL) {
-            return getPlotCount(getContextualWorldName());
+            return getPlotCount(getLocation().getWorldName());
         }
         final AtomicInteger count = new AtomicInteger(0);
         final UUID uuid = getUUID();
@@ -339,7 +339,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     public int getClusterCount() {
         if (!Settings.Limit.GLOBAL) {
-            return getClusterCount(getContextualWorldName());
+            return getClusterCount(getLocation().getWorldName());
         }
         final AtomicInteger count = new AtomicInteger(0);
         this.plotAreaManager.forEachPlotArea(value -> {
@@ -352,34 +352,6 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
         return count.get();
     }
 
-    /**
-     * {@return the world name at the player's contextual position}
-     * The contextual position can be affected when using a command with
-     * an explicit plot override, e.g., `/plot &ltid&gt info`.
-     */
-    private @NonNull String getContextualWorldName() {
-        Plot current = getCurrentPlot();
-        if (current != null) {
-            return current.getWorldName();
-        }
-        return getLocation().getWorldName();
-    }
-
-    /**
-     * {@return the plot area at the player's contextual position}
-     * The contextual position can be affected when using a command with
-     * an explicit plot override, e.g., `/plot &ltid&gt info`.
-     *
-     * @since TODO
-     */
-    public @Nullable PlotArea getContextualPlotArea() {
-        Plot current = getCurrentPlot();
-        if (current != null) {
-            return current.getArea();
-        }
-        return getLocation().getPlotArea();
-    }
-
     /**
      * Get the number of plots this player owns in the world.
      *
@@ -436,12 +408,8 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
     }
 
     public PlotArea getApplicablePlotArea() {
-        Plot plot = getCurrentPlot();
-        if (plot == null) {
         return this.plotAreaManager.getApplicablePlotArea(getLocation());
     }
-        return plot.getArea();
-    }
 
     @Override
     public @NonNull RequiredType getSuperCaller() {
@@ -646,16 +614,16 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
             PlotId id = plot.getId();
             int x = id.getX();
             int z = id.getY();
-            ByteBuffer buffer = ByteBuffer.allocate(14);
+            ByteBuffer buffer = ByteBuffer.allocate(13);
             buffer.putShort((short) x);
             buffer.putShort((short) z);
             Location location = getLocation();
             buffer.putInt(location.getX());
-            buffer.putShort((short) location.getY());
+            buffer.put((byte) location.getY());
             buffer.putInt(location.getZ());
-            setPersistentMeta("quitLocV2", buffer.array());
-        } else if (hasPersistentMeta("quitLocV2")) {
-            removePersistentMeta("quitLocV2");
+            setPersistentMeta("quitLoc", buffer.array());
+        } else if (hasPersistentMeta("quitLoc")) {
+            removePersistentMeta("quitLoc");
         }
         if (plot != null) {
             this.eventDispatcher.callLeave(this, plot);
@@ -710,8 +678,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     public void populatePersistentMetaMap() {
         if (Settings.Enabled_Components.PERSISTENT_META) {
-            DBFunc.getPersistentMeta(
-                    getUUID(), new RunnableVal<>() {
+            DBFunc.getPersistentMeta(getUUID(), new RunnableVal<>() {
                 @Override
                 public void run(Map<String, byte[]> value) {
                     try {
@@ -733,18 +700,11 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
                             return;
                         }
                         PlotArea area = ((SinglePlotAreaManager) manager).getArea();
-                                boolean V2 = false;
                         byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
-                                if (arr == null) {
-                                    arr = PlotPlayer.this.getPersistentMeta("quitLocV2");
                         if (arr == null) {
                             return;
                         }
-                                    V2 = true;
-                                    removePersistentMeta("quitLocV2");
-                                } else {
                         removePersistentMeta("quitLoc");
-                                }
 
                         if (!getMeta("teleportOnLogin", true)) {
                             return;
@@ -754,7 +714,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
                         final int plotZ = quitWorld.getShort();
                         PlotId id = PlotId.of(plotX, plotZ);
                         int x = quitWorld.getInt();
-                                int y = V2 ? quitWorld.getShort() : (quitWorld.get() & 0xFF);
+                        int y = quitWorld.get() & 0xFF;
                         int z = quitWorld.getInt();
                         Plot plot = area.getOwnedPlot(id);
 
@@ -788,11 +748,10 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
                             }
                         }
                     } catch (Throwable e) {
-                                LOGGER.error("Error populating persistent meta for player {}", PlotPlayer.this.getName(), e);
+                        e.printStackTrace();
                     }
                 }
-                    }
-            );
+            });
         }
     }
 
@@ -860,8 +819,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
     }
 
     @SuppressWarnings("unchecked")
-    @Nullable
-    <T> T getPersistentMeta(final @NonNull MetaDataKey<T> key) {
+    @Nullable <T> T getPersistentMeta(final @NonNull MetaDataKey<T> key) {
         final byte[] value = this.getPersistentMeta(key.toString());
         if (value == null) {
             return null;
@@ -1031,11 +989,9 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
             if (throwable != null) {
                 sendMessage(
                         TranslatableCaption.of("errors.error"),
-                        TagResolver.resolver(
-                                "value", Tag.inserting(
+                        TagResolver.resolver("value", Tag.inserting(
                                 Component.text("Failed to resolve asynchronous caption replacements")
-                                )
-                        )
+                        ))
                 );
                 LOGGER.error("Failed to resolve asynchronous tagresolver(s) for " + caption, throwable);
             } else {

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

@@ -321,8 +321,7 @@ public class Plot {
     }
 
     /**
-     * Get the plot from a string. Performs a check to ensure Plot#getBottomAbs is not outside world bounds
-     * (x/z +/- 30,000,000) to prevent crashes
+     * Get the plot from a string.
      *
      * @param player  Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context.
      * @param arg     The search term
@@ -333,31 +332,6 @@ public class Plot {
             final @Nullable PlotPlayer<?> player,
             final @Nullable String arg,
             final boolean message
-    ) {
-        Plot plot = getPlotFromStringUnchecked(player, arg, message);
-        if (plot != null && !WorldUtil.isValidLocation(plot.getBottomAbs())) {
-            if (message) {
-                (player == null ? ConsolePlayer.getConsole() : player).sendMessage(TranslatableCaption.of(
-                        "invalid.world_location_plot"));
-            }
-            return null;
-        }
-        return plot;
-    }
-
-    /**
-     * Get the plot from a string. Does not perform a check on world bounds.
-     *
-     * @param player  Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context.
-     * @param arg     The search term
-     * @param message If a message should be sent to the player if a plot cannot be found
-     * @return The plot if only 1 result is found, or null
-     * @since 7.5.5
-     */
-    public static @Nullable Plot getPlotFromStringUnchecked(
-            final @Nullable PlotPlayer<?> player,
-            final @Nullable String arg,
-            final boolean message
     ) {
         if (arg == null) {
             if (player == null) {
@@ -415,51 +389,13 @@ public class Plot {
     }
 
     /**
-     * Gets a plot from a string e.g. [area];[id]. Performs a check to ensure Plot#getBottomAbs is not outside world bounds
-     * (x/z +/- 30,000,000) to prevent crashes
+     * Gets a plot from a string e.g. [area];[id]
      *
      * @param defaultArea if no area is specified
      * @param string      plot id/area + id
      * @return New or existing plot object
      */
     public static @Nullable Plot fromString(final @Nullable PlotArea defaultArea, final @NonNull String string) {
-        return fromString(defaultArea, string, null);
-    }
-
-    /**
-     * Gets a plot from a string e.g. [area];[id]. Performs a check to ensure Plot#getBottomAbs is not outside world bounds
-     * (x/z +/- 30,000,000) to prevent crashes
-     *
-     * @param defaultArea if no area is specified
-     * @param string      plot id/area + id
-     * @param player      {@link PlotPlayer} player to notify if plot is invalid (outside bounds)
-     * @return New or existing plot object
-     * @since 7.5.5
-     */
-    public static @Nullable Plot fromString(
-            final @Nullable PlotArea defaultArea,
-            final @NonNull String string,
-            final @Nullable PlotPlayer<?> player
-    ) {
-        Plot plot = fromStringUnchecked(defaultArea, string);
-        if (plot != null && !WorldUtil.isValidLocation(plot.getBottomAbs())) {
-            if (player != null) {
-                player.sendMessage(TranslatableCaption.of("invalid.world_location_plot"));
-            }
-            return null;
-        }
-        return plot;
-    }
-
-    /**
-     * Gets a plot from a string e.g. [area];[id]. Does not perform a check on world bounds.
-     *
-     * @param defaultArea if no area is specified
-     * @param string      plot id/area + id
-     * @return New or existing plot object
-     * @since 7.5.5
-     */
-    public static @Nullable Plot fromStringUnchecked(final @Nullable PlotArea defaultArea, final @NonNull String string) {
         final String[] split = string.split("[;,]");
         if (split.length == 2) {
             if (defaultArea != null) {
@@ -483,8 +419,7 @@ public class Plot {
     }
 
     /**
-     * Return a new/cached plot object at a given location. Does not check world bounds for potential crashes, these should be
-     * performed before (or after) this method is used.
+     * Return a new/cached plot object at a given location.
      *
      * <p>
      * Use {@link PlotPlayer#getCurrentPlot()} if a player is expected here.
@@ -541,7 +476,7 @@ public class Plot {
      *
      * @return World name
      */
-    public @NonNull String getWorldName() {
+    public @Nullable String getWorldName() {
         return area.getWorldName();
     }
 

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

@@ -371,7 +371,8 @@ public final class PlotModificationManager {
                             manager.createRoadSouthEast(current, queue);
                         }
                     }
-                } else if (current.isMerged(Direction.SOUTH)) {
+                }
+                if (current.isMerged(Direction.SOUTH)) {
                     manager.createRoadSouth(current, queue);
                 }
             }

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

@@ -63,18 +63,4 @@ public class PlotTitle {
         return subtitle;
     }
 
-    /**
-     * Provides a string representation of this plot title value (used in placeholders).
-     *
-     * @return the plot title representation in the format {@code "<title>" "<subtitle>"}
-     * @since 7.5.5
-     */
-    @Override
-    public String toString() {
-        return "\"%s\" \"%s\"".formatted(
-                this.title != null ? this.title : "",
-                this.subtitle != null ? this.subtitle : ""
-        );
-    }
-
 }

Core/src/main/java/com/plotsquared/core/plot/world/SinglePlot.java

@@ -58,7 +58,7 @@ public class SinglePlot extends Plot {
     }
 
     @Override
-    public @NonNull String getWorldName() {
+    public String getWorldName() {
         return getId().toUnderscoreSeparatedString();
     }
 

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

@@ -135,7 +135,6 @@ public abstract class SchematicHandler {
         }
         final String filename;
         final String website;
-        final @Nullable UUID finalUuid = uuid;
         if (uuid == null) {
             uuid = UUID.randomUUID();
             website = Settings.Web.URL + "upload.php?" + uuid;
@@ -145,11 +144,10 @@ public abstract class SchematicHandler {
             filename = file + '.' + extension;
         }
         final URL url;
-        String uri = Settings.Web.URL + "?key=" + uuid + "&type=" + extension;
         try {
-            url = URI.create(uri).toURL();
+            url = URI.create(Settings.Web.URL + "?key=" + uuid + "&type=" + extension).toURL();
         } catch (MalformedURLException e) {
-            LOGGER.error("Malformed URI `{}`", uri, e);
+            e.printStackTrace();
             whenDone.run();
             return;
         }
@@ -195,7 +193,7 @@ public abstract class SchematicHandler {
                 }
                 TaskManager.runTask(whenDone);
             } catch (IOException e) {
-                LOGGER.error("Error while uploading schematic for UUID {}", finalUuid, e);
+                e.printStackTrace();
                 TaskManager.runTask(whenDone);
             }
         });
@@ -390,14 +388,8 @@ public abstract class SchematicHandler {
             }
             queue.enqueue();
         } catch (Exception e) {
+            e.printStackTrace();
             TaskManager.runTask(whenDone);
-            LOGGER.error(
-                    "Error pasting schematic to plot {};{} for player {}",
-                    plot.getArea(),
-                    plot.getId(),
-                    actor == null ? "null" : actor.getName(),
-                    e
-            );
         }
     }
 
@@ -464,7 +456,7 @@ public abstract class SchematicHandler {
                 Clipboard clip = reader.read();
                 return new Schematic(clip);
             } catch (IOException e) {
-                LOGGER.error("Error reading schematic from file {}", file.getAbsolutePath(), e);
+                e.printStackTrace();
             }
         } else {
             throw new UnsupportedFormatException("This schematic format is not recognised or supported.");
@@ -478,7 +470,7 @@ public abstract class SchematicHandler {
             InputStream inputStream = Channels.newInputStream(readableByteChannel);
             return getSchematic(inputStream);
         } catch (IOException e) {
-            LOGGER.error("Error reading schematic from {}", url, e);
+            e.printStackTrace();
         }
         return null;
     }
@@ -494,7 +486,7 @@ public abstract class SchematicHandler {
                 Clipboard clip = schematicReader.read();
                 return new Schematic(clip);
             } catch (IOException e) {
-                LOGGER.error("Error reading schematic", e);
+                e.printStackTrace();
             }
         }
         return null;
@@ -523,7 +515,7 @@ public abstract class SchematicHandler {
             }
             return schematics;
         } catch (JsonParseException | IOException e) {
-            LOGGER.error("Error retrieving saves for UUID {}", uuid, e);
+            e.printStackTrace();
         }
         return null;
     }
@@ -540,7 +532,7 @@ public abstract class SchematicHandler {
                 try (NBTOutputStream nos = new NBTOutputStream(new GZIPOutputStream(output, true))) {
                     nos.writeNamedTag("Schematic", tag);
                 } catch (IOException e1) {
-                    LOGGER.error("Error uploading schematic for UUID {}", uuid, e1);
+                    e1.printStackTrace();
                 }
             }
         }, whenDone);
@@ -564,9 +556,9 @@ public abstract class SchematicHandler {
                 nbtStream.writeNamedTag("Schematic", tag);
             }
         } catch (FileNotFoundException e) {
-            LOGGER.error("Error saving schematic at {}", path, e);
+            e.printStackTrace();
         } catch (IOException e) {
-            LOGGER.error("Error saving schematic at {}", path, e);
+            e.printStackTrace();
             return false;
         }
         return true;
@@ -589,7 +581,7 @@ public abstract class SchematicHandler {
         schematic.put("BlockData", new ByteArrayTag(buffer.toByteArray()));
         schematic.put("BlockEntities", new ListTag(CompoundTag.class, tileEntities));
 
-        if (biomeBuffer.size() == 0 || biomePalette.isEmpty()) {
+        if (biomeBuffer.size() == 0 || biomePalette.size() == 0) {
             return;
         }
 
@@ -741,7 +733,10 @@ public abstract class SchematicHandler {
                                     }
                                     BaseBlock block = aabb.getWorld().getFullBlock(point);
                                     if (block.getNbtData() != null) {
-                                        Map<String, Tag> values = new HashMap<>(block.getNbtData().getValue());
+                                        Map<String, Tag> values = new HashMap<>();
+                                        for (Map.Entry<String, Tag> entry : block.getNbtData().getValue().entrySet()) {
+                                            values.put(entry.getKey(), entry.getValue());
+                                        }
 
                                         // Positions are kept in NBT, we don't want that.
                                         values.remove("x");

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

@@ -49,12 +49,10 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 import java.util.TimeZone;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
-import java.util.stream.Collectors;
 
 /**
  * Registry that contains {@link Placeholder placeholders}
@@ -129,22 +127,6 @@ public final class PlaceholderRegistry {
             }
             return legacyComponent(TranslatableCaption.of("info.unknown"), player);
         });
-        this.createPlaceholder("currentplot_owners", (player, plot) -> {
-            if (plot.getFlag(ServerPlotFlag.class)) {
-                return legacyComponent(TranslatableCaption.of("info.server"), player);
-            }
-            final Set<UUID> plotOwners = plot.getOwners();
-            if (plotOwners.isEmpty()) {
-                return legacyComponent(TranslatableCaption.of("generic.generic_unowned"), player);
-            }
-            return plotOwners.stream().map(PlotSquared.platform().playerManager()::getUsernameCaption).map(f -> {
-                try {
-                    return f.get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS).getComponent(player);
-                } catch (final Exception ignored) {
-                    return legacyComponent(TranslatableCaption.of("info.unknown"), player);
-                }
-            }).collect(Collectors.joining(", "));
-        });
         this.createPlaceholder("currentplot_members", (player, plot) -> {
             if (plot.getMembers().isEmpty() && plot.getTrusted().isEmpty()) {
                 return legacyComponent(TranslatableCaption.of("info.none"), player);

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

@@ -234,7 +234,6 @@
   "invalid.not_valid_number": "<prefix><red>That's not a valid number within the range: </red><gray><value></gray>",
   "invalid.not_valid_plot_id": "<prefix><red>That's not a valid plot ID.</red>",
   "invalid.origin_cant_be_target": "<prefix><red>The origin and target location cannot be the same.</red>",
-  "invalid.world_location_plot": "<prefix><red>The target plot is invalid.</red>",
   "invalid.found_no_plots": "<prefix><red>Found no plots with your search query.</red>",
   "invalid.number_not_in_range": "<prefix><red>That's not a valid number within the range: <gray>(<min>, <max>)</gray></red>",
   "invalid.number_not_positive": "<red>That's not a positive number: <gray><value></gray></red>",
@@ -354,8 +353,6 @@
   "info.infinite": "<gray>Infinite</gray>",
   "info.plot_unowned": "<prefix><red>The current plot must have an owner to perform this action.</red>",
   "info.plot_info_unclaimed": "<prefix><gray>Plot <gold><plot></gold> is not yet claimed.</gray>",
-  "info.plot_info_categories.use_rating": "<prefix><gold>Categories: </gold> <gray>members, alias, biome, seen, denied, flags, id, size, trusted, owner, rating</gray>",
-  "info.plot_info_categories.use_likes": "<prefix><gold>Categories: </gold> <gray>members, alias, biome, seen, denied, flags, id, size, trusted, owner, likes</gray>",
   "info.plot_info_header": "<dark_gray><strikethrough>--------- <reset><gold>INFO </gold><dark_gray><strikethrough>---------</dark_gray><reset>",
   "info.plot_info_hidden": "<prefix><red>You cannot view the information about this plot.</red>",
   "info.plot_info_format": "<header>\n<gold>ID: <gray><id></gray>\nCreation: <gray><creationdate></gray>\nArea: <gray><area></gray>\nAlias: <gray><alias></gray>\nOwner: <gray><owner></gray>\nBiome: <gray><biome></gray>\nCan Build: <gray><build></gray>\nRating: <gray><rating></gray>\nSeen: <gray><seen></gray>\nTrusted: <gray><trusted></gray>\nMembers: <gray><members></gray>\nDenied: <gray><denied></gray>\nFlags: <gray><flags></gray>\nDescription: <gray><desc></gray></gold>\n<footer>",
@@ -415,7 +412,6 @@
   "deny.denied_added": "<prefix><dark_aqua>You successfully denied the player from this plot.</dark_aqua>",
   "deny.no_enter": "<prefix><red>You are denied from the plot <red><gold><plot></gold><red> and therefore not allowed to enter.</red>",
   "deny.you_got_denied": "<prefix><red>You are denied from the plot you were previously on, and got teleported to spawn.</red>",
-  "deny.cannot_interact": "<prefix><red>You are denied from the plot <red><gold><plot></gold><red> and therefore cannot interact with it.</red>",
   "deny.cant_remove_owner": "<prefix><red>You can't remove the plot owner.</red>",
   "kick.player_not_in_plot": "<prefix><red>The player <gray><player></gray> is not on this plot.</red>",
   "kick.cannot_kick_player": "<prefix><red>You cannot kick the player <gray><player></gray>.</red>",
@@ -458,7 +454,7 @@
   "category.command_category_debug": "<gray>Debug</gray>",
   "category.command_category_administration": "<gray>Admin</gray>",
   "grants.granted_plots": "<prefix><gold>Result: <gray><amount> </gray>grants left.</gold>",
-  "grants.added": "<prefix><gold>1</gold> <gray>grant has been added. (<grants> total grants)</gray>",
+  "grants.added": "<prefix><gold><grants></gold> <gray>grant(s) have been added.</gray>",
   "events.event_denied": "<prefix><gold><value> </gold><gray>Cancelled by external plugin.</gray>",
   "backups.backup_impossible": "<prefix><red>Backups are not enabled for this plot: <plot>.</red>",
   "backups.backup_save_success": "<prefix><gold>The backup was created successfully.</gold>",

Core/src/test/java/com/plotsquared/core/configuration/caption/ClickStripTransformTest.java

@@ -37,7 +37,12 @@ class ClickStripTransformTest {
     void removeClickEvent() {
         var commonAction = ClickEvent.Action.OPEN_FILE;
         var transform = new ClickStripTransform(EnumSet.of(commonAction));
-        var component = Component.text("Hello").clickEvent(ClickEvent.openFile("World"));
+        var component = Component.text("Hello")
+                .clickEvent(ClickEvent.clickEvent(
+                                commonAction,
+                                "World"
+                        )
+                );
         var transformedComponent = transform.transform(component);
         Assertions.assertNull(transformedComponent.clickEvent());
     }
@@ -47,7 +52,10 @@ class ClickStripTransformTest {
     void ignoreClickEvent() {
         var actionToRemove = ClickEvent.Action.SUGGEST_COMMAND;
         var transform = new ClickStripTransform(EnumSet.of(actionToRemove));
-        var originalClickEvent = ClickEvent.changePage(1337);
+        var originalClickEvent = ClickEvent.clickEvent(
+                ClickEvent.Action.CHANGE_PAGE,
+                "World"
+        );
         var component = Component.text("Hello")
                 .clickEvent(originalClickEvent);
         var transformedComponent = transform.transform(component);
@@ -68,12 +76,12 @@ class ClickStripTransformTest {
                 .insertion("DEF");
         var component = Component.text("Hello ")
                 .append(
-                        inner.clickEvent(ClickEvent.openUrl("https://example.org"))
+                        inner.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, "https://example.org"))
                 );
         var transformedComponent = transform.transform(component);
         Assertions.assertFalse(transformedComponent.children().isEmpty()); // child still exists
-        Assertions.assertEquals(inner, transformedComponent.children().getFirst()); // only the click event has changed
-        Assertions.assertNull(transformedComponent.children().getFirst().clickEvent());
+        Assertions.assertEquals(inner, transformedComponent.children().get(0)); // only the click event has changed
+        Assertions.assertNull(transformedComponent.children().get(0).clickEvent());
     }
 
 }

build.gradle.kts

@@ -1,7 +1,9 @@
 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
 
 plugins {
     java
@@ -20,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.9-SNAPSHOT"
+version = "7.5.4-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -65,16 +67,10 @@ subprojects {
         plugin<IdeaPlugin>()
     }
 
-    configurations.matching { it.name == "signatures" }.configureEach {
-        attributes {
-            attribute(Attribute.of("signatures-unique", String::class.java), "true")
-        }
-    }
-
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:6.0.0")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.0")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.13.1")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.1")
     }
 
     plugins.withId("java") {
@@ -101,16 +97,10 @@ subprojects {
         }
     }
 
-    afterEvaluate {
     val javaComponent = components["java"] as AdhocComponentWithVariants
-        configurations.findByName("shadowRuntimeElements")?.let { shadowRuntimeElements ->
-            javaComponent.withVariantsFromConfiguration(shadowRuntimeElements) {
+    javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
         skip()
     }
-        } ?: run {
-            logger.warn("Configuration 'shadowRuntimeElements' does not exist.")
-        }
-    }
 
     signing {
         if (!project.hasProperty("skip.signing") && !version.toString().endsWith("-SNAPSHOT")) {
@@ -182,7 +172,7 @@ subprojects {
                 url.set("https://github.com/IntellectualSites/PlotSquared/issues")
             }
 
-            publishToMavenCentral()
+            publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
         }
     }
 
@@ -216,7 +206,7 @@ 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", "1.21.6", "1.21.7", "1.21.8")
+val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5")
 tasks {
     register("cacheLatestFaweArtifact") {
         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()

gradle/libs.versions.toml

@@ -2,21 +2,21 @@
 # Platform expectations
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.9.8"
-checkerqual = "3.51.1"
+spotbugs = "4.9.3"
+checkerqual = "3.49.4"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.25.0"
-adventure-bukkit = "4.4.1"
+adventure = "4.21.0"
+adventure-bukkit = "4.4.0"
 log4j = "2.19.0"
 
 # Plugins
 worldedit = "7.2.20"
-fawe = "2.14.0"
+fawe = "2.13.0"
 placeholderapi = "2.11.6"
 luckperms = "5.5"
-essentialsx = "2.21.2"
+essentialsx = "2.21.1"
 mvdwapi = "3.1.1"
 
 # Third party
@@ -33,11 +33,11 @@ vault = "1.7.1"
 serverlib = "2.3.7"
 
 # Gradle plugins
-shadow = "9.2.2"
+shadow = "8.3.6"
 grgit = "4.1.1"
-spotless = "8.0.0"
-publish = "0.34.0"
-runPaper = "3.0.2"
+spotless = "7.0.4"
+publish = "0.32.0"
+runPaper = "2.3.1"
 
 [libraries]
 # Platform expectations

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,6 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -171,6 +172,7 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -210,6 +212,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

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