From b9295115ff968b3d6d941ac3af91afe598420202 Mon Sep 17 00:00:00 2001 From: Myles Date: Thu, 1 Aug 2024 00:45:40 -0500 Subject: standardize style and language - standardize code style across PR - change some language/fix typos in documentation (code + external) --- src/main/resources/language.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/main/resources/language.yml') diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml index 835d577..dabb5f4 100644 --- a/src/main/resources/language.yml +++ b/src/main/resources/language.yml @@ -1,5 +1,7 @@ +# All plugin chat messages will have this message prepended to them prefix: "&f[&eTumble&f] " +# Error messages 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!" @@ -9,13 +11,14 @@ 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%'." +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: "&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'." +arena-not-ready-op: "&4Incomplete arena. &7Set a game spawn with '/tumble 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'." +# Success messages +create-success: "&aArena created successfully! &eBefore you can join, 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%" @@ -24,6 +27,7 @@ reload-success: "&aConfig files reloaded. &eCheck console for 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" -- cgit v1.2.3 From cadddd7499f92b4529ce34231ff4a379011515ff Mon Sep 17 00:00:00 2001 From: Myles Date: Thu, 1 Aug 2024 16:17:01 -0500 Subject: bugfixes and more stylistic changes - remove update checker and multiverse from build dependencies - add config option to hide death messages - ensure join/leave/death messages only apply for tumble games - fix a bunch of random command bugs I found - layers no longer generate with a placeholder material before being clumped - misc refactoring --- src/main/resources/language.yml | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) (limited to 'src/main/resources/language.yml') diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml index dabb5f4..388c975 100644 --- a/src/main/resources/language.yml +++ b/src/main/resources/language.yml @@ -2,35 +2,35 @@ prefix: "&f[&eTumble&f] " # Error messages -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." +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: "&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 '/tumble setGameSpawn'." -specify-game-type: "&4No game is currently taking place in this arena! &7Provide the game type to start one." +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 you can join, you must set a game spawn location with '/tumble setgamespawn'." -forcestart-success: "&aStarting game." +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!" @@ -41,9 +41,3 @@ count-3: "&23" count-2: "&e2" count-1: "&41" count-go: "&aGo!" - - - - - - -- cgit v1.2.3