Fixed commands and added some more comments.

Author: PPGOME

plugin.yml

@@ -17,7 +17,6 @@ commands:
            /<command> request: Make a request to the moderators
   check:
     description: Check request queue
-    permission: modreq.check
     usage: |
            /<command> <p:#|#>: Check request queue or a specific request
   tp-id:

pom.xml

@@ -6,7 +6,7 @@
 	<version>3.0</version>
 	<packaging>jar</packaging>
 	<name>ModReq</name>
-	<description>Moderator Request Sytem</description>
+	<description>Moderator Request System</description>
 	<url>https://github.com/NerdNu/ModReq</url>
 	<scm>
 		<connection>scm:git:https://github.com/NerdNu/ModReq.git</connection>

src/nu/nerd/modreq/commands/CheckCommand.java

@@ -24,6 +24,7 @@
  * @since 3.0
  */
 public class CheckCommand implements CommandHandler {
+
     private final ModReq plugin;
     private RequestTable reqTable;
     private Map<String, String> environment;
@@ -131,7 +132,7 @@ public boolean execute(Player player, String name, String[] args) {
                             sendMessage(player, configuration.GENERAL__NO_REQUESTS, environment, configuration);
                         } else {
                             messageRequestListToPlayer(player, requests, finalPage, requests.size(),
-                                    false, environment, configuration, plugin, plugin.getNoteTable());
+                                    true, environment, configuration, plugin, plugin.getNoteTable());
                         }
                     });
                 });

src/nu/nerd/modreq/commands/CommandRegistry.java

@@ -12,10 +12,20 @@
 public class CommandRegistry {
     private final Map<String, CommandHandler> commands = new HashMap<>();
 
+    /**
+     * Register a command and store it for recalling
+     * @param commandName What the player types in chat
+     * @param commandHandler The instance of that command's class
+     */
     public void register(String commandName, CommandHandler commandHandler) {
         commands.put(commandName.toLowerCase(), commandHandler);
     }
 
+    /**
+     * Get the instance of a command's class
+     * @param commandName What the player types in chat
+     * @return The instance of that command's class
+     */
     public CommandHandler getHandler(String commandName) {
         return commands.get(commandName.toLowerCase());
     }

src/nu/nerd/modreq/commands/DoneCommand.java

@@ -114,7 +114,7 @@ public boolean execute(Player player, String name, String[] args) {
                                     environment.put("close_message", doneMessage);
                                     environment.put("mod", playerName);
                                     environment.put("request_id", String.valueOf(requestId));
-                                    if (doneMessage.length() != 0) {
+                                    if (!doneMessage.isEmpty()) {
                                         sendMessage(requestCreator, configuration.GENERAL__COMPLETED_MESSAGE,
                                                 environment, configuration);
                                     } else {

src/nu/nerd/modreq/commands/MRNoteCommand.java

@@ -101,6 +101,6 @@ public boolean execute(Player player, String name, String[] args) {
                 }
             });
         });
-        return false;
+        return true;
     }
 }

src/nu/nerd/modreq/commands/ModreqCommand.java

@@ -7,6 +7,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitScheduler;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -25,7 +26,7 @@ public class ModreqCommand implements CommandHandler {
     private RequestTable reqTable;
     private Map<String, String> environment;
     private Configuration configuration;
-    private CompletableFuture<Void> future;
+    private BukkitScheduler bukkitScheduler = Bukkit.getScheduler();
 
     /**
      * Creates a new {@code ModreqCommand} instance.
@@ -38,14 +39,12 @@ public ModreqCommand(ModReq plugin) {
         this.reqTable = plugin.getReqTable();
         this.environment = plugin.getEnvironment();
         this.configuration = plugin.getConfiguration();
-        this.future = plugin.getCompleteableFuture();
     }
 
     @Override
     public boolean execute(Player player, String name, String[] args) {
 
         reqTable.getNumRequestFromUser(player.getUniqueId()).thenAccept(numRequests -> {
-            Bukkit.getScheduler().runTask(plugin, () -> {
                 if (numRequests < configuration.MAX_REQUESTS) {
                     Request req = new Request();
                     req.setPlayerUUID(player.getUniqueId());
@@ -64,15 +63,19 @@ public boolean execute(Player player, String name, String[] args) {
                     req.setRequestLocation(location);
                     req.setStatus(Request.RequestStatus.OPEN);
 
-                    reqTable.save(req);
-                    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 {
-                    environment.put("max_requests", Integer.toString(configuration.MAX_REQUESTS));
-                    sendMessage(player, configuration.GENERAL__MAX_REQUESTS, environment, configuration);
+                    bukkitScheduler.runTask(plugin, () -> {
+                        environment.put("max_requests", Integer.toString(configuration.MAX_REQUESTS));
+                        sendMessage(player, configuration.GENERAL__MAX_REQUESTS, environment, configuration);
+                    });
                 }
-            });
         });
         return true;
     }

src/nu/nerd/modreq/commands/ReopenCommand.java

@@ -66,13 +66,15 @@ public boolean execute(Player player, String name, String[] args) {
                 request.setCloseSeenByUser(false);
                 reqTable.save(request);
 
-                environment.put("mod", player.getName());
-                environment.put("request_id", String.valueOf(request.getId()));
                 bukkitScheduler.runTask(plugin, () -> {
+                    environment.put("mod", player.getName());
+                    environment.put("request_id", String.valueOf(request.getId()));
+
                     messageMods(configuration.MOD__REOPENED, environment, configuration);
+
+                    environment.remove("mod");
+                    environment.remove("request_id");
                 });
-                environment.remove("mod");
-                environment.remove("request_id");
             }
         });
         return true;

src/nu/nerd/modreq/database/Note.java

@@ -5,6 +5,12 @@
 
 import java.util.UUID;
 
+/**
+ * Represents the note table in the database.
+ *
+ * @version 1.0
+ * @since 3.0
+ */
 @DatabaseTable(tableName = "modreq_notes")
 public class Note {
 
@@ -38,53 +44,71 @@ public class Note {
 	@DatabaseField
 	private String noteBody;
 
+	// ----------------------------------------------------------------------------
+
 	public Note(){}
 
+	// ----------------------------------------------------------------------------
+
 	/**
+	 * Returns the modeq's ID
 	 * @return the id
 	 */
 	public int getId() {
 		return id;
 	}
 
 	/**
+	 * Sets the modreq's ID
 	 * @param id the id to set
 	 */
 	public void setId(int id) {
 		this.id = id;
 	}
 
+	/**
+	 * Sets the player's UUID
+	 * @param playerUUID The player's UUID
+	 */
 	public void setPlayerUUID(UUID playerUUID) {
 		this.playerUUID = playerUUID;
 	}
 
+	/**
+	 * Returns the player's UUID
+	 * @return the player's UUID
+	 */
 	public UUID getPlayerUUID() {
 		return this.playerUUID;
 	}
 
 	/**
+	 * Returns the player
 	 * @return the player
 	 */
 	public String getPlayer() {
 		return player;
 	}
 
 	/**
+	 * Sets the player
 	 * @param player the player to set
 	 */
 	public void setPlayer(String player) {
 		this.player = player;
 	}
 
 	/**
-	 * @return the requestId
+	 * Returns the request ID
+	 * @return the request ID
 	 */
 	public int getRequestId() {
 		return requestId;
 	}
 
 	/**
-	 * @param requestId the requestId to set
+	 * Sets the request ID
+	 * @param requestId the request ID to set
 	 */
 	public void setRequestId(int requestId) {
 		this.requestId = requestId;

src/nu/nerd/modreq/database/NoteTable.java

@@ -8,14 +8,33 @@
 import com.j256.ormlite.stmt.QueryBuilder;
 import nu.nerd.modreq.ModReq;
 
+/**
+ * Represents the interaction between the notes table in the database and the plugin.
+ *
+ * @version 1.0
+ * @since 3.0
+ */
 public class NoteTable {
 
+	/**
+	 * The data access object for the notes table.
+	 */
 	private final Dao<Note, Integer> noteDao;
 
+	/**
+	 * Creates a new {@code NoteTable} instance.
+	 *
+	 * @param plugin The main plugin instance, used for fetching the Note DAO.
+	 */
 	public NoteTable(ModReq plugin) {
 		this.noteDao = plugin.getNoteDao();
 	}
 
+	/**
+	 * Gets the notes attached to a request.
+	 * @param request The request being queried.
+	 * @return The notes the specified request has attached to it.
+	 */
 	public CompletableFuture<List<Note>> getRequestNotes(Request request) {
 		return CompletableFuture.supplyAsync(() -> {
 			try{
@@ -28,6 +47,11 @@ public CompletableFuture<List<Note>> getRequestNotes(Request request) {
 		});
 	}
 
+	/**
+	 * Gets the amount of notes a request has.
+	 * @param request The request being queried.
+	 * @return The amount of notes the specified request has.
+	 */
 	public CompletableFuture<Integer> getNoteCount(Request request) {
 		return CompletableFuture.supplyAsync(() -> {
 			try {
@@ -38,6 +62,10 @@ public CompletableFuture<Integer> getNoteCount(Request request) {
 		});
 	}
 
+	/**
+	 * Removes the note from the database.
+	 * @param note The note being removed.
+	 */
 	public void remove(Note note) {
 		CompletableFuture.runAsync(() -> {
 			try{
@@ -48,6 +76,10 @@ public void remove(Note note) {
 		});
 	}
 
+	/**
+	 * Saves the note to the database.
+	 * @param note The note being saved.
+	 */
 	public void save(Note note) {
 		CompletableFuture.runAsync(() -> {
 			try{