Revert "TEMPORARY: limit to 2 commands"

This reverts commit 46570db.

Author: TBG1000

src/main/java/tc/oc/occ/nitro/NitroListener.java

@@ -47,27 +47,17 @@ public void onNitroAdd(NitroUserAddEvent event) {
     // Print amount of commands to be executed
     Bukkit.getConsoleSender()
         .sendMessage("[Nitro] Executing " + commandsToExecute.length + " command(s)");
-    // Execute commands
-    if (commandsToExecute.length == 1) {
-      Bukkit.getServer()
-          .dispatchCommand(Bukkit.getConsoleSender(), commandsToExecute[0].replace("%s", parts[2]));
-    } else {
-      Bukkit.getScheduler()
-          .runTaskLater(
-              plugin,
-              () ->
-                  Bukkit.getServer()
-                      .dispatchCommand(
-                          Bukkit.getConsoleSender(), commandsToExecute[0].replace("%s", parts[2])),
-              20 * 2);
-      Bukkit.getScheduler()
-          .runTaskLater(
-              plugin,
-              () ->
-                  Bukkit.getServer()
-                      .dispatchCommand(
-                          Bukkit.getConsoleSender(), commandsToExecute[1].replace("%s", parts[2])),
-              20 * 4);
+    // Print the commands
+    for (int i = 0; i < commandsToExecute.length; i++) {
+      Bukkit.getConsoleSender()
+          .sendMessage("[Nitro] Command " + (i + 1) + ": " + commandsToExecute[i]);
+      // If the command contains the placeholder %s, replace it with the player's name
+      if (commandsToExecute[i].contains("%s")) {
+        Bukkit.dispatchCommand(
+            Bukkit.getConsoleSender(), commandsToExecute[i].replace("%s", parts[2]));
+      } else {
+        Bukkit.dispatchCommand(Bukkit.getConsoleSender(), commandsToExecute[i]);
+      }
     }
     api.getConfig().save(plugin.getConfig());
     plugin.saveConfig();
@@ -103,27 +93,16 @@ public void onNitroRemove(NitroUserRemoveEvent event) {
     // Print amount of commands to be executed
     Bukkit.getConsoleSender()
         .sendMessage("[Nitro] Executing " + commandsToExecute.length + " command(s)");
-    // Execute commands
-    if (commandsToExecute.length == 1) {
-      Bukkit.getServer()
-          .dispatchCommand(Bukkit.getConsoleSender(), commandsToExecute[0].replace("%s", parts[2]));
-    } else {
-      Bukkit.getScheduler()
-          .runTaskLater(
-              plugin,
-              () ->
-                  Bukkit.getServer()
-                      .dispatchCommand(
-                          Bukkit.getConsoleSender(), commandsToExecute[0].replace("%s", parts[2])),
-              20 * 2);
-      Bukkit.getScheduler()
-          .runTaskLater(
-              plugin,
-              () ->
-                  Bukkit.getServer()
-                      .dispatchCommand(
-                          Bukkit.getConsoleSender(), commandsToExecute[1].replace("%s", parts[2])),
-              20 * 4);
+    // Print the commands
+    for (int i = 0; i < commandsToExecute.length; i++) {
+      Bukkit.getConsoleSender()
+          .sendMessage("[Nitro] Command " + (i + 1) + ": " + commandsToExecute[i]);
+      if (commandsToExecute[i].contains("%s")) {
+        Bukkit.dispatchCommand(
+            Bukkit.getConsoleSender(), commandsToExecute[i].replace("%s", parts[2]));
+      } else {
+        Bukkit.dispatchCommand(Bukkit.getConsoleSender(), commandsToExecute[i]);
+      }
     }
     api.getConfig().removeNitro(event.getUser());
     api.getConfig().save(plugin.getConfig());

src/main/java/tc/oc/occ/nitro/discord/DiscordBot.java

@@ -34,8 +34,7 @@ public void enable() {
       new DiscordApiBuilder()
           .setToken(config.getToken())
           .setWaitForServersOnStartup(false)
-          .setIntents(
-              Intent.GUILDS, Intent.GUILD_MEMBERS, Intent.GUILD_PRESENCES, Intent.GUILD_MESSAGES)
+          .setIntents(Intent.GUILDS, Intent.GUILD_MEMBERS, Intent.GUILD_PRESENCES, Intent.GUILD_MESSAGES)
           .login()
           .thenAcceptAsync(
               api -> {

src/main/java/tc/oc/occ/nitro/discord/listener/NitroRedeemer.java

@@ -1,5 +1,7 @@
 package tc.oc.occ.nitro.discord.listener;
 
+import java.util.UUID;
+import org.bukkit.Bukkit;
 import org.javacord.api.entity.message.MessageBuilder;
 import org.javacord.api.event.message.MessageCreateEvent;
 import org.javacord.api.listener.message.MessageCreateListener;
@@ -51,9 +53,15 @@ public void onMessageCreate(MessageCreateEvent event) {
                             .thenAcceptAsync(
                                 uuid -> {
                                   if (uuid != null) {
+                                    String minecraftUsername =
+                                        Bukkit.getPlayer(UUID.fromString(uuid.toString()))
+                                            .getName();
                                     NitroUser nitro =
                                         config.addNitro(
-                                            discriminatedUsername, discordId, username, uuid);
+                                            discriminatedUsername,
+                                            discordId,
+                                            minecraftUsername,
+                                            uuid);
                                     NitroCloudy.get().callSyncEvent(new NitroUserAddEvent(nitro));
                                     new MessageBuilder()
                                         .append(