Release 7.5.7

Signed-off-by: Alexander Brandes <mc.cache@web.de>

.github/workflows/build-pr.yml

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

.github/workflows/codeql.yml

@@ -20,9 +20,9 @@ jobs:
         language: [ 'java' ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21

Bukkit/build.gradle.kts

@@ -41,7 +41,6 @@ dependencies {
     compileOnly(libs.luckperms)
     compileOnly(libs.essentialsx) {
         exclude(group = "org.spigotmc")
-        exclude(group = "io.papermc.paper")
     }
     compileOnly(libs.mvdwapi) { isTransitive = false }
 
@@ -75,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/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/ProjectileEventListener.java

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

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,93 +18,158 @@
  */
 package com.plotsquared.bukkit.schematic;
 
-import com.google.gson.Gson;
+import com.destroystokyo.paper.profile.PlayerProfile;
-import com.google.gson.GsonBuilder;
+import com.destroystokyo.paper.profile.ProfileProperty;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.PlotSquared;
+import com.sk89q.jnbt.ByteTag;
-import com.plotsquared.core.util.ReflectionUtils;
 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.bukkit.WorldEditPlugin;
+import com.sk89q.worldedit.blocks.BaseItemStack;
-import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.extension.platform.NoCapablePlatformException;
+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.BlockState;
+import org.bukkit.block.Container;
 import org.bukkit.block.Sign;
-import org.bukkit.block.sign.Side;
+import org.bukkit.block.Skull;
-import org.bukkit.block.sign.SignSide;
+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;
 
-import java.lang.invoke.MethodHandle;
+import java.util.ArrayList;
-import java.lang.invoke.MethodHandles;
+import java.util.HashMap;
-import java.lang.invoke.MethodType;
-import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
+import java.util.Map;
-import java.util.function.Consumer;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.UUID;
 
-/**
- * This class (attempts to) restore block tile entity data, after the underlying block state has been placed.
- * This is used on chunk population (world generation) and in the platforms queue handler (as a fallback for WorldEdit placement).
- * <br />
- * This class relies heavily on reflective access, native minecraft methods and non-standardized WorldEdit / FAWE methods. It's
- * extremely prone to breakage between versions (Minecraft and/or (FA)WE), but supports most if not all possible tile entities.
- * Given the previous logic of this class was also non-reliable between version updates, and did only support a small subset of
- * tile entities, it's a fair trade-off.
- */
-@ApiStatus.Internal
 public class StateWrapper {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapper.class.getSimpleName());
-
-    private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
-    private static final Gson GSON = new GsonBuilder().registerTypeHierarchyAdapter(Tag.class, new NbtGsonSerializer()).create();
-    private static final String CRAFTBUKKIT_PACKAGE = Bukkit.getServer().getClass().getPackageName();
-
-    private static final boolean FORCE_UPDATE_STATE = true;
-    private static final boolean UPDATE_TRIGGER_PHYSICS = false;
-    private static final boolean SUPPORTED = PlotSquared.platform().serverVersion()[1] > 20 ||
-            (PlotSquared.platform().serverVersion()[1] == 20 && PlotSquared.platform().serverVersion()[2] >= 4);
-    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 boolean NOT_SUPPORTED_NOTIFIED = false;
-    private static boolean FAILED_INITIALIZATION = false;
-    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;
-
-    // SIGN HACK
-    private static boolean PAPER_SIGN_NOTIFIED = false;
-    private static boolean FAILED_SIGN_INITIALIZATION = false;
-    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 CompoundTag tag;
 
+    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.
      *
@@ -128,264 +193,157 @@ public class StateWrapper {
      * @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 || FAILED_INITIALIZATION) {
+        if (this.tag == null) {
             return false;
         }
-        if (!SUPPORTED) {
+        org.bukkit.block.BlockState state = block.getState();
-            if (!NOT_SUPPORTED_NOTIFIED) {
+        switch (getId()) {
-                NOT_SUPPORTED_NOTIFIED = true;
+            case "chest", "beacon", "brewingstand", "dispenser", "dropper", "furnace", "hopper", "shulkerbox" -> {
-                LOGGER.error(INITIALIZATION_ERROR_TEMPLATE, "Your server version is not supported. 1.20.4 or later is required");
+                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;
             }
-        if (ADAPTER == null) {
+            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");
+
+                    if (player != null && !player.isEmpty()) {
                         try {
-                findNbtCompoundClassType(clazz -> LIN_TAG_CLASS = clazz, clazz -> JNBT_TAG_CLASS = clazz);
+                            skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
-                ReflectionUtils.RefClass worldEditPluginRefClass = ReflectionUtils.getRefClass(WorldEditPlugin.class);
+                            skull.update(true);
-                WorldEditPlugin worldEditPlugin = (WorldEditPlugin) worldEditPluginRefClass
+                        } catch (Exception e) {
-                        .getMethod("getInstance")
+                            e.printStackTrace();
-                        .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) {
-                LOGGER.error(INITIALIZATION_ERROR_TEMPLATE, "Failed to access required WorldEdit methods", e);
-                FAILED_INITIALIZATION = true;
-                return false;
                         }
-            try {
+                        return true;
-                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) {
-                LOGGER.error(INITIALIZATION_ERROR_TEMPLATE, "Failed to initialize required native method accessors", e);
-                FAILED_INITIALIZATION = true;
-                return false;
-            }
-        }
-        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 ? this.tag : TO_LIN_TAG.invoke(this.tag)
-            );
-            CRAFT_BLOCK_ENTITY_STATE_LOAD_DATA.invoke(blockState, nativeTag);
-            if (blockState instanceof Sign sign) {
-                Object text;
-                if ((text = tag.getValue().get("front_text")) != null && text instanceof CompoundTag textTag) {
-                    setSignTextHack(sign, textTag, true);
-                }
-                if ((text = tag.getValue().get("back_text")) != null && text instanceof CompoundTag textTag) {
-                    setSignTextHack(sign, textTag, false);
-                }
-            }
-            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;
                     }
 
-    /**
+                    final CompoundTag properties = (CompoundTag) skullOwner.getValue().get("Properties");
-     * Set sign content on the bukkit tile entity. The server does not load sign content applied via the main logic
+                    if (properties == null) {
-     * (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 sign  The sign to apply data onto.
-     * @param text  The compound tag containing the data for the sign side ({@code front_text} / {@code back_text})
-     * @param front If the compound tag contains the data for the front side.
-     * @throws Throwable if something went wrong when reflectively updating the sign.
-     */
-    private static void setSignTextHack(Sign sign, CompoundTag text, boolean front) throws Throwable {
-        final SignSide side = sign.getSide(front ? Side.FRONT : Side.BACK);
-        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);
-                if (line instanceof StringTag stringTag) {
-                    //noinspection deprecation - Paper deprecatiom
-                    side.setLine(i, stringTag.getValue());
-                    continue;
-                }
-                if (line instanceof ListTag || line instanceof CompoundTag) {
-                    if (!initializeSignHack()) {
-                        continue;
-                    }
-                    // 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). Adventure can't parse those, so we handle these lines as
-                    // plaintext lines (can't contain any other extra data either way).
-                    if (line instanceof CompoundTag compoundTag && compoundTag.getValue().containsKey("")) {
-                        //noinspection deprecation - Paper deprecatiom
-                        side.setLine(i, compoundTag.getString(""));
-                        continue;
-                    }
-                    // serializes the line content from JNBT to Gson JSON objects, passes that to adventure and deserializes
-                    // into an adventure component.
-                    BUKKIT_SIGN_SIDE_LINE_SET.invoke(
-                            side, i, GSON_SERIALIZER_DESERIALIZE_TREE.invoke(
-                                    KYORI_GSON_SERIALIZER,
-                                    GSON.toJsonTree(line.getValue())
-                            )
-                    );
-                }
-            }
-        }
-    }
-
-    private static boolean initializeSignHack() {
-        if (FAILED_SIGN_INITIALIZATION) {
                         return false;
                     }
-        if (KYORI_GSON_SERIALIZER != null) {
+                    final ListTag textures = properties.getListTag("textures");
-            return true; // already initialized
+                    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 (!PAPER_SIGN_NOTIFIED) {
+                        if (!paperErrorTextureSent) {
-                PAPER_SIGN_NOTIFIED = true;
+                            paperErrorTextureSent = true;
-                LOGGER.error("Can't populate non-plain sign line. To load modern sign content, use Paper.");
+                            LOGGER.error("Failed to populate skull data in your road schematic - This is a Spigot limitation.");
                         }
                         return false;
                     }
-        try {
+                    final PlayerProfile profile = Bukkit.createProfile(UUID.randomUUID());
-            char[] dontObfuscate = new char[]{
+                    profile.setProperty(new ProfileProperty("textures", textureValue));
-                    'n', 'e', 't', '.', 'k', 'y', 'o', 'r', 'i', '.', 'a', 'd', 'v', 'e', 'n', 't', 'u', 'r', 'e', '.',
+                    skull.setPlayerProfile(profile);
-                    't', 'e', 'x', 't', '.', 's', 'e', 'r', 'i', 'a', 'l', 'i', 'z', 'e', 'r', '.', 'g', 's', 'o', 'n', '.',
+                    skull.update(true);
-                    '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());
                     return true;
-        } catch (Throwable e) {
+
-            FAILED_SIGN_INITIALIZATION = true;
+                }
-            LOGGER.error("Failed to initialize sign-hack. Signs populated by schematics might not have their line contents.", e);
                 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"));
-     * Initialize the used NBT tag class. For modern FAWE and WE that'll be Lin - for older ones JNBT.
+                        PatternType patternType = PatternType.getByIdentifier(compoundTag.getString("Pattern"));
-     *
+                        if (color == null || patternType == null) {
-     * @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(
+                        return new Pattern(color, patternType);
-                Class.forName("org.enginehub.linbus.tree.ToLinTag"),
+                    }).filter(Objects::nonNull).toList());
-                "toLinTag",
+                    banner.update(true);
-                MethodType.methodType(linTagClass)
+                    return true;
-        );
+                }
+                return false;
+            }
+        }
+        return false;
     }
 
-    /**
+    public String getId() {
-     * Find the method (handle) to convert from native (= WE/FAWE) NBT tags to minecraft NBT tags.
+        String tileid = this.tag.getString("id").toLowerCase();
-     * <br />
+        if (tileid.startsWith("minecraft:")) {
-     * Depending on the used version of WE/FAWE, this differs:
+            tileid = tileid.replace("minecraft:", "");
-     * <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));
         }
+        return tileid;
     }
 
-    private static MethodHandle findCraftBlockEntityStateLoadDataMethodHandle(Class<?> craftBlockEntityStateClass) throws
+    public List<CompoundTag> serializeInventory(ItemStack[] items) {
-            NoSuchMethodException, IllegalAccessException, ClassNotFoundException {
+        List<CompoundTag> tags = new ArrayList<>();
-        for (final Method method : craftBlockEntityStateClass.getMethods()) {
+        for (int i = 0; i < items.length; ++i) {
-            if (method.getName().equals("loadData") && method.getParameterCount() == 1) {
+            if (items[i] != null) {
-                return LOOKUP.unreflect(method);
+                Map<String, Tag> tagData = serializeItem(items[i]);
+                tagData.put("Slot", new ByteTag((byte) i));
+                tags.add(new CompoundTag(tagData));
             }
         }
-        throw new NoSuchMethodException("Couldn't find #loadData(CompoundTag) in " + craftBlockEntityStateClass.getName());
+        return tags;
     }
 
-    private static MethodHandle findCraftBlockEntityStateUpdateMethodHandle(Class<?> craftBlockEntityStateClass) throws
+    public Map<String, Tag> serializeItem(ItemStack item) {
-            NoSuchMethodException, IllegalAccessException, ClassNotFoundException {
+        Map<String, Tag> data = new HashMap<>();
-        for (final Method method : craftBlockEntityStateClass.getMethods()) {
+        data.put("id", new StringTag(item.getType().name()));
-            if (method.getReturnType().equals(Boolean.TYPE) && method.getParameterCount() == 2 &&
+        data.put("Damage", new ShortTag(item.getDurability()));
-                    method.getParameterTypes()[0] == Boolean.TYPE && method.getParameterTypes()[1] == Boolean.TYPE) {
+        data.put("Count", new ByteTag((byte) item.getAmount()));
-                return LOOKUP.unreflect(method);
+        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));
         }
-        throw new NoSuchMethodException("Couldn't find method for #update(boolean, boolean) in " + craftBlockEntityStateClass.getName());
+        return data;
     }
 
 }

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

@@ -18,6 +18,8 @@
  */
 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;
@@ -30,12 +32,14 @@ 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, final Path file) {
+    Backup(final BackupProfile owner, final long creationTime, @Nullable final Path file) {
         this.owner = owner;
         this.creationTime = creationTime;
         this.file = file;
@@ -49,7 +53,7 @@ public class Backup {
             try {
                 Files.deleteIfExists(file);
             } catch (final IOException e) {
-                e.printStackTrace();
+                LOGGER.error("Error deleting backup at {}", file, e);
             }
         }
     }

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

@@ -21,14 +21,15 @@ 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.player.ConsolePlayer;
+import com.plotsquared.core.exception.PlotSquaredException;
 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 net.kyori.adventure.text.minimessage.MiniMessage;
+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;
 
@@ -51,7 +52,7 @@ import java.util.concurrent.CompletableFuture;
  */
 public class PlayerBackupProfile implements BackupProfile {
 
-    static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlayerBackupProfile.class.getSimpleName());
 
     private final UUID owner;
     private final Plot plot;
@@ -87,7 +88,7 @@ public class PlayerBackupProfile implements BackupProfile {
                 Files.createDirectory(path);
             }
         } catch (final Exception e) {
-            e.printStackTrace();
+            LOGGER.error("Error resolving {} from {}", child, parent, e);
         }
         return path;
     }
@@ -104,7 +105,7 @@ public class PlayerBackupProfile implements BackupProfile {
                     try {
                         Files.createDirectories(path);
                     } catch (IOException e) {
-                        e.printStackTrace();
+                        LOGGER.error("Error creating directory {}", path, e);
                         return Collections.emptyList();
                     }
                 }
@@ -117,11 +118,11 @@ public class PlayerBackupProfile implements BackupProfile {
                             backups.add(
                                     new Backup(this, basicFileAttributes.creationTime().toMillis(), file));
                         } catch (IOException e) {
-                            e.printStackTrace();
+                            LOGGER.error("Error getting attributes for file {} to create backup", file, e);
                         }
                     });
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    LOGGER.error("Error walking files from {}", path, e);
                 }
                 backups.sort(Comparator.comparingLong(Backup::getCreationTime).reversed());
                 return (this.backupCache = backups);
@@ -133,7 +134,7 @@ public class PlayerBackupProfile implements BackupProfile {
     public void destroy() {
         this.listBackups().whenCompleteAsync((backups, error) -> {
             if (error != null) {
-                error.printStackTrace();
+                LOGGER.error("Error while listing backups", error);
             }
             backups.forEach(Backup::delete);
             this.backupCache = null;
@@ -141,10 +142,12 @@ 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
@@ -156,7 +159,8 @@ 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))
                 );
@@ -180,7 +184,7 @@ public class PlayerBackupProfile implements BackupProfile {
                 try {
                     schematic = this.schematicHandler.getSchematic(backup.getFile().toFile());
                 } catch (SchematicHandler.UnsupportedFormatException e) {
-                    e.printStackTrace();
+                    LOGGER.error("Unsupported format for backup {}", backup.getFile(), e);
                 }
                 if (schematic == null) {
                     future.completeExceptionally(new IllegalArgumentException(
@@ -200,10 +204,9 @@ public class PlayerBackupProfile implements BackupProfile {
                                     if (value) {
                                         future.complete(null);
                                     } else {
-                                        future.completeExceptionally(new RuntimeException(MINI_MESSAGE.escapeTags(
+                                        future.completeExceptionally(new PlotSquaredException(
                                                 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,6 +32,8 @@ 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;
 
@@ -47,6 +49,7 @@ 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;
@@ -112,7 +115,12 @@ public class SimpleBackupManager implements BackupManager {
                                 TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
                         );
                     }
-                    throwable.printStackTrace();
+                    LOGGER.error(
+                            "Error creating backup for plot {};{} and player {}",
+                            plot.getArea(),
+                            plot.getId(),
+                            player == null ? "null" : player.getName(), throwable
+                    );
                 } else {
                     if (player != null) {
                         player.sendMessage(TranslatableCaption.of("backups.backup_automatic_finished"));
@@ -128,6 +136,7 @@ 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,7 +21,6 @@ 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;
@@ -58,8 +57,7 @@ public class Alias extends SubCommand {
             return false;
         }
 
-        Location location = player.getLocation();
+        Plot plot = player.getCurrentPlot();
-        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,6 +24,7 @@ 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;
@@ -32,6 +33,8 @@ 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;
@@ -57,6 +60,8 @@ 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
@@ -326,19 +331,28 @@ 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(Component.text(throwable.getMessage())))
+                                TagResolver.resolver("reason", Tag.inserting(reason))
                         );
-                        throwable.printStackTrace();
+                        LOGGER.error("Error loading player ({}) backup", player.getName(), throwable);
-                    } else {
+                        return;
+                    }
                     if (number < 1 || number > backups.size()) {
                         player.sendMessage(
                                 TranslatableCaption.of("backups.backup_impossible"),
@@ -364,7 +378,8 @@ 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) {
@@ -382,7 +397,6 @@ public final class Backup extends Command {
                             );
                         }
                     }
-                    }
                 });
             }
         }

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

@@ -20,6 +20,7 @@ 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;
@@ -84,8 +85,9 @@ 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(
-                player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
+                plotCount + 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,7 +26,6 @@ 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;
@@ -72,8 +71,7 @@ public class Claim extends SubCommand {
         if (args.length >= 1) {
             schematic = args[0];
         }
-        Location location = player.getLocation();
+        Plot plot = player.getCurrentPlot();
-        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -90,7 +88,7 @@ public class Claim extends SubCommand {
         boolean force = event.getEventResult() == Result.FORCE;
         int currentPlots = Settings.Limit.GLOBAL ?
                 player.getPlotCount() :
-                player.getPlotCount(location.getWorldName());
+                player.getPlotCount(plot.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();
-        if (!Settings.Done.COUNTS_TOWARDS_LIMIT && (player.getAllowedPlots()
+        int plotCount = Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plot.getWorldName());
-                < player.getPlotCount() + size)) {
+        if (!Settings.Done.COUNTS_TOWARDS_LIMIT && (player.getAllowedPlots() < plotCount + 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,7 +19,6 @@
 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;
@@ -37,8 +36,7 @@ public class Copy extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
+        Plot plot1 = player.getCurrentPlot();
-        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,7 +22,6 @@ 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;
@@ -47,8 +46,7 @@ public class CreateRoadSchematic extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
+        Plot plot = player.getCurrentPlot();
-        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -57,7 +55,7 @@ public class CreateRoadSchematic extends SubCommand {
             player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
             return false;
         }
-        if (!(location.getPlotArea() instanceof HybridPlotWorld)) {
+        if (!(plot.getArea() 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,7 +22,6 @@ 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;
@@ -57,8 +56,7 @@ public class DebugRoadRegen extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
+        Plot plot = player.getCurrentPlot();
-        Plot plot = location.getPlotAbs();
         if (args.length < 1) {
             player.sendMessage(
                     TranslatableCaption.of("commandconfig.command_syntax"),
@@ -92,8 +90,7 @@ public class DebugRoadRegen extends SubCommand {
     }
 
     public boolean regenPlot(PlotPlayer<?> player) {
-        Location location = player.getLocation();
+        PlotArea area = player.getCurrentPlot().getArea();
-        PlotArea area = location.getPlotArea();
         if (area == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
             return false;
@@ -148,8 +145,7 @@ public class DebugRoadRegen extends SubCommand {
             return false;
         }
 
-        Location location = player.getLocation();
+        PlotArea area = player.getCurrentPlot().getArea();
-        PlotArea area = location.getPlotArea();
         if (area == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
         }

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

@@ -23,7 +23,6 @@ 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;
@@ -61,8 +60,7 @@ public class Delete extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
+        final Plot plot = player.getCurrentPlot();
-        final Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -92,7 +90,7 @@ public class Delete extends SubCommand {
         final java.util.Set<Plot> plots = plot.getConnectedPlots();
         final int currentPlots = Settings.Limit.GLOBAL ?
                 player.getPlotCount() :
-                player.getPlotCount(location.getWorldName());
+                player.getPlotCount(plot.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,8 +70,7 @@ public class Deny extends SubCommand {
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
 
-        Location location = player.getLocation();
+        final Plot plot = player.getCurrentPlot();
-        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,7 +26,6 @@ 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;
@@ -61,8 +60,7 @@ public class Done extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
+        final Plot plot = player.getCurrentPlot();
-        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.getLocation().getWorldName();
+        String world = player.getCurrentPlot().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,7 +27,6 @@ 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;
@@ -179,8 +178,7 @@ 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 Location location = player.getLocation();
+        final Plot plot = player.getCurrentPlot();
-        final Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -344,7 +342,7 @@ public final class FlagCommand extends Command {
         if (plotFlag == null) {
             return;
         }
-        Plot plot = player.getLocation().getPlotAbs();
+        Plot plot = player.getCurrentPlot();
         PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
@@ -409,7 +407,7 @@ public final class FlagCommand extends Command {
         if (plotFlag == null) {
             return;
         }
-        Plot plot = player.getLocation().getPlotAbs();
+        Plot plot = player.getCurrentPlot();
         PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
@@ -419,7 +417,7 @@ public final class FlagCommand extends Command {
             return;
         }
         boolean force = event.getEventResult() == Result.FORCE;
-        final PlotFlag localFlag = player.getLocation().getPlotAbs().getFlagContainer()
+        final PlotFlag localFlag = player.getCurrentPlot().getFlagContainer()
                 .getFlag(event.getFlag().getClass());
         if (!force) {
             for (String entry : args[1].split(",")) {
@@ -444,7 +442,7 @@ public final class FlagCommand extends Command {
             return;
         }
         boolean result =
-                player.getLocation().getPlotAbs().setFlag(localFlag.merge(parsed.getValue()));
+                player.getCurrentPlot().setFlag(localFlag.merge(parsed.getValue()));
         if (!result) {
             player.sendMessage(TranslatableCaption.of("flag.flag_not_added"));
             return;
@@ -484,7 +482,7 @@ public final class FlagCommand extends Command {
         if (flag == null) {
             return;
         }
-        final Plot plot = player.getLocation().getPlotAbs();
+        final Plot plot = player.getCurrentPlot();
         final PlotFlag<?, ?> flagWithOldValue = plot.getFlagContainer().getFlag(flag.getClass());
         PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(flag, plot);
         if (event.getEventResult() == Result.DENY) {
@@ -687,7 +685,7 @@ public final class FlagCommand extends Command {
                             .build()
             );
             // Default value
-            final String defaultValue = player.getLocation().getPlotArea().getFlagContainer()
+            final String defaultValue = player.getCurrentPlot().getArea().getFlagContainer()
                     .getFlagErased(plotFlag.getClass()).toString();
             player.sendMessage(
                     TranslatableCaption.of("flag.flag_info_default_value"),

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

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

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

@@ -68,7 +68,7 @@ public class Load extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, final String[] args) {
-        final String world = player.getLocation().getWorldName();
+        final String world = player.getCurrentPlot().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/Middle.java

@@ -20,7 +20,6 @@ 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;
 
@@ -36,8 +35,7 @@ public class Middle extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] arguments) {
-        Location location = player.getLocation();
+        Plot plot = player.getCurrentPlot();
-        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,7 +20,6 @@ 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;
@@ -55,8 +54,7 @@ public class Move extends SubCommand {
             RunnableVal3<Command, Runnable, Runnable> confirm,
             RunnableVal2<Command, CommandResult> whenDone
     ) {
-        Location location = player.getLocation();
+        Plot plot1 = player.getCurrentPlot();
-        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,7 +23,6 @@ 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;
@@ -74,8 +73,7 @@ public class Music extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
+        final Plot plot = player.getCurrentPlot();
-        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,7 +21,6 @@ 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;
@@ -56,8 +55,7 @@ public class Remove extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
+        Plot plot = player.getCurrentPlot();
-        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -132,8 +130,7 @@ public class Remove extends SubCommand {
 
     @Override
     public Collection<Command> tab(final PlotPlayer<?> player, final String[] args, final boolean space) {
-        Location location = player.getLocation();
+        Plot plot = player.getCurrentPlot();
-        Plot plot = location.getPlotAbs();
         if (plot == null) {
             return Collections.emptyList();
         }

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

@@ -22,7 +22,6 @@ 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;
@@ -102,8 +101,7 @@ public class SchematicCmd extends SubCommand {
                     );
                     break;
                 }
-                Location loc = player.getLocation();
+                final Plot plot = player.getCurrentPlot();
-                final Plot plot = loc.getPlotAbs();
                 if (plot == null) {
                     player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
                     return false;
@@ -247,8 +245,7 @@ public class SchematicCmd extends SubCommand {
                     player.sendMessage(TranslatableCaption.of("error.task_in_process"));
                     return false;
                 }
-                Location location = player.getLocation();
+                Plot plot = player.getCurrentPlot();
-                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.getLocation().getPlotArea();
+                final PlotArea plotArea = player.getCurrentPlot().getArea();
                 if (plotArea == null) {
                     return false;
                 }

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

@@ -19,7 +19,6 @@
 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;
@@ -32,8 +31,7 @@ public abstract class SetCommand extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
+        Plot plot = player.getCurrentPlot();
-        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,7 +19,6 @@
 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;
@@ -44,8 +43,7 @@ public class Swap extends SubCommand {
             RunnableVal3<Command, Runnable, Runnable> confirm,
             RunnableVal2<Command, CommandResult> whenDone
     ) {
-        Location location = player.getLocation();
+        Plot plot1 = player.getCurrentPlot();
-        Plot plot1 = location.getPlotAbs();
         if (plot1 == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return CompletableFuture.completedFuture(false);
@@ -79,8 +77,10 @@ public class Swap extends SubCommand {
         String p1 = plot1.toString();
         String p2 = plot2.toString();
 
-        return plot1.getPlotModificationManager().move(plot2, player, () -> {
+        return plot1.getPlotModificationManager().move(
-        }, true).thenApply(result -> {
+                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,7 +22,6 @@ 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;
@@ -51,8 +50,7 @@ public class Unlink extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
+        final Plot plot = player.getCurrentPlot();
-        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/exception/PlotSquaredException.java

@@ -0,0 +1,62 @@
+/*
+ * 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,6 +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}
      */
+    @Nullable
     public Plot getCurrentPlot() {
         try (final MetaDataAccess<Plot> lastPlotAccess =
                      this.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
@@ -319,7 +320,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
      */
     public int getPlotCount() {
         if (!Settings.Limit.GLOBAL) {
-            return getPlotCount(getLocation().getWorldName());
+            return getPlotCount(getCurrentPlot().getWorldName());
         }
         final AtomicInteger count = new AtomicInteger(0);
         final UUID uuid = getUUID();
@@ -339,7 +340,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     public int getClusterCount() {
         if (!Settings.Limit.GLOBAL) {
-            return getClusterCount(getLocation().getWorldName());
+            return getClusterCount(getCurrentPlot().getWorldName());
         }
         final AtomicInteger count = new AtomicInteger(0);
         this.plotAreaManager.forEachPlotArea(value -> {
@@ -408,8 +409,12 @@ 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() {
@@ -614,16 +619,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(13);
+            ByteBuffer buffer = ByteBuffer.allocate(14);
             buffer.putShort((short) x);
             buffer.putShort((short) z);
             Location location = getLocation();
             buffer.putInt(location.getX());
-            buffer.put((byte) location.getY());
+            buffer.putShort((short) location.getY());
             buffer.putInt(location.getZ());
-            setPersistentMeta("quitLoc", buffer.array());
+            setPersistentMeta("quitLocV2", buffer.array());
-        } else if (hasPersistentMeta("quitLoc")) {
+        } else if (hasPersistentMeta("quitLocV2")) {
-            removePersistentMeta("quitLoc");
+            removePersistentMeta("quitLocV2");
         }
         if (plot != null) {
             this.eventDispatcher.callLeave(this, plot);
@@ -700,11 +705,18 @@ 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;
@@ -714,7 +726,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 = quitWorld.get() & 0xFF;
+                        int y = V2 ? quitWorld.getShort() : (quitWorld.get() & 0xFF);
                         int z = quitWorld.getInt();
                         Plot plot = area.getOwnedPlot(id);
 
@@ -748,10 +760,11 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
                             }
                         }
                     } catch (Throwable e) {
-                        e.printStackTrace();
+                        LOGGER.error("Error populating persistent meta for player {}", PlotPlayer.this.getName(), e);
                     }
                 }
-            });
+                    }
+            );
         }
     }
 

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

@@ -135,6 +135,7 @@ 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;
@@ -144,10 +145,11 @@ public abstract class SchematicHandler {
             filename = file + '.' + extension;
         }
         final URL url;
+        String uri = Settings.Web.URL + "?key=" + uuid + "&type=" + extension;
         try {
-            url = URI.create(Settings.Web.URL + "?key=" + uuid + "&type=" + extension).toURL();
+            url = URI.create(uri).toURL();
         } catch (MalformedURLException e) {
-            e.printStackTrace();
+            LOGGER.error("Malformed URI `{}`", uri, e);
             whenDone.run();
             return;
         }
@@ -193,7 +195,7 @@ public abstract class SchematicHandler {
                 }
                 TaskManager.runTask(whenDone);
             } catch (IOException e) {
-                e.printStackTrace();
+                LOGGER.error("Error while uploading schematic for UUID {}", finalUuid, e);
                 TaskManager.runTask(whenDone);
             }
         });
@@ -388,8 +390,14 @@ 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
+            );
         }
     }
 
@@ -456,7 +464,7 @@ public abstract class SchematicHandler {
                 Clipboard clip = reader.read();
                 return new Schematic(clip);
             } catch (IOException e) {
-                e.printStackTrace();
+                LOGGER.error("Error reading schematic from file {}", file.getAbsolutePath(), e);
             }
         } else {
             throw new UnsupportedFormatException("This schematic format is not recognised or supported.");
@@ -470,7 +478,7 @@ public abstract class SchematicHandler {
             InputStream inputStream = Channels.newInputStream(readableByteChannel);
             return getSchematic(inputStream);
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.error("Error reading schematic from {}", url, e);
         }
         return null;
     }
@@ -486,7 +494,7 @@ public abstract class SchematicHandler {
                 Clipboard clip = schematicReader.read();
                 return new Schematic(clip);
             } catch (IOException e) {
-                e.printStackTrace();
+                LOGGER.error("Error reading schematic", e);
             }
         }
         return null;
@@ -515,7 +523,7 @@ public abstract class SchematicHandler {
             }
             return schematics;
         } catch (JsonParseException | IOException e) {
-            e.printStackTrace();
+            LOGGER.error("Error retrieving saves for UUID {}", uuid, e);
         }
         return null;
     }
@@ -532,7 +540,7 @@ public abstract class SchematicHandler {
                 try (NBTOutputStream nos = new NBTOutputStream(new GZIPOutputStream(output, true))) {
                     nos.writeNamedTag("Schematic", tag);
                 } catch (IOException e1) {
-                    e1.printStackTrace();
+                    LOGGER.error("Error uploading schematic for UUID {}", uuid, e1);
                 }
             }
         }, whenDone);
@@ -556,9 +564,9 @@ public abstract class SchematicHandler {
                 nbtStream.writeNamedTag("Schematic", tag);
             }
         } catch (FileNotFoundException e) {
-            e.printStackTrace();
+            LOGGER.error("Error saving schematic at {}", path, e);
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.error("Error saving schematic at {}", path, e);
             return false;
         }
         return true;
@@ -581,7 +589,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.size() == 0) {
+        if (biomeBuffer.size() == 0 || biomePalette.isEmpty()) {
             return;
         }
 
@@ -733,10 +741,7 @@ public abstract class SchematicHandler {
                                     }
                                     BaseBlock block = aabb.getWorld().getFullBlock(point);
                                     if (block.getNbtData() != null) {
-                                        Map<String, Tag> values = new HashMap<>();
+                                        Map<String, Tag> values = new HashMap<>(block.getNbtData().getValue());
-                                        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");

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.7-SNAPSHOT"
+version = "7.5.7"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""

gradle/libs.versions.toml

@@ -3,7 +3,7 @@
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
 spotbugs = "4.9.4"
-checkerqual = "3.49.5"
+checkerqual = "3.50.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"