Merge pull request #22 from tylermurphy534/1.4.0

1.4.0

5 files changed, 139 insertions, 9 deletions

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 778e3b4..6c239fb 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,3 +1,11 @@
+#============================================================#
+# +--------------------------------------------------------+ #
+# |                 Kenshins Hide and Seek                 | #
+# |                   Configuration file                   | #
+# |                    by KenshinEto                       | #
+# +--------------------------------------------------------+ #
+#============================================================#
+
 # How long in seconds will the game last, set it < 1 to disable
 # default: 1200 aka 20min
 gameLength: 1200
@@ -30,7 +38,7 @@ pvp: true
 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
+# to the designated exit position so that they 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
@@ -62,7 +70,8 @@ taunt:
 # the amount of time set in seconds. You can allow it to be stackable, meaning
 # when multiple Hiders use the powerup at the same time, it stacks the times, or
 # just overwrites. Only Hiders can see that the Seekers are glowing. Delay must
-# be longer than 1s.
+# be longer than 1s. Since the glow effect wasn't added until Minecraft 1.9,
+# any server running 1.8 will have this disabled regardless of the options below.
 glow:
   time: 30
   stackable: true
@@ -90,10 +99,34 @@ lobby:
   max: 10
   enabled: true
 
+# As a hider, the closer a seeker gets to you, the louder and faster a pining noise will play.
+# There are 3 separate distances (in blocks) you can set to the 3 different levels for the noise.
+# The higher the level, the closer the seeker.
+seekerPing:
+  distances:
+    level1: 30
+    level2: 20
+    level3: 10
+  enabled: true
+
 # Changes the default plugin language. Currently, Supported localizations are:
 # en-US (English - United States)
 # de-DE (German - Germany)
-local: "en-US"
+locale: "en-US"
+
+# Block's commands being run by any user while playing the game.
+# Can be usefully If you aren't using a permission plugin and want
+# to op people, but still want to block certain commands.
+# Not really usefully if using permission plugins.
+# You can add /kill for any use, but it's already blocked on those
+# playing the game.
+blockedCommands:
+  - msg
+  - tp
+  - gamemode
+  - kill
+  - give
+  - effect
 
 # ---------------------------------------------------------- #
 # ONLY EDIT BEYOND THIS POINT IF YOU KNOW WHAT YOU ARE DOING #
@@ -101,7 +134,7 @@ local: "en-US"
 
 # 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 completely break the entire plugin when you run /hs mapsave.
+# this section will completely break the entire plugin when you run /hs savemap.
 bounds:
   min:
     x: 0
diff --git a/src/main/resources/lang/localization_de-DE.yml b/src/main/resources/lang/localization_de-DE.yml
index d2dcc1e..67c14fd 100644
--- a/src/main/resources/lang/localization_de-DE.yml
+++ b/src/main/resources/lang/localization_de-DE.yml
@@ -64,6 +64,7 @@ Localization:
   NOT_AT_ZERO: "Bitte nicht an einer Position setzen, die eine Koordinate bei 0 enthält."
   NO_GAME_INFO: "Keine Informationen zum Gameplay für diesen Spieler vorhanden."
   INFORMATION_FOR: "Gewinninformationen für {PLAYER}:"
+  BLOCKED_COMMAND: "Command blocked by Kenshin's Hide And Seek"
 
 # DO NOT EDIT IT OR IT MAY BREAK OR RESET FILE
 version: 2
diff --git a/src/main/resources/lang/localization_en-US.yml b/src/main/resources/lang/localization_en-US.yml
index 93cbd4e..16dacc8 100644
--- a/src/main/resources/lang/localization_en-US.yml
+++ b/src/main/resources/lang/localization_en-US.yml
@@ -37,7 +37,7 @@ Localization:
   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."
   WORLDBORDER_WARN: "World border will shrink in the next 30s!"
-  TAUNTED: "$c$oOh no! You have been chosen to be taunted."
+  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"
@@ -54,7 +54,7 @@ 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: "Attention SEEKERS, its time to fin the hiders!"
+  START: "Attention SEEKERS, its time to find the hiders!"
   STOP: "Game has been force stopped."
   HIDERS_SUBTITLE: "Hide away from the seekers"
   SEEKERS_SUBTITLE: "Eliminate all hiders"
@@ -64,7 +64,8 @@ Localization:
   NOT_AT_ZERO: "Please do not set at a location containing a coordinate at 0."
   NO_GAME_INFO: "Player has no gameplay information."
   INFORMATION_FOR: "Win information for {PLAYER}:"
+  BLOCKED_COMMAND: "Command blocked by Hide And Seek plugin."
 
 # DO NOT EDIT IT OR IT MAY BREAK OR RESET FILE
-version: 2
+version: 3
 type: "en-US"
\ No newline at end of file
diff --git a/src/main/resources/leaderboard.yml b/src/main/resources/leaderboard.yml
new file mode 100644
index 0000000..376ae9f
--- /dev/null
+++ b/src/main/resources/leaderboard.yml
@@ -0,0 +1,87 @@
+#============================================================#
+# +--------------------------------------------------------+ #
+# |                 Kenshins Hide and Seek                 | #
+# |                    Leaderboard file                    | #
+# |                    by KenshinEto                       | #
+# +--------------------------------------------------------+ #
+#============================================================#
+# This config file allows you to change what is displayed on the scoreboard\leaderboard
+# while in the lobby, or in the game. Below are a list of predefined placeholders.
+#
+#   LOBBY BOARD PLACEHOLDERS
+#
+#   {COUNTDOWN} - Displays the time left in the lobby countdown. If there are not enough
+#                 people in the lobby, or the lobby countdown its disabled, it just
+#                 displays waiting for players. The text displayed can be changed below.
+#   {COUNT}     - The amount of player currently in the lobby.
+#   {SEEKER%}   - The chance that a player will be selected to be a seeker.
+#   {HIDER%}    - The chance that a player will be selected to be a hider.
+#
+#   GAME BOARD PLACEHOLDERS
+#
+#   {TIME}      - The amount of time left in the game in MmSs.
+#   {TEAM}      - The team you are on. Hider, Seeker, or Spectator.
+#   {BORDER}    - The current status of the world boarder, if enabled.
+#                 If the world border is disabled, this line is removed
+#                 automatically. Displays the time left until the border
+#                 moves in MmSs, or "Decreasing" if it's decreasing.
+#                 What is displayed exactly can be changed below.
+#   {TAUNT}     - The current status of the taunt system, if enabled.
+#                 If taunts are disabled, any line with {TAUNT} will be
+#                 automatically removed. Shows the time left till next
+#                 taunt in MmSs, if the taunt is active, and if the taunt
+#                 has expired (one player left). What is displayed exactly
+#                 can be changed below.
+#   {GLOW}      - The current status of the glow powerup, if enabled.
+#                 This line is automatically removed if the glow poewrup
+#                 is disabled. Tells all players if a Glow powerup is active,
+#                 only Hiders will be able to see its effects though.
+#   {#SEEKER}   - Number of current seekers.
+#   {#HIDER}    - Number of current hiders.
+#
+#   YOU CANNOT USE TWO PLACEHOLDERS ON THE SAME LINE. ONLY THE FIRST ONE WILL
+#   BE CHANGED, AND THE SECOND ONE WILL SAY A PLACEHOLDER MARKER!
+
+lobby:
+  title: "&eHIDE AND SEEK"
+  content: [
+    "{COUNTDOWN}",
+    "",
+    "Players: {COUNT}",
+    "",
+    "&cSEEKER % &f{SEEKER%}",
+    "&6HIDER % &f{HIDER%}"
+  ]
+
+game:
+  title: "&eHIDE AND SEEK"
+  content: [
+    "Team: {TEAM}",
+    "",
+    "Time Left: &a{TIME}",
+    "",
+    "Taunt: &e{TAUNT}",
+    "Glow: {GLOW}",
+    "WorldBorder: &b{BORDER}",
+    "",
+    "&cSEEKERS: &f{#SEEKER}",
+    "&6HIDERS: &f{#HIDER}"
+  ]
+
+countdown:
+  waiting: "Waiting for players..."
+  adminStart: "Waiting for gamemaster..."
+  counting: "Starting in: $a{AMOUNT}s"
+
+taunt:
+  counting: "{AMOUNT}m{AMOUNT}s"
+  active: "Active"
+  expired: "Expired"
+
+glow:
+  active: "&aActive"
+  inactive: "&cInactive"
+
+border:
+  counting: "{AMOUNT}m{AMOUNT}s"
+  decreasing: "Decreasing"
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index bd391c9..c03205c 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,9 +1,9 @@
 name: HideAndSeek
 main: net.tylermurphy.hideAndSeek.Main
-version: 1.3.3
+version: 1.4.0
 author: KenshinEto
 load: STARTUP
-api-version: 1.14
+api-version: 1.13
 depend: [ProtocolLib]
 commands:
   hideandseek:
@@ -29,6 +29,8 @@ permissions:
       hideandseek.join: true
       hideandseek.leave: true
       hideandseek.leavebounds: true
+      hideandseek.wins: true
+      hideand.top: true
   hideandseek.about:
     description: Allows you to run the about command
     default: true
@@ -74,3 +76,9 @@ permissions:
   hideandseek.leavebounds:
     description: Allows players to leave specified game bounderies
     default: op
+  hideandseek.wins:
+    description: Allows players to see a players amount of wins
+    default: true
+  hideandseek.top:
+    description: Allows players to see the global wins leaderboard
+    default: true