Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/com/MylesAndMore/Tumble/game/Generator.java
#	src/main/java/com/MylesAndMore/Tumble/game/Layers.java

12 files changed, 35 insertions, 42 deletions

diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Create.java b/src/main/java/com/MylesAndMore/Tumble/commands/Create.java
index 667be5e..d60ca64 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Create.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Create.java
@@ -33,7 +33,7 @@ public class Create implements SubCommand, CommandExecutor, TabCompleter {
 
         String arenaName = args[0];
         ArenaManager.arenas.put(arenaName, new Arena(arenaName));
-        ArenaManager.WriteConfig();
+        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 3953bea..29583a4 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
@@ -29,17 +29,16 @@ public class ForceStart implements SubCommand, CommandExecutor, TabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
-
         Game game;
+
         if (args.length < 1 || args[0] == null) {
-            // no arena passed in, try to infer from game player is in
+            // No arena passed in, try to infer from game player is in
             game = ArenaManager.findGamePlayerIsIn((Player)sender);
             if (game == null) {
                 sender.sendMessage(LanguageManager.fromKey("missing-arena-parameter"));
                 return false;
             }
-        }
-        else {
+        } else {
             String arenaName = args[0];
             if (!ArenaManager.arenas.containsKey(arenaName)) {
                 sender.sendMessage(LanguageManager.fromKey("invalid-arena").replace("%arena%",arenaName));
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
index 37d3465..f308979 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
@@ -31,14 +31,13 @@ public class ForceStop implements SubCommand, CommandExecutor, TabCompleter {
 
         Game game;
         if (args.length < 1 || args[0] == null) {
-            // no arena passed in, try to infer from game player is in
+            // No arena passed in, try to infer from game player is in
             game = ArenaManager.findGamePlayerIsIn((Player)sender);
             if (game == null) {
                 sender.sendMessage(LanguageManager.fromKey("missing-arena-parameter"));
                 return false;
             }
-        }
-        else {
+        } else {
             String arenaName = args[0];
             if (!ArenaManager.arenas.containsKey(arenaName)) {
                 sender.sendMessage(LanguageManager.fromKey("invalid-arena").replace("%arena%",arenaName));
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Join.java b/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
index 6ce33c3..f26d4e5 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
@@ -50,26 +50,34 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
             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));
             return false;
         }
         Arena arena = ArenaManager.arenas.get(arenaName);
 
+        // Check to make sure this arena has a game spawn
+        if (arena.gameSpawn == null) {
+            if (p.isOp()) {
+                sender.sendMessage(LanguageManager.fromKey("arena-not-ready-op"));
+            } else {
+                sender.sendMessage(LanguageManager.fromKey("arena-not-ready"));
+            }
+            return false;
+        }
+
         Game game;
         if (args.length < 2 || args[1] == null) {
-            // no type specified: try to infer game type from game taking place in the arena
+            // No type specified: try to infer game type from game taking place in the arena
             if (arena.game == null) {
-                // cant infer if no game is taking place
+                // Can't infer if no game is taking place
                 sender.sendMessage(LanguageManager.fromKey("specify-game-type"));
                 return false;
             }
 
             game = arena.game;
-        }
-        else {
-            // type specified
+        } else {
+            // Game type specified
             GameType type;
             switch (args[1]) {
                 case "shovels", "shovel"     -> type = GameType.SHOVELS;
@@ -82,12 +90,10 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
             }
 
             if (arena.game == null) {
-                // no game is taking place in this arena, start one
+                // No game is taking place in this arena, start one
                 game = arena.game = new Game(arena, type);
-            }
-            else
-            {
-                // a game is taking place in this arena, check that it is the right type
+            } else {
+                // A game is taking place in this arena, check that it is the right type
                 if (arena.game.type == type) {
                     game = arena.game;
                 }
@@ -100,16 +106,7 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
             }
         }
 
-        // check to make sure the arena has a game spawn
-        if (game.arena.gameSpawn == null) {
-            if (p.isOp()) {
-                sender.sendMessage(LanguageManager.fromKey("arena-not-ready-op"));
-            } else {
-                sender.sendMessage(LanguageManager.fromKey("arena-not-ready"));
-            }
-            return false;
-        }
-
+        // Make sure the game isn't in progress before adding the player
         if (game.gameState != GameState.WAITING) {
             sender.sendMessage(LanguageManager.fromKey("game-in-progress"));
             return false;
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java b/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
index 79faef9..588755f 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
@@ -29,7 +29,6 @@ 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()) {
             if (a.game != null) {
                 a.game.stopGame();
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java b/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java
index c2aa149..9abc784 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java
@@ -38,7 +38,7 @@ public class Remove implements SubCommand, CommandExecutor, TabCompleter {
         }
 
         ArenaManager.arenas.remove(arenaName);
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("remove-success"));
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.java
index 21bdfe8..817a1a4 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.java
@@ -45,7 +45,7 @@ public class SetGameSpawn implements SubCommand, CommandExecutor, TabCompleter {
         Arena arena = ArenaManager.arenas.get(arenaName);
 
         arena.gameSpawn = ((Player)sender).getLocation();
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("set-success"));
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.java
index 142ffdd..27cc410 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.java
@@ -46,7 +46,7 @@ public class SetKillYLevel implements SubCommand, CommandExecutor, TabCompleter
         Arena arena = ArenaManager.arenas.get(arenaName);
 
         arena.killAtY = ((int) ((Player) sender).getLocation().getY());
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("set-success"));
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.java
index a080d08..5708643 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.java
@@ -45,7 +45,7 @@ public class SetLobby implements SubCommand, CommandExecutor, TabCompleter {
         Arena arena = ArenaManager.arenas.get(arenaName);
 
         arena.lobby = ((Player)sender).getLocation();
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("set-success"));
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java
index a96e1a9..7b90099 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java
@@ -45,7 +45,7 @@ public class SetWaitArea implements SubCommand, CommandExecutor, TabCompleter {
         Arena arena = ArenaManager.arenas.get(arenaName);
 
         arena.waitArea = ((Player)sender).getLocation();
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("set-success"));
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.java
index 98a535b..e0d2bea 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.java
@@ -45,7 +45,7 @@ public class SetWinnerLobby implements SubCommand, CommandExecutor, TabCompleter
         Arena arena = ArenaManager.arenas.get(arenaName);
 
         arena.winnerLobby = ((Player)sender).getLocation();
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("set-success"));
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Tumble.java b/src/main/java/com/MylesAndMore/Tumble/commands/Tumble.java
index 8b4f925..e7d1cf4 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Tumble.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Tumble.java
@@ -44,7 +44,7 @@ public class Tumble implements CommandExecutor, TabCompleter {
             return false;
         }
 
-        // pass command action through to subCommand
+        // Pass command action through to subCommand
         subCmd.onCommand(sender, command, args[0], removeFirst(args));
         return true;
     }
@@ -52,7 +52,7 @@ public class Tumble implements CommandExecutor, TabCompleter {
     @Override
     public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         if (args.length == 1) {
-            // show only subCommands the user has permission for
+            // Show only subCommands the user has permission for
             ArrayList<String> PermittedSubCmds = new ArrayList<>();
             for (SubCommand subCmd: subCommands.values()) {
                 if (sender.hasPermission(subCmd.getPermission())) {
@@ -67,11 +67,10 @@ public class Tumble implements CommandExecutor, TabCompleter {
                 return Collections.emptyList();
             }
 
-            // pass tab complete through to subCommand
+            // Pass tab complete through to subCommand
             if (subCommands.get(args[0]) instanceof TabCompleter tcmp) {
                 return tcmp.onTabComplete(sender, command, args[0], removeFirst(args));
-            }
-            else {
+            } else {
                 return null;
             }
         }