removed cmd-file output for good.

Fix bundle loading problem in regions Fix EndCommand breaking from console and being confusing named Fix Reward command bracket error
GreenSurvivors · Feb 27, 2024 · 437ee3a · 437ee3a
1 parent 3a9c292
commit 437ee3a
Show file tree

Hide file tree

Showing 133 changed files with 148 additions and 272 deletions.
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/Events.java b/Minigames/src/main/java/au/com/mineauz/minigames/Events.java
@@ -80,7 +80,6 @@ public void onPlayerResourcePack(@NotNull PlayerResourcePackStatusEvent event) {
                     }
                 }
             }
-
         }
     }
 

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/MinigameTimer.java b/Minigames/src/main/java/au/com/mineauz/minigames/MinigameTimer.java
@@ -23,7 +23,7 @@ public class MinigameTimer {
     private static final Minigames plugin = Minigames.getPlugin();
     private final long timeLength;
     private final Minigame minigame;
-    private final List<Long> timeMsg = new ArrayList<>();
+    private final List<Long> msgTimes = new ArrayList<>();
     private long timeLeft = 0;
     private int taskID = -1;
     private boolean broadcastTime = true;
@@ -33,7 +33,7 @@ public MinigameTimer(Minigame minigame, long timeLength) {
         this.timeLength = timeLength;
         this.timeLeft = timeLength;
         this.minigame = minigame;
-        timeMsg.addAll(plugin.getConfig().getLongList("multiplayer.timerMessageInterval"));
+        msgTimes.addAll(plugin.getConfig().getLongList("multiplayer.timerMessageInterval"));
         startTimer();
     }
 
@@ -95,7 +95,7 @@ private void runTimer() {
             }
         }
 
-        if (timeMsg.contains(timeLeft) && broadcastTime) {
+        if (msgTimes.contains(timeLeft) && broadcastTime) {
             PlayMGSound.playSound(minigame, MGSounds.TIMER_TICK.getSound());
             MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_TIMELEFT,
                     Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(Duration.ofSeconds(timeLeft)))));

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/PlayerLoadout.java b/Minigames/src/main/java/au/com/mineauz/minigames/PlayerLoadout.java
@@ -52,8 +52,6 @@ public Component getValue() {
             public void setValue(Component value) {
                 displayname = value;
             }
-
-
         };
     }
 
@@ -208,8 +206,6 @@ public Boolean getValue() {
             public void setValue(Boolean value) {
                 fallDamage = value;
             }
-
-
         };
     }
 
@@ -233,8 +229,6 @@ public Boolean getValue() {
             public void setValue(Boolean value) {
                 hunger = value;
             }
-
-
         };
     }
 
@@ -259,8 +253,6 @@ public void setValue(Integer value) {
                 if (level >= -1)
                     level = value;
             }
-
-
         };
     }
 
@@ -292,8 +284,6 @@ public Boolean getValue() {
             public void setValue(Boolean value) {
                 setInventoryLocked(value);
             }
-
-
         };
     }
 
@@ -317,8 +307,6 @@ public Boolean getValue() {
             public void setValue(Boolean value) {
                 setArmourLocked(value);
             }
-
-
         };
     }
 
@@ -337,8 +325,6 @@ public Boolean getValue() {
             public void setValue(Boolean value) {
                 allowOffHand = value;
             }
-
-
         };
     }
 
@@ -388,8 +374,6 @@ public Boolean getValue() {
             public void setValue(Boolean value) {
                 setDisplayInMenu(value);
             }
-
-
         };
     }
 

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteBackend.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteBackend.java
@@ -53,7 +53,6 @@ public void setDatabase(File dbbath) {
 
     @Override
     public boolean initialize(ConfigurationSection config) {
-
         try {
             Class.forName("org.sqlite.JDBC");
 
@@ -115,7 +114,6 @@ private boolean checkForColumn(Statement statement, String columnName) {
             logger.error("Exception looking for SQLite column " + columnName + " on table " + "PlayerStats", e);
             return false;
         }
-
     }
 
     private void ensureTables(ConnectionHandler connection) throws SQLException {

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/BackupCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/BackupCommand.java
@@ -114,5 +114,4 @@ public boolean onCommand(@NotNull CommandSender sender,
         }
         return null;
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/DeniedCommandCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/DeniedCommandCommand.java
@@ -78,5 +78,4 @@ public boolean onCommand(@NotNull CommandSender sender,
         }
         return null;
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/DisableAllCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/DisableAllCommand.java
@@ -77,5 +77,4 @@ public boolean onCommand(@NotNull CommandSender sender,
         List<String> mgs = new ArrayList<>(PLUGIN.getMinigameManager().getAllMinigames().keySet());
         return CommandDispatcher.tabCompleteMatch(mgs, args[args.length - 1]);
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/EditCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/EditCommand.java
@@ -53,10 +53,10 @@ public boolean onCommand(@NotNull CommandSender sender,
                 if (sender instanceof Player player) {
                     MinigamePlayer mgPlayer = PLUGIN.getPlayerManager().getMinigamePlayer(player);
                     mgm.displayMenu(mgPlayer);
-                    return true;
                 } else {
                     MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgCommandLangKey.COMMAND_ERROR_SENDERNOTAPLAYER);
                 }
+                return true;
             } else {
                 MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MinigameLangKey.MINIGAME_ERROR_NOMINIGAME,
                         Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), args[0]));
@@ -74,5 +74,4 @@ public boolean onCommand(@NotNull CommandSender sender,
         }
         return null;
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/EnableAllCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/EnableAllCommand.java
@@ -76,5 +76,4 @@ public boolean onCommand(@NotNull CommandSender sender,
         List<String> mgs = new ArrayList<>(PLUGIN.getMinigameManager().getAllMinigames().keySet());
         return CommandDispatcher.tabCompleteMatch(mgs, args[args.length - 1]);
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/PlayerCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/PlayerCommand.java
@@ -136,5 +136,4 @@ public boolean onCommand(@NotNull CommandSender sender,
         }
         return null;
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/ReloadCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/ReloadCommand.java
@@ -89,5 +89,4 @@ public boolean onCommand(@NotNull CommandSender sender,
                                                          @NotNull String @NotNull [] args) {
         return null;
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/ResourcePackCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/ResourcePackCommand.java
@@ -66,15 +66,17 @@ public boolean onCommand(final @NotNull CommandSender sender, @NotNull String @N
                         if (sender instanceof Player player) {
                             mgPlayer = PLUGIN.getPlayerManager().getMinigamePlayer(player);
                         } else {
-                            return false;
+                            MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgCommandLangKey.COMMAND_ERROR_SENDERNOTAPLAYER,
+                                    Placeholder.unparsed(MinigamePlaceHolderKey.TEXT.getKey(), args[2]));
+                            return true;
                         }
                     } else {
                         mgPlayer = PLUGIN.getPlayerManager().getMinigamePlayer(args[2]);
 
                         if (mgPlayer == null) {
-                            MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgCommandLangKey.COMMAND_ERROR_SENDERNOTAPLAYER,
+                            MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgCommandLangKey.COMMAD_ERROR_NOTPLAYER,
                                     Placeholder.unparsed(MinigamePlaceHolderKey.TEXT.getKey(), args[2]));
-                            return false;
+                            return true;
                         }
                     }
 

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/RevertCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/RevertCommand.java
@@ -65,5 +65,4 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull String @NotNull
                                                          @NotNull String @NotNull [] args) {
         return null;
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/SpectateCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/SpectateCommand.java
@@ -77,5 +77,4 @@ public boolean onCommand(@NotNull CommandSender sender,
         List<String> mgs = new ArrayList<>(PLUGIN.getMinigameManager().getAllMinigames().keySet());
         return CommandDispatcher.tabCompleteMatch(mgs, args[args.length - 1]);
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/TeleportCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/TeleportCommand.java
@@ -218,5 +218,4 @@ else if (team != null && pos >= team.getStartLocations().size())
         }
         return null;
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/ToolCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/ToolCommand.java
@@ -144,5 +144,4 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull String @NotNull
         }
         return null;
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetBlockWhitelistCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetBlockWhitelistCommand.java
@@ -129,5 +129,4 @@ else if (args.length == 2 && args[0].equalsIgnoreCase("remove")) {
         }
         return null;
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetBlocksDropCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetBlocksDropCommand.java
@@ -71,5 +71,4 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Minigame miniga
             return CommandDispatcher.tabCompleteMatch(List.of("true", "false"), args[0]);
         return null;
     }
-
 }
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetCommand.java
@@ -1,6 +1,5 @@
 package au.com.mineauz.minigames.commands.set;
 
-import au.com.mineauz.minigames.Minigames;
 import au.com.mineauz.minigames.commands.ACommand;
 import au.com.mineauz.minigames.commands.CommandDispatcher;
 import au.com.mineauz.minigames.managers.MinigameMessageManager;
@@ -11,45 +10,20 @@
 import au.com.mineauz.minigames.minigame.Minigame;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.util.*;
 
 public class SetCommand extends ACommand {
     private static final @NotNull Map<@NotNull String, @NotNull ASetCommand> parameterList = new TreeMap<>(); // sort by name for display in help
-    private static BufferedWriter cmdFile;
 
     static {
-        if (PLUGIN.getConfig().getBoolean("outputCMDToFile")) {
-            try {
-                cmdFile = new BufferedWriter(new FileWriter(PLUGIN.getDataFolder() + File.pathSeparator + "setcmds.txt"));
-                cmdFile.write("{| class=\"wikitable\"");
-                cmdFile.newLine();
-                cmdFile.write("! Command");
-                cmdFile.newLine();
-                cmdFile.write("! Syntax");
-                cmdFile.newLine();
-                cmdFile.write("! Description");
-                cmdFile.newLine();
-                cmdFile.write("! Permission");
-                cmdFile.newLine();
-                cmdFile.write("! Alias");
-                cmdFile.newLine();
-            } catch (IOException e) {
-                Minigames.getCmpnntLogger().warn("couldn't write cmd file", e);
-            }
-        }
         registerSetCommand(new SetStartCommand());
-        registerSetCommand(new SetEndCommand());
-        registerSetCommand(new SetQuitCommand());
+        registerSetCommand(new SetEndLocationCommand());
+        registerSetCommand(new SetQuitLocationCommand());
         registerSetCommand(new SetLobbyCommand());
         registerSetCommand(new SetRewardCommand());
         registerSetCommand(new SetSecondaryRewardCommand());
@@ -63,7 +37,7 @@ public class SetCommand extends ACommand {
         registerSetCommand(new SetMinTreasureCommand());
         registerSetCommand(new SetMaxTreasureCommand());
         registerSetCommand(new SetFlagCommand());
-        registerSetCommand(new SetLocationCommand());
+        registerSetCommand(new SetLocationHintCommand());
         registerSetCommand(new SetUsePermissionsCommand());
         registerSetCommand(new SetMinScoreCommand());
         registerSetCommand(new SetMaxScoreCommand());
@@ -99,69 +73,16 @@ public class SetCommand extends ACommand {
         registerSetCommand(new SetFlightCommand());
         registerSetCommand(new SetHintDelayCommand());
         registerSetCommand(new SetRestartDelayCommand());
-        registerSetCommand(new SetSpectatorSpawnCommand());
+        registerSetCommand(new SetSpectatorSpawnLocationCommand());
         registerSetCommand(new SetInfectedPercentCommand());
         registerSetCommand(new SetGameOverCommand());
         registerSetCommand(new SetDisplayScoreboardCommand());
         registerSetCommand(new SetInfectedTeamCommand());
         registerSetCommand(new SetSurvivorTeamCommand());
-
-        if (PLUGIN.getConfig().getBoolean("outputCMDToFile")) {
-            try {
-                cmdFile.write("|}");
-                cmdFile.close();
-            } catch (IOException e) {
-                Minigames.getCmpnntLogger().warn("couldn't write cmd file", e);
-            }
-        }
     }
 
     public static void registerSetCommand(ASetCommand command) {
         parameterList.put(command.getName(), command);
-
-        if (PLUGIN.getConfig().getBoolean("outputCMDToFile")) {
-            PlainTextComponentSerializer plainCmpntSerial = PlainTextComponentSerializer.plainText();
-
-            try {
-                cmdFile.write("|-");
-                cmdFile.newLine();
-                cmdFile.write("| '''" + command.getName() + "'''");
-                cmdFile.newLine();
-                if (command.getUsage() != null) {
-                    cmdFile.write("| ");
-                    cmdFile.write(plainCmpntSerial.serialize(command.getUsage()));
-                } else {
-                    cmdFile.write("| N/A");
-                }
-                cmdFile.newLine();
-                command.getDescription();
-                cmdFile.write("| " + command.getDescription());
-                cmdFile.newLine();
-                if (command.getPermission() != null) {
-                    cmdFile.write("| " + command.getPermission());
-                } else {
-                    cmdFile.write("| N/A");
-                }
-                cmdFile.newLine();
-                if (command.getAliases() != null) {
-                    int count = 0;
-                    cmdFile.write("| ");
-                    for (String alias : command.getAliases()) {
-                        cmdFile.write(alias);
-                        count++;
-                        if (count != command.getAliases().length) {
-                            cmdFile.write("\n\n");
-                        }
-                    }
-                } else {
-                    cmdFile.write("| N/A");
-                }
-                cmdFile.newLine();
-
-            } catch (IOException e) {
-                Minigames.getCmpnntLogger().warn("couldn't write cmd file", e);
-            }
-        }
     }
 
     public static @NotNull Collection<@NotNull ASetCommand> getSetCommands() {

diff --git a/...ames/src/main/java/au/com/mineauz/minigames/commands/set/SetDisplayScoreboardCommand.java b/...ames/src/main/java/au/com/mineauz/minigames/commands/set/SetDisplayScoreboardCommand.java
@@ -87,5 +87,4 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Minigame miniga
         }
         return null;
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     }
                 }
             }
         }
@@ Expand Down @@