From bb254145ed0bb56d0482f6ba34e05cb728a7c8cc Mon Sep 17 00:00:00 2001 From: tylermurphy534 Date: Wed, 2 Nov 2022 07:18:00 -0400 Subject: 1.7.0 beta 2 --- src/main/resources/config.yml | 107 ++++++++++++------------- src/main/resources/lang/localization_en-US.yml | 19 +++-- src/main/resources/leaderboard.yml | 7 +- 3 files changed, 71 insertions(+), 62 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 6463898..389352a 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -15,23 +15,23 @@ gameLength: 1200 announceMessagesToNonPlayers: true # When the game is starting, the plugin will state there is x seconds left to hide. -# You change where countdown messages to be displayed: in the chat, action bar, or a title. +# You change where countdown messages are to be displayed: in the chat, action bar, or a title. # Below you can set CHAT, ACTIONBAR, or TITLE. Any invalid option will revert to CHAT. # -# CHAT - Messages will be displayed in the chat +# CHAT - Staring messages will be displayed in the chat # -# ACTIONBAR - Messages will be displayed in the action bar (area above the hotbar) +# ACTIONBAR - Staring messages will be displayed in the action bar (area above the hotbar) # -# TITLE - Messages will be displayed as a title +# TITLE - Staring messages will be displayed as a title # # default: CHAT -hideCountdownDisplay: CHAT +hideCountdownDisplay: "CHAT" # Allow Hiders to see their own teams nametags as well as seekers. Seekers can never see nametags regardless. # default: false nametagsVisible: false -# Require bukkit permissions though a plugin to run commands, recommended on large servers +# Require bukkit permissions though a permissions plugin to run commands, or require op, recommended on most servers # default: true permissionsRequired: true @@ -80,11 +80,11 @@ leaveOnEnd: false # PROXY - Send the player to a specified server in a bungee-cord / velocity setup. # # default: EXIT -leaveType: EXIT +leaveType: "EXIT" # Ignore this setting if you aren't using the PROXY leave type method above. If you are, set this to the server you want to send # players too. -leaveServer: hub +leaveServer: "hub" # By default, the plugin forces you to use a map save to protect from changes to a map thought a game play though. It copies your # hide-and-seek world to a separate world, and loads the game there to contain the game in an isolated and backed up map This allows you to @@ -117,40 +117,16 @@ delayedRespawn: # MYSQL - Uses a mysql server to store data, good for multi-server setups or large servers. # # default: SQLITE -databaseType: SQLITE +databaseType: "SQLITE" # The following settings are used for MYSQL databases ONLY. If you are running SQLITE, these # will be ignored. If you are running MYSQL, you need to provide the database host url, database # host port (usually 3306), database username, and database password. -databaseHost: localhost +databaseHost: "localhost" databasePort: 3306 -databaseUser: root -databasePass: -databaseName: hideandseek - -# The world border closes every interval, which is evey [delay] in minutes. -# Thw world border 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. - -# You want block hunt? We have block hunt! Just enable it below, and set the -# available blocks to pick from, and you're all set! It's that easy! -# Items are displayed in the order that they are listed below. -# The solidifyTime is the time in server ticks that it takes players to solidify. -# Every 20 ticks is a second. Minimum solidifyTime is 20 ticks. -blockhunt: - enabled: false - solidifyTime: 60 - blocks: [CRAFTING_TABLE, GRASS_BLOCK, DIRT, BEACON, BOOKSHELF] - -worldBorder: - x: 0 - z: 0 - delay: 10 - size: 500 - moveAmount: 100 - warn: true - enabled: false +databaseUser: "root" +databasePass: "pass" +databaseName: "hideandseek" # 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 @@ -173,8 +149,12 @@ glow: stackable: true enabled: true name: "Glow Powerup" - lore: [ "Throw to make all seekers glow", "Last 30s, all hiders can see it", "Time stacks on multi use" ] - material: SNOWBALL + lore: [ + "Throw to make all seekers glow", + "Last 30s, all hiders can see it", + "Time stacks on multi use" + ] + material: "SNOWBALL" model-data: 0 # This has the same glow effect as the glow powerup in that all seekers positions get @@ -221,14 +201,16 @@ lobby: # If you set adminOnly to false, only the item will become non admin only, not the command. lobbyItems: leave: - material: BED + material: "BED" name: "&cLeave Lobby" - lore: ["Go back to server hub"] + lore: [ + "Go back to server hub" + ] position: 8 model-data: 0 enabled: true start: - material: CLOCK + material: "CLOCK" name: "&bStart Game" lore: [] position: 0 @@ -241,15 +223,19 @@ lobbyItems: # and position of the item. You can also change the model data if your server is running 1.14 or above. spectatorItems: flight: - material: FEATHER + material: "FEATHER" name: "&bToggle Flight" - lore: [ "Turns flying on and off" ] + lore: [ + "Turns flying on and off" + ] position: 3 model-data: 0 teleport: - material: COMPASS + material: "COMPASS" name: "&bTeleport to Others" - lore: [ "Allows you to teleport to all other players in game" ] + lore: [ + "Allows you to teleport to all other players in game" + ] position: 5 model-data: 0 @@ -265,8 +251,8 @@ seekerPing: leadingVolume: 0.5 volume: 0.3 pitch: 1 - heartbeatNoise: BLOCK_NOTE_BLOCK_BASEDRUM - ringingNoise: BLOCK_NOTE_BLOCK_PLING + heartbeatNoise: "BLOCK_NOTE_BLOCK_BASEDRUM" + ringingNoise: "BLOCK_NOTE_BLOCK_PLING" enabled: true # Changes the default plugin language. Currently, Supported localizations are: @@ -275,26 +261,37 @@ seekerPing: locale: "en-US" # Stop commands being run by any user while playing the game. -# Can be usefull If you aren't using a permission plugin and want +# Can be usefull If you aren't using a permission plugin and don't 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] +blockedCommands: [ + "msg", + "tp", + "gamemode", + "kill", + "give", + "effect" +] # Stop interactions with any block by any user while playing the game. # If your map has things such as chests for aesthetic only, you can # block the use of clicking them. It shouldn't matter what version of # the block ID you enter, as the plugin will automatically switch to the # block ID of your current Minecraft server version. -blockedInteracts: [FURNACE, CRAFTING_TABLE, ANVIL, CHEST, BARREL] -# ---------------------------------------------------------- # -# ONLY EDIT BEYOND THIS POINT IF YOU KNOW WHAT YOU ARE DOING # -# ---------------------------------------------------------- # +blockedInteracts: [ + "FURNACE", + "CRAFTING_TABLE", + "ANVIL", + "CHEST", + "BARREL" +] # Location where players are teleported when they exit (/hs leave) +# Auto filled by /hs setexit, so you don't need to touch this here exit: x: 0 y: 0 z: 0 - world: world \ No newline at end of file + world: "world" \ No newline at end of file diff --git a/src/main/resources/lang/localization_en-US.yml b/src/main/resources/lang/localization_en-US.yml index 91d7abe..53f86be 100644 --- a/src/main/resources/lang/localization_en-US.yml +++ b/src/main/resources/lang/localization_en-US.yml @@ -10,6 +10,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 occurred." + COMMAND_INVALID_ARG: "Invalid argument: {AMOUNT}" 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." @@ -17,7 +18,7 @@ Localization: GAME_GAMEOVER_SEEKERS_QUIT: "All seekers have quit." GAME_GAMEOVER_HIDERS_QUIT: "All hiders have quit." GAME_GAMEOVER_TIME: "Seekers ran out of time. Hiders win!" - GAME_SETUP: "There are no setup maps! Run /hs setup on a map to see what you need to do." + GAME_SETUP: "There are no setup maps! Run /hs map status on a map 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." @@ -32,6 +33,9 @@ Localization: MAPSAVE_END: "Map save complete." MAPSAVE_ERROR: "Couldn't find current map." MAPSAVE_DISABLED: "Mapsave is disabled in config.yml." + MAPSAVE_FAIL_WORLD: "Mapsave failed. Failed to load current world." + MAPSAVE_INVALID: "Invalid world to save: {AMOUNT}" + MAPSAVE_FAIL_DIR: "Failed to rename directory: {AMOUNT}" WORLDBORDER_DISABLE: "Disabled world border." WORLDBORDER_INVALID_INPUT: "Invalid integer {AMOUNT}." WORLDBORDER_MIN_SIZE: "World border cannot be smaller than 100 blocks." @@ -58,6 +62,7 @@ Localization: SEEKER_SPAWN: "Set seeker lobby position to current location" START_MIN_PLAYERS: "You must have at least {AMOUNT} players to start." START_INVALID_NAME: "Invalid player: {PLAYER}." + START_FAILED_SEEKER: "Failed to select random seeker." START_COUNTDOWN: "Hiders have {AMOUNT} seconds to hide!" START_COUNTDOWN_LAST: "Hiders have {AMOUNT} second to hide!" START: "Attention SEEKERS, its time to find the hiders!" @@ -77,9 +82,9 @@ Localization: FLYING_ENABLED: "&l&bFlying Enabled" FLYING_DISABLED: "&l&bFlying Disabled" RESPAWN_NOTICE: "You will respawn in {AMOUNT} seconds." - INVALID_MAP: "That is an invalid map name!!" + INVALID_MAP: "That is an invalid map name!" MAP_ALREADY_EXISTS: "This map already exists!" - INVALID_MAP_NAME: "A map name can only contain numbers or letters" + INVALID_MAP_NAME: "A map name can only contain numbers or letters." MAP_CREATED: "Created new map: {AMOUNT}" MAP_FAIL_DELETE: "Failed to delete map: {AMOUNT}" MAP_DELETED: "Deleted map: {AMOUNT}" @@ -88,9 +93,11 @@ Localization: LIST_MAPS: "The current maps are:" ARGUMENT_COUNT: "This command requires more arguments to run." GAME_SPAWN_NEEDED: "Game spawn must be set before seeker spawn." - SEEKER_LOBBY_SPAWN_RESET: "Seeker lobby spawn reset since the game spawn was moved to a new world" - SEEKER_LOBBY_INVALID: "Seeker lobby must be in the same world as game spawn" + SEEKER_LOBBY_SPAWN_RESET: "Seeker lobby spawn reset since the game spawn was moved to a new world." + SEEKER_LOBBY_INVALID: "Seeker lobby must be in the same world as game spawn." + CONFIG_ERROR: "Error reloading config. Check server logs." + BLOCKHUNT_DISABLED: "Please enable blockhunt in this map inside maps.yml to enable disguises. Blockhunt does not work on 1.8" # DO NOT EDIT IT OR IT MAY BREAK OR RESET FILE -version: 3 +version: 4 type: "en-US" \ No newline at end of file diff --git a/src/main/resources/leaderboard.yml b/src/main/resources/leaderboard.yml index 9c7a777..cd958a3 100644 --- a/src/main/resources/leaderboard.yml +++ b/src/main/resources/leaderboard.yml @@ -16,6 +16,7 @@ # {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. +# {MAP} - The current map the player is on # # GAME BOARD PLACEHOLDERS # @@ -38,6 +39,7 @@ # only Hiders will be able to see its effects though. # {#SEEKER} - Number of current seekers. # {#HIDER} - Number of current hiders. +# {MAP} - The current map the player is on # # 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! @@ -50,12 +52,15 @@ lobby: "Players: {COUNT}", "", "&cSEEKER % &f{SEEKER%}", - "&6HIDER % &f{HIDER%}" + "&6HIDER % &f{HIDER%}", + "", + "Map: {MAP}", ] game: title: "&eHIDE AND SEEK" content: [ + "Map: {MAP}", "Team: {TEAM}", "", "Time Left: &a{TIME}", -- cgit v1.2.3-freya