freya/kenshinshideandseek
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: clean up typos, improperly named variables

Browse source
This commit is contained in:
bobby29831 2022-05-14 08:47:54 -05:00
parent e45099a5f4
commit 99d31ff71c
10 changed files with 63 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/beta.yml vendored
View file

@ -30,7 +30,7 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2 restore-keys: ${{ runner.os }}-m2
- name: Upload artificats - name: Upload artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: artifacts-beta name: artifacts-beta

32
src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java
View file

@ -40,7 +40,7 @@ public class SetBorder implements ICommand {
return; return;
} }
if (args.length < 3) { if (args.length < 3) {
worldborderEnabled = false; worldBorderEnabled = false;
addToConfig("worldBorder.enabled",false); addToConfig("worldBorder.enabled",false);
saveConfig(); saveConfig();
sender.sendMessage(messagePrefix + message("WORLDBORDER_DISABLE")); sender.sendMessage(messagePrefix + message("WORLDBORDER_DISABLE"));
@ -68,26 +68,26 @@ public class SetBorder implements ICommand {
sender.sendMessage(errorPrefix + message("WORLDBORDER_CHANGE_SIZE")); sender.sendMessage(errorPrefix + message("WORLDBORDER_CHANGE_SIZE"));
return; return;
} }
Vector newWorldborderPosition = new Vector(); Vector vec = new Vector();
Player player = (Player) sender; Player player = (Player) sender;
newWorldborderPosition.setX(player.getLocation().getBlockX()); vec.setX(player.getLocation().getBlockX());
newWorldborderPosition.setY(0); vec.setY(0);
newWorldborderPosition.setZ(player.getLocation().getBlockZ()); vec.setZ(player.getLocation().getBlockZ());
if (spawnPosition.distance(newWorldborderPosition) > 100) { if (spawnPosition.distance(vec) > 100) {
sender.sendMessage(errorPrefix + message("WORLDBORDER_POSITION")); sender.sendMessage(errorPrefix + message("WORLDBORDER_POSITION"));
return; return;
} }
worldborderPosition = newWorldborderPosition; worldBorderPosition = vec;
worldborderSize = num; worldBorderSize = num;
worldborderDelay = delay; worldBorderDelay = delay;
worldborderChange = change; worldBorderChange = change;
worldborderEnabled = true; worldBorderEnabled = true;
addToConfig("worldBorder.x", worldborderPosition.getBlockX()); addToConfig("worldBorder.x", worldBorderPosition.getBlockX());
addToConfig("worldBorder.z", worldborderPosition.getBlockZ()); addToConfig("worldBorder.z", worldBorderPosition.getBlockZ());
addToConfig("worldBorder.delay", worldborderDelay); addToConfig("worldBorder.delay", worldBorderDelay);
addToConfig("worldBorder.size", worldborderSize); addToConfig("worldBorder.size", worldBorderSize);
addToConfig("worldBorder.enabled", true); addToConfig("worldBorder.enabled", true);
addToConfig("worldBorder.move", worldborderChange); addToConfig("worldBorder.move", worldBorderChange);
sender.sendMessage(messagePrefix + message("WORLDBORDER_ENABLE").addAmount(num).addAmount(delay)); sender.sendMessage(messagePrefix + message("WORLDBORDER_ENABLE").addAmount(num).addAmount(delay));
saveConfig(); saveConfig();
Main.getInstance().getGame().getBorder().resetWorldBorder(spawnWorld); Main.getInstance().getGame().getBorder().resetWorldBorder(spawnWorld);

2
src/main/java/net/tylermurphy/hideAndSeek/command/location/SetSpawnLocation.java
View file

@ -36,7 +36,7 @@ public class SetSpawnLocation implements ICommand {
Player player = (Player) sender; Player player = (Player) sender;
LocationUtils.setLocation(player, Locations.GAME, vector -> { LocationUtils.setLocation(player, Locations.GAME, vector -> {
if (worldborderEnabled && vector.distance(worldborderPosition) > 100) { if (worldBorderEnabled && vector.distance(worldBorderPosition) > 100) {
sender.sendMessage(errorPrefix + message("WORLDBORDER_POSITION")); sender.sendMessage(errorPrefix + message("WORLDBORDER_POSITION"));
throw new RuntimeException("World border not enabled or not in valid position!"); throw new RuntimeException("World border not enabled or not in valid position!");
} }

32
src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java
View file

@ -46,9 +46,9 @@ public class Config {
messagePrefix, messagePrefix,
errorPrefix, errorPrefix,
tauntPrefix, tauntPrefix,
worldborderPrefix, worldBorderPrefix,
abortPrefix, abortPrefix,
gameoverPrefix, gameOverPrefix,
warningPrefix, warningPrefix,
spawnWorld, spawnWorld,
exitWorld, exitWorld,
@ -62,13 +62,13 @@ public class Config {
spawnPosition, spawnPosition,
lobbyPosition, lobbyPosition,
exitPosition, exitPosition,
worldborderPosition; worldBorderPosition;
public static boolean public static boolean
nametagsVisible, nameTagsVisible,
permissionsRequired, permissionsRequired,
announceMessagesToNonPlayers, announceMessagesToNonPlayers,
worldborderEnabled, worldBorderEnabled,
tauntEnabled, tauntEnabled,
tauntCountdown, tauntCountdown,
tauntLast, tauntLast,
@ -87,10 +87,10 @@ public class Config {
public static int public static int
minPlayers, minPlayers,
worldborderSize, worldBorderSize,
worldborderDelay, worldBorderDelay,
currentWorldborderSize, currentWorldborderSize,
worldborderChange, worldBorderChange,
gameLength, gameLength,
saveMinX, saveMinX,
saveMinZ, saveMinZ,
@ -183,15 +183,15 @@ public class Config {
exitWorld = config.getString("spawns.exit.world"); exitWorld = config.getString("spawns.exit.world");
//World border //World border
worldborderPosition = new Vector( worldBorderPosition = new Vector(
config.getInt("worldBorder.x"), config.getInt("worldBorder.x"),
0, 0,
config.getInt("worldBorder.z") config.getInt("worldBorder.z")
); );
worldborderSize = Math.max(100, config.getInt("worldBorder.size")); worldBorderSize = Math.max(100, config.getInt("worldBorder.size"));
worldborderDelay = Math.max(1, config.getInt("worldBorder.delay")); worldBorderDelay = Math.max(1, config.getInt("worldBorder.delay"));
worldborderEnabled = config.getBoolean("worldBorder.enabled"); worldBorderEnabled = config.getBoolean("worldBorder.enabled");
worldborderChange = config.getInt("worldBorder.moveAmount"); worldBorderChange = config.getInt("worldBorder.moveAmount");
//Prefix //Prefix
char SYMBOLE = '\u00A7'; char SYMBOLE = '\u00A7';
@ -200,9 +200,9 @@ public class Config {
messagePrefix = config.getString("prefix.default").replace("&", SYMBOLE_STRING); messagePrefix = config.getString("prefix.default").replace("&", SYMBOLE_STRING);
errorPrefix = config.getString("prefix.error").replace("&", SYMBOLE_STRING); errorPrefix = config.getString("prefix.error").replace("&", SYMBOLE_STRING);
tauntPrefix = config.getString("prefix.taunt").replace("&", SYMBOLE_STRING); tauntPrefix = config.getString("prefix.taunt").replace("&", SYMBOLE_STRING);
worldborderPrefix = config.getString("prefix.border").replace("&", SYMBOLE_STRING); worldBorderPrefix = config.getString("prefix.border").replace("&", SYMBOLE_STRING);
abortPrefix = config.getString("prefix.abort").replace("&", SYMBOLE_STRING); abortPrefix = config.getString("prefix.abort").replace("&", SYMBOLE_STRING);
gameoverPrefix = config.getString("prefix.gameover").replace("&", SYMBOLE_STRING); gameOverPrefix = config.getString("prefix.gameover").replace("&", SYMBOLE_STRING);
warningPrefix = config.getString("prefix.warning").replace("&", SYMBOLE_STRING); warningPrefix = config.getString("prefix.warning").replace("&", SYMBOLE_STRING);
//Map Bounds //Map Bounds
@ -248,7 +248,7 @@ public class Config {
ringingSound = ringingOptional.orElse(XSound.BLOCK_NOTE_BLOCK_PLING); ringingSound = ringingOptional.orElse(XSound.BLOCK_NOTE_BLOCK_PLING);
//Other //Other
nametagsVisible = config.getBoolean("nametagsVisible"); nameTagsVisible = config.getBoolean("nametagsVisible");
permissionsRequired = config.getBoolean("permissionsRequired"); permissionsRequired = config.getBoolean("permissionsRequired");
gameLength = config.getInt("gameLength"); gameLength = config.getInt("gameLength");
pvpEnabled = config.getBoolean("pvp"); pvpEnabled = config.getBoolean("pvp");

6
src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
View file

@ -265,7 +265,7 @@ public class Board {
String value = getTeam(player); String value = getTeam(player);
board.setLine(String.valueOf(i), line.replace("{TEAM}", value)); board.setLine(String.valueOf(i), line.replace("{TEAM}", value));
} else if (line.contains("{BORDER}")) { } else if (line.contains("{BORDER}")) {
if (!worldborderEnabled) continue; if (!worldBorderEnabled) continue;
if (worldBorder == null || status == Status.STARTING) { if (worldBorder == null || status == Status.STARTING) {
board.setLine(String.valueOf(i), line.replace("{BORDER}", BORDER_COUNTING.replace("{AMOUNT}", "0"))); board.setLine(String.valueOf(i), line.replace("{BORDER}", BORDER_COUNTING.replace("{AMOUNT}", "0")));
} else if (!worldBorder.isRunning()) { } else if (!worldBorder.isRunning()) {
@ -401,7 +401,7 @@ class CustomBoard {
for(Player player : Main.getInstance().getBoard().getSeekers()) for(Player player : Main.getInstance().getBoard().getSeekers())
seekerTeam.addEntry(player.getName()); seekerTeam.addEntry(player.getName());
if (Version.atLeast("1.9")) { if (Version.atLeast("1.9")) {
if (nametagsVisible) { if (nameTagsVisible) {
hiderTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.FOR_OWN_TEAM); hiderTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.FOR_OWN_TEAM);
seekerTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.FOR_OTHER_TEAMS); seekerTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.FOR_OTHER_TEAMS);
} else { } else {
@ -409,7 +409,7 @@ class CustomBoard {
seekerTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.NEVER); seekerTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.NEVER);
} }
} else { } else {
if (nametagsVisible) { if (nameTagsVisible) {
hiderTeam.setNameTagVisibility(NameTagVisibility.HIDE_FOR_OTHER_TEAMS); hiderTeam.setNameTagVisibility(NameTagVisibility.HIDE_FOR_OTHER_TEAMS);
seekerTeam.setNameTagVisibility(NameTagVisibility.HIDE_FOR_OWN_TEAM); seekerTeam.setNameTagVisibility(NameTagVisibility.HIDE_FOR_OWN_TEAM);
} else { } else {

14
src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
View file

@ -303,7 +303,7 @@ public class Game {
board.reloadGameBoards(); board.reloadGameBoards();
gameTimer--; gameTimer--;
} }
if (worldborderEnabled) worldBorder.update(); if (worldBorderEnabled) worldBorder.update();
if (tauntEnabled) taunt.update(); if (tauntEnabled) taunt.update();
if (glowEnabled) glow.update(); if (glowEnabled) glow.update();
} }
@ -336,12 +336,12 @@ public class Game {
private void checkWinConditions() { private void checkWinConditions() {
if (board.sizeHider() < 1) { if (board.sizeHider() < 1) {
if (hiderLeft) { if (hiderLeft) {
if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_QUIT")); if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameOverPrefix + message("GAME_GAMEOVER_HIDERS_QUIT"));
else broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_QUIT")); else broadcastMessage(gameOverPrefix + message("GAME_GAMEOVER_HIDERS_QUIT"));
stop(WinType.NONE); stop(WinType.NONE);
} else { } else {
if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_FOUND")); if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameOverPrefix + message("GAME_GAMEOVER_HIDERS_FOUND"));
else broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_FOUND")); else broadcastMessage(gameOverPrefix + message("GAME_GAMEOVER_HIDERS_FOUND"));
stop(WinType.SEEKER_WIN); stop(WinType.SEEKER_WIN);
} }
} else if (board.sizeSeeker() < 1) { } else if (board.sizeSeeker() < 1) {
@ -349,8 +349,8 @@ public class Game {
else broadcastMessage(abortPrefix + message("GAME_GAMEOVER_SEEKERS_QUIT")); else broadcastMessage(abortPrefix + message("GAME_GAMEOVER_SEEKERS_QUIT"));
stop(WinType.NONE); stop(WinType.NONE);
} else if (gameTimer < 1) { } else if (gameTimer < 1) {
if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_TIME")); if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameOverPrefix + message("GAME_GAMEOVER_TIME"));
else broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_TIME")); else broadcastMessage(gameOverPrefix + message("GAME_GAMEOVER_TIME"));
stop(WinType.HIDER_WIN); stop(WinType.HIDER_WIN);
} }
hiderLeft = false; hiderLeft = false;

28
src/main/java/net/tylermurphy/hideAndSeek/game/events/Border.java
View file

@ -13,31 +13,31 @@ public class Border {
private boolean running; private boolean running;
public Border() { public Border() {
delay = 60 * worldborderDelay; delay = 60 * worldBorderDelay;
} }
public void update() { public void update() {
if (delay == 30 && !running) { if (delay == 30 && !running) {
Main.getInstance().getGame().broadcastMessage(worldborderPrefix + message("WORLDBORDER_WARN")); Main.getInstance().getGame().broadcastMessage(worldBorderPrefix + message("WORLDBORDER_WARN"));
} else if (delay == 0) { } else if (delay == 0) {
if (running) { if (running) {
delay = 60 * worldborderDelay; delay = 60 * worldBorderDelay;
running = false; running = false;
} }
else decreaceWorldborder(); else decreaseWorldBorder();
} }
delay--; delay--;
} }
private void decreaceWorldborder() { private void decreaseWorldBorder() {
if (currentWorldborderSize == 100) return; if (currentWorldborderSize == 100) return;
int change = worldborderChange; int change = worldBorderChange;
if (currentWorldborderSize-worldborderChange < 100) { if (currentWorldborderSize-worldBorderChange < 100) {
change = currentWorldborderSize-100; change = currentWorldborderSize-100;
} }
running = true; running = true;
Main.getInstance().getGame().broadcastMessage(worldborderPrefix + message("WORLDBORDER_DECREASING").addAmount(change)); Main.getInstance().getGame().broadcastMessage(worldBorderPrefix + message("WORLDBORDER_DECREASING").addAmount(change));
currentWorldborderSize -= worldborderChange; currentWorldborderSize -= worldBorderChange;
World world = Bukkit.getWorld(Main.getInstance().getGame().getGameWorld()); World world = Bukkit.getWorld(Main.getInstance().getGame().getGameWorld());
assert world != null; assert world != null;
org.bukkit.WorldBorder border = world.getWorldBorder(); org.bukkit.WorldBorder border = world.getWorldBorder();
@ -49,15 +49,15 @@ public class Border {
World world = Bukkit.getWorld(worldName); World world = Bukkit.getWorld(worldName);
assert world != null; assert world != null;
org.bukkit.WorldBorder border = world.getWorldBorder(); org.bukkit.WorldBorder border = world.getWorldBorder();
if (worldborderEnabled) { if (worldBorderEnabled) {
border.setSize(worldborderSize); border.setSize(worldBorderSize);
border.setCenter(worldborderPosition.getX(), worldborderPosition.getZ()); border.setCenter(worldBorderPosition.getX(), worldBorderPosition.getZ());
currentWorldborderSize = worldborderSize; currentWorldborderSize = worldBorderSize;
} else { } else {
border.setSize(30000000); border.setSize(30000000);
border.setCenter(0, 0); border.setCenter(0, 0);
} }
delay = 60 * worldborderDelay; delay = 60 * worldBorderDelay;
} }
public int getDelay() { public int getDelay() {

2
src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java
View file

@ -82,7 +82,7 @@ public class CommandHandler {
try { try {
COMMAND_REGISTER.get(args[0].toLowerCase()).execute(sender,Arrays.copyOfRange(args, 1, args.length)); COMMAND_REGISTER.get(args[0].toLowerCase()).execute(sender,Arrays.copyOfRange(args, 1, args.length));
} catch (Exception e) { } catch (Exception e) {
sender.sendMessage(errorPrefix + "An error has occured."); sender.sendMessage(errorPrefix + "An error has occurred.");
e.printStackTrace(); e.printStackTrace();
} }
} }

4
src/main/resources/config.yml
View file

@ -94,8 +94,8 @@ leaveServer: hub
# default: true # default: true
mapSaveEnabled: true mapSaveEnabled: true
# The worldborder closes every interval, which is evey [delay] in minutes. # The world border closes every interval, which is evey [delay] in minutes.
# Thw worldborder starts at [size], and decreases 100 blocks every interval. # 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. # 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 can choose if Hiders are warned 30 seconds before the border moves.
worldBorder: worldBorder:

2
src/main/resources/plugin.yml
View file

@ -42,7 +42,7 @@ permissions:
description: Allows you to reload the config description: Allows you to reload the config
default: op default: op
hideandseek.setborder: hideandseek.setborder:
description: Allows you to set the game worldborder description: Allows you to set the game world border
default: op default: op
hideandseek.setspawn: hideandseek.setspawn:
description: Allows you to set the game spawn point description: Allows you to set the game spawn point