1.3.1 build 4

4 files changed, 152 insertions, 43 deletions

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 457bb3a..64fdece 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -10,37 +10,34 @@ announceMessagesToNonPlayers: true
 # default: false
 nametagsVisible: false
 
-# Require bukkit permessions though a plugin to run commands, recomended on large servers
+# Require bukkit permissions though a plugin to run commands, recommended on large servers
 # default: true
 permissionsRequired: true
 
-# Minimum ammount of players to start the game. Cannot go lower than 2.
+# Minimum amount of players to start the game. Cannot go lower than 2.
 # default: 2
 minPlayers: 2
 
-# Spawn locations where players are teleported
-spawns:
-  # Location where players are teleported into the game (/hs start)
-  game:
-    x: 0
-    y: 0
-    z: 0
-    world: world
-  # Location where players are teleported into the lobby (/hs join)
-  lobby:
-    x: 0
-    y: 0
-    z: 0
-    world: world
-  # Location where players are teleported when they exit (/hs leave)
-  exit:
-    x: 0
-    y: 0
-    z: 0
-    world: world
+# This plugin by default functions as not tag to catch Hiders, but to pvp. All players are given weapons,
+# and seekers slightly better weapons (this can be changed in items.yml). If you want, you can disable this
+# entire pvp functionality, and make Hiders get found on a single hit. Hiders would also not be able to fight
+# back against Seekers if disabled.
+# default: true
+pvp: true
+
+# Players that join the server will automatically be placed into the lobby.
+# default: false
+autoJoin: false
+
+# (When autoJoin is false), when players join the world containing the lobby, they are automatically teleported
+# to the designated exit position so that they possibly don't spawn in the lobby while not in the queue. Anyone
+# who ever joins in the game world (the duplicated world where the game is played) will always be teleported
+# out regardless.
+# default: false
+teleportToExit: false
 
-# The worldborder closes every interval, whish is evey [delay] in minutes.
-# Thw worldborder stharts at [size], and decreaces 100 blocks every interval.
+# 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.
 # You can choose if Hiders are warned 30 seconds before the border moves.
 worldBorder:
@@ -53,7 +50,7 @@ worldBorder:
 
 # The taunt will activate every delay set in seconds. It will spawn a firework
 # on a random Hider to alert a Seeker where someone may be. You can choose
-# to publially show the taunt countdown, and have the taunt run with only
+# to publicly show the taunt countdown, and have the taunt run with only
 # one Hider left. Taunt delay must at least be 60s.
 taunt:
   delay: 360
@@ -71,7 +68,7 @@ glow:
   stackable: true
   enabled: true
 
-# The message prefixes displayed before messages. The message contents themselvs
+# The message prefixes displayed before messages. The message contents themselves
 # can be changed in localization.yml.
 prefix:
   default: '&9Hide and Seek > &f'
@@ -86,9 +83,9 @@ prefix:
 # ONLY EDIT BEYOND THIS POINT IF YOU KNOW WHAT YOU ARE DOING #
 # ---------------------------------------------------------- #
 
-# The 2 coordinate bounds that will contain your hideAndSeek map. Its reccomended
+# The 2 coordinate bounds that will contain your hideAndSeek map. Its recommended
 # that you use /hs setbounds for this, and not edit this directly, as breaking
-# this section will completly break the entire plugin when you run /hs mapsave.
+# this section will completely break the entire plugin when you run /hs mapsave.
 bounds:
   min:
     x: 0
@@ -97,3 +94,23 @@ bounds:
     x: 0
     z: 0
 
+# Spawn locations where players are teleported
+spawns:
+  # Location where players are teleported into the game (/hs start)
+  game:
+    x: 0
+    y: 0
+    z: 0
+    world: world
+  # Location where players are teleported into the lobby (/hs join)
+  lobby:
+    x: 0
+    y: 0
+    z: 0
+    world: world
+  # Location where players are teleported when they exit (/hs leave)
+  exit:
+    x: 0
+    y: 0
+    z: 0
+    world: world
\ No newline at end of file
diff --git a/src/main/resources/items.yml b/src/main/resources/items.yml
new file mode 100644
index 0000000..d9b3b2a
--- /dev/null
+++ b/src/main/resources/items.yml
@@ -0,0 +1,87 @@
+# For materials, look at https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Material.html
+# For potion types, look at https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/potion/PotionType.html
+# For effects, look at https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/potion/PotionEffectType.html
+# If pvp is disabled in config.yml, only effects will be given to players.
+items:
+  seeker:
+    '1':
+      material: DIAMOND_SWORD
+      amount: 1
+      enchantments:
+        sharpness: 1
+      name: 'Seeker Sword'
+      unbreakable: true
+      lore:
+        - 'This is the seeker sword'
+    '2':
+      material: STICK
+      amount: 1
+      enchantments:
+        knockback: 3
+      name: 'Wacky Stick'
+      lore:
+        - 'It will launch people very far'
+        - 'Use wisely!'
+  hider:
+    '1':
+      material: STONE_SWORD
+      amount: 1
+      enchantments:
+        sharpness: 2
+      name: 'Hider Sword'
+      unbreakable: true
+      lore:
+        - 'This is the hider sword'
+    '2':
+      material: SPLASH_POTION
+      amount: 1
+      type: REGEN
+    '3':
+      material: POTION
+      amount: 2
+      type: INSTANT_HEAL
+    '4':
+      type: DOLPHINS_GRACE
+      duration: 1000000
+      amplifier: 1
+      ambient: false
+      particles: false
+effects:
+  seeker:
+    '1':
+      type: SPEED
+      duration: 1000000
+      amplifier: 2
+      ambient: false
+      particles: false
+    '2':
+      type: JUMP
+      duration: 1000000
+      amplifier: 1
+      ambient: false
+      particles: false
+    '3':
+      type: SLOW_FALLING
+      duration: 1000000
+      amplifier: 1
+      ambient: false
+      particles: false
+    '4':
+      type: WATER_BREATHING
+      duration: 1000000
+      amplifier: 10
+      ambient: false
+      particles: false
+  hider:
+    '1':
+      type: WATER_BREATHING
+      duration: 1000000
+      amplifier: 1
+      ambient: false
+      particles: false
+    '2':
+      type: DOLPHINS_GRACE
+      duration: 1000000
+      amplifier: 1
+      ambient: false
+      particles: false
\ No newline at end of file
diff --git a/src/main/resources/localization.yml b/src/main/resources/localization.yml
index e714046..f6a82dc 100644
--- a/src/main/resources/localization.yml
+++ b/src/main/resources/localization.yml
@@ -1,7 +1,7 @@
 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 occoured."
+  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."
@@ -11,32 +11,32 @@ Localization:
   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 inprogress."
-  GAME_NOT_INPROGRESS: "There is no game inprogress."
+  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 midgame and are now a spectator."
+  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: "Coudnt find current map."
-  WORLDBORDER_DISABLE: "Disabled worldborder."
+  MAPSAVE_ERROR: "Couldn't find current map."
+  WORLDBORDER_DISABLE: "Disabled world border."
   WORLDBORDER_INVALID_INPUT: "Invalid integer {AMOUNT}."
-  WORLDBORDER_MIN_SIZE: "Worldborder cannot be smaller than 100 blocks."
-  WORLDBORDER_POSITION: "Spawn position must be 100 from worldborder center."
+  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: "Worlderborder decreasing by 100 blocks over the next 30s."
+  WORLDBORDER_DECREASING: "Would 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 isnt set, /hs setspawn"
-  SETUP_LOBBY: "&c&l- &fLobby spawn isnt set, /hs setlobby"
-  SETUP_EXIT: "&c&l- &fQuit/exit teleport location isnt set, /hs setexit"
-  SETUP_SAVEMAP: "&c&l- &fHide and seek map isnt saved, /hs savemap (after /hs setspawn)"
+  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"
@@ -45,9 +45,10 @@ Localization:
   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: "Attetion SEEKERS, its time to fin the hiders!"
+  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: "Sucessfully set bounds at this position."
+  BOUNDS: "Successfully set bounds at this position ({AMOUNT}/2)."
+  NOT_AT_ZERO: "Please do not set at a location containing a coordinate at 0."
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 2f6b145..ad5b2e3 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -21,6 +21,7 @@ permissions:
       hideandseek.setspawn: true
       hideandseek.setlobby: true
       hideandseek.setexit: true
+      hideadnseek.setbounds: true
       hideandseek.setup: true
       hideandseek.start: true
       hideandseek.stop: true
@@ -48,6 +49,9 @@ permissions:
   hideandseek.setexit:
     description: Allows you to set the game exit point
     default: op
+  hideandseek.setbounds:
+    description: Allows you to set bounds for the game map
+    default: op
   hideandseek.setup:
     description: Allows you to see what needs to be setup for the plugin to function
     default: op