SQL stuff is all async now, I think

RhythmicSys · RhythmicSys · commit 26329f2b6002 · 2025-06-03T14:35:56.000-07:00
diff --git a/src/main/java/simplexity/simplepms/SimplePMs.java b/src/main/java/simplexity/simplepms/SimplePMs.java
@@ -3,7 +3,6 @@
 import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import simplexity.simplepms.commands.Block;
@@ -15,35 +14,26 @@
 import simplexity.simplepms.commands.SocialSpy;
 import simplexity.simplepms.commands.Unblock;
 import simplexity.simplepms.config.ConfigHandler;
-import simplexity.simplepms.listeners.LoginListener;
+import simplexity.simplepms.listeners.JoinListener;
 import simplexity.simplepms.listeners.PreCommandListener;
-import simplexity.simplepms.listeners.PreLoginListener;
 import simplexity.simplepms.listeners.QuitListener;
-
-import java.util.HashSet;
-import java.util.Set;
+import simplexity.simplepms.saving.SqlHandler;
 
 @SuppressWarnings("UnstableApiUsage")
 public final class SimplePMs extends JavaPlugin {
 
     private static Plugin instance;
     private static final MiniMessage miniMessage = MiniMessage.miniMessage();
     private static boolean papiEnabled = false;
-    private static final HashSet<Player> spyingPlayers = new HashSet<>();
     private static ConsoleCommandSender consoleSender;
 
 
-    public static Set<Player> getSpyingPlayers() {
-        return spyingPlayers;
-    }
-
     @Override
     public void onEnable() {
         instance = this;
-        this.getServer().getPluginManager().registerEvents(new PreLoginListener(), this);
         this.getServer().getPluginManager().registerEvents(new QuitListener(), this);
         this.getServer().getPluginManager().registerEvents(new PreCommandListener(), this);
-        this.getServer().getPluginManager().registerEvents(new LoginListener(), this);
+        this.getServer().getPluginManager().registerEvents(new JoinListener(), this);
         if (this.getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) {
             papiEnabled = true;
         }
@@ -52,6 +42,7 @@ public void onEnable() {
         getConfig().options().copyDefaults(true);
         saveConfig();
         ConfigHandler.getInstance().loadConfigValues();
+        SqlHandler.getInstance().init();
         this.getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, commands -> {
             commands.registrar().register(PrivateMessage.createCommand());
             commands.registrar().register(PrivateMessage.createTellAlias());
@@ -68,6 +59,12 @@ public void onEnable() {
         });
     }
 
+    @Override
+
+    public void onDisable() {
+        SqlHandler.getInstance().shutdownConnection();
+    }
+
     public static MiniMessage getMiniMessage() {
         return miniMessage;
     }
diff --git a/src/main/java/simplexity/simplepms/commands/Blocklist.java b/src/main/java/simplexity/simplepms/commands/Blocklist.java
@@ -38,11 +38,11 @@ public static LiteralCommandNode<CommandSourceStack> createCommand() {
                         message = message.appendNewline();
                         message = message.append(miniMessage.deserialize(
                                 LocaleMessage.BLOCKLIST_NAME.getMessage(),
-                                Placeholder.parsed("name", block.blockedPlayerName())
+                                Placeholder.parsed("name", block.getBlockedPlayerName())
                         ));
-                        if (block.blockReason() == null || block.blockReason().isEmpty()) continue;
+                        if (block.getBlockReason() == null || block.getBlockReason().isEmpty()) continue;
                         message = message.append(miniMessage.deserialize(LocaleMessage.BLOCKLIST_REASON.getMessage(),
-                                Placeholder.parsed("reason", block.blockReason())));
+                                Placeholder.parsed("reason", block.getBlockReason())));
                     }
                     player.sendMessage(message);
                     return Command.SINGLE_SUCCESS;
diff --git a/src/main/java/simplexity/simplepms/commands/Reload.java b/src/main/java/simplexity/simplepms/commands/Reload.java
@@ -8,6 +8,7 @@
 import simplexity.simplepms.config.ConfigHandler;
 import simplexity.simplepms.config.LocaleMessage;
 import simplexity.simplepms.logic.Constants;
+import simplexity.simplepms.saving.SqlHandler;
 
 @SuppressWarnings("UnstableApiUsage")
 public class Reload {
@@ -18,6 +19,7 @@ public static LiteralCommandNode<CommandSourceStack> createCommand() {
                 .executes(ctx -> {
                     CommandSender sender = ctx.getSource().getSender();
                     ConfigHandler.getInstance().loadConfigValues();
+                    SqlHandler.getInstance().reloadDatabase();
                     sender.sendRichMessage(LocaleMessage.RELOADED.getMessage());
                     return Command.SINGLE_SUCCESS;
                 }).build();
diff --git a/src/main/java/simplexity/simplepms/commands/SocialSpy.java b/src/main/java/simplexity/simplepms/commands/SocialSpy.java
@@ -6,7 +6,6 @@
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.command.brigadier.Commands;
 import org.bukkit.entity.Player;
-import simplexity.simplepms.SimplePMs;
 import simplexity.simplepms.config.LocaleMessage;
 import simplexity.simplepms.logic.Constants;
 import simplexity.simplepms.saving.Cache;
@@ -41,12 +40,12 @@ private static int execute(CommandContext<CommandSourceStack> ctx) {
         if (settings == null || settings.isSocialSpyEnabled()) {
             Cache.updateSocialSpySettings(uuid, false);
             player.sendRichMessage(LocaleMessage.SOCIAL_SPY_DISABLED.getMessage());
-            SimplePMs.getSpyingPlayers().remove(player);
+            Cache.getSpyingPlayers().remove(player);
             return Command.SINGLE_SUCCESS;
         }
         Cache.updateSocialSpySettings(uuid, true);
         player.sendRichMessage(LocaleMessage.SOCIAL_SPY_ENABLED.getMessage());
-        SimplePMs.getSpyingPlayers().add(player);
+        Cache.getSpyingPlayers().add(player);
         return Command.SINGLE_SUCCESS;
     }
 
diff --git a/src/main/java/simplexity/simplepms/commands/Unblock.java b/src/main/java/simplexity/simplepms/commands/Unblock.java
@@ -63,8 +63,8 @@ private static CompletableFuture<Suggestions> suggestBlockedUsers(final CommandC
         List<PlayerBlock> blockedPlayers = Cache.getBlockList(playerSender.getUniqueId());
         if (blockedPlayers.isEmpty()) return builder.buildFuture();
         for (PlayerBlock block : blockedPlayers) {
-            builder.suggest(block.blockedPlayerName(),
-                    MessageComponentSerializer.message().serialize(Component.text(block.blockReason())));
+            builder.suggest(block.getBlockedPlayerName(),
+                    MessageComponentSerializer.message().serialize(Component.text(block.getBlockReason())));
         }
         return builder.buildFuture();
     }
diff --git a/src/main/java/simplexity/simplepms/commands/arguments/OfflinePlayerArgument.java b/src/main/java/simplexity/simplepms/commands/arguments/OfflinePlayerArgument.java
@@ -43,7 +43,7 @@ public class OfflinePlayerArgument implements CustomArgumentType<OfflinePlayer,
 
     @Override
     public @NotNull ArgumentType<String> getNativeType() {
-        return StringArgumentType.word();
+        return StringArgumentType.greedyString();
     }
 
     /**
diff --git a/src/main/java/simplexity/simplepms/commands/util/MessageChecks.java b/src/main/java/simplexity/simplepms/commands/util/MessageChecks.java
@@ -64,7 +64,7 @@ private static boolean userBlocked(Player blocklistPlayer, Player potentialBlock
             return false;
         }
         for (PlayerBlock playerBlock : playerBlocks) {
-            if (playerBlock.blockedPlayerUUID().equals(potentialBlock.getUniqueId())) {
+            if (playerBlock.getBlockedPlayerUUID().equals(potentialBlock.getUniqueId())) {
                 return true;
             }
         }
diff --git a/src/main/java/simplexity/simplepms/config/ConfigHandler.java b/src/main/java/simplexity/simplepms/config/ConfigHandler.java
@@ -3,7 +3,6 @@
 import org.bukkit.Sound;
 import org.bukkit.configuration.file.FileConfiguration;
 import simplexity.simplepms.SimplePMs;
-import simplexity.simplepms.saving.SqlHandler;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -30,7 +29,6 @@ public static ConfigHandler getInstance() {
     public void loadConfigValues() {
         SimplePMs.getInstance().reloadConfig();
         FileConfiguration config = SimplePMs.getInstance().getConfig();
-        SqlHandler.getInstance().init();
         LocaleHandler.getInstance().reloadLocale();
         List<String> commands = config.getStringList("command-spy.commands");
         List<String> consoleNames = config.getStringList("valid-console-names");
diff --git a/src/main/java/simplexity/simplepms/config/LocaleMessage.java b/src/main/java/simplexity/simplepms/config/LocaleMessage.java
@@ -31,6 +31,7 @@ public enum LocaleMessage {
     ERROR_CANNOT_MESSAGE_SOMEONE_YOU_BLOCKED("error.cannot-message-someone-you-blocked", "<red>Sorry, you cannot message someone you currently have blocked.</red>"),
     ERROR_CANNOT_MESSAGE_CONSOLE("error.cannot-message-console", "<red>Sorry, you cannot message the server</red>"),
     ERROR_SOMETHING_WENT_WRONG("error.something-wrong", "<red>Sorry, something went wrong, please check console for more information</red>"),
+    ERROR_NAME_NOT_FOUND("error.name-not-found", "Name not found"),
     LOG_ERROR_SOUND_NOT_VALID("console-error.sound-not-valid", "Warning! The sound you have input: '%sound-string%' is invalid! Please be sure you use a sound that is listed on https://jd.papermc.io/paper/1.21.4/org/bukkit/Sound.html"),
     LOG_ERROR_USING_DEFAULT_SOUND("console-error.using-default-sound", "Using %default-sound% until a valid sound is provided"),
     LOG_ERROR_FLOAT_OUT_OF_RANGE("console-error.float-out-of-range", "The number %number% is out of range! Volume and pitch values must be a number between 0 and 2!"),
diff --git a/src/main/java/simplexity/simplepms/listeners/JoinListener.java b/src/main/java/simplexity/simplepms/listeners/JoinListener.java
@@ -0,0 +1,20 @@
+package simplexity.simplepms.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import simplexity.simplepms.logic.Constants;
+import simplexity.simplepms.saving.Cache;
+
+import java.util.UUID;
+
+public class JoinListener implements Listener {
+
+    @EventHandler
+    public void onLogin(PlayerJoinEvent joinEvent) {
+        Player player = joinEvent.getPlayer();
+        UUID playerUuid = player.getUniqueId();
+        Cache.populateCache(playerUuid, player, player.hasPermission(Constants.ADMIN_SOCIAL_SPY));
+    }
+}
diff --git a/src/main/java/simplexity/simplepms/listeners/LoginListener.java b/src/main/java/simplexity/simplepms/listeners/LoginListener.java
diff --git a/src/main/java/simplexity/simplepms/listeners/PreLoginListener.java b/src/main/java/simplexity/simplepms/listeners/PreLoginListener.java
diff --git a/src/main/java/simplexity/simplepms/listeners/QuitListener.java b/src/main/java/simplexity/simplepms/listeners/QuitListener.java
@@ -3,13 +3,12 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
-import simplexity.simplepms.SimplePMs;
 import simplexity.simplepms.saving.Cache;
 
 public class QuitListener implements Listener {
     @EventHandler
     public void onQuit(PlayerQuitEvent e) {
-        SimplePMs.getSpyingPlayers().remove(e.getPlayer());
+        Cache.getSpyingPlayers().remove(e.getPlayer());
         Cache.removeBlockListFromCache(e.getPlayer().getUniqueId());
         Cache.removePlayerSettingsFromCache(e.getPlayer().getUniqueId());
     }
diff --git a/src/main/java/simplexity/simplepms/logic/PMHandler.java b/src/main/java/simplexity/simplepms/logic/PMHandler.java
@@ -6,6 +6,7 @@
 import simplexity.simplepms.config.ConfigHandler;
 import simplexity.simplepms.config.LocaleMessage;
 import simplexity.simplepms.events.PrivateMessageEvent;
+import simplexity.simplepms.saving.Cache;
 
 import java.util.HashMap;
 
@@ -57,7 +58,7 @@ private static void handleMessageReceive(CommandSender initiator, CommandSender
 
 
     private static PrivateMessageEvent callPMEvent(CommandSender initiator, CommandSender target, String messageContent) {
-        PrivateMessageEvent messageEvent = new PrivateMessageEvent(initiator, target, messageContent, SimplePMs.getSpyingPlayers());
+        PrivateMessageEvent messageEvent = new PrivateMessageEvent(initiator, target, messageContent, Cache.getSpyingPlayers());
         SimplePMs.getInstance().getServer().getPluginManager().callEvent(messageEvent);
         return messageEvent;
     }
diff --git a/src/main/java/simplexity/simplepms/logic/SpyHandler.java b/src/main/java/simplexity/simplepms/logic/SpyHandler.java
@@ -7,6 +7,7 @@
 import simplexity.simplepms.config.ConfigHandler;
 import simplexity.simplepms.config.LocaleMessage;
 import simplexity.simplepms.events.PrivateMessageEvent;
+import simplexity.simplepms.saving.Cache;
 
 public class SpyHandler {
 
@@ -20,7 +21,7 @@ public static void sendCommandSpy(CommandSender initiator, String command, Strin
             console.sendMessage(parsedMessage);
         }
         if (initiator.hasPermission(Constants.BYPASS_COMMAND_SPY)) return;
-        for (Player spyingPlayer : SimplePMs.getSpyingPlayers()) {
+        for (Player spyingPlayer : Cache.getSpyingPlayers()) {
             if (initiator.equals(spyingPlayer)) continue;
             if (!spyingPlayer.hasPermission(Constants.ADMIN_SOCIAL_SPY)) continue;
             spyingPlayer.sendMessage(parsedMessage);
diff --git a/src/main/java/simplexity/simplepms/logic/UnblockHandler.java b/src/main/java/simplexity/simplepms/logic/UnblockHandler.java
@@ -18,8 +18,8 @@ public static void removeBlockedPlayer(@NotNull Player blockingPlayer, @NotNull
         List<PlayerBlock> playerBlocks = Cache.getBlockList(blockingPlayer.getUniqueId());
         UUID playerToUnblockUuid = null;
         for (PlayerBlock block : playerBlocks) {
-            if (block.blockedPlayerName().equalsIgnoreCase(userToRemove)) {
-                playerToUnblockUuid = block.blockedPlayerUUID();
+            if (block.getBlockedPlayerName().equalsIgnoreCase(userToRemove)) {
+                playerToUnblockUuid = block.getBlockedPlayerUUID();
                 break;
             }
         }
diff --git a/src/main/java/simplexity/simplepms/saving/Cache.java b/src/main/java/simplexity/simplepms/saving/Cache.java
diff --git a/src/main/java/simplexity/simplepms/saving/SqlHandler.java b/src/main/java/simplexity/simplepms/saving/SqlHandler.java
diff --git a/src/main/java/simplexity/simplepms/saving/objects/PlayerBlock.java b/src/main/java/simplexity/simplepms/saving/objects/PlayerBlock.java

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ private static CompletableFuture<Suggestions> suggestBlockedUsers(final CommandC`
`63`	`63`	`List<PlayerBlock> blockedPlayers = Cache.getBlockList(playerSender.getUniqueId());`
`64`	`64`	`if (blockedPlayers.isEmpty()) return builder.buildFuture();`
`65`	`65`	`for (PlayerBlock block : blockedPlayers) {`
`66`		`- builder.suggest(block.blockedPlayerName(),`
`67`		`- MessageComponentSerializer.message().serialize(Component.text(block.blockReason())));`
	`66`	`+ builder.suggest(block.getBlockedPlayerName(),`
	`67`	`+ MessageComponentSerializer.message().serialize(Component.text(block.getBlockReason())));`
`68`	`68`	`}`
`69`	`69`	`return builder.buildFuture();`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public class OfflinePlayerArgument implements CustomArgumentType<OfflinePlayer,`
`43`	`43`
`44`	`44`	`@Override`
`45`	`45`	`public @NotNull ArgumentType<String> getNativeType() {`
`46`		`- return StringArgumentType.word();`
	`46`	`+ return StringArgumentType.greedyString();`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ private static boolean userBlocked(Player blocklistPlayer, Player potentialBlock`
`64`	`64`	`return false;`
`65`	`65`	`}`
`66`	`66`	`for (PlayerBlock playerBlock : playerBlocks) {`
`67`		`- if (playerBlock.blockedPlayerUUID().equals(potentialBlock.getUniqueId())) {`
	`67`	`+ if (playerBlock.getBlockedPlayerUUID().equals(potentialBlock.getUniqueId())) {`
`68`	`68`	`return true;`
`69`	`69`	`}`
`70`	`70`	`}`