diff options
Diffstat (limited to 'src/main/java/cat/freya/khs')
23 files changed, 53 insertions, 59 deletions
diff --git a/src/main/java/cat/freya/khs/Main.java b/src/main/java/cat/freya/khs/Main.java index d1dfa63..ef5340d 100644 --- a/src/main/java/cat/freya/khs/Main.java +++ b/src/main/java/cat/freya/khs/Main.java @@ -37,7 +37,7 @@ import static cat.freya.khs.configuration.Config.*; import static cat.freya.khs.configuration.Localization.message; public class Main extends JavaPlugin implements Listener { - + private static Main instance; private static int version; private static int sub_version; @@ -214,15 +214,15 @@ public class Main extends JavaPlugin implements Listener { if (matcher.find()) { version = Integer.parseInt(matcher.group(1)); sub_version = 0; - + getLogger().info("Identified server version: " + version); - + return; } throw new IllegalArgumentException("Failed to parse server version from: " + Bukkit.getVersion()); } - + public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) { if (!(sender instanceof Player)) { sender.sendMessage(errorPrefix + message("COMMAND_PLAYER_ONLY")); @@ -231,7 +231,7 @@ public class Main extends JavaPlugin implements Listener { commandGroup.handleCommand((Player)sender, args); return true; } - + public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { if (!(sender instanceof Player)) { sender.sendMessage(errorPrefix + message("COMMAND_PLAYER_ONLY")); @@ -297,5 +297,5 @@ public class Main extends JavaPlugin implements Listener { if(!isEnabled()) return; Bukkit.getServer().getScheduler().runTask(this, task); } - + } diff --git a/src/main/java/cat/freya/khs/command/Reload.java b/src/main/java/cat/freya/khs/command/Reload.java index 767d2c5..036b5aa 100644 --- a/src/main/java/cat/freya/khs/command/Reload.java +++ b/src/main/java/cat/freya/khs/command/Reload.java @@ -16,7 +16,7 @@ import static cat.freya.khs.configuration.Localization.message; public class Reload implements ICommand { public void execute(Player sender, String[] args) { - + if (Main.getInstance().getGame().getStatus() != Status.STANDBY) { sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); return; diff --git a/src/main/java/cat/freya/khs/command/SetExitLocation.java b/src/main/java/cat/freya/khs/command/SetExitLocation.java index 637088b..24efa81 100644 --- a/src/main/java/cat/freya/khs/command/SetExitLocation.java +++ b/src/main/java/cat/freya/khs/command/SetExitLocation.java @@ -26,7 +26,7 @@ public class SetExitLocation implements ICommand { public String getLabel() { return "setexit"; } - + public String getUsage() { return ""; } diff --git a/src/main/java/cat/freya/khs/command/Start.java b/src/main/java/cat/freya/khs/command/Start.java index e28a6cc..e0ada5f 100644 --- a/src/main/java/cat/freya/khs/command/Start.java +++ b/src/main/java/cat/freya/khs/command/Start.java @@ -33,7 +33,7 @@ public class Start implements ICommand { sender.sendMessage(errorPrefix + message("START_MIN_PLAYERS").addAmount(minPlayers)); return; } - + if (args.length < 1) { Main.getInstance().getGame().start(); return; @@ -48,7 +48,7 @@ public class Start implements ICommand { } initialSeekers.add(seeker); } - + int minHiders = minPlayers - startingSeekerCount; if (Main.getInstance().getBoard().size() - initialSeekers.size() < minHiders) { sender.sendMessage(errorPrefix + message("START_MIN_PLAYERS").addAmount(minPlayers)); @@ -57,11 +57,11 @@ public class Start implements ICommand { Main.getInstance().getGame().start(initialSeekers); } - + public String getLabel() { return "start"; } - + public String getUsage() { return "<*seekers...>"; } diff --git a/src/main/java/cat/freya/khs/command/Stop.java b/src/main/java/cat/freya/khs/command/Stop.java index c272c7b..72de537 100644 --- a/src/main/java/cat/freya/khs/command/Stop.java +++ b/src/main/java/cat/freya/khs/command/Stop.java @@ -30,7 +30,7 @@ public class Stop implements ICommand { public String getLabel() { return "stop"; } - + public String getUsage() { return ""; } diff --git a/src/main/java/cat/freya/khs/command/map/Save.java b/src/main/java/cat/freya/khs/command/map/Save.java index 7d3a3c0..8998bdd 100644 --- a/src/main/java/cat/freya/khs/command/map/Save.java +++ b/src/main/java/cat/freya/khs/command/map/Save.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; public class Save implements ICommand { public static boolean runningBackup = false; - + public void execute(Player sender, String[] args) { if (!Config.mapSaveEnabled) { sender.sendMessage(Config.errorPrefix + Localization.message("MAPSAVE_DISABLED")); diff --git a/src/main/java/cat/freya/khs/command/map/Status.java b/src/main/java/cat/freya/khs/command/map/Status.java index e62e10d..15dc8e9 100644 --- a/src/main/java/cat/freya/khs/command/map/Status.java +++ b/src/main/java/cat/freya/khs/command/map/Status.java @@ -12,9 +12,9 @@ import java.util.List; import java.util.stream.Collectors; public class Status implements ICommand { - + public void execute(Player sender, String[] args) { - + String msg = Localization.message("SETUP").toString(); int count = 0; Map map = Maps.getMap(args[0]); diff --git a/src/main/java/cat/freya/khs/command/map/set/Border.java b/src/main/java/cat/freya/khs/command/map/set/Border.java index c40b742..b0aa905 100644 --- a/src/main/java/cat/freya/khs/command/map/set/Border.java +++ b/src/main/java/cat/freya/khs/command/map/set/Border.java @@ -67,7 +67,7 @@ public class Border implements ICommand { public String getLabel() { return "border"; } - + public String getUsage() { return "<map> <size> <delay> <move>"; } diff --git a/src/main/java/cat/freya/khs/command/map/set/Bounds.java b/src/main/java/cat/freya/khs/command/map/set/Bounds.java index 82adcf1..c05e634 100644 --- a/src/main/java/cat/freya/khs/command/map/set/Bounds.java +++ b/src/main/java/cat/freya/khs/command/map/set/Bounds.java @@ -93,7 +93,7 @@ public class Bounds implements ICommand { public String getLabel() { return "bounds"; } - + public String getUsage() { return "<map>"; } diff --git a/src/main/java/cat/freya/khs/command/map/set/Lobby.java b/src/main/java/cat/freya/khs/command/map/set/Lobby.java index 847211c..4aac83e 100644 --- a/src/main/java/cat/freya/khs/command/map/set/Lobby.java +++ b/src/main/java/cat/freya/khs/command/map/set/Lobby.java @@ -23,7 +23,7 @@ public class Lobby implements ICommand { public String getLabel() { return "lobby"; } - + public String getUsage() { return "<map>"; } diff --git a/src/main/java/cat/freya/khs/command/map/set/Spawn.java b/src/main/java/cat/freya/khs/command/map/set/Spawn.java index 44f4d13..740c3b6 100644 --- a/src/main/java/cat/freya/khs/command/map/set/Spawn.java +++ b/src/main/java/cat/freya/khs/command/map/set/Spawn.java @@ -48,7 +48,7 @@ public class Spawn implements ICommand { public String getLabel() { return "spawn"; } - + public String getUsage() { return "<map>"; } diff --git a/src/main/java/cat/freya/khs/command/util/CommandGroup.java b/src/main/java/cat/freya/khs/command/util/CommandGroup.java index ab5ca43..13b0c2b 100644 --- a/src/main/java/cat/freya/khs/command/util/CommandGroup.java +++ b/src/main/java/cat/freya/khs/command/util/CommandGroup.java @@ -42,7 +42,7 @@ public class CommandGroup { } } } - + public void handleCommand(Player player, String[] args) { Tuple<ICommand, String, String[]> data = getCommand(args, this.getLabel()); diff --git a/src/main/java/cat/freya/khs/configuration/Config.java b/src/main/java/cat/freya/khs/configuration/Config.java index ac5fcb7..1bbbefa 100644 --- a/src/main/java/cat/freya/khs/configuration/Config.java +++ b/src/main/java/cat/freya/khs/configuration/Config.java @@ -21,7 +21,7 @@ public class Config { private static ConfigManager config; - public static String + public static String messagePrefix, errorPrefix, tauntPrefix, @@ -39,7 +39,7 @@ public class Config { databaseUser, databasePass, databaseName; - + public static boolean nameTagsVisible, permissionsRequired, @@ -69,8 +69,8 @@ public class Config { waitTillNoneLeft, gameOverTitle, regenHealth; - - public static int + + public static int minPlayers, gameLength, tauntDelay, @@ -116,7 +116,7 @@ public class Config { public static Location exitPosition; - + public static void loadConfig() { config = ConfigManager.create("config.yml"); @@ -260,7 +260,7 @@ public class Config { regenHealth = config.getBoolean("regenHealth"); } - + public static void addToConfig(String path, Object value) { config.set(path, value); } @@ -285,5 +285,5 @@ public class Config { try{ temp = XItemStack.deserialize(item); } catch(Exception ignored) {} return temp; } - + } diff --git a/src/main/java/cat/freya/khs/configuration/Items.java b/src/main/java/cat/freya/khs/configuration/Items.java index bdc56ad..6419d63 100644 --- a/src/main/java/cat/freya/khs/configuration/Items.java +++ b/src/main/java/cat/freya/khs/configuration/Items.java @@ -16,7 +16,7 @@ import java.util.List; public class Items { public static List<ItemStack> HIDER_ITEMS, SEEKER_ITEMS; - public static ItemStack + public static ItemStack HIDER_HELM, SEEKER_HELM, HIDER_CHEST, SEEKER_CHEST, HIDER_LEGS, SEEKER_LEGS, diff --git a/src/main/java/cat/freya/khs/configuration/Localization.java b/src/main/java/cat/freya/khs/configuration/Localization.java index 8b18696..9708d66 100644 --- a/src/main/java/cat/freya/khs/configuration/Localization.java +++ b/src/main/java/cat/freya/khs/configuration/Localization.java @@ -18,12 +18,6 @@ public class Localization { {"GAME_SETUP", "SETUP_GAME", "SETUP_LOBBY", "SETUP_SEEKER_LOBBY", "SETUP_EXIT", "SETUP_SAVEMAP", "SETUP_BOUNDS"}, {"GAME_PLAYER_FOUND", "GAME_PLAYER_FOUND_BY"} }); - put("de-DE", new String[][]{ - {}, - {"TAUNTED"}, - {"GAME_SETUP", "SETUP_GAME", "SETUP_LOBBY", "SETUP_SEEKER_LOBBY", "SETUP_EXIT", "SETUP_SAVEMAP", "SETUP_BOUNDS"}, - {"GAME_PLAYER_FOUND", "GAME_PLAYER_FOUND_BY"} - }); }}; public static void loadLocalization() { @@ -65,7 +59,7 @@ public class Localization { ); } } - + public static LocalizationString message(String key) { LocalizationString message = LOCAL.get(key); if (message == null) { diff --git a/src/main/java/cat/freya/khs/game/Board.java b/src/main/java/cat/freya/khs/game/Board.java index e8e378d..1471fee 100644 --- a/src/main/java/cat/freya/khs/game/Board.java +++ b/src/main/java/cat/freya/khs/game/Board.java @@ -36,7 +36,7 @@ public class Board { public boolean containsUUID(UUID uuid) { return Players.containsKey(uuid); - } + } public boolean isHider(Player player) { return isHider(player.getUniqueId()); diff --git a/src/main/java/cat/freya/khs/game/Game.java b/src/main/java/cat/freya/khs/game/Game.java index 69e9b82..9e15689 100644 --- a/src/main/java/cat/freya/khs/game/Game.java +++ b/src/main/java/cat/freya/khs/game/Game.java @@ -347,7 +347,7 @@ public class Game { public void broadcastTitle(String title, String subtitle) { for (Player player : board.getPlayers()) { - Titles.sendTitle(player, 10, 70, 20, title, subtitle); + Titles.sendTitle(player, 10, 70, 20, title, subtitle); } } diff --git a/src/main/java/cat/freya/khs/game/listener/DisguiseHandler.java b/src/main/java/cat/freya/khs/game/listener/DisguiseHandler.java index d874ae9..7bfca5f 100644 --- a/src/main/java/cat/freya/khs/game/listener/DisguiseHandler.java +++ b/src/main/java/cat/freya/khs/game/listener/DisguiseHandler.java @@ -62,7 +62,7 @@ public class DisguiseHandler implements Listener { Disguise disguise = Main.getInstance().getDisguiser().getByEntityID(id); if(disguise == null) disguise = Main.getInstance().getDisguiser().getByHitBoxID(id); if(disguise == null) return; - + if(disguise.getPlayer().getGameMode() == GameMode.CREATIVE) return; event.setCancelled(true); handleAttack(disguise, player); diff --git a/src/main/java/cat/freya/khs/game/listener/InteractHandler.java b/src/main/java/cat/freya/khs/game/listener/InteractHandler.java index 09ab62b..5203285 100644 --- a/src/main/java/cat/freya/khs/game/listener/InteractHandler.java +++ b/src/main/java/cat/freya/khs/game/listener/InteractHandler.java @@ -108,11 +108,11 @@ public class InteractHandler implements Listener { } public static void createSpectatorTeleportPage(Player player, int page) { - + if (page < 0) { return; } - + final Board board = Main.getInstance().getBoard(); List<Player> players = new ArrayList<>(); players.addAll(board.getHiders()); @@ -121,13 +121,13 @@ public class InteractHandler implements Listener { final int page_size = 9 * 5; final int amount = players.size(); final int start = page * page_size; - + int page_amount = amount - start; - + if (page_amount < 1) { return; } - + boolean next = false, prev = true; if (page_amount > page_size) { @@ -145,12 +145,12 @@ public class InteractHandler implements Listener { final List<String> hider_lore = new ArrayList<>(); hider_lore.add(message("HIDER_TEAM_NAME").toString()); final List<String> seeker_lore = new ArrayList<>(); seeker_lore.add(message("SEEKER_TEAM_NAME").toString()); - + for (int i = 0; i < page_amount; i++) { Player plr = players.get(i); teleportMenu.addItem(getSkull(plr, board.isHider(plr) ? hider_lore : seeker_lore)); } - + final int lastRow = (rows - 1) * 9; if (prev) { teleportMenu.setItem(lastRow, getPageItem(page - 1)); diff --git a/src/main/java/cat/freya/khs/game/listener/InventoryHandler.java b/src/main/java/cat/freya/khs/game/listener/InventoryHandler.java index ccf292d..1ffa996 100644 --- a/src/main/java/cat/freya/khs/game/listener/InventoryHandler.java +++ b/src/main/java/cat/freya/khs/game/listener/InventoryHandler.java @@ -55,12 +55,12 @@ public class InventoryHandler implements Listener { private void checkForSpectatorTeleportMenu(InventoryClickEvent event){ Player player = (Player) event.getWhoClicked(); - + ItemStack item = event.getCurrentItem(); ItemMeta meta = item.getItemMeta(); String name = meta.getDisplayName(); - + if (Main.getInstance().getBoard().isSpectator(player)) { if (XMaterial.PLAYER_HEAD.isSimilar(item)) { event.setCancelled(true); diff --git a/src/main/java/cat/freya/khs/util/PAPIExpansion.java b/src/main/java/cat/freya/khs/util/PAPIExpansion.java index a569c0f..1103ba1 100644 --- a/src/main/java/cat/freya/khs/util/PAPIExpansion.java +++ b/src/main/java/cat/freya/khs/util/PAPIExpansion.java @@ -60,7 +60,7 @@ public class PAPIExpansion extends PlaceholderExpansion { return "-"; } } - + if (args.length == 1 && args[0].equals("seekers")) { if (!board.containsUUID(player.getUniqueId())) { return "-"; diff --git a/src/main/java/cat/freya/khs/util/packet/EntityMetadataPacket.java b/src/main/java/cat/freya/khs/util/packet/EntityMetadataPacket.java index 04f1ad5..ff57fea 100644 --- a/src/main/java/cat/freya/khs/util/packet/EntityMetadataPacket.java +++ b/src/main/java/cat/freya/khs/util/packet/EntityMetadataPacket.java @@ -61,7 +61,7 @@ public class EntityMetadataPacket extends AbstractPacket { } else { packet.getWatchableCollectionModifier().write(0, watcher.getWatchableObjects()); - + } } diff --git a/src/main/java/cat/freya/khs/world/WorldLoader.java b/src/main/java/cat/freya/khs/world/WorldLoader.java index 8460365..97d1273 100644 --- a/src/main/java/cat/freya/khs/world/WorldLoader.java +++ b/src/main/java/cat/freya/khs/world/WorldLoader.java @@ -16,7 +16,7 @@ import static cat.freya.khs.configuration.Localization.message; public class WorldLoader { private final Map map; - + public WorldLoader(Map map) { this.map = map; } @@ -52,12 +52,12 @@ public class WorldLoader { world.setAutoSave(false); }); } - + public void rollback() { unloadMap(); loadMap(); } - + public String save() { World world = Bukkit.getServer().getWorld(map.getSpawnName()); if(world == null){ @@ -91,7 +91,7 @@ public class WorldLoader { return errorPrefix + message("MAPSAVE_ERROR"); } } - + private void copyFileFolder(String name, Boolean isMca) throws IOException { File region = new File(Main.getInstance().getWorldContainer()+File.separator+ map.getSpawnName() +File.separator+name); File temp = new File(Main.getInstance().getWorldContainer()+File.separator+"temp_"+ map.getGameSpawnName() +File.separator+name); @@ -110,14 +110,14 @@ public class WorldLoader { int minZ = (int)Math.floor(map.getBoundsMin().getZ() / 512.0); int maxX = (int)Math.floor(map.getBoundsMax().getX() / 512.0); int maxZ = (int)Math.floor(map.getBoundsMax().getZ() / 512.0); - + String[] parts = file.split("\\."); if (parts.length > 1) { if ( Integer.parseInt(parts[1]) < minX || Integer.parseInt(parts[1]) > maxX || Integer.parseInt(parts[2]) < minZ || Integer.parseInt(parts[2]) > maxZ ) continue; } } - + File srcFile = new File(region, file); if (srcFile.isDirectory()) { copyFileFolder(name+File.separator+file, false); @@ -128,7 +128,7 @@ public class WorldLoader { } } } - + private void copyFile(File source, File target) throws IOException { InputStream in = Files.newInputStream(source.toPath()); OutputStream out = Files.newOutputStream(target.toPath()); @@ -139,7 +139,7 @@ public class WorldLoader { in.close(); out.close(); } - + public static void deleteDirectory(File directoryToBeDeleted) { File[] allContents = directoryToBeDeleted.listFiles(); if (allContents != null) { @@ -151,5 +151,5 @@ public class WorldLoader { throw new RuntimeException("Failed to delete directory: "+directoryToBeDeleted.getPath()); } } - + } |