[WIP] #147 Database Rework

README.md

@@ -1,4 +1,5 @@
 <!-- PROJECT DESCRIPTION -->
+<!--suppress HtmlDeprecatedAttribute -->
 <br />
 
 <p align="Center">

pom.xml

@@ -164,13 +164,6 @@
             <version>4.0.3</version>
             <scope>compile</scope>
         </dependency>
-        <!-- Apache Commons VFS -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs2</artifactId>
-            <version>2.4</version> <!-- TODO: Use another SFTP/FTP dependency -->
-            <scope>compile</scope>
-        </dependency>
         <!-- Apache Commons Net -->
         <dependency>
             <groupId>commons-net</groupId>

src/main/java/com/alpsbte/plotsystem/PlotSystem.java

@@ -191,7 +191,6 @@ public void onEnable() {
         DecentHologramDisplay.registerPlugin(this);
         HologramRegister.init();
         PlotUtils.checkPlotsForLastActivity();
-        PlotUtils.syncPlotSchematicFiles();
         Utils.ChatUtils.checkForChatInputExpiry();
         PlotUtils.Effects.startTimer();
 
@@ -234,7 +233,8 @@ public void onDisable() {
         } else {
             // Unload plots
             for (UUID player : PlotUtils.Cache.getCachedInProgressPlots().keySet()) {
-                for (Plot plot : PlotUtils.Cache.getCachedInProgressPlots(Builder.byUUID(player))) {
+                Builder builder = Builder.byUUID(player);
+                for (Plot plot : PlotUtils.Cache.getCachedInProgressPlots(builder)) {
                     if (plot != null) plot.getWorld().unloadWorld(true);
                 }
             }
@@ -270,7 +270,6 @@ public void saveConfig() {
     public static PlotSystem getPlugin() {
         return plugin;
     }
-
     public CommandManager getCommandManager() {
         return commandManager;
     }

src/main/java/com/alpsbte/plotsystem/commands/CMD_Companion.java

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- *  Copyright © 2023, Alps BTE <[email protected]>
+ *  Copyright © 2025, Alps BTE <[email protected]>
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,6 @@
 
 package com.alpsbte.plotsystem.commands;
 
-import com.alpsbte.plotsystem.PlotSystem;
 import com.alpsbte.plotsystem.core.menus.companion.CompanionMenu;
 import com.alpsbte.plotsystem.core.menus.tutorial.TutorialStagesMenu;
 import com.alpsbte.plotsystem.core.menus.tutorial.TutorialsMenu;
@@ -33,19 +32,13 @@
 import com.alpsbte.plotsystem.core.system.tutorial.Tutorial;
 import com.alpsbte.plotsystem.core.system.tutorial.TutorialCategory;
 import com.alpsbte.plotsystem.utils.Utils;
-import com.alpsbte.plotsystem.utils.io.ConfigPaths;
 import com.alpsbte.plotsystem.utils.io.LangPaths;
 import com.alpsbte.plotsystem.utils.io.LangUtil;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.sql.SQLException;
-
-import static net.kyori.adventure.text.Component.text;
-
 public class CMD_Companion extends BaseCommand {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String s, String[] args) {
@@ -54,20 +47,15 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
             return true;
         }
 
-        if (getPlayer(sender) == null) return true;
+        Player player = getPlayer(sender);
+        if (player == null) return true;
 
-        try {
-            FileConfiguration config = PlotSystem.getPlugin().getConfig();
-            Tutorial tutorial = AbstractTutorial.getActiveTutorial(getPlayer(sender).getUniqueId());
-            if (tutorial != null) {
-                new TutorialStagesMenu(getPlayer(sender), tutorial.getId());
-            } else if (config.getBoolean(ConfigPaths.TUTORIAL_ENABLE) && config.getBoolean(ConfigPaths.TUTORIAL_REQUIRE_BEGINNER_TUTORIAL) &&
-                    !TutorialPlot.isPlotCompleted(getPlayer(sender), TutorialCategory.BEGINNER.getId()) && getPlayer(sender).hasPermission("plotsystem.tutorial")) {
-                new TutorialsMenu(getPlayer(sender));
-            } else CompanionMenu.open((Player) sender);
-        } catch (SQLException ex) {
-            PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
-        }
+        Tutorial tutorial = AbstractTutorial.getActiveTutorial(player.getUniqueId());
+        if (tutorial != null) {
+            new TutorialStagesMenu(player, tutorial.getId());
+        } else if (TutorialPlot.isRequiredAndInProgress(TutorialCategory.BEGINNER.getId(), player.getUniqueId()) && player.hasPermission("plotsystem.tutorial")) {
+            new TutorialsMenu(player);
+        } else CompanionMenu.open((Player) sender);
 
         return true;
     }

src/main/java/com/alpsbte/plotsystem/commands/CMD_Plots.java

@@ -30,49 +30,48 @@
 import com.alpsbte.plotsystem.utils.Utils;
 import com.alpsbte.plotsystem.utils.io.LangPaths;
 import com.alpsbte.plotsystem.utils.io.LangUtil;
+import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.sql.SQLException;
-
-import static net.kyori.adventure.text.Component.text;
+import java.util.concurrent.CompletableFuture;
 
 public class CMD_Plots extends BaseCommand {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String s, String[] args) {
-        if (!sender.hasPermission(getPermission())) {
-            sender.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.PLAYER_HAS_NO_PERMISSIONS)));
+        Player player = getPlayer(sender);
+        if (player == null) {
+            Bukkit.getConsoleSender().sendMessage(Component.text("This command can only be used as a player!", NamedTextColor.RED));
             return true;
         }
 
-        if (getPlayer(sender) == null) {
-            Bukkit.getConsoleSender().sendMessage(text("This command can only be used as a player!", NamedTextColor.RED));
+        if (!sender.hasPermission(getPermission())) {
+            sender.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.PLAYER_HAS_NO_PERMISSIONS)));
             return true;
         }
 
-        Player player = (Player) sender;
-
-        try {
-            if (args.length < 1) {
-                new PlayerPlotsMenu(player, Builder.byUUID(player.getUniqueId()));
-                return true;
-            }
+        if (args.length < 1) {
+            CompletableFuture.runAsync(() -> {
+                Builder builder = Builder.byUUID(player.getUniqueId());
+                Bukkit.getScheduler().runTask(PlotSystem.getPlugin(), () -> new PlayerPlotsMenu(player, builder));
+            });
+        }
 
-            Builder builder = Builder.getBuilderByName(args[0]);
-            if (builder == null) {
-                player.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.PLAYER_NOT_FOUND)));
-                return true;
-            }
+        CompletableFuture.runAsync(() -> {
+            Builder builder = Builder.byName(args[0]);
+            Bukkit.getScheduler().runTask(PlotSystem.getPlugin(), () -> {
+                if (builder == null) {
+                    player.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.PLAYER_NOT_FOUND)));
+                    return;
+                }
 
-            new PlayerPlotsMenu(player, builder);
-        } catch (SQLException ex) {
-            sender.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.ERROR_OCCURRED)));
-            PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
-        }
+                new PlayerPlotsMenu(player, builder);
+            });
+        });
         return true;
     }
 

src/main/java/com/alpsbte/plotsystem/commands/CMD_Tpll.java

@@ -46,7 +46,6 @@
 
 import java.io.IOException;
 import java.math.RoundingMode;
-import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -74,78 +73,84 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
             return true;
         }
 
-        try {
-            if (args == null || args.length < 2 || args.length > 3) {
-                sendInfo(sender);
-                return true;
-            }
+        if (args == null || args.length < 2 || args.length > 3) {
+            sendInfo(sender);
+            return true;
+        }
 
-            String[] splitCoords = args[0].split(",");
-            if (splitCoords.length == 2) {
-                args = splitCoords;
-            }
+        String[] splitCoords = args[0].split(",");
+        if (splitCoords.length == 2) {
+            args = splitCoords;
+        }
 
-            if (args[0].endsWith(",")) {
-                args[0] = args[0].substring(0, args[0].length() - 1);
-            }
-            if (args[1].endsWith(",")) {
-                args[1] = args[1].substring(0, args[1].length() - 1);
-            }
+        if (args[0].endsWith(",")) {
+            args[0] = args[0].substring(0, args[0].length() - 1);
+        }
+        if (args[1].endsWith(",")) {
+            args[1] = args[1].substring(0, args[1].length() - 1);
+        }
+
+        // Parse coordinates to doubles
+        double lat;
+        double lon;
+        try {
+            lat = Double.parseDouble(args[0]);
+            lon = Double.parseDouble(args[1]);
+        } catch (Exception ignore) {
+            sendInfo(sender);
+            return true;
+        }
 
-            // Parse coordinates to doubles
-            double lat;
-            double lon;
+        CompletableFuture.runAsync(() -> {
             try {
-                lat = Double.parseDouble(args[0]);
-                lon = Double.parseDouble(args[1]);
-            } catch (Exception ignore) {
-                sendInfo(sender);
-                return true;
-            }
+                // Get the terra coordinates from the irl coordinates
+                double[] terraCoords = CoordinateConversion.convertFromGeo(lon, lat);
 
-            // Get the terra coordinates from the irl coordinates
-            double[] terraCoords = CoordinateConversion.convertFromGeo(lon, lat);
+                // Get plot, that the player is in
+                AbstractPlot plot = PlotUtils.getCurrentPlot(Builder.byUUID(player.getUniqueId()), Status.unfinished, Status.unreviewed, Status.completed);
 
-            // Get plot, that the player is in
-            AbstractPlot plot = PlotUtils.getCurrentPlot(Builder.byUUID(player.getUniqueId()), Status.unfinished, Status.unreviewed, Status.completed);
+                // Convert terra coordinates to plot relative coordinates
+                CompletableFuture<double[]> plotCoordsFuture = plot != null ? PlotUtils.convertTerraToPlotXZ(plot, terraCoords) : null;
 
-            // Convert terra coordinates to plot relative coordinates
-            CompletableFuture<double[]> plotCoords = plot != null ? PlotUtils.convertTerraToPlotXZ(plot, terraCoords) : null;
+                if (plotCoordsFuture == null) {
+                    player.sendMessage(Utils.ChatUtils.getAlertFormat(langUtil.get(sender, LangPaths.Message.Error.CANNOT_TELEPORT_OUTSIDE_PLOT)));
+                    return;
+                }
 
-            if (plotCoords == null) {
-                player.sendMessage(Utils.ChatUtils.getAlertFormat(langUtil.get(sender, LangPaths.Message.Error.CANNOT_TELEPORT_OUTSIDE_PLOT)));
-                return true;
-            }
+                double[] plotCoordinates = plotCoordsFuture.get();
 
-            // Get Highest Y
-            int highestY = 0;
-            Location block = new Location(playerWorld, plotCoords.get()[0], 0, plotCoords.get()[1]);
-            for (int i = 1; i < 256; i++) {
-                block.add(0, 1, 0);
-                if (!block.getBlock().isEmpty()) {
-                    highestY = i;
-                }
-            }
-            if (highestY < PlotWorld.MIN_WORLD_HEIGHT) {
-                highestY = PlotWorld.MIN_WORLD_HEIGHT;
-            }
+                Bukkit.getScheduler().runTask(PlotSystem.getPlugin(), () -> {
+                    int highestY = getHighestY(playerWorld, plotCoordinates);
 
-            player.teleport(new Location(playerWorld, plotCoords.get()[0], highestY + 1, plotCoords.get()[1], player.getLocation().getYaw(), player.getLocation().getPitch()));
+                    player.teleport(new Location(playerWorld, plotCoordinates[0], highestY + 1, plotCoordinates[1], player.getLocation().getYaw(), player.getLocation().getPitch()));
 
-            DecimalFormat df = new DecimalFormat("##.#####");
-            df.setRoundingMode(RoundingMode.FLOOR);
-            player.sendMessage(Utils.ChatUtils.getInfoFormat(langUtil.get(sender, LangPaths.Message.Info.TELEPORTING_TPLL, df.format(lat), df.format(lon))));
+                    DecimalFormat df = new DecimalFormat("##.#####");
+                    df.setRoundingMode(RoundingMode.FLOOR);
+                    player.sendMessage(Utils.ChatUtils.getInfoFormat(langUtil.get(sender, LangPaths.Message.Info.TELEPORTING_TPLL, df.format(lat), df.format(lon))));
+                });
+            } catch (IOException | OutOfProjectionBoundsException ex) {
+                PlotSystem.getPlugin().getComponentLogger().error(text("A coordinate conversion error occurred!"), ex);
+                player.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.ERROR_OCCURRED)));
+            } catch (InterruptedException | ExecutionException ex) {
+                sendInfo(sender);
+            }
+        });
+        return true;
+    }
 
-        } catch (SQLException ex) {
-            PlotSystem.getPlugin().getComponentLogger().error(text("A SQL error occurred!"), ex);
-            player.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.ERROR_OCCURRED)));
-        } catch (IOException | OutOfProjectionBoundsException ex) {
-            PlotSystem.getPlugin().getComponentLogger().error(text("A coordinate conversion error occurred!"), ex);
-            player.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.ERROR_OCCURRED)));
-        } catch (InterruptedException | ExecutionException ex) {
-            sendInfo(sender);
+    private static int getHighestY(World playerWorld, double[] plotCoordinates) {
+        int highestY = 0;
+        Location block = new Location(playerWorld, plotCoordinates[0], 0, plotCoordinates[1]);
+        for (int i = 1; i < 256; i++) {
+            block.add(0, 1, 0);
+            if (!block.getBlock().isEmpty()) {
+                highestY = i;
+            }
         }
-        return true;
+        if (highestY < PlotWorld.MIN_WORLD_HEIGHT) {
+            highestY = PlotWorld.MIN_WORLD_HEIGHT;
+        }
+        return highestY;
     }
 
     @Override

src/main/java/com/alpsbte/plotsystem/commands/CMD_Tutorial.java

@@ -47,29 +47,30 @@ public class CMD_Tutorial extends BaseCommand {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String s, String[] args) {
-        if (sender.hasPermission(getPermission())) {
-            if (getPlayer(sender) != null) {
-                if (PlotSystem.getPlugin().getConfig().getBoolean(ConfigPaths.TUTORIAL_ENABLE)) {
-                    if (args.length == 0) {
-                        Tutorial tutorial = AbstractTutorial.getActiveTutorial(getPlayer(sender).getUniqueId());
-                        if (tutorial != null) {
-                            new TutorialStagesMenu(tutorial.getPlayer(), tutorial.getId());
-                        } else {
-                            new TutorialsMenu(getPlayer(sender));
-                        }
-                    } else if (args.length == 1 && AlpsUtils.tryParseInt(args[0]) != null) {
-                        int tutorialId = Integer.parseInt(args[0]);
-                        if (TutorialCategory.byId(tutorialId) == null) return true;
-                        AbstractTutorial.loadTutorial(getPlayer(sender), tutorialId);
-                    }
-                } else {
-                    sender.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.TUTORIAL_DISABLED)));
-                }
+        if (!sender.hasPermission(getPermission())) {
+            sender.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.PLAYER_HAS_NO_PERMISSIONS)));
+            return true;
+        }
+        if (getPlayer(sender) == null) {
+            Bukkit.getConsoleSender().sendMessage(Component.text("This command can only be used as a player!", NamedTextColor.RED));
+            return true;
+        }
+        if (!PlotSystem.getPlugin().getConfig().getBoolean(ConfigPaths.TUTORIAL_ENABLE)) {
+            sender.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.TUTORIAL_DISABLED)));
+            return true;
+        }
+
+        if (args.length == 0) {
+            Tutorial tutorial = AbstractTutorial.getActiveTutorial(getPlayer(sender).getUniqueId());
+            if (tutorial != null) {
+                new TutorialStagesMenu(tutorial.getPlayer(), tutorial.getId());
             } else {
-                Bukkit.getConsoleSender().sendMessage(Component.text("This command can only be used as a player!", NamedTextColor.RED));
+                new TutorialsMenu(getPlayer(sender));
             }
-        } else {
-            sender.sendMessage(Utils.ChatUtils.getAlertFormat(LangUtil.getInstance().get(sender, LangPaths.Message.Error.PLAYER_HAS_NO_PERMISSIONS)));
+        } else if (args.length == 1 && AlpsUtils.tryParseInt(args[0]) != null) {
+            int tutorialId = Integer.parseInt(args[0]);
+            if (TutorialCategory.byId(tutorialId) == null) return true;
+            AbstractTutorial.loadTutorial(getPlayer(sender), tutorialId);
         }
         return true;
     }

src/main/java/com/alpsbte/plotsystem/commands/CommandManager.java

@@ -41,7 +41,7 @@
 
 public class CommandManager {
 
-    public final List<BaseCommand> baseCommands = new ArrayList<BaseCommand>() {{
+    public final List<BaseCommand> baseCommands = new ArrayList<>() {{
         // Default Commands
         add(new CMD_CancelChat());
         add(new CMD_Companion());