Cleanup, ready for release

PPGOME · PPGOME · commit 010c1a496eb9 · 2025-08-03T01:00:40.000-04:00
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nu.nerd</groupId>
 	<artifactId>ModReq</artifactId>
-	<version>3.0</version>
+	<version>3.0.0</version>
 	<packaging>jar</packaging>
 	<name>ModReq</name>
 	<description>Moderator Request System</description>
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>io.papermc.paper</groupId>
 			<artifactId>paper-api</artifactId>
-			<version>1.21.4-R0.1-SNAPSHOT</version>
+			<version>1.20-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<!--
diff --git a/src/nu/nerd/modreq/ModReq.java b/src/nu/nerd/modreq/ModReq.java
@@ -132,8 +132,8 @@ public void onEnable() {
         tpIdCommand = new TPIdCommand(this);
         unclaimCommand = new UnclaimCommand(this);
         elevateCommand = new ElevateCommand(this, unclaimCommand);
-        tpInfoCommand = new TPInfoCommand(this, tpIdCommand, checkCommand);
-        tpClaimCommand = new TPClaimCommand(this, claimCommand, tpIdCommand, checkCommand);
+        tpInfoCommand = new TPInfoCommand(tpIdCommand, checkCommand);
+        tpClaimCommand = new TPClaimCommand(claimCommand, tpIdCommand, checkCommand);
 
         // Command Registration
         registry.register("check", checkCommand);
@@ -253,8 +253,6 @@ public String getDatabaseUrl() {
         return DATABASE_URL;
     }
 
-    // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String name, String[] args) {
         if(!(sender instanceof Player)) {
diff --git a/src/nu/nerd/modreq/commands/CheckCommand.java b/src/nu/nerd/modreq/commands/CheckCommand.java
@@ -64,7 +64,12 @@ public boolean execute(Player player, String name, String[] args) {
 
                 // If the player wants to specify a page (shorthand)
             } else if (arg.startsWith("p:")) {
-                page = Integer.parseInt(arg.substring(2));
+                try {
+                    page = Integer.parseInt(arg.substring(2));
+                } catch (NumberFormatException exception) {
+                    sendMessage(player, configuration.GENERAL__PAGE_ERROR, environment, configuration);
+                    return true;
+                }
 
                 // If the player wants to specify a page
             } else if (arg.equalsIgnoreCase("--page") || arg.equalsIgnoreCase("-p")) {
@@ -119,14 +124,12 @@ public boolean execute(Player player, String name, String[] args) {
         final UUID finalLimitUUID = limitUUID;
         final boolean finalShowNotes = showNotes;
         final int finalPage = page;
-        final int finalRequestId = requestId;
         final boolean finalIncludeElevated = includeElevated;
         final String finalSearchTerm = searchTerm;
-        CompletableFuture<Void> future;
 
         if (page > 0) {
             if (limitUUID != null) {
-                future = reqTable.getUserRequests(limitUUID).thenAccept(requests -> {
+                reqTable.getUserRequests(limitUUID).thenAccept(requests -> {
                     bukkitScheduler.runTask(plugin, () -> {
                         if (requests.isEmpty()) {
                             sendMessage(player, configuration.GENERAL__NO_REQUESTS, environment, configuration);
@@ -154,7 +157,7 @@ public boolean execute(Player player, String name, String[] args) {
                         Request.RequestStatus.CLAIMED
                 );
 
-                future = CompletableFuture.allOf(requestsFuture, countFuture).thenAccept(ignore -> {
+                CompletableFuture.allOf(requestsFuture, countFuture).thenAccept(ignore -> {
                     List<Request> requests = requestsFuture.join();
                     int totalCount = countFuture.join();
 
@@ -173,23 +176,20 @@ public boolean execute(Player player, String name, String[] args) {
 
             }
         } else if (requestId > 0) {
-            future = reqTable.getRequest(requestId).thenAccept(request -> {
-                bukkitScheduler.runTask(plugin, () -> {
-                    if (request == null) {
-                        // Request doesn't exist
-                        sendMessage(player, configuration.GENERAL__REQUEST_ERROR, environment, configuration);
-                    } else if (finalLimitUUID != null && !request.getPlayerUUID().equals(finalLimitUUID)) {
-                        // Request exists but player doesn't have permission to view it
-                        sendMessage(player, configuration.GENERAL__REQUEST_ERROR, environment, configuration);
-                    } else {
-                        // Show the request details
-                        messageRequestToPlayer(player, request, finalShowNotes, environment,
-                                configuration, plugin, plugin.getNoteTable());
-                    }
-                });
-            });
+            reqTable.getRequest(requestId).thenAccept(request -> bukkitScheduler.runTask(plugin, () -> {
+                if (request == null) {
+                    // Request doesn't exist
+                    sendMessage(player, configuration.GENERAL__REQUEST_ERROR, environment, configuration);
+                } else if (finalLimitUUID != null && !request.getPlayerUUID().equals(finalLimitUUID)) {
+                    // Request exists but player doesn't have permission to view it
+                    sendMessage(player, configuration.GENERAL__REQUEST_ERROR, environment, configuration);
+                } else {
+                    // Show the request details
+                    messageRequestToPlayer(player, request, finalShowNotes, environment,
+                            configuration, plugin, plugin.getNoteTable());
+                }
+            }));
         } else {
-            future = CompletableFuture.completedFuture(null);
 
             bukkitScheduler.runTask(plugin, () ->
                     sendMessage(player, configuration.GENERAL__NO_REQUESTS, environment, configuration));
diff --git a/src/nu/nerd/modreq/commands/ElevateCommand.java b/src/nu/nerd/modreq/commands/ElevateCommand.java
@@ -28,10 +28,8 @@ public class ElevateCommand implements CommandHandler {
     private RequestTable reqTable;
     private Map<String, String> environment;
     private Configuration configuration;
-    private CompletableFuture<Void> future;
     private UnclaimCommand unclaimCommand;
     private Map<UUID, Integer> claimedIds;
-    private BukkitScheduler bukkitScheduler = Bukkit.getScheduler();
 
     /**
      * Creates a new {@code ElevateCommand} instance.
@@ -44,7 +42,6 @@ public ElevateCommand(ModReq plugin, UnclaimCommand unclaimCommand) {
         this.reqTable = plugin.getReqTable();
         this.environment = plugin.getEnvironment();
         this.configuration = plugin.getConfiguration();
-        this.future = plugin.getCompleteableFuture();
         this.claimedIds = plugin.getClaimedIds();
         this.unclaimCommand = unclaimCommand;
     }
diff --git a/src/nu/nerd/modreq/commands/MRNoteCommand.java b/src/nu/nerd/modreq/commands/MRNoteCommand.java
@@ -30,7 +30,6 @@ public class MRNoteCommand implements CommandHandler {
     private NoteTable noteTable;
     private Map<String, String> environment;
     private Configuration configuration;
-    private CompletableFuture<Void> future;
     private Map<UUID, Integer> claimedIds;
     private BukkitScheduler bukkitScheduler = Bukkit.getScheduler();
 
@@ -46,7 +45,6 @@ public MRNoteCommand(ModReq plugin) {
         this.noteTable = plugin.getNoteTable();
         this.environment = plugin.getEnvironment();
         this.configuration = plugin.getConfiguration();
-        this.future = plugin.getCompleteableFuture();
         this.claimedIds = plugin.getClaimedIds();
     }
 
diff --git a/src/nu/nerd/modreq/commands/MRResetCommand.java b/src/nu/nerd/modreq/commands/MRResetCommand.java
@@ -29,10 +29,6 @@
 public class MRResetCommand implements CommandHandler {
 
     private final ModReq plugin;
-    private RequestTable reqTable;
-    private Map<String, String> environment;
-    private Configuration configuration;
-    private CompletableFuture<Void> future;
     ComponentLogger logger;
     String DATABASE_URL;
 
@@ -44,10 +40,6 @@ public class MRResetCommand implements CommandHandler {
      */
     public MRResetCommand(ModReq plugin) {
         this.plugin = plugin;
-        this.reqTable = plugin.getReqTable();
-        this.environment = plugin.getEnvironment();
-        this.configuration = plugin.getConfiguration();
-        this.future = plugin.getCompleteableFuture();
         logger = plugin.getComponentLogger();
         this.DATABASE_URL = plugin.getDatabaseUrl();
     }
diff --git a/src/nu/nerd/modreq/commands/ModreqCommand.java b/src/nu/nerd/modreq/commands/ModreqCommand.java
@@ -44,7 +44,8 @@ public ModreqCommand(ModReq plugin) {
     @Override
     public boolean execute(Player player, String name, String[] args) {
 
-        reqTable.getNumRequestFromUser(player.getUniqueId()).thenAccept(numRequests -> {
+        if(args.length > 0) {
+            reqTable.getNumRequestFromUser(player.getUniqueId()).thenAccept(numRequests -> {
                 if (numRequests < configuration.MAX_REQUESTS) {
                     Request req = new Request();
                     req.setPlayerUUID(player.getUniqueId());
@@ -63,20 +64,21 @@ public boolean execute(Player player, String name, String[] args) {
                     req.setRequestLocation(location);
                     req.setStatus(Request.RequestStatus.OPEN);
 
-                    reqTable.saveAndGetId(req).thenAccept(savedReq -> {
-                        bukkitScheduler.runTask(plugin, () -> {
-                            environment.put("request_id", String.valueOf(req.getId()));
-                            messageMods(configuration.MOD__NEW_REQUEST, environment, configuration);
-                            sendMessage(player, configuration.GENERAL__REQUEST_FILED, environment, configuration);
-                        });
-                    });
+                    reqTable.saveAndGetId(req).thenAccept(savedReq -> bukkitScheduler.runTask(plugin, () -> {
+                        environment.put("request_id", String.valueOf(req.getId()));
+                        messageMods(configuration.MOD__NEW_REQUEST, environment, configuration);
+                        sendMessage(player, configuration.GENERAL__REQUEST_FILED, environment, configuration);
+                    }));
                 } else {
                     bukkitScheduler.runTask(plugin, () -> {
                         environment.put("max_requests", Integer.toString(configuration.MAX_REQUESTS));
                         sendMessage(player, configuration.GENERAL__MAX_REQUESTS, environment, configuration);
                     });
                 }
-        });
-        return true;
+            });
+            return true;
+        } else {
+            return false;
+        }
     }
 }
diff --git a/src/nu/nerd/modreq/commands/ReopenCommand.java b/src/nu/nerd/modreq/commands/ReopenCommand.java
@@ -27,7 +27,6 @@ public class ReopenCommand implements CommandHandler {
     private RequestTable reqTable;
     private Map<String, String> environment;
     private Configuration configuration;
-    private CompletableFuture<Void> future;
     private Map<UUID, Integer> claimedIds;
     private BukkitScheduler bukkitScheduler = Bukkit.getScheduler();
 
@@ -42,7 +41,6 @@ public ReopenCommand(ModReq plugin) {
         this.reqTable = plugin.getReqTable();
         this.environment = plugin.getEnvironment();
         this.configuration = plugin.getConfiguration();
-        this.future = plugin.getCompleteableFuture();
         this.claimedIds = plugin.getClaimedIds();
     }
 
diff --git a/src/nu/nerd/modreq/commands/TPClaimCommand.java b/src/nu/nerd/modreq/commands/TPClaimCommand.java
@@ -16,27 +16,14 @@
  */
 public class TPClaimCommand implements CommandHandler {
 
-    private final ModReq plugin;
-    private RequestTable reqTable;
-    private Map<String, String> environment;
-    private Configuration configuration;
-    private CompletableFuture<Void> future;
     private ClaimCommand claimCommand;
     private TPIdCommand tpIdCommand;
     private CheckCommand checkCommand;
 
     /**
      * Creates a new {@code TPClaimCommand} instance.
-     *
-     * @param plugin The main plugin instance, used for scheduling, environment variables, database access,
-     *               and asynchronous operations.
      */
-    public TPClaimCommand(ModReq plugin, ClaimCommand claimCommand, TPIdCommand tpIdCommand, CheckCommand checkCommand) {
-        this.plugin = plugin;
-        this.reqTable = plugin.getReqTable();
-        this.environment = plugin.getEnvironment();
-        this.configuration = plugin.getConfiguration();
-        this.future = plugin.getCompleteableFuture();
+    public TPClaimCommand(ClaimCommand claimCommand, TPIdCommand tpIdCommand, CheckCommand checkCommand) {
         this.claimCommand = claimCommand;
         this.tpIdCommand = tpIdCommand;
         this.checkCommand = checkCommand;
diff --git a/src/nu/nerd/modreq/commands/TPIdCommand.java b/src/nu/nerd/modreq/commands/TPIdCommand.java
@@ -30,7 +30,6 @@ public class TPIdCommand implements CommandHandler {
     private RequestTable reqTable;
     private Map<String, String> environment;
     private Configuration configuration;
-    private CompletableFuture<Void> future;
     private Map<UUID, Integer> claimedIds;
     private BukkitScheduler bukkitScheduler = Bukkit.getScheduler();
 
@@ -45,7 +44,6 @@ public TPIdCommand(ModReq plugin) {
         this.reqTable = plugin.getReqTable();
         this.environment = plugin.getEnvironment();
         this.configuration = plugin.getConfiguration();
-        this.future = plugin.getCompleteableFuture();
         this.claimedIds = plugin.getClaimedIds();
     }
 
diff --git a/src/nu/nerd/modreq/commands/TPInfoCommand.java b/src/nu/nerd/modreq/commands/TPInfoCommand.java
@@ -16,26 +16,13 @@
  */
 public class TPInfoCommand implements CommandHandler {
 
-    private final ModReq plugin;
-    private RequestTable reqTable;
-    private Map<String, String> environment;
-    private Configuration configuration;
-    private CompletableFuture<Void> future;
     private TPIdCommand tpIdCommand;
     private CheckCommand checkCommand;
 
     /**
      * Creates a new {@code TPInfoCommand} instance.
-     *
-     * @param plugin The main plugin instance, used for scheduling, environment variables, database access,
-     *               and asynchronous operations.
      */
-    public TPInfoCommand(ModReq plugin, TPIdCommand tpIdCommand, CheckCommand checkCommand) {
-        this.plugin = plugin;
-        this.reqTable = plugin.getReqTable();
-        this.environment = plugin.getEnvironment();
-        this.configuration = plugin.getConfiguration();
-        this.future = plugin.getCompleteableFuture();
+    public TPInfoCommand(TPIdCommand tpIdCommand, CheckCommand checkCommand) {
         this.tpIdCommand = tpIdCommand;
         this.checkCommand = checkCommand;
     }
diff --git a/src/nu/nerd/modreq/commands/UnclaimCommand.java b/src/nu/nerd/modreq/commands/UnclaimCommand.java
@@ -27,7 +27,6 @@ public class UnclaimCommand implements CommandHandler {
     private RequestTable reqTable;
     private Map<String, String> environment;
     private Configuration configuration;
-    private CompletableFuture<Void> future;
     private Map<UUID, Integer> claimedIds;
 
     /**
@@ -41,7 +40,6 @@ public UnclaimCommand(ModReq plugin) {
         this.reqTable = plugin.getReqTable();
         this.environment = plugin.getEnvironment();
         this.configuration = plugin.getConfiguration();
-        this.future = plugin.getCompleteableFuture();
         this.claimedIds = plugin.getClaimedIds();
     }
 
diff --git a/src/nu/nerd/modreq/database/Note.java b/src/nu/nerd/modreq/database/Note.java
@@ -46,7 +46,7 @@ public class Note {
 
 	// ----------------------------------------------------------------------------
 
-	public Note(){}
+	public Note(){ /* Empty as ORMLite requires an empty constructor to initialize this ORM class. */ }
 
 	// ----------------------------------------------------------------------------
 
diff --git a/src/nu/nerd/modreq/utils/MessageUtils.java b/src/nu/nerd/modreq/utils/MessageUtils.java
@@ -200,23 +200,25 @@ public static void messageRequestToPlayer(
         messages.add(buildMessage(configuration.GENERAL__ITEM__REQUEST, environment, configuration));
         environment.remove("request_message");
 
+        System.out.println("Show notes reached!");
+        System.out.println("showNotes value: " + showNotes);
         if (showNotes) {
             noteTable.getRequestNotes(req).thenAcceptAsync(notes -> {
                 int i = 1;
 
                 for (Note note : notes) {
+                    System.out.println(note.getNoteBody());
                     Map<String, String> noteEnvironment = new HashMap<>(environment);
                     noteEnvironment.put("id", Integer.toString(i));
                     noteEnvironment.put("user", note.getPlayer());
                     noteEnvironment.put("message", note.getNoteBody());
                     messages.add(buildMessage(configuration.GENERAL__ITEM__NOTE, noteEnvironment, configuration));
                     i++;
                 }
-                Bukkit.getScheduler().runTask(plugin, () -> {
-                    sender.sendMessage(messages.toArray(new String[0]));
-                });
+                Bukkit.getScheduler().runTask(plugin, () -> sender.sendMessage(messages.toArray(new String[0])));
             });
+        } else {
+            Bukkit.getScheduler().runTask(plugin, () -> sender.sendMessage(messages.toArray(new String[0])));
         }
     }
-
 }
