Feature/no invite for rankup

pom.xml

@@ -12,27 +12,31 @@
     <name>PlotSystem</name>
 
     <properties>
-        <java-version>21</java-version>
+        <java-version>25</java-version>
         <maven.compiler.release>${java-version}</maven.compiler.release>
+        <maven.compiler.version>3.15.0</maven.compiler.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <paper.api.version>1.21.10-R0.1-SNAPSHOT</paper.api.version>
+        <paper.api.version>[26.2.build,)</paper.api.version>
 
-        <bteuk.network.version>develop-d213a081ad-1</bteuk.network.version>
-        <bteuk.lib.version>5958727df9</bteuk.lib.version>
+        <btuk.network.version>develop-cd2ced40b0-1</btuk.network.version>
+        <btuk.lib.version>main-36b0421e66-1</btuk.lib.version>
 
-        <kyori.version>4.26.1</kyori.version>
-        <multiverse.version>5.3.3</multiverse.version>
+        <kyori.version>5.2.0</kyori.version>
+        <multiverse.version>5.8.0</multiverse.version>
+        <worldguard.version>7.0.18</worldguard.version>
+        <decentholograms.version>2.10.1</decentholograms.version>
 
-        <lombok.version>1.18.42</lombok.version>
+        <lombok.version>1.18.46</lombok.version>
+        <commons.io.version>2.22.0</commons.io.version>
     </properties>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>${maven.compiler.version}</version>
                 <configuration>
                     <annotationProcessorPaths>
                         <path>
@@ -135,19 +139,19 @@
         <dependency>
             <groupId>com.github.BTEUK.Network</groupId>
             <artifactId>api</artifactId>
-            <version>${bteuk.network.version}</version>
+            <version>${btuk.network.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.github.BTEUK.Network</groupId>
             <artifactId>papercore</artifactId>
-            <version>${bteuk.network.version}</version>
+            <version>${btuk.network.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.github.BTEUK.BTEUKLib</groupId>
             <artifactId>Minecraft</artifactId>
-            <version>${bteuk.lib.version}</version>
+            <version>${btuk.lib.version}</version>
         </dependency>
 
         <dependency>
@@ -184,13 +188,13 @@
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.14</version>
+            <version>${worldguard.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.20.0</version>
+            <version>${commons.io.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mvplugins.multiverse.core</groupId>
@@ -207,7 +211,7 @@
         <dependency>
             <groupId>com.github.decentsoftware-eu</groupId>
             <artifactId>decentholograms</artifactId>
-            <version>2.9.7</version>
+            <version>${decentholograms.version}</version>
             <scope>provided</scope>
         </dependency>
 

src/main/java/net/bteuk/plotsystem/PlotSystem.java

@@ -4,10 +4,7 @@
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager;
 import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
 import lombok.Getter;
-import net.bteuk.minecraft.gui.GuiListener;
-import net.bteuk.minecraft.gui.GuiManager;
 import net.bteuk.network.api.NetworkAPI;
-import net.bteuk.network.lib.utils.ChatUtils;
 import net.bteuk.plotsystem.commands.ClaimCommand;
 import net.bteuk.plotsystem.commands.LocationCommand;
 import net.bteuk.plotsystem.commands.PlotSystemCommand;
@@ -37,6 +34,9 @@
 import net.bteuk.plotsystem.utils.PlotHologram;
 import net.bteuk.plotsystem.utils.User;
 import net.bteuk.plotsystem.utils.plugins.Multiverse;
+import org.btuk.minecraft.gui.GuiListener;
+import org.btuk.minecraft.gui.GuiManager;
+import org.btuk.network.lib.utils.ChatUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
@@ -115,12 +115,11 @@ public void onEnable() {
         // Add save world if it does not yet exist.
         // Save world name is in config.
         // This implies first launch with plugin.
-        if (!Multiverse.hasWorld(CONFIG.getString("save_world"))) {
+        String saveWorld = CONFIG.getString("save_world");
+        if (!Multiverse.hasWorld(saveWorld)) {
             // Create save world.
-            if (!Multiverse.createVoidWorld(CONFIG.getString("save_world"))) {
-
+            if (!Multiverse.createVoidWorld(saveWorld, CONFIG.getString("save_world_dimension"))) {
                 LOGGER.warning("Failed to create save world!");
-
             }
         }
 

src/main/java/net/bteuk/plotsystem/commands/ClaimCommand.java

@@ -2,10 +2,8 @@
 
 import io.papermc.paper.command.brigadier.BasicCommand;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
-import net.bteuk.minecraft.gui.GuiManager;
 import net.bteuk.network.api.NetworkAPI;
 import net.bteuk.network.api.PlotAPI;
-import net.bteuk.network.lib.utils.ChatUtils;
 import net.bteuk.plotsystem.PlotSystem;
 import net.bteuk.plotsystem.gui.ClaimGui;
 import net.bteuk.plotsystem.utils.ParseUtils;
@@ -14,6 +12,8 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
+import org.btuk.minecraft.gui.GuiManager;
+import org.btuk.network.lib.utils.ChatUtils;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/net/bteuk/plotsystem/commands/CreateCommand.java

@@ -1,12 +1,12 @@
 package net.bteuk.plotsystem.commands;
 
-import net.bteuk.minecraft.gui.GuiManager;
 import net.bteuk.network.api.PlotAPI;
-import net.bteuk.network.lib.utils.ChatUtils;
 import net.bteuk.plotsystem.PlotSystem;
 import net.bteuk.plotsystem.gui.CreatePlotGui;
 import net.bteuk.plotsystem.gui.CreateZoneGui;
 import net.bteuk.plotsystem.utils.User;
+import org.btuk.minecraft.gui.GuiManager;
+import org.btuk.network.lib.utils.ChatUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

src/main/java/net/bteuk/plotsystem/commands/DeleteCommand.java

@@ -2,15 +2,15 @@
 
 import net.bteuk.network.api.PlotAPI;
 import net.bteuk.network.api.plotsystem.PlotStatus;
-import net.bteuk.network.lib.utils.ChatUtils;
+import net.bteuk.network.papercore.WorldUtils;
 import net.bteuk.plotsystem.PlotSystem;
 import net.bteuk.plotsystem.exceptions.RegionManagerNotFoundException;
 import net.bteuk.plotsystem.utils.PlotHelper;
 import net.bteuk.plotsystem.utils.User;
 import net.bteuk.plotsystem.utils.plugins.WorldGuardFunctions;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
+import org.btuk.network.lib.utils.ChatUtils;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -130,7 +130,7 @@ private void deletePlot(CommandSender sender, String[] args) {
         }
 
         // Get world of plot.
-        World world = Bukkit.getWorld(plotAPI.getPlotLocation(plotID));
+        World world = WorldUtils.getWorld(plotAPI.getPlotLocation(plotID));
 
         // If world is null then the plot is not on this server.
         if (world == null) {

src/main/java/net/bteuk/plotsystem/commands/LocationCommand.java

@@ -7,15 +7,16 @@
 import net.bteuk.network.api.PlotAPI;
 import net.bteuk.network.api.SQLAPI;
 import net.bteuk.network.api.entity.NetworkLocation;
-import net.bteuk.network.lib.utils.ChatUtils;
 import net.bteuk.network.papercore.LocationAdapter;
+import net.bteuk.network.papercore.WorldUtils;
 import net.bteuk.plotsystem.PlotSystem;
 import net.bteuk.plotsystem.utils.CopyRegionFormat;
 import net.bteuk.plotsystem.utils.Utils;
 import net.bteuk.plotsystem.utils.plugins.Multiverse;
 import net.bteuk.plotsystem.utils.plugins.WorldEditor;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
+import org.btuk.network.lib.utils.ChatUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -88,18 +89,18 @@ public void createLocation(CommandSender sender, String[] args) {
         int zTransform = -(regionZMin * 512);
 
         // Create the world and add the regions.
-        Multiverse.createVoidWorld(commandArguments.location());
+        Multiverse.createVoidWorld(commandArguments.location(), commandArguments.location());
 
-        String saveWorld = PlotSystem.getInstance().getConfig().getString("save_world");
+        String saveWorld = PlotSystem.getInstance().getConfig().getString("save_world_dimension");
 
         if (saveWorld == null) {
             sender.sendMessage(ChatUtils.error("The save world is not set in config."));
             return;
         }
 
         // Get worlds.
-        World copy = Bukkit.getWorld(saveWorld);
-        World paste = Bukkit.getWorld(commandArguments.location());
+        World copy = WorldUtils.getWorld(saveWorld);
+        World paste = WorldUtils.getWorld(commandArguments.location());
 
         // Check that the worlds are not null, else delete the Multiverse world.
         if (copy == null || paste == null) {
@@ -129,10 +130,10 @@ public void createLocation(CommandSender sender, String[] args) {
             copyRegions(sender, regions);
 
             int coordMin = coordinateAPI.addCoordinate(
-                    LocationAdapter.adapt(new Location(Bukkit.getWorld(commandArguments.location()), (regionXMin * 512), networkAPI.getMinY(), (regionZMin * 512), 0, 0)));
+                    LocationAdapter.adapt(new Location(WorldUtils.getWorld(commandArguments.location()), (regionXMin * 512), networkAPI.getMinY(), (regionZMin * 512), 0, 0)));
 
             int coordMax = coordinateAPI.addCoordinate(LocationAdapter.adapt(
-                    new Location(Bukkit.getWorld(commandArguments.location()), ((regionXMax * 512) + 511), networkAPI.getMaxY() - 1, ((regionZMax * 512) + 511), 0, 0)));
+                    new Location(WorldUtils.getWorld(commandArguments.location()), ((regionXMax * 512) + 511), networkAPI.getMaxY() - 1, ((regionZMax * 512) + 511), 0, 0)));
 
             // Add the location to the database.
             if (plotAPI.createLocation(commandArguments.location, commandArguments.location, PlotSystem.SERVER_NAME, coordMin, coordMax, xTransform, zTransform)) {
@@ -211,15 +212,15 @@ public void updateLocation(CommandSender sender, String[] args) {
         int zTransform = plotAPI.getZTransform(commandArguments.location());
 
         // Get the worlds.
-        String saveWorld = PlotSystem.getInstance().getConfig().getString("save_world");
+        String saveWorld = PlotSystem.getInstance().getConfig().getString("save_world_dimension");
         if (saveWorld == null) {
             sender.sendMessage(ChatUtils.error("The save world is not set in config."));
             return;
         }
 
         // Get worlds.
-        World copy = Bukkit.getWorld(saveWorld);
-        World paste = Bukkit.getWorld(commandArguments.location());
+        World copy = WorldUtils.getWorld(saveWorld);
+        World paste = WorldUtils.getWorld(commandArguments.location());
 
         // Check that the worlds are not null, else delete the Multiverse world.
         if (copy == null || paste == null) {
@@ -250,7 +251,7 @@ public void updateLocation(CommandSender sender, String[] args) {
 
             copyRegions(sender, regions);
 
-            World world = Bukkit.getWorld(commandArguments.location());
+            World world = WorldUtils.getWorld(commandArguments.location());
             coordinateAPI.updateCoordinate(minCoordinateId, LocationAdapter.adapt(new Location(world, (regionXMin * 512), world.getMinHeight(), (regionZMin * 512), 0, 0)));
             coordinateAPI.updateCoordinate(maxCoordinateId,
                     LocationAdapter.adapt(new Location(world, ((regionXMax * 512) + 511), world.getMaxHeight() - 1, ((regionZMax * 512) + 511), 0, 0)));
@@ -307,14 +308,14 @@ public void deleteLocation(CommandSender sender, String[] args) {
 
         // Teleport all players out of the world, so it can be deleted.
         // Get the worlds.
-        String saveWorldName = PlotSystem.getInstance().getConfig().getString("save_world");
+        String saveWorldName = PlotSystem.getInstance().getConfig().getString("save_world_dimension");
         if (saveWorldName == null) {
             sender.sendMessage(ChatUtils.error("The save world is not set in config."));
             return;
         }
 
         // Get save world.
-        World saveWorld = Bukkit.getWorld(saveWorldName);
+        World saveWorld = WorldUtils.getWorld(saveWorldName);
 
         teleportPlayersFromLocation(args[2], saveWorld);
 
@@ -371,6 +372,9 @@ private static CommandArguments parseCommandArguments(CommandSender sender, Stri
             return null;
         }
 
+        // Ensure the location name is lowercase.
+        args[2] = args[2].toLowerCase();
+
         return new CommandArguments(args[2], xmin, ymin, zmin, xmax, ymax, zmax);
     }
 
@@ -449,7 +453,7 @@ private void teleportToLocation(CommandSender sender, String location, int coord
             double z = ((coordinateAPI.getZ(coordMax) + coordinateAPI.getZ(coordMin)) / 2) + plotAPI.getZTransform(location);
 
             // Teleport to the location.
-            World world = Bukkit.getWorld(location);
+            World world = WorldUtils.getWorld(location);
 
             double y = 64;
             if (world != null) {
@@ -474,7 +478,7 @@ private void teleportPlayersFromLocation(String location, World saveWorld) {
         // Teleport all players away from the location.
         Location teleportLocation = new Location(saveWorld, x, Utils.getHighestYAt(saveWorld, (int) x, (int) z), z);
         PlotSystem.getInstance().getServer().getOnlinePlayers().forEach(player -> {
-            if (player.getWorld().getName().equals(location)) {
+            if (player.getWorld().key().asMinimalString().equals(location)) {
                 player.teleport(teleportLocation);
                 player.sendMessage(ChatUtils.success("Teleported to save world, location %s is being deleted.", location));
             }

src/main/java/net/bteuk/plotsystem/commands/PlotSystemCommand.java

@@ -2,12 +2,11 @@
 
 import io.papermc.paper.command.brigadier.BasicCommand;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
-import net.bteuk.minecraft.gui.GuiManager;
 import net.bteuk.network.api.CoordinateAPI;
 import net.bteuk.network.api.EventAPI;
 import net.bteuk.network.api.PlotAPI;
-import net.bteuk.network.lib.utils.ChatUtils;
 import net.bteuk.network.papercore.LocationAdapter;
+import net.bteuk.network.papercore.WorldUtils;
 import net.bteuk.plotsystem.PlotSystem;
 import net.bteuk.plotsystem.exceptions.RegionManagerNotFoundException;
 import net.bteuk.plotsystem.utils.ParseUtils;
@@ -17,7 +16,8 @@
 import net.bteuk.plotsystem.utils.plugins.WorldGuardFunctions;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
+import org.btuk.minecraft.gui.GuiManager;
+import org.btuk.network.lib.utils.ChatUtils;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
@@ -226,7 +226,7 @@ public void updateFlags(CommandSender sender, String[] args) {
             return;
         }
 
-        World world = Bukkit.getWorld(args[1]);
+        World world = WorldUtils.getWorld(args[1]);
 
         if (world == null) {
             sender.sendMessage(ChatUtils.error("Location " + args[1] + " does not exist on this server."));

src/main/java/net/bteuk/plotsystem/commands/ResetCommand.java

@@ -1,13 +1,13 @@
 package net.bteuk.plotsystem.commands;
 
-import net.bteuk.minecraft.component.ComponentUtils;
 import net.bteuk.network.api.EventAPI;
 import net.bteuk.network.api.PlotAPI;
-import net.bteuk.network.lib.utils.ChatUtils;
+import net.bteuk.network.papercore.WorldUtils;
 import net.bteuk.plotsystem.PlotSystem;
 import net.bteuk.plotsystem.utils.User;
 import net.kyori.adventure.text.Component;
-import org.bukkit.Bukkit;
+import org.btuk.minecraft.component.ComponentUtils;
+import org.btuk.network.lib.utils.ChatUtils;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -103,7 +103,7 @@ private void resetPlot(CommandSender sender, String[] args) {
         }
 
         // Get world of plot.
-        World world = Bukkit.getWorld(plotAPI.getPlotLocation(plotID));
+        World world = WorldUtils.getWorld(plotAPI.getPlotLocation(plotID));
 
         // If world is null then the plot is not on this server.
         if (world == null) {

src/main/java/net/bteuk/plotsystem/commands/ReviewCommand.java

@@ -4,9 +4,9 @@
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import net.bteuk.network.api.plotsystem.ReviewCategory;
 import net.bteuk.network.api.plotsystem.ReviewSelection;
-import net.bteuk.network.lib.utils.ChatUtils;
 import net.bteuk.plotsystem.PlotSystem;
 import net.bteuk.plotsystem.utils.User;
+import org.btuk.network.lib.utils.ChatUtils;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/net/bteuk/plotsystem/commands/ToggleOutlines.java

@@ -3,9 +3,9 @@
 import io.papermc.paper.command.brigadier.BasicCommand;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import net.bteuk.network.api.PlotAPI;
-import net.bteuk.network.lib.utils.ChatUtils;
 import net.bteuk.plotsystem.PlotSystem;
 import net.bteuk.plotsystem.utils.User;
+import org.btuk.network.lib.utils.ChatUtils;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;