config file validation, and non static managers

1 files changed, 11 insertions, 10 deletions

diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java
index d251d3f..be97431 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java
@@ -1,8 +1,6 @@
 package com.MylesAndMore.Tumble.commands;
 
 import com.MylesAndMore.Tumble.game.Arena;
-import com.MylesAndMore.Tumble.config.LanguageManager;
-import com.MylesAndMore.Tumble.config.ArenaManager;
 import com.MylesAndMore.Tumble.plugin.SubCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -14,6 +12,9 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Collections;
 import java.util.List;
 
+import static com.MylesAndMore.Tumble.Main.arenaManager;
+import static com.MylesAndMore.Tumble.Main.languageManager;
+
 public class SetWaitArea implements SubCommand, CommandExecutor, TabCompleter {
     @Override
     public String getCommandName() {
@@ -28,32 +29,32 @@ public class SetWaitArea implements SubCommand, CommandExecutor, TabCompleter {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         if (!(sender instanceof Player)) {
-            sender.sendMessage(LanguageManager.fromKey("not-for-console"));
+            sender.sendMessage(languageManager.fromKey("not-for-console"));
             return false;
         }
 
         if (args.length == 0 || args[0] == null || args[0].isEmpty()) {
-            sender.sendMessage(LanguageManager.fromKey("missing-arena-parameter"));
+            sender.sendMessage(languageManager.fromKey("missing-arena-parameter"));
             return false;
         }
         String arenaName = args[0];
 
-        if (!ArenaManager.arenas.containsKey(arenaName)) {
-            sender.sendMessage(LanguageManager.fromKey("invalid-arena").replace("%arena%",arenaName));
+        if (!arenaManager.arenas.containsKey(arenaName)) {
+            sender.sendMessage(languageManager.fromKey("invalid-arena").replace("%arena%",arenaName));
             return false;
         }
-        Arena arena = ArenaManager.arenas.get(arenaName);
+        Arena arena = arenaManager.arenas.get(arenaName);
 
         arena.waitArea = ((Player)sender).getLocation();
-        ArenaManager.WriteConfig();
-        sender.sendMessage(LanguageManager.fromKey("set-success"));
+        arenaManager.WriteConfig();
+        sender.sendMessage(languageManager.fromKey("set-success"));
         return true;
     }
 
     @Override
     public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         if (args.length == 1) {
-            return ArenaManager.arenas.keySet().stream().toList();
+            return arenaManager.arenas.keySet().stream().toList();
         }
 
         return Collections.emptyList();