config file validation, and non static managers

13 files changed, 123 insertions, 113 deletions

diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Create.java b/src/main/java/com/MylesAndMore/Tumble/commands/Create.java
index aa39db3..d21f8a4 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Create.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Create.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;
@@ -13,6 +11,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 Create implements SubCommand, CommandExecutor, TabCompleter {
     @Override
     public String getCommandName() {
@@ -27,14 +28,14 @@ public class Create implements SubCommand, CommandExecutor, TabCompleter {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         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];
-        ArenaManager.arenas.put(arenaName, new Arena(arenaName));
-        ArenaManager.WriteConfig();
-        sender.sendMessage(LanguageManager.fromKey("create-success"));
+        arenaManager.arenas.put(arenaName, new Arena(arenaName));
+        arenaManager.WriteConfig();
+        sender.sendMessage(languageManager.fromKey("create-success"));
         return true;
     }
 
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
index 905e5da..2d39c83 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
@@ -1,8 +1,6 @@
 package com.MylesAndMore.Tumble.commands;
 
 import com.MylesAndMore.Tumble.game.Game;
-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.ArrayList;
 import java.util.List;
 
+import static com.MylesAndMore.Tumble.Main.arenaManager;
+import static com.MylesAndMore.Tumble.Main.languageManager;
+
 public class ForceStart implements SubCommand, CommandExecutor, TabCompleter {
 
     @Override
@@ -31,35 +32,35 @@ public class ForceStart implements SubCommand, CommandExecutor, TabCompleter {
 
         Game game;
         if (args.length < 1 || args[0] == null) {
-            game = ArenaManager.findGamePlayerIsIn((Player)sender);
+            game = arenaManager.findGamePlayerIsIn((Player)sender);
             if (game == null) {
-                sender.sendMessage(LanguageManager.fromKey("missing-arena-parameter"));
+                sender.sendMessage(languageManager.fromKey("missing-arena-parameter"));
                 return false;
             }
         }
         else {
             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;
             }
-            game = ArenaManager.arenas.get(arenaName).game;
+            game = arenaManager.arenas.get(arenaName).game;
         }
 
         if (game == null) {
-            sender.sendMessage(LanguageManager.fromKey("no-game-in-arena"));
+            sender.sendMessage(languageManager.fromKey("no-game-in-arena"));
             return false;
         }
 
         game.gameStart();
-        sender.sendMessage(LanguageManager.fromKey("forcestart-success"));
+        sender.sendMessage(languageManager.fromKey("forcestart-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 new ArrayList<>();
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
index 3d98d91..5ca856b 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
@@ -1,8 +1,6 @@
 package com.MylesAndMore.Tumble.commands;
 
 import com.MylesAndMore.Tumble.game.Game;
-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.ArrayList;
 import java.util.List;
 
+import static com.MylesAndMore.Tumble.Main.arenaManager;
+import static com.MylesAndMore.Tumble.Main.languageManager;
+
 public class ForceStop implements SubCommand, CommandExecutor, TabCompleter {
 
     @Override
@@ -31,35 +32,35 @@ public class ForceStop implements SubCommand, CommandExecutor, TabCompleter {
 
         Game game;
         if (args.length < 1 || args[0] == null) {
-            game = ArenaManager.findGamePlayerIsIn((Player)sender);
+            game = arenaManager.findGamePlayerIsIn((Player)sender);
             if (game == null) {
-                sender.sendMessage(LanguageManager.fromKey("missing-arena-parameter"));
+                sender.sendMessage(languageManager.fromKey("missing-arena-parameter"));
                 return false;
             }
         }
         else {
             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;
             }
-            game = ArenaManager.arenas.get(arenaName).game;
+            game = arenaManager.arenas.get(arenaName).game;
         }
 
         if (game == null) {
-            sender.sendMessage(LanguageManager.fromKey("no-game-in-arena"));
+            sender.sendMessage(languageManager.fromKey("no-game-in-arena"));
             return false;
         }
 
         game.gameEnd();
-        sender.sendMessage(LanguageManager.fromKey("forcestop-success"));
+        sender.sendMessage(languageManager.fromKey("forcestop-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 new ArrayList<>();
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Join.java b/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
index a887c99..3bda96c 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Join.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.game.Game;
 import com.MylesAndMore.Tumble.plugin.GameState;
 import com.MylesAndMore.Tumble.plugin.GameType;
@@ -21,6 +19,9 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import static com.MylesAndMore.Tumble.Main.arenaManager;
+import static com.MylesAndMore.Tumble.Main.languageManager;
+
 public class Join implements SubCommand, CommandExecutor, TabCompleter {
 
     @Override
@@ -37,25 +38,25 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
     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 (ArenaManager.findGamePlayerIsIn((Player)sender) != null) {
-            sender.sendMessage(LanguageManager.fromKey("already-in-game"));
+        if (arenaManager.findGamePlayerIsIn((Player)sender) != null) {
+            sender.sendMessage(languageManager.fromKey("already-in-game"));
         }
 
         if (args.length < 1 || args[0] == null) {
-            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))
+        if (!arenaManager.arenas.containsKey(arenaName))
         {
-            sender.sendMessage(LanguageManager.fromKey("invalid-arena").replace("%arena%", arenaName));
+            sender.sendMessage(languageManager.fromKey("invalid-arena").replace("%arena%", arenaName));
             return false;
         }
-        Arena arena = ArenaManager.arenas.get(arenaName);
+        Arena arena = arenaManager.arenas.get(arenaName);
 
         Game game;
         if (args.length < 2 || args[1] == null) {
@@ -74,7 +75,7 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
                 case "snowballs", "snowball" -> type = GameType.SNOWBALLS;
                 case "mix", "mixed"          -> type = GameType.MIXED;
                 default                      -> {
-                    sender.sendMessage(LanguageManager.fromKey("invalid-type"));
+                    sender.sendMessage(languageManager.fromKey("invalid-type"));
                     return false;
                 }
             }
@@ -88,7 +89,7 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
                     game = arena.game;
                 }
                 else {
-                    sender.sendMessage(LanguageManager.fromKey("another-type-in-arena")
+                    sender.sendMessage(languageManager.fromKey("another-type-in-arena")
                             .replace("%type%",type.toString())
                             .replace("%arena%",arenaName));
                     return false;
@@ -97,12 +98,12 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
         }
 
         if (game.gameState != GameState.WAITING) {
-            sender.sendMessage(LanguageManager.fromKey("game-in-progress"));
+            sender.sendMessage(languageManager.fromKey("game-in-progress"));
             return false;
         }
 
         game.addPlayer((Player)sender);
-        sender.sendMessage(LanguageManager.fromKey("join-success")
+        sender.sendMessage(languageManager.fromKey("join-success")
                 .replace("%type%", game.type.toString())
                 .replace("%arena%", arena.name));
         return true;
@@ -111,7 +112,7 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
     @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();
         }
         if (args.length == 2) {
             return Arrays.stream(GameType.values()).map(Objects::toString).collect(Collectors.toList());
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Leave.java b/src/main/java/com/MylesAndMore/Tumble/commands/Leave.java
index 0250cc6..f5a4eeb 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Leave.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Leave.java
@@ -1,8 +1,6 @@
 package com.MylesAndMore.Tumble.commands;
 
 import com.MylesAndMore.Tumble.game.Game;
-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.ArrayList;
 import java.util.List;
 
+import static com.MylesAndMore.Tumble.Main.arenaManager;
+import static com.MylesAndMore.Tumble.Main.languageManager;
+
 public class Leave implements SubCommand, CommandExecutor, TabCompleter {
 
     @Override
@@ -30,18 +31,18 @@ public class Leave implements SubCommand, CommandExecutor, TabCompleter {
     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;
         }
 
-        Game game = ArenaManager.findGamePlayerIsIn((Player)sender);
+        Game game = arenaManager.findGamePlayerIsIn((Player)sender);
         if (game == null) {
-            sender.sendMessage(LanguageManager.fromKey("no-game-in-arena"));
+            sender.sendMessage(languageManager.fromKey("no-game-in-arena"));
             return false;
         }
 
         game.removePlayer((Player) sender);
-        sender.sendMessage(LanguageManager.fromKey("leave-success")
+        sender.sendMessage(languageManager.fromKey("leave-success")
                 .replace("%arena%", game.arena.name)
                 .replace("%type%", game.type.toString()));
         return true;
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java b/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
index 66535d5..7d6041e 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Reload.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;
@@ -13,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.MylesAndMore.Tumble.Main.plugin;
+import static com.MylesAndMore.Tumble.Main.*;
 
 public class Reload implements SubCommand, CommandExecutor, TabCompleter {
 
@@ -30,14 +28,14 @@ public class Reload implements SubCommand, CommandExecutor, TabCompleter {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
 
-        for (Arena a : ArenaManager.arenas.values()) {
+        for (Arena a : arenaManager.arenas.values()) {
             if (a.game != null) {
                 a.game.gameEnd();
             }
         }
 
         plugin.onEnable();
-        sender.sendMessage(LanguageManager.fromKey("reload-success"));
+        sender.sendMessage(languageManager.fromKey("reload-success"));
         return true;
     }
 
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java b/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java
index 32ee232..2d6f9eb 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java
@@ -1,7 +1,5 @@
 package com.MylesAndMore.Tumble.commands;
 
-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;
@@ -12,6 +10,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 Remove implements SubCommand, CommandExecutor, TabCompleter {
 
     @Override
@@ -27,26 +28,26 @@ public class Remove implements SubCommand, CommandExecutor, TabCompleter {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         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;
         }
 
-        ArenaManager.arenas.remove(arenaName);
-        ArenaManager.WriteConfig();
-        sender.sendMessage(LanguageManager.fromKey("remove-success"));
+        arenaManager.arenas.remove(arenaName);
+        arenaManager.WriteConfig();
+        sender.sendMessage(languageManager.fromKey("remove-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();
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.java
index 783434c..b98d186 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.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 SetGameSpawn implements SubCommand, CommandExecutor, TabCompleter {
     @Override
     public String getCommandName() {
@@ -28,32 +29,32 @@ public class SetGameSpawn 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.gameSpawn = ((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();
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.java
index fec52ea..c6f7891 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.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 SetKillYLevel implements SubCommand, CommandExecutor, TabCompleter {
 
     @Override
@@ -29,32 +30,32 @@ public class SetKillYLevel 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.killAtY = ((int) ((Player) sender).getLocation().getY());
-        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();
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.java
index e50b3e0..85e9fd8 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.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 SetLobby implements SubCommand, CommandExecutor, TabCompleter {
     @Override
     public String getCommandName() {
@@ -28,32 +29,32 @@ public class SetLobby 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.lobby = ((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();
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();
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.java
index 64a0386..6e4550f 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.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 SetWinnerLobby implements SubCommand, CommandExecutor, TabCompleter {
     @Override
     public String getCommandName() {
@@ -28,32 +29,32 @@ public class SetWinnerLobby 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.winnerLobby = ((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();
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Tumble.java b/src/main/java/com/MylesAndMore/Tumble/commands/Tumble.java
index f1d2e38..2cf5b90 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Tumble.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Tumble.java
@@ -1,6 +1,5 @@
 package com.MylesAndMore.Tumble.commands;
 
-import com.MylesAndMore.Tumble.config.LanguageManager;
 import com.MylesAndMore.Tumble.plugin.SubCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -10,6 +9,8 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
+import static com.MylesAndMore.Tumble.Main.languageManager;
+
 public class Tumble implements CommandExecutor, TabCompleter {
 
     private static final Map<String, SubCommand> subCommands = Map.ofEntries(
@@ -30,14 +31,14 @@ public class Tumble implements CommandExecutor, TabCompleter {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         if (!subCommands.containsKey(args[0])) {
-            sender.sendMessage(LanguageManager.fromKey("unknown-command"));
+            sender.sendMessage(languageManager.fromKey("unknown-command"));
             return true;
         }
 
         var subCmd = subCommands.get(args[0]);
 
         if (!sender.hasPermission(subCmd.getPermission())) {
-            sender.sendMessage(LanguageManager.fromKey("no-permission").replace("%permission%", subCmd.getPermission()));
+            sender.sendMessage(languageManager.fromKey("no-permission").replace("%permission%", subCmd.getPermission()));
             return false;
         }