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

4 files changed, 44 insertions, 34 deletions

diff --git a/src/main/resources/arenas.yml b/src/main/resources/arenas.yml
index 3b755c3..7c26e08 100644
--- a/src/main/resources/arenas.yml
+++ b/src/main/resources/arenas.yml
@@ -1,2 +1,2 @@
-# NOTE: Coordinates cannot be zero! Use something like 0.5
-arenas: {}
\ No newline at end of file
+# NOTE: No coordinate can be equal to zero! Use 0.5 instead if needed.
+arenas:
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index ded50ef..28cc4e2 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,7 +1,9 @@
-# Hides player join/leave messages in public chat
+# Hides player join and leave messages in public chat during games
 hide-join-leave-messages: false
 
-# Duration in seconds to wait for more players to join
-wait-duration: 15
-
+# Hides player death messages in public chat during games
+hide-death-messages: false
 
+# Duration (in seconds) to wait for more players to join a game before starting
+# Set to 0 to disable
+wait-duration: 15
diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml
index 835d577..388c975 100644
--- a/src/main/resources/language.yml
+++ b/src/main/resources/language.yml
@@ -1,32 +1,36 @@
+# All plugin chat messages will have this message prepended to them
 prefix: "&f[&eTumble&f] "
 
-unknown-command: "&4Unknown command '%command%'"
-no-permission: "&4You do not have permission to perform this command! &7Required permission: '%permission%.'"
-missing-arena-parameter: "&4Missing arena name!"
-invalid-arena: "&4arena '%arena%' does not exist!"
-invalid-type: "&4Invalid game type!"
-no-game-in-arena: "&4No game is currently running in this arena!"
-player-not-in-game: "&4You are not in a game!"
-not-for-console: "&4This cannot be run by the console!"
-game-in-progress: "&4This game is still in progress!&7 wait until it finishes or join another game."
-another-type-in-arena: "A game of %type% is currently taking place in this arena!&7 choose another arena or join it with '/tmbl join %arena% %type%'."
-already-in-game: "&4You are already in a game! Leave it to join another one."
-arena-not-ready: "&4This arena is not finished being set up!"
-arena-not-ready-op: "&4Incomplete arena. &7Set a game spawn with '/tmbl setGameSpawn'."
-specify-game-type: "&4No game is currently taking place in this arena! &7Provide the game type to start one."
-
-create-success: "&aArena created successfully! &eBefore you can join, you must set a game spawn location with '/tmbl setgamespawn'."
-forcestart-success: "&aStarting game."
+# Error messages
+unknown-command: "&cUnknown command '%command%'"
+no-permission: "&cYou do not have permission to perform this command! &7Required permission: '%permission%.'"
+missing-arena-parameter: "&cMissing arena name!"
+invalid-arena: "&carena '%arena%' does not exist!"
+invalid-type: "&cInvalid game type!"
+no-game-in-arena: "&cNo game is currently running in this arena!"
+player-not-in-game: "&cYou are not in a game!"
+not-for-console: "&cThis cannot be run by the console!"
+game-in-progress: "&cThis game is still in progress!&7 wait until it finishes or join another game."
+another-type-in-arena: "A game of %type% is currently taking place in this arena!&7 choose another arena or join it with '/tumble join %arena% %type%'."
+already-in-game: "&cYou are already in a game! Leave it to join another one."
+arena-not-ready: "&cThis arena is not yet set up!"
+arena-not-ready-op: "&cIncomplete arena. &7Set a game spawn with '/tumble setGameSpawn'."
+specify-game-type: "&cNo game is currently taking place in this arena! &7Provide the game type to start one."
+
+# Success messages
+create-success: "&aArena created successfully! &eBefore this arena is usable, you must set a game spawn location with '/tumble setgamespawn'."
+forcestart-success: "&aStarting game..."
 forcestop-success: "&aGame stopped."
 join-success: "&aJoined game &d%arena% - %type%"
 leave-success: "&aLeft game &d%arena% - %type%"
-reload-success: "&aConfig files reloaded. &eCheck console for errors."
+reload-success: "&aConfig files reloaded. &eCheck console for possible errors."
 remove-success: "&aArena removed."
 set-success: "&aLocation set."
 
+# Game messages
 showdown: "&4Showdown!"
 lobby-in-10: "&9Returning to lobby in ten seconds..."
-waiting-for-players: "&aWaiting for players"
+waiting-for-players: "&aWaiting for players..."
 time-till-start: "&aGame will begin in %wait% seconds!"
 round-over: "&cRound over!"
 round-winner: "&6%winner%  has won the round!"
@@ -37,9 +41,3 @@ count-3: "&23"
 count-2: "&e2"
 count-1: "&41"
 count-go: "&aGo!"
-
-
-
-
-
-
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index c8085b8..da7f8bd 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: com.MylesAndMore.Tumble.Main
 name: Tumble
-version: 1.0.4
+version: 2.0.0
 description: 'A Minecraft: Java Edition plugin recreating the Tumble minigame from Minecraft Legacy Console Edition.'
 api-version: 1.16
 load: POSTWORLD
@@ -10,8 +10,8 @@ softdepend: [Multiverse-Core]
 
 commands:
   tumble:
-    description: Base command for Rumble
-    usage: "/tmbl <subCommand> ..."
+    description: Base command for Tumble
+    usage: "/tumble <subCommand> ..."
     aliases: tmbl
 
 permissions:
@@ -22,23 +22,33 @@ permissions:
     description: Allows you to leave a Tumble match.
     default: true
   tumble.forcestart:
+    description: Allows you to forcibly start a Tumble match.
     default: op
   tumble.forcestop:
+    description: Allows you to forcibly stop a Tumble match.
     default: op
   tumble.reload:
+    description: Allows you to reload the Tumble configuration.
     default: op
   tumble.create:
+    description: Allows you to create Tumble arenas.
     default: op
   tumble.remove:
+    description: Allows you to remove Tumble arenas.
     default: op
   tumble.setgamespawn:
+    description: Allows you to set the game spawn location for Tumble arenas.
     default: op
   tumble.setkillylevel:
+    description: Allows you to set the kill Y-level for Tumble arenas.
     default: op
   tumble.setlobby:
+    description: Allows you to set the lobby location for Tumble arenas.
     default: op
   tumble.setwaitarea:
+    description: Allows you to set the wait area location for Tumble arenas.
     default: op
   tumble.setwinnerlobby:
+    description: Allows you to set the winner lobby location for Tumble arenas.
     default: op