Merge pull request #15 from tylermurphy534/1.3.1

1.3.1

4 files changed, 8 insertions, 61 deletions

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 7d16cae..7366476 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -36,9 +36,6 @@ autoJoin: false
 # default: false
 teleportToExit: false
 
-countdown:
-  
-
 # The worldborder closes every interval, which is evey [delay] in minutes.
 # Thw worldborder starts at [size], and decreases 100 blocks every interval.
 # x & z are the center location. [enabled] is whenever the border is enabled.
diff --git a/src/main/resources/lang/localization_de-DE.yml b/src/main/resources/lang/localization_de-DE.yml
index d8930f8..c5b0b72 100644
--- a/src/main/resources/lang/localization_de-DE.yml
+++ b/src/main/resources/lang/localization_de-DE.yml
@@ -46,6 +46,7 @@ Localization:
   SETUP_EXIT: "&c&l- &fTeleport-Position für das Spielende festlegen mit /hs setexit"
   SETUP_SAVEMAP: "&c&l- &fHide and Seek Weltkarte speichern mit /hs savemap (nach /hs setspawn)"
   SETUP_COMPLETE: "Alles eingerichtet! Hide and Seek ist spielbereit."
+  SETUP_BOUNDS: "&c&l- &fBitte legen Sie Spielgrenzen in 2 gegenüberliegenden Ecken der Spielkarte fest, /hs setbounds"
   GAME_SPAWN: "Teleport-Position für Spielbeginn festgelegt"
   LOBBY_SPAWN: "Teleport-Position für Lobby festgelegt"
   EXIT_SPAWN: "Teleport-Position für Spielende festgelegt"
@@ -56,5 +57,10 @@ Localization:
   STOP: "Das Spiel wurde gestoppt."
   HIDERS_SUBTITLE: "Verstecke dich gut vor den Seekern!"
   SEEKERS_SUBTITLE: "Finde alle Hider!"
+  BOUNDS_WRONG_WORLD: "Führe diesen Befehl bitte in der Spielwelt aus."
+  BOUNDS: "Grenzen erfolgreich an dieser Position gesetzt. ({AMOUNT}/2)"
+  NOT_AT_ZERO: "Bitte nicht an einer Position setzen, die eine Koordinate bei 0 enthält."
 
+# DO NOT EDIT IT OR IT MAY BREAK OR RESET FILE
+version: 2
 type: "de-DE"
diff --git a/src/main/resources/lang/localization_en-US.yml b/src/main/resources/lang/localization_en-US.yml
index 19c79b7..af5b80c 100644
--- a/src/main/resources/lang/localization_en-US.yml
+++ b/src/main/resources/lang/localization_en-US.yml
@@ -61,4 +61,6 @@ Localization:
   BOUNDS: "Successfully set bounds at this position ({AMOUNT}/2)."
   NOT_AT_ZERO: "Please do not set at a location containing a coordinate at 0."
 
+# DO NOT EDIT IT OR IT MAY BREAK OR RESET FILE
+version: 2
 type: "en-US"
\ No newline at end of file
diff --git a/src/main/resources/localization.yml b/src/main/resources/localization.yml
deleted file mode 100644
index 2acb0fc..0000000
--- a/src/main/resources/localization.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-Localization:
-  COMMAND_PLAYER_ONLY: "This command can only be run as a player."
-  COMMAND_NOT_ALLOWED: "You are not allowed to run this command."
-  COMMAND_ERROR: "An internal error has occurred."
-  GAME_PLAYER_DEATH: "&c{PLAYER}&f was killed."
-  GAME_PLAYER_FOUND: "&e{PLAYER}&f was found and became a seeker."
-  GAME_PLAYER_FOUND_BY: "&e{PLAYER}&f was found by &c{PLAYER}&f and became a seeker."
-  GAME_GAMEOVER_HIDERS_FOUND: "All hiders have been found."
-  GAME_GAMEOVER_SEEKERS_QUIT: "All seekers have quit."
-  GAME_GAMEOVER_TIME: "Seekers ran out of time. Hiders win!"
-  GAME_SETUP: "Game is not setup. Run /hs setup to see what you need to do."
-  GAME_INGAME: "You are already in the lobby/game."
-  GAME_NOT_INGAME: "You are not in a lobby/game."
-  GAME_INPROGRESS: "There is currently a game in progress."
-  GAME_NOT_INPROGRESS: "There is no game in progress."
-  GAME_JOIN: "{PLAYER} has joined the HideAndSeek lobby."
-  GAME_JOIN_SPECTATOR: "You have joined mid game and are now a spectator."
-  GAME_LEAVE: "{PLAYER} has left the HideAndSeek lobby."
-  CONFIG_RELOAD: "Reloaded the config."
-  MAPSAVE_INPROGRESS: "Map save is currently in progress. Try again later."
-  MAPSAVE_START: "Starting map save."
-  MAPSAVE_WARNING: "All commands will be disabled when the save is in progress. Do not turn off the server."
-  MAPSAVE_END: "Map save complete."
-  MAPSAVE_ERROR: "Couldn't find current map."
-  WORLDBORDER_DISABLE: "Disabled world border."
-  WORLDBORDER_INVALID_INPUT: "Invalid integer {AMOUNT}."
-  WORLDBORDER_MIN_SIZE: "World border cannot be smaller than 100 blocks."
-  WORLDBORDER_POSITION: "Spawn position must be 100 from world border center."
-  WORLDBORDER_ENABLE: "Set border center to current location, size to {AMOUNT}, and delay to {AMOUNT}."
-  WORLDBORDER_DECREASING: "World border decreasing by 100 blocks over the next 30s."
-  TAUNTED: "$c$oOh no! You have been chosen to be taunted."
-  TAUNT: "A random hider will be taunted in the next 30s."
-  TAUNT_ACTIVATE: "Taunt has been activated."
-  ERROR_GAME_SPAWN: "Please set game spawn location first"
-  SETUP: "&f&lThe following is needed for setup..."
-  SETUP_GAME: "&c&l- &fGame spawn isn't set, /hs setspawn"
-  SETUP_LOBBY: "&c&l- &fLobby spawn isn't set, /hs setlobby"
-  SETUP_EXIT: "&c&l- &fQuit/exit teleport location isn't set, /hs setexit"
-  SETUP_SAVEMAP: "&c&l- &fHide and seek map isn't saved, /hs savemap (after /hs setspawn)"
-  SETUP_BOUNDS: "&c&l- &fPlease set game bounds in 2 opposite corners of the game map, /hs setbounds"
-  SETUP_COMPLETE: "Everything is setup and ready to go!"
-  GAME_SPAWN: "Set game spawn position to current location"
-  LOBBY_SPAWN: "Set lobby position to current location"
-  EXIT_SPAWN: "Set exit position to current location"
-  START_MIN_PLAYERS: "You must have at least {AMOUNT} players to start."
-  START_INVALID_NAME: "Invalid player: {PLAYER}."
-  START_COUNTDOWN: "Hiders have {AMOUNT} seconds to hide!"
-  START: "Attention SEEKERS, its time to fin the hiders!"
-  STOP: "Game has been force stopped."
-  HIDERS_SUBTITLE: "Hide away from the seekers"
-  SEEKERS_SUBTITLE: "Eliminate all hiders"
-  BOUNDS_WRONG_WORLD: "Please run this command in the game world."
-  BOUNDS: "Successfully set bounds at this position ({AMOUNT}/2)."
-  NOT_AT_ZERO: "Please do not set at a location containing a coordinate at 0."
-
-# DO NOT EDIT IT OR IT MAY BREAK OR RESET FILE
-version: 2
-type: "en-US"
\ No newline at end of file