build: Update net.kyori

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

@@ -80,8 +80,7 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
                     result.setBiome(x, z, BukkitAdapter.adapt(biome));
                 }
 
-                //do not annotate with Override until we discontinue support for 1.4.4 (we no longer support 1.4.4)
-                @Override
+                //do not annotate with Override until we discontinue support for 1.4.4
                 public void setBiome(int x, int y, int z, @NonNull Biome biome) {
                     result.setBiome(x, z, BukkitAdapter.adapt(biome));
 

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

@@ -282,7 +282,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                 CompoundTag tag = block.getNbtData();
                 StateWrapper sw = new StateWrapper(tag);
 
-                sw.restoreTag(existing);
+                sw.restoreTag(getWorld().getName(), existing.getX(), existing.getY(), existing.getZ());
             }
         }
     }

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

@@ -44,7 +44,6 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -167,32 +166,14 @@ public class StateWrapper {
         return str;
     }
 
-    /**
-     * Restore the TileEntity data to the given world at the given coordinates.
-     *
-     * @param worldName World name
-     * @param x         x position
-     * @param y         y position
-     * @param z         z position
-     * @return true if successful
-     */
+    @SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
     public boolean restoreTag(String worldName, int x, int y, int z) {
-        World world = BukkitUtil.getWorld(worldName);
-        if (world == null) {
+        if (this.tag == null) {
             return false;
         }
-        return restoreTag(world.getBlockAt(x, y, z));
-    }
-
-    /**
-     * Restore the TileEntity data to the given block
-     *
-     * @param block Block to restore to
-     * @return true if successful
-     */
-    @SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
-    public boolean restoreTag(@NonNull Block block) {
-        if (this.tag == null) {
+        World world = BukkitUtil.getWorld(worldName);
+        Block block = world.getBlockAt(x, y, z);
+        if (block == null) {
             return false;
         }
         org.bukkit.block.BlockState state = block.getState();

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

@@ -889,8 +889,8 @@ public class PlotSquared {
                             e.printStackTrace();
                         }
                         LOGGER.info("| generator: {}>{}", baseGenerator, areaGen);
-                        LOGGER.info("| plot world: {}", pa.getClass().getCanonicalName());
-                        LOGGER.info("| manager: {}", pa.getPlotManager().getClass().getCanonicalName());
+                        LOGGER.info("| plot world: {}", pa);
+                        LOGGER.info("| manager: {}", pa);
                         LOGGER.info("Note: Area created for cluster '{}' (invalid or old configuration?)", name);
                         areaGen.getPlotGenerator().initialize(pa);
                         areaGen.augment(pa);
@@ -906,13 +906,6 @@ public class PlotSquared {
                     throw new IllegalArgumentException("Invalid Generator: " + gen_string);
                 }
                 PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
-                LOGGER.info("- generator: {}>{}", baseGenerator, areaGen);
-                LOGGER.info("- plot world: {}", pa.getClass().getCanonicalName());
-                LOGGER.info("- plot area manager: {}", pa.getPlotManager().getClass().getCanonicalName());
-                if (!this.worldConfiguration.contains(path)) {
-                    this.worldConfiguration.createSection(path);
-                    worldSection = this.worldConfiguration.getConfigurationSection(path);
-                }
                 pa.saveConfiguration(worldSection);
                 pa.loadDefaultConfiguration(worldSection);
                 try {
@@ -920,6 +913,9 @@ public class PlotSquared {
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
+                LOGGER.info("- generator: {}>{}", baseGenerator, areaGen);
+                LOGGER.info("- plot world: {}", pa);
+                LOGGER.info("- plot area manager: {}", pa.getPlotManager());
                 areaGen.getPlotGenerator().initialize(pa);
                 areaGen.augment(pa);
                 addPlotArea(pa);

build.gradle.kts

@@ -140,7 +140,7 @@ allprojects {
                         }
                         developer {
                             id.set("NotMyFault")
-                            name.set("Alexander Brandes")
+                            name.set("NotMyFault")
                             organization.set("IntellectualSites")
                             email.set("contact@notmyfault.dev")
                         }

gradle/libs.versions.toml

@@ -8,13 +8,13 @@ guava = "31.0.1-jre" # Version set by Minecraft
 paper = "1.18.1-R0.1-SNAPSHOT"
 checker-qual = "3.22.0"
 guice = "5.1.0"
-spotbugs = "4.7.0"
+spotbugs = "4.6.0"
 snakeyaml = "1.30" # Version set by Bukkit
 
 # Adventure & MiniMessage
-adventure-api = "4.9.3"
-adventure-text-minimessage = "4.1.0-SNAPSHOT"
-adventure-platform-bukkit = "4.0.1"
+adventure-api = "4.10.1"
+adventure-text-minimessage = "4.10.1"
+adventure-platform-bukkit = "4.1.0"
 
 # Plugins
 worldedit = "7.2.10"