From 3ebb86268a543d154cdf20ac2ffbf7b56bdf9794 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Thu, 28 Oct 2021 23:09:28 -0400 Subject: 1.3.1 build 2 --- .../hideAndSeek/configuration/ConfigManager.java | 156 +++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java (limited to 'src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java') diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java new file mode 100644 index 0000000..7ea38db --- /dev/null +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java @@ -0,0 +1,156 @@ +package net.tylermurphy.hideAndSeek.configuration; + +import net.tylermurphy.hideAndSeek.Main; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.file.YamlConfiguration; + +import java.io.*; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.Map; + +public class ConfigManager { + + private File file; + private YamlConfiguration config,defaultConfig; + + public ConfigManager(String filename){ + this.file = new File(Main.plugin.getDataFolder(), filename); + + if(!file.exists()){ + saveDefaultConfiguration(); + } + + this.config = YamlConfiguration.loadConfiguration(file); + + InputStream input = Main.plugin.getResource(file.getName()); + InputStreamReader reader = new InputStreamReader(input); + this.defaultConfig = YamlConfiguration.loadConfiguration(reader); + try{ + input.close(); + reader.close(); + } catch (IOException e){} + + } + + private void saveDefaultConfiguration(){ + try{ + InputStream input = Main.plugin.getResource(file.getName()); + java.nio.file.Files.copy(input, file.toPath()); + input.close(); + } catch(IOException e){ + e.printStackTrace(); + } + } + + public void addToSection(String sectionName, Map values) { + ConfigurationSection section = config.getConfigurationSection(sectionName); + if(section == null) section = config.createSection(sectionName); + Map sectionValues = section.getValues(true); + for(Map.Entry entry : values.entrySet()) { + sectionValues.put(entry.getKey(), entry.getValue()); + } + config.createSection(sectionName, sectionValues); + } + + public void addToConfig(String path, Object value) { + config.set(path, value); + } + + public double getDouble(String path){ + double value = config.getDouble(path); + if(value == 0.0D){ + return defaultConfig.getDouble(path); + } else { + return value; + } + } + + public int getInt(String path){ + int value = config.getInt(path); + if(value == 0){ + return defaultConfig.getInt(path); + } else { + return value; + } + } + + public String getString(String path){ + String value = config.getString(path); + if(value == null){ + return defaultConfig.getString(path); + } else { + return value; + } + } + + public boolean getBoolean(String path){ + boolean value = config.getBoolean(path); + if(value == false){ + return defaultConfig.getBoolean(path); + } else { + return value; + } + } + + public ConfigurationSection getConfigurationSection(String path){ + ConfigurationSection section = config.getConfigurationSection(path); + if(section == null){ + return defaultConfig.getConfigurationSection(path); + } else { + return section; + } + } + + public void set(String path, Object value){ + config.set(path, value); + } + + public void saveConfig(){ + try { + InputStream is = Main.plugin.getResource(file.getName()); + StringBuilder textBuilder = new StringBuilder(); + Reader reader = new BufferedReader(new InputStreamReader(is, Charset.forName(StandardCharsets.UTF_8.name()))); + int c = 0; + while((c = reader.read()) != -1){ + textBuilder.append((char) c); + } + String yamlString = textBuilder.toString(); + Map temp = config.getValues(true); + for(Map.Entry entry: temp.entrySet()){ + System.out.println(entry.getKey() + " " + entry.getValue().getClass().getName()); + if(entry.getValue() instanceof Integer || entry.getValue() instanceof Double || entry.getValue() instanceof String || entry.getValue() instanceof Boolean){ + String[] parts = entry.getKey().split("\\."); + int index = 0; + int i = 0; + for(String part : parts) { + if(i == 0) { + index = yamlString.indexOf(part, index); + } else { + index = yamlString.indexOf(" " + part, index); + index++; + } + i++; + if(index == -1) break; + } + if(index == -1) continue;; + int start = yamlString.indexOf(' ', index); + int end = yamlString.indexOf('\n', index); + String replace = entry.getValue().toString(); + if(entry.getValue() instanceof String){ + replace = "\"" + replace + "\""; + } + StringBuilder builder = new StringBuilder(yamlString); + builder.replace(start+1, end, replace); + yamlString = builder.toString(); + } + } + PrintWriter out = new PrintWriter(file); + out.print(yamlString); + out.close(); + } catch (IOException e){ + e.printStackTrace(); + } + } + +} -- cgit v1.2.3-freya From 2a526291526811841d02ff813d9b3a7752570b43 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Sun, 31 Oct 2021 11:25:27 -0400 Subject: 1.3.1 build 4 --- .../java/net/tylermurphy/hideAndSeek/Main.java | 2 + .../hideAndSeek/bukkit/EventListener.java | 19 ++- .../net/tylermurphy/hideAndSeek/command/Join.java | 6 +- .../tylermurphy/hideAndSeek/command/Reload.java | 2 + .../tylermurphy/hideAndSeek/command/SetBounds.java | 14 ++- .../hideAndSeek/command/SetExitLocation.java | 13 +- .../hideAndSeek/command/SetLobbyLocation.java | 12 +- .../hideAndSeek/command/SetSpawnLocation.java | 14 ++- .../hideAndSeek/configuration/Config.java | 10 +- .../hideAndSeek/configuration/ConfigManager.java | 13 +- .../hideAndSeek/configuration/Items.java | 131 +++++++++++++++++++++ .../hideAndSeek/configuration/Localization.java | 5 +- .../net/tylermurphy/hideAndSeek/util/Board.java | 15 +-- .../tylermurphy/hideAndSeek/util/CustomBoard.java | 8 +- .../net/tylermurphy/hideAndSeek/util/Util.java | 54 ++------- .../tylermurphy/hideAndSeek/world/WorldLoader.java | 2 +- src/main/resources/config.yml | 73 +++++++----- src/main/resources/items.yml | 87 ++++++++++++++ src/main/resources/localization.yml | 31 ++--- src/main/resources/plugin.yml | 4 + 20 files changed, 381 insertions(+), 134 deletions(-) create mode 100644 src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java create mode 100644 src/main/resources/items.yml (limited to 'src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java') diff --git a/src/main/java/net/tylermurphy/hideAndSeek/Main.java b/src/main/java/net/tylermurphy/hideAndSeek/Main.java index 1a5570e..f5c8518 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/Main.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/Main.java @@ -22,6 +22,7 @@ import net.tylermurphy.hideAndSeek.bukkit.TabCompleter; import net.tylermurphy.hideAndSeek.bukkit.Tick; import net.tylermurphy.hideAndSeek.configuration.Config; import net.tylermurphy.hideAndSeek.configuration.Localization; +import net.tylermurphy.hideAndSeek.configuration.Items; import net.tylermurphy.hideAndSeek.events.Glow; import net.tylermurphy.hideAndSeek.events.Taunt; import net.tylermurphy.hideAndSeek.events.Worldborder; @@ -63,6 +64,7 @@ public class Main extends JavaPlugin implements Listener { // Init Configuration Config.loadConfig(); Localization.loadLocalization(); + Items.loadItems(); // Create World Loader worldLoader = new WorldLoader(spawnWorld); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java index dc8b9ce..2e8eafb 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java @@ -2,6 +2,7 @@ package net.tylermurphy.hideAndSeek.bukkit; import static net.tylermurphy.hideAndSeek.configuration.Config.*; +import net.tylermurphy.hideAndSeek.command.Join; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; @@ -38,10 +39,18 @@ public class EventListener implements Listener { event.getPlayer().setLevel(0); Main.plugin.board.remove(event.getPlayer()); if(!Util.isSetup()) return; - if(event.getPlayer().getWorld().getName().equals("hideandseek_"+spawnWorld) || event.getPlayer().getWorld().getName().equals(lobbyWorld)){ - event.getPlayer().teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ())); - event.getPlayer().setGameMode(GameMode.ADVENTURE); - + if(autoJoin){ + Join.join(event.getPlayer()); + } else if(teleportToExit) { + if (event.getPlayer().getWorld().getName().equals("hideandseek_" + spawnWorld) || event.getPlayer().getWorld().getName().equals(lobbyWorld)) { + event.getPlayer().teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ())); + event.getPlayer().setGameMode(GameMode.ADVENTURE); + } + } else { + if (event.getPlayer().getWorld().getName().equals("hideandseek_" + spawnWorld)) { + event.getPlayer().teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ())); + event.getPlayer().setGameMode(GameMode.ADVENTURE); + } } } @@ -90,7 +99,7 @@ public class EventListener implements Listener { } } Player player = (Player) event.getEntity(); - if(player.getHealth()-event.getDamage() < 0) { + if(player.getHealth()-event.getDamage() < 0 || !pvpEnabled) { if(spawnPosition == null) return; event.setCancelled(true); player.setHealth(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java index b3691bf..17b8f7a 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java @@ -30,6 +30,10 @@ public class Join implements ICommand { return; } + join(player); + } + + public static void join(Player player){ if(Main.plugin.status.equals("Standby")) { player.getInventory().clear(); Main.plugin.board.addHider(player); @@ -46,7 +50,7 @@ public class Join implements ICommand { Main.plugin.board.createGameBoard(player); player.teleport(new Location(Bukkit.getWorld("hideandseek_"+spawnWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ())); } - + player.setFoodLevel(20); player.setHealth(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getBaseValue()); } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java index 2c7ba04..971cd13 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java @@ -2,6 +2,7 @@ package net.tylermurphy.hideAndSeek.command; import static net.tylermurphy.hideAndSeek.configuration.Config.*; +import net.tylermurphy.hideAndSeek.configuration.Items; import org.bukkit.command.CommandSender; import net.tylermurphy.hideAndSeek.Main; @@ -20,6 +21,7 @@ public class Reload implements ICommand { } Config.loadConfig(); Localization.loadLocalization(); + Items.loadItems(); sender.sendMessage(messagePrefix + message("CONFIG_RELOAD")); } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java index 210f7fe..c94a0d1 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java @@ -24,15 +24,25 @@ public class SetBounds implements ICommand { sender.sendMessage(errorPrefix + message("BOUNDS_WRONG_WORLD")); return; } + if(player.getLocation().getBlockX() == 0 || player.getLocation().getBlockZ() == 0){ + sender.sendMessage(errorPrefix + message("NOT_AT_ZERO")); + return; + } + boolean first = true; + if(saveMinX != 0 && saveMinZ != 0 && saveMaxX != 0 && saveMaxZ != 0) { + saveMinX = 0; saveMinZ= 0; saveMaxX = 0; saveMaxZ = 0; + } if(saveMaxX == 0) { addToConfig("bounds.max.x", player.getLocation().getBlockX()); saveMaxX = player.getLocation().getBlockX(); } else if(saveMaxX < player.getLocation().getBlockX()) { + first = false; addToConfig("bounds.max.x", player.getLocation().getBlockX()); addToConfig("bounds.min.x", saveMaxX); saveMinX = saveMaxX; saveMaxX = player.getLocation().getBlockX(); } else { + first = false; addToConfig("bounds.min.x", player.getLocation().getBlockX()); saveMinX = player.getLocation().getBlockX(); } @@ -40,15 +50,17 @@ public class SetBounds implements ICommand { addToConfig("bounds.max.z", player.getLocation().getBlockZ()); saveMaxZ = player.getLocation().getBlockZ(); } else if(saveMaxZ < player.getLocation().getBlockZ()) { + first = false; addToConfig("bounds.max.z", player.getLocation().getBlockZ()); addToConfig("bounds.min.z", saveMaxZ); saveMinZ = saveMaxZ; saveMaxZ = player.getLocation().getBlockZ(); } else { + first = false; addToConfig("bounds.min.z", player.getLocation().getBlockZ()); saveMinZ = player.getLocation().getBlockZ(); } - sender.sendMessage(messagePrefix + message("BOUNDS")); + sender.sendMessage(messagePrefix + message("BOUNDS").addAmount(first ? 1 : 2)); saveConfig(); } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java index c9d2fae..e0b8a5d 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java @@ -15,18 +15,21 @@ import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class SetExitLocation implements ICommand { public void execute(CommandSender sender, String[] args) { + if(!Main.plugin.status.equals("Standby")) { + sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); + return; + } Vector newExitPosition = new Vector(); Player player = (Player) sender; + if(player.getLocation().getBlockX() == 0 || player.getLocation().getBlockZ() == 0 || player.getLocation().getBlockY() == 0){ + sender.sendMessage(errorPrefix + message("NOT_AT_ZERO")); + return; + } newExitPosition.setX(player.getLocation().getBlockX()); newExitPosition.setY(player.getLocation().getBlockY()); newExitPosition.setZ(player.getLocation().getBlockZ()); - if(!Main.plugin.status.equals("Standby")) { - sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); - return; - } exitPosition = newExitPosition; sender.sendMessage(messagePrefix + message("EXIT_SPAWN")); - Map temp = new HashMap(); addToConfig("spawns.exit.x", exitPosition.getX()); addToConfig("spawns.exit.y", exitPosition.getY()); addToConfig("spawns.exit.z", exitPosition.getZ()); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java index a8a1887..53ae721 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java @@ -15,15 +15,19 @@ import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class SetLobbyLocation implements ICommand { public void execute(CommandSender sender, String[] args) { + if(!Main.plugin.status.equals("Standby")) { + sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); + return; + } Vector newLobbyPosition = new Vector(); Player player = (Player) sender; + if(player.getLocation().getBlockX() == 0 || player.getLocation().getBlockZ() == 0 || player.getLocation().getBlockY() == 0){ + sender.sendMessage(errorPrefix + message("NOT_AT_ZERO")); + return; + } newLobbyPosition.setX(player.getLocation().getBlockX()); newLobbyPosition.setY(player.getLocation().getBlockY()); newLobbyPosition.setZ(player.getLocation().getBlockZ()); - if(!Main.plugin.status.equals("Standby")) { - sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); - return; - } lobbyPosition = newLobbyPosition; sender.sendMessage(messagePrefix + message("LOBBY_SPAWN")); addToConfig("spawns.lobby.x", lobbyPosition.getX()); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java index d634968..5324ecf 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java @@ -17,16 +17,20 @@ import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class SetSpawnLocation implements ICommand { public void execute(CommandSender sender, String[] args) { + if(!Main.plugin.status.equals("Standby")) { + sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); + return; + } Vector newSpawnPosition = new Vector(); Player player = (Player) sender; + if(player.getLocation().getBlockX() == 0 || player.getLocation().getBlockZ() == 0 || player.getLocation().getBlockY() == 0){ + sender.sendMessage(errorPrefix + message("NOT_AT_ZERO")); + return; + } newSpawnPosition.setX(player.getLocation().getBlockX()); newSpawnPosition.setY(player.getLocation().getBlockY()); newSpawnPosition.setZ(player.getLocation().getBlockZ()); - if(!Main.plugin.status.equals("Standby")) { - sender.sendMessage(errorPrefix + message("GAME_INPROGRESS")); - return; - } - if(worldborderEnabled && spawnPosition.distance(worldborderPosition) > 100) { + if(worldborderEnabled && newSpawnPosition.distance(worldborderPosition) > 100) { sender.sendMessage(errorPrefix + message("WORLDBORDER_POSITION")); return; } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java index 04faca2..f2b7680 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java @@ -13,7 +13,7 @@ import net.tylermurphy.hideAndSeek.Main; public class Config { - static ConfigManager manager; + private static ConfigManager manager; public static String messagePrefix, @@ -42,7 +42,10 @@ public class Config { tauntCountdown, tauntLast, glowEnabled, - glowStackable; + glowStackable, + pvpEnabled, + autoJoin, + teleportToExit; public static int minPlayers, @@ -131,6 +134,9 @@ public class Config { permissionsRequired = manager.getBoolean("permissionsRequired"); minPlayers = Math.max(2, manager.getInt("minPlayers")); gameLength = manager.getInt("gameLength"); + pvpEnabled = manager.getBoolean("pvp"); + autoJoin = manager.getBoolean("autoJoin"); + teleportToExit = manager.getBoolean("teleportToExit"); } public static void addToConfig(String path, Object value) { diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java index 7ea38db..df970bf 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java @@ -30,7 +30,6 @@ public class ConfigManager { input.close(); reader.close(); } catch (IOException e){} - } private void saveDefaultConfiguration(){ @@ -43,16 +42,6 @@ public class ConfigManager { } } - public void addToSection(String sectionName, Map values) { - ConfigurationSection section = config.getConfigurationSection(sectionName); - if(section == null) section = config.createSection(sectionName); - Map sectionValues = section.getValues(true); - for(Map.Entry entry : values.entrySet()) { - sectionValues.put(entry.getKey(), entry.getValue()); - } - config.createSection(sectionName, sectionValues); - } - public void addToConfig(String path, Object value) { config.set(path, value); } @@ -89,7 +78,7 @@ public class ConfigManager { if(value == false){ return defaultConfig.getBoolean(path); } else { - return value; + return true; } } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java new file mode 100644 index 0000000..fbf5d2c --- /dev/null +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java @@ -0,0 +1,131 @@ +package net.tylermurphy.hideAndSeek.configuration; + +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.NamespacedKey; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.inventory.meta.PotionMeta; +import org.bukkit.potion.*; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public class Items { + + private static ConfigManager manager; + + public static List HIDER_ITEMS, SEEKER_ITEMS; + public static List HIDER_EFFECTS, SEEKER_EFFECTS; + + public static void loadItems() { + + manager = new ConfigManager("items.yml"); + + SEEKER_ITEMS = new ArrayList(); + ConfigurationSection SeekerItems = manager.getConfigurationSection("items.seeker"); + int i = 1; + while (true) { + ConfigurationSection section = SeekerItems.getConfigurationSection(String.valueOf(i)); + if(section == null) break; + ItemStack item = createItem(section); + if(item != null) SEEKER_ITEMS.add(item); + i++; + } + + HIDER_ITEMS = new ArrayList(); + ConfigurationSection HiderItems = manager.getConfigurationSection("items.hider"); + i = 1; + while (true) { + ConfigurationSection section = HiderItems.getConfigurationSection(String.valueOf(i)); + if(section == null) break; + ItemStack item = createItem(section); + if(item != null) HIDER_ITEMS.add(item); + i++; + } + + SEEKER_EFFECTS = new ArrayList(); + ConfigurationSection SeekerEffects = manager.getConfigurationSection("effects.seeker"); + i = 1; + while (true) { + ConfigurationSection section = SeekerEffects.getConfigurationSection(String.valueOf(i)); + if(section == null) break; + PotionEffect effect = getPotionEffect(section); + if(effect != null) SEEKER_EFFECTS.add(effect); + i++; + } + + HIDER_EFFECTS = new ArrayList(); + ConfigurationSection HiderEffects = manager.getConfigurationSection("effects.hider"); + i = 1; + while (true) { + ConfigurationSection section = HiderEffects.getConfigurationSection(String.valueOf(i)); + if(section == null) break; + PotionEffect effect = getPotionEffect(section); + if(effect != null) HIDER_EFFECTS.add(effect); + i++; + } + + } + + private static ItemStack createItem(ConfigurationSection item) { + String material_string = item.getString("material"); + if(material_string == null) return null; + Material material = Material.valueOf(material_string.toUpperCase()); + int amount = item.getInt("amount"); + ItemStack stack = new ItemStack(material, amount); + if(material == Material.POTION || material == Material.SPLASH_POTION || material == Material.LINGERING_POTION){ + PotionMeta meta = getPotionMeta(stack, item); + stack.setItemMeta(meta); + } else { + ConfigurationSection enchantments = item.getConfigurationSection("enchantments"); + if (enchantments != null) + for (String enchantment_string : enchantments.getKeys(false)) { + Enchantment enchantment = Enchantment.getByKey(NamespacedKey.minecraft(enchantment_string)); + if (enchantment == null) continue; + stack.addUnsafeEnchantment( + enchantment, + enchantments.getInt(enchantment_string) + ); + } + ItemMeta meta = getItemMeta(stack,item); + stack.setItemMeta(meta); + } + return stack; + } + + private static ItemMeta getItemMeta(ItemStack stack, ConfigurationSection item){ + ItemMeta meta = stack.getItemMeta(); + assert meta != null; + String name = item.getString("name"); + if(name != null) + meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', name)); + meta.setUnbreakable(item.getBoolean("unbreakable")); + meta.setLore(item.getStringList("lore")); + return meta; + } + + private static PotionMeta getPotionMeta(ItemStack stack, ConfigurationSection item){ + String type = item.getString("type"); + PotionMeta meta = (PotionMeta) stack.getItemMeta(); + if(type==null) return meta; + assert meta != null; + meta.setBasePotionData(new PotionData((PotionType.valueOf(type.toUpperCase())))); + return meta; + } + + private static PotionEffect getPotionEffect(ConfigurationSection item){ + String type = item.getString("type"); + if(type == null) return null; + return new PotionEffect( + Objects.requireNonNull(PotionEffectType.getByName(type.toUpperCase())), + item.getInt("duration"), + item.getInt("amplifier"), + item.getBoolean("ambient"), + item.getBoolean("particles") + ); + } +} diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java index 82d19d4..9980a4e 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java @@ -21,7 +21,8 @@ public class Localization { public static boolean loadLocalization() { manager = new ConfigManager("localization.yml"); - + manager.saveConfig(); + for(String key : manager.getConfigurationSection("Localization").getKeys(false)) { LOCAL.put( key, @@ -29,8 +30,6 @@ public class Localization { ); } - manager.saveConfig(); - return true; } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Board.java b/src/main/java/net/tylermurphy/hideAndSeek/util/Board.java index 59b9ac8..80cbdee 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/util/Board.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/util/Board.java @@ -159,9 +159,9 @@ public class Board { } board.setLine("hiders", ChatColor.BOLD + "" + ChatColor.YELLOW + "HIDER%" + ChatColor.WHITE + getHiderPercent()); board.setLine("seekers", ChatColor.BOLD + "" + ChatColor.RED + "SEEKER%" + ChatColor.WHITE + getSeekerPercent()); - board.addBlank(recreate); + board.addBlank(); board.setLine("players", "Players: " + playerList.values().size()); - board.addBlank(recreate); + board.addBlank(); board.setLine("waiting", "Waiting to start..."); board.display(); customBoards.put(player.getName(), board); @@ -175,11 +175,10 @@ public class Board { CustomBoard board = customBoards.get(player.getName()); if(recreate) { board = new CustomBoard(player, "&l&eHIDE AND SEEK"); - board.updateTeams(); } board.setLine("hiders", ChatColor.BOLD + "" + ChatColor.YELLOW + "HIDERS:" + ChatColor.WHITE + " " + Hider.size()); board.setLine("seekers", ChatColor.BOLD + "" + ChatColor.RED + "SEEKERS:" + ChatColor.WHITE + " " + Seeker.size()); - board.addBlank(recreate); + board.addBlank(); if(glowEnabled){ if(Main.plugin.glow == null || !Main.plugin.glow.isRunning()) board.setLine("glow", "Glow: " + ChatColor.RED + "Inactive"); @@ -189,15 +188,17 @@ public class Board { if(tauntEnabled && tauntCountdown){ if(Main.plugin.taunt == null) board.setLine("taunt", "Taunt: " + ChatColor.YELLOW + "0m0s"); - else if(!Main.plugin.taunt.isRunning()) + else if(!tauntLast && Hider.size() == 1){ + board.setLine("taunt", "Taunt: " + ChatColor.YELLOW + "Expired"); + } else if(!Main.plugin.taunt.isRunning()) board.setLine("taunt", "Taunt: " + ChatColor.YELLOW + Main.plugin.taunt.getDelay()/60 + "m" + Main.plugin.taunt.getDelay()%60 + "s"); else board.setLine("taunt", "Taunt: " + ChatColor.YELLOW + "Active"); } if(glowEnabled || (tauntEnabled && tauntCountdown)) - board.addBlank(recreate); + board.addBlank(); board.setLine("time", "Time Left: " + ChatColor.GREEN + Main.plugin.timeLeft/60 + "m" + Main.plugin.timeLeft%60 + "s"); - board.addBlank(recreate); + board.addBlank(); board.setLine("team", "Team: " + getTeam(player)); board.display(); customBoards.put(player.getName(), board); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/CustomBoard.java b/src/main/java/net/tylermurphy/hideAndSeek/util/CustomBoard.java index a01d965..69d865a 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/util/CustomBoard.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/util/CustomBoard.java @@ -18,6 +18,7 @@ public class CustomBoard { private final Player player; private final Map LINES; private int blanks; + private boolean displayed; public CustomBoard(Player player, String title){ this.board = Bukkit.getScoreboardManager().getNewScoreboard(); @@ -26,6 +27,8 @@ public class CustomBoard { this.obj = board.registerNewObjective( "Scoreboard", "dummy", ChatColor.translateAlternateColorCodes('&', title)); this.blanks = 0; + this.displayed = false; + this.updateTeams(); } public void updateTeams() { @@ -67,8 +70,8 @@ public class CustomBoard { LINES.put(key, line); } - public void addBlank(boolean value){ - if(!value) return; + public void addBlank(){ + if(displayed) return; String temp = ""; for(int i = 0; i <= blanks; i ++) temp += ChatColor.RESET; @@ -86,6 +89,7 @@ public class CustomBoard { } public void display() { + displayed = true; obj.setDisplaySlot(DisplaySlot.SIDEBAR); player.setScoreboard(board); } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Util.java b/src/main/java/net/tylermurphy/hideAndSeek/util/Util.java index 3ab04a9..c24936b 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/util/Util.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/util/Util.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.List; import net.md_5.bungee.api.ChatColor; +import net.tylermurphy.hideAndSeek.configuration.Items; import net.tylermurphy.hideAndSeek.configuration.LocalizationString; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -55,48 +56,18 @@ public class Util { for (PotionEffect effect : player.getActivePotionEffects()) { player.removePotionEffect(effect.getType()); } - player.addPotionEffect(new PotionEffect(PotionEffectType.DOLPHINS_GRACE, 1000000, 1, false, false)); if (Main.plugin.board.isSeeker(player)) { - ItemStack diamondSword = new ItemStack(Material.DIAMOND_SWORD, 1); - diamondSword.addEnchantment(Enchantment.DAMAGE_ALL, 1); - ItemMeta diamondSwordMeta = diamondSword.getItemMeta(); - diamondSwordMeta.setDisplayName("Seeker Sword"); - diamondSwordMeta.setUnbreakable(true); - diamondSword.setItemMeta(diamondSwordMeta); - player.getInventory().addItem(diamondSword); - - ItemStack wackyStick = new ItemStack(Material.STICK, 1); - wackyStick.addUnsafeEnchantment(Enchantment.KNOCKBACK, 3); - ItemMeta wackyStickMeta = wackyStick.getItemMeta(); - wackyStickMeta.setDisplayName("Wacky Stick"); - wackyStick.setItemMeta(wackyStickMeta); - player.getInventory().addItem(wackyStick); - - player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 1000000, 2, false, false)); - player.addPotionEffect(new PotionEffect(PotionEffectType.JUMP, 1000000, 1, false, false)); - player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW_FALLING, 1000000, 1, false, false)); - player.addPotionEffect(new PotionEffect(PotionEffectType.WATER_BREATHING, 1000000, 10, false, false)); + if(pvpEnabled) + for(ItemStack item : Items.SEEKER_ITEMS) + player.getInventory().addItem(item); + for(PotionEffect effect : Items.SEEKER_EFFECTS) + player.addPotionEffect(effect); } else if (Main.plugin.board.isHider(player)) { - ItemStack stoneSword = new ItemStack(Material.STONE_SWORD, 1); - stoneSword.addEnchantment(Enchantment.DAMAGE_ALL, 2); - ItemMeta stoneSwordMeta = stoneSword.getItemMeta(); - stoneSwordMeta.setDisplayName("Hider Sword"); - stoneSwordMeta.setUnbreakable(true); - stoneSword.setItemMeta(stoneSwordMeta); - player.getInventory().addItem(stoneSword); - - ItemStack splashPotion = new ItemStack(Material.SPLASH_POTION, 1); - PotionMeta splashPotionMeta = (PotionMeta) splashPotion.getItemMeta(); - splashPotionMeta.setBasePotionData(new PotionData(PotionType.REGEN)); - splashPotion.setItemMeta(splashPotionMeta); - player.getInventory().addItem(splashPotion); - - ItemStack potion = new ItemStack(Material.POTION, 2); - PotionMeta potionMeta = (PotionMeta) potion.getItemMeta(); - potionMeta.setBasePotionData(new PotionData(PotionType.INSTANT_HEAL)); - potion.setItemMeta(potionMeta); - player.getInventory().addItem(potion); - + if(pvpEnabled) + for(ItemStack item : Items.HIDER_ITEMS) + player.getInventory().addItem(item); + for(PotionEffect effect : Items.HIDER_EFFECTS) + player.addPotionEffect(effect); if(glowEnabled) { ItemStack snowball = new ItemStack(Material.SNOWBALL, 1); ItemMeta snowballMeta = snowball.getItemMeta(); @@ -109,9 +80,6 @@ public class Util { snowball.setItemMeta(snowballMeta); player.getInventory().addItem(snowball); } - - player.addPotionEffect(new PotionEffect(PotionEffectType.WATER_BREATHING, 1000000, 1, false, false)); } } - } \ No newline at end of file diff --git a/src/main/java/net/tylermurphy/hideAndSeek/world/WorldLoader.java b/src/main/java/net/tylermurphy/hideAndSeek/world/WorldLoader.java index cfb85bf..5a8c324 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/world/WorldLoader.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/world/WorldLoader.java @@ -35,7 +35,7 @@ public class WorldLoader { public void loadMap(){ Bukkit.getServer().createWorld(new WorldCreator(savename).generator(new VoidGenerator())); - Bukkit.getServer().getWorld(savename).setAutoSave(false); + Bukkit.getServer().getWorld(savename).setAutoSave(false); } public void rollback(){ 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 -- cgit v1.2.3-freya From 72f093b243c07766d1cce808c9a0fccb30227b9d Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Mon, 8 Nov 2021 15:53:13 -0500 Subject: 1.3.1 build 6 --- HideAndSeekPlugin.iml | 12 ++++ pom.xml | 16 +---- .../java/net/tylermurphy/hideAndSeek/Main.java | 16 +++-- .../hideAndSeek/bukkit/EventListener.java | 70 ++++++++++++---------- .../net/tylermurphy/hideAndSeek/bukkit/Tick.java | 8 ++- .../hideAndSeek/configuration/ConfigManager.java | 1 + .../net/tylermurphy/hideAndSeek/events/Glow.java | 18 +++--- .../net/tylermurphy/hideAndSeek/events/Taunt.java | 63 ++++++++++--------- .../hideAndSeek/events/Worldborder.java | 32 +++++++--- .../net/tylermurphy/hideAndSeek/util/Board.java | 15 ++++- 10 files changed, 137 insertions(+), 114 deletions(-) create mode 100644 HideAndSeekPlugin.iml (limited to 'src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java') diff --git a/HideAndSeekPlugin.iml b/HideAndSeekPlugin.iml new file mode 100644 index 0000000..fa63d4b --- /dev/null +++ b/HideAndSeekPlugin.iml @@ -0,0 +1,12 @@ + + + + + + + SPIGOT + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index e0cca85..4d9cd0f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,8 @@ - - - 4.0.0 - +4.0.0 net.tylermurphy HideAndSeek 1.3.1 Hide and Seek Plugin - @@ -22,7 +16,6 @@ - spigot-repo @@ -33,7 +26,6 @@ https://repo.dmulloy2.net/repository/public/ - org.spigotmc @@ -48,10 +40,4 @@ 4.7.0 - - - 11 - 11 - - \ No newline at end of file diff --git a/src/main/java/net/tylermurphy/hideAndSeek/Main.java b/src/main/java/net/tylermurphy/hideAndSeek/Main.java index f5c8518..4815a30 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/Main.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/Main.java @@ -77,15 +77,13 @@ public class Main extends JavaPlugin implements Listener { board.reload(); // Start Tick Timer - onTickTask = Bukkit.getServer().getScheduler().runTaskTimer(this, new Runnable(){ - public void run(){ - try{ - Tick.onTick(); - } catch (Exception e) { - e.printStackTrace(); - } - } - },0,1); + onTickTask = Bukkit.getServer().getScheduler().runTaskTimer(this, () -> { + try{ + Tick.onTick(); + } catch (Exception e) { + e.printStackTrace(); + } + },0,1); } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java index 2e8eafb..ffad241 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java @@ -82,43 +82,47 @@ public class EventListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST) public void onEntityDamage(EntityDamageEvent event) { - if(event.getEntity() instanceof Player) { - Player p = (Player) event.getEntity(); - if(!Main.plugin.board.isPlayer(p)) return; - if(!Main.plugin.status.equals("Playing")) { - event.setCancelled(true); - return; - } - Player attacker = null; - if(event instanceof EntityDamageByEntityEvent) { - Entity damager = ((EntityDamageByEntityEvent)event).getDamager(); - if(damager instanceof Player) { - attacker = (Player) damager; - if(Main.plugin.board.onSameTeam(p, attacker)) event.setCancelled(true); - if(Main.plugin.board.isSpectator(p)) event.setCancelled(true); - } - } - Player player = (Player) event.getEntity(); - if(player.getHealth()-event.getDamage() < 0 || !pvpEnabled) { - if(spawnPosition == null) return; - event.setCancelled(true); - player.setHealth(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); - player.teleport(new Location(Bukkit.getWorld("hideandseek_"+spawnWorld), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ())); - Packet.playSound(player, Sound.ENTITY_PLAYER_DEATH, 1, 1); - if(Main.plugin.board.isSeeker(player)) { - Bukkit.broadcastMessage(message("GAME_PLAYER_DEATH").addPlayer(event.getEntity()).toString()); + try { + if (event.getEntity() instanceof Player) { + Player p = (Player) event.getEntity(); + if (!Main.plugin.board.isPlayer(p)) return; + if (!Main.plugin.status.equals("Playing")) { + event.setCancelled(true); + return; } - if(Main.plugin.board.isHider(player)) { - if(attacker == null) { - Util.broadcastMessage(message("GAME_PLAYER_FOUND").addPlayer(event.getEntity()).toString()); - } else { - Util.broadcastMessage(message("GAME_PLAYER_FOUND_BY").addPlayer(event.getEntity()).addPlayer(attacker).toString()); + Player attacker = null; + if (event instanceof EntityDamageByEntityEvent) { + Entity damager = ((EntityDamageByEntityEvent) event).getDamager(); + if (damager instanceof Player) { + attacker = (Player) damager; + if (Main.plugin.board.onSameTeam(p, attacker)) event.setCancelled(true); + if (Main.plugin.board.isSpectator(p)) event.setCancelled(true); + } + } + Player player = (Player) event.getEntity(); + if (player.getHealth() - event.getDamage() < 0 || !pvpEnabled) { + if (spawnPosition == null) return; + event.setCancelled(true); + player.setHealth(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); + player.teleport(new Location(Bukkit.getWorld("hideandseek_" + spawnWorld), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ())); + Packet.playSound(player, Sound.ENTITY_PLAYER_DEATH, 1, 1); + if (Main.plugin.board.isSeeker(player)) { + Bukkit.broadcastMessage(message("GAME_PLAYER_DEATH").addPlayer(event.getEntity()).toString()); + } + if (Main.plugin.board.isHider(player)) { + if (attacker == null) { + Util.broadcastMessage(message("GAME_PLAYER_FOUND").addPlayer(event.getEntity()).toString()); + } else { + Util.broadcastMessage(message("GAME_PLAYER_FOUND_BY").addPlayer(event.getEntity()).addPlayer(attacker).toString()); + } + Main.plugin.board.addSeeker(player); } - Main.plugin.board.addSeeker(player); + Util.resetPlayer(player); + Main.plugin.board.reloadBoardTeams(); } - Util.resetPlayer(player); - Main.plugin.board.reloadBoardTeams(); } + } catch (Exception e){ + //Has shown to cause problems, so ignore if exception } } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java index eadcf14..8efbe80 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java @@ -40,9 +40,13 @@ public class Tick { else tick = 1; for(Player hider : Main.plugin.board.getHiders()) { - int distance = 100; + int distance = 100, temp = 100; for(Player seeker : Main.plugin.board.getSeekers()) { - int temp = (int) hider.getLocation().distance(seeker.getLocation()); + try { + temp = (int) hider.getLocation().distance(seeker.getLocation()); + } catch (Exception e){ + //Players in different worlds, NOT OK!!! + } if(distance > temp) { distance = temp; } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java index df970bf..09b3dcf 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java @@ -125,6 +125,7 @@ public class ConfigManager { if(index == -1) continue;; int start = yamlString.indexOf(' ', index); int end = yamlString.indexOf('\n', index); + if(end == -1) end = yamlString.length(); String replace = entry.getValue().toString(); if(entry.getValue() instanceof String){ replace = "\"" + replace + "\""; diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java index 6ea5ab8..a817df3 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java @@ -37,16 +37,14 @@ public class Glow { } private void waitGlow() { - Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() { - public void run() { - if(temp != Main.plugin.gameId) return; - glowTime--; - glowTime = Math.max(glowTime, 0); - if(glowTime == 0) { - stopGlow(); - } else { - waitGlow(); - } + Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, () -> { + if(temp != Main.plugin.gameId) return; + glowTime--; + glowTime = Math.max(glowTime, 0); + if(glowTime == 0) { + stopGlow(); + } else { + waitGlow(); } }, 20); } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java index 748ae40..d24c93f 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java @@ -32,20 +32,19 @@ public class Taunt { } private void waitTaunt() { - Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() { - public void run() { - if(delay == 0) { - if(!tauntLast && Main.plugin.board.size() < 2) return; - else executeTaunt(); - } else { - delay--; - waitTaunt(); - } + Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, () -> { + if(delay == 0) { + if(!tauntLast && Main.plugin.board.size() < 2) return; + else executeTaunt(); + } else { + delay--; + waitTaunt(); } },20); } private void executeTaunt() { + if(temp != Main.plugin.gameId) return; Player taunted = null; int rand = (int) (Math.random()*Main.plugin.board.sizeHider()); for(Player player : Main.plugin.board.getPlayers()) { @@ -62,31 +61,29 @@ public class Taunt { taunted.sendMessage(message("TAUNTED").toString()); Util.broadcastMessage(tauntPrefix + message("TAUNT")); tauntPlayer = taunted.getName(); - Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() { - public void run() { - if(temp != Main.plugin.gameId) return; - Player taunted = Main.plugin.board.getPlayer(tauntPlayer); - if(taunted != null) { - Firework fw = (Firework) taunted.getLocation().getWorld().spawnEntity(taunted.getLocation(), EntityType.FIREWORK); - FireworkMeta fwm = fw.getFireworkMeta(); - fwm.setPower(4); - fwm.addEffect(FireworkEffect.builder() - .withColor(Color.BLUE) - .withColor(Color.RED) - .withColor(Color.YELLOW) - .with(FireworkEffect.Type.STAR) - .with(FireworkEffect.Type.BALL) - .with(FireworkEffect.Type.BALL_LARGE) - .flicker(true) - .withTrail() - .build()); - fw.setFireworkMeta(fwm); - Util.broadcastMessage(tauntPrefix + message("TAUNT_ACTIVATE")); - } - tauntPlayer = ""; - running = false; - schedule(); + Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, () -> { + if(temp != Main.plugin.gameId) return; + Player taunted1 = Main.plugin.board.getPlayer(tauntPlayer); + if(taunted1 != null) { + Firework fw = (Firework) taunted1.getLocation().getWorld().spawnEntity(taunted1.getLocation(), EntityType.FIREWORK); + FireworkMeta fwm = fw.getFireworkMeta(); + fwm.setPower(4); + fwm.addEffect(FireworkEffect.builder() + .withColor(Color.BLUE) + .withColor(Color.RED) + .withColor(Color.YELLOW) + .with(FireworkEffect.Type.STAR) + .with(FireworkEffect.Type.BALL) + .with(FireworkEffect.Type.BALL_LARGE) + .flicker(true) + .withTrail() + .build()); + fw.setFireworkMeta(fwm); + Util.broadcastMessage(tauntPrefix + message("TAUNT_ACTIVATE")); } + tauntPlayer = ""; + running = false; + schedule(); },20*30); } else { schedule(); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java index 5884a94..5d0e48c 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java @@ -13,32 +13,38 @@ import net.tylermurphy.hideAndSeek.util.Util; public class Worldborder { private final int temp; + private int delay; + private boolean running; public Worldborder(int temp) { this.temp = temp; } public void schedule() { - Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() { - public void run() { - decreaceWorldborder(); + delay = 60*worldborderDelay; + running = false; + waitBorder(); + } + + private void waitBorder(){ + Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, () -> { + if(delay == 0) decreaceWorldborder(); + else { + delay--; waitBorder(); } - },20*60*worldborderDelay); + }, 20); } private void decreaceWorldborder() { if(temp != Main.plugin.gameId) return; if(currentWorldborderSize-100 > 100) { + running = true; Util.broadcastMessage(worldborderPrefix + message("WORLDBORDER_DECREASING")); currentWorldborderSize -= 100; World world = Bukkit.getWorld("hideandseek_"+spawnWorld); WorldBorder border = world.getWorldBorder(); border.setSize(border.getSize()-100,30); - Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() { - public void run() { - decreaceWorldborder(); - } - },20*60*worldborderDelay); + schedule(); } } @@ -56,5 +62,13 @@ public class Worldborder { border.setCenter(0, 0); } } + + public int getDelay(){ + return delay; + } + + public boolean isRunning() { + return running; + } } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Board.java b/src/main/java/net/tylermurphy/hideAndSeek/util/Board.java index 80cbdee..9d856b5 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/util/Board.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/util/Board.java @@ -180,13 +180,13 @@ public class Board { board.setLine("seekers", ChatColor.BOLD + "" + ChatColor.RED + "SEEKERS:" + ChatColor.WHITE + " " + Seeker.size()); board.addBlank(); if(glowEnabled){ - if(Main.plugin.glow == null || !Main.plugin.glow.isRunning()) + if(Main.plugin.glow == null || Main.plugin.status.equals("Starting") || !Main.plugin.glow.isRunning()) board.setLine("glow", "Glow: " + ChatColor.RED + "Inactive"); else board.setLine("glow", "Glow: " + ChatColor.GREEN + "Active"); } if(tauntEnabled && tauntCountdown){ - if(Main.plugin.taunt == null) + if(Main.plugin.taunt == null || Main.plugin.status.equals("Starting")) board.setLine("taunt", "Taunt: " + ChatColor.YELLOW + "0m0s"); else if(!tauntLast && Hider.size() == 1){ board.setLine("taunt", "Taunt: " + ChatColor.YELLOW + "Expired"); @@ -195,7 +195,16 @@ public class Board { else board.setLine("taunt", "Taunt: " + ChatColor.YELLOW + "Active"); } - if(glowEnabled || (tauntEnabled && tauntCountdown)) + if(worldborderEnabled){ + if(Main.plugin.worldborder == null || Main.plugin.status.equals("Starting")){ + board.setLine("board", "WorldBorder: " + ChatColor.YELLOW + "0m0s"); + } else if(!Main.plugin.worldborder.isRunning()) { + board.setLine("board", "WorldBorder: " + ChatColor.YELLOW + Main.plugin.worldborder.getDelay()/60 + "m" + Main.plugin.worldborder.getDelay()%60 + "s"); + } else { + board.setLine("board", "WorldBorder: " + ChatColor.YELLOW + "Decreasing"); + } + } + if(glowEnabled || (tauntEnabled && tauntCountdown) || worldborderEnabled) board.addBlank(); board.setLine("time", "Time Left: " + ChatColor.GREEN + Main.plugin.timeLeft/60 + "m" + Main.plugin.timeLeft%60 + "s"); board.addBlank(); -- cgit v1.2.3-freya From d09daa4682bba968a9180aee62a65cad9fea3766 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Mon, 20 Dec 2021 16:51:44 -0500 Subject: localization resets on internal update --- .../java/net/tylermurphy/hideAndSeek/Main.java | 3 +- .../hideAndSeek/configuration/Config.java | 9 ------ .../hideAndSeek/configuration/ConfigManager.java | 7 +++-- .../hideAndSeek/configuration/Items.java | 12 ++++---- .../hideAndSeek/configuration/Localization.java | 34 ++++++++++++---------- src/main/resources/config.yml | 3 ++ src/main/resources/items.yml | 12 ++++---- src/main/resources/localization.yml | 5 +++- 8 files changed, 44 insertions(+), 41 deletions(-) (limited to 'src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java') diff --git a/src/main/java/net/tylermurphy/hideAndSeek/Main.java b/src/main/java/net/tylermurphy/hideAndSeek/Main.java index 4815a30..f92bf15 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/Main.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/Main.java @@ -88,7 +88,8 @@ public class Main extends JavaPlugin implements Listener { } public void onDisable() { - onTickTask.cancel(); + if(onTickTask != null) + onTickTask.cancel(); } public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java index f2b7680..be86660 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java @@ -1,16 +1,7 @@ package net.tylermurphy.hideAndSeek.configuration; -import java.io.File; -import java.util.Map; -import java.util.Map.Entry; - -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.util.Vector; -import net.tylermurphy.hideAndSeek.Main; - public class Config { private static ConfigManager manager; diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java index 09b3dcf..0129680 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java @@ -73,6 +73,10 @@ public class ConfigManager { } } + public void reset(String path){ + config.set(path, defaultConfig.get(path)); + } + public boolean getBoolean(String path){ boolean value = config.getBoolean(path); if(value == false){ @@ -107,7 +111,6 @@ public class ConfigManager { String yamlString = textBuilder.toString(); Map temp = config.getValues(true); for(Map.Entry entry: temp.entrySet()){ - System.out.println(entry.getKey() + " " + entry.getValue().getClass().getName()); if(entry.getValue() instanceof Integer || entry.getValue() instanceof Double || entry.getValue() instanceof String || entry.getValue() instanceof Boolean){ String[] parts = entry.getKey().split("\\."); int index = 0; @@ -131,7 +134,7 @@ public class ConfigManager { replace = "\"" + replace + "\""; } StringBuilder builder = new StringBuilder(yamlString); - builder.replace(start+1, end, replace); + builder.replace(start+1, end == -1 ? yamlString.length() : end, replace); yamlString = builder.toString(); } } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java index fbf5d2c..e5470af 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java @@ -16,16 +16,14 @@ import java.util.Objects; public class Items { - private static ConfigManager manager; - public static List HIDER_ITEMS, SEEKER_ITEMS; public static List HIDER_EFFECTS, SEEKER_EFFECTS; public static void loadItems() { - manager = new ConfigManager("items.yml"); + ConfigManager manager = new ConfigManager("items.yml"); - SEEKER_ITEMS = new ArrayList(); + SEEKER_ITEMS = new ArrayList<>(); ConfigurationSection SeekerItems = manager.getConfigurationSection("items.seeker"); int i = 1; while (true) { @@ -36,7 +34,7 @@ public class Items { i++; } - HIDER_ITEMS = new ArrayList(); + HIDER_ITEMS = new ArrayList<>(); ConfigurationSection HiderItems = manager.getConfigurationSection("items.hider"); i = 1; while (true) { @@ -47,7 +45,7 @@ public class Items { i++; } - SEEKER_EFFECTS = new ArrayList(); + SEEKER_EFFECTS = new ArrayList<>(); ConfigurationSection SeekerEffects = manager.getConfigurationSection("effects.seeker"); i = 1; while (true) { @@ -58,7 +56,7 @@ public class Items { i++; } - HIDER_EFFECTS = new ArrayList(); + HIDER_EFFECTS = new ArrayList<>(); ConfigurationSection HiderEffects = manager.getConfigurationSection("effects.hider"); i = 1; while (true) { diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java index 9980a4e..1ae8ca2 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java @@ -1,26 +1,32 @@ package net.tylermurphy.hideAndSeek.configuration; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; import java.util.HashMap; import java.util.Map; -import org.bukkit.configuration.file.YamlConfiguration; - import net.md_5.bungee.api.ChatColor; -import net.tylermurphy.hideAndSeek.Main; public class Localization { - public static final Map LOCAL = new HashMap(); - - private static ConfigManager manager; - - public static boolean loadLocalization() { + public static final Map LOCAL = new HashMap<>(); + + private static String[][] CHANGES = {{"WORLDBORDER_DECREASING"}}; + + public static void loadLocalization() { + + ConfigManager manager = new ConfigManager("localization.yml"); + + int PLUGIN_VERSION = 2; + int VERSION = manager.getInt("version"); + if(VERSION < PLUGIN_VERSION){ + for(int i = VERSION; i < PLUGIN_VERSION; i++){ + if(i < 1) continue; + String[] changeList = CHANGES[i-1]; + for(String change : changeList) + manager.reset("Localization." + change); + } + manager.reset("version"); + } - manager = new ConfigManager("localization.yml"); manager.saveConfig(); for(String key : manager.getConfigurationSection("Localization").getKeys(false)) { @@ -29,8 +35,6 @@ public class Localization { new LocalizationString( ChatColor.translateAlternateColorCodes('&', manager.getString("Localization."+key) ) ) ); } - - return true; } public static LocalizationString message(String key) { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 64fdece..c6b5ecd 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -36,6 +36,9 @@ autoJoin: false # default: false teleportToExit: false +countdown: + + # 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. diff --git a/src/main/resources/items.yml b/src/main/resources/items.yml index d9b3b2a..4ef7953 100644 --- a/src/main/resources/items.yml +++ b/src/main/resources/items.yml @@ -40,12 +40,6 @@ items: material: POTION amount: 2 type: INSTANT_HEAL - '4': - type: DOLPHINS_GRACE - duration: 1000000 - amplifier: 1 - ambient: false - particles: false effects: seeker: '1': @@ -72,6 +66,12 @@ effects: amplifier: 10 ambient: false particles: false + '5': + type: DOLPHINS_GRACE + duration: 1000000 + amplifier: 1 + ambient: false + particles: false hider: '1': type: WATER_BREATHING diff --git a/src/main/resources/localization.yml b/src/main/resources/localization.yml index f6a82dc..e73ee80 100644 --- a/src/main/resources/localization.yml +++ b/src/main/resources/localization.yml @@ -27,7 +27,7 @@ Localization: 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: "Would border decreasing by 100 blocks over the next 30s." + WORLDBORDER_DECREASING: "World 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." @@ -52,3 +52,6 @@ Localization: BOUNDS_WRONG_WORLD: "Please run this command in the game world." BOUNDS: "Successfully set bounds at this position ({AMOUNT}/2)." NOT_AT_ZERO: "Please do not set at a location containing a coordinate at 0." + +# DO NOT EDIT +version: 2 -- cgit v1.2.3-freya From 08c6e6b24bcbdb9b4ed0e6d3db102fc804b5631a Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Mon, 20 Dec 2021 17:24:43 -0500 Subject: added support for multiple default local files --- .gitignore | 2 +- .../hideAndSeek/configuration/Config.java | 4 +- .../hideAndSeek/configuration/ConfigManager.java | 27 +++++++++ .../hideAndSeek/configuration/Localization.java | 9 ++- src/main/resource/lang/localization_de-DE.yml | 58 -------------------- src/main/resources/config.yml | 5 ++ src/main/resources/lang/localization_de-DE.yml | 60 ++++++++++++++++++++ src/main/resources/lang/localization_en-US.yml | 64 ++++++++++++++++++++++ src/main/resources/localization.yml | 3 +- 9 files changed, 170 insertions(+), 62 deletions(-) delete mode 100644 src/main/resource/lang/localization_de-DE.yml create mode 100644 src/main/resources/lang/localization_de-DE.yml create mode 100644 src/main/resources/lang/localization_en-US.yml (limited to 'src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java') diff --git a/.gitignore b/.gitignore index 633697f..3c5a335 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ bin/ target/ .git/ .idea -hideandseek-plugin.iml +*.iml diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java index be86660..ee9d88d 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java @@ -16,7 +16,8 @@ public class Config { warningPrefix, spawnWorld, exitWorld, - lobbyWorld; + lobbyWorld, + local; public static Vector spawnPosition, @@ -128,6 +129,7 @@ public class Config { pvpEnabled = manager.getBoolean("pvp"); autoJoin = manager.getBoolean("autoJoin"); teleportToExit = manager.getBoolean("teleportToExit"); + local = manager.getString("local"); } public static void addToConfig(String path, Object value) { diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java index 0129680..d16f3d8 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java @@ -32,6 +32,28 @@ public class ConfigManager { } catch (IOException e){} } + public ConfigManager(String filename, String defaultFilename){ + this.file = new File(Main.plugin.getDataFolder(), filename); + + if(!file.exists()){ + saveDefaultConfiguration(); + } + + this.config = YamlConfiguration.loadConfiguration(file); + + InputStream input = Main.plugin.getResource(defaultFilename); + InputStreamReader reader = new InputStreamReader(input); + this.defaultConfig = YamlConfiguration.loadConfiguration(reader); + try{ + input.close(); + reader.close(); + } catch (IOException e){ + Main.plugin.getLogger().severe("Couldn't find "+defaultFilename+" internally. Did you set an incorrect local?"); + Main.plugin.getServer().getPluginManager().disablePlugin(Main.plugin); + throw new RuntimeException(); + } + } + private void saveDefaultConfiguration(){ try{ InputStream input = Main.plugin.getResource(file.getName()); @@ -77,6 +99,11 @@ public class ConfigManager { config.set(path, defaultConfig.get(path)); } + public void resetConfig(){ + config = defaultConfig; + saveConfig(); + } + public boolean getBoolean(String path){ boolean value = config.getBoolean(path); if(value == false){ diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java index 1ae8ca2..c404aa3 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java @@ -1,5 +1,6 @@ package net.tylermurphy.hideAndSeek.configuration; +import java.io.File; import java.util.HashMap; import java.util.Map; @@ -13,7 +14,7 @@ public class Localization { public static void loadLocalization() { - ConfigManager manager = new ConfigManager("localization.yml"); + ConfigManager manager = new ConfigManager("localization.yml", "lang"+File.separator+"localization_"+Config.local+".yml"); int PLUGIN_VERSION = 2; int VERSION = manager.getInt("version"); @@ -27,6 +28,12 @@ public class Localization { manager.reset("version"); } + String SELECTED_LOCAL = manager.getString("local"); + if(!SELECTED_LOCAL.equals(Config.local)){ + manager.resetConfig(); + } + + manager.saveConfig(); for(String key : manager.getConfigurationSection("Localization").getKeys(false)) { diff --git a/src/main/resource/lang/localization_de-DE.yml b/src/main/resource/lang/localization_de-DE.yml deleted file mode 100644 index 0954f93..0000000 --- a/src/main/resource/lang/localization_de-DE.yml +++ /dev/null @@ -1,58 +0,0 @@ -#============================================================# -# +--------------------------------------------------------+ # -# | Kenshins Hide and Seek 1.3.0 | # -# | German language file | # -# | by HerrMelodious | # -# +--------------------------------------------------------+ # -#============================================================# - -Localization: - COMMAND_PLAYER_ONLY: "Dieser Befehl kann nur als Spieler ausgeführt werden." - COMMAND_NOT_ALLOWED: "Es ist dir nicht gestattet diesen Befehl auszuführen." - COMMAND_ERROR: "Ein unbekannter Fehler ist aufgetreten." - GAME_PLAYER_DEATH: "&c{PLAYER}&f ist gestorben." - GAME_PLAYER_FOUND: "&e{PLAYER}&f wurde gefunden und ist nun ein Seeker." - GAME_PLAYER_FOUND_BY: "&e{PLAYER}&f wurde von &c{PLAYER}&f gefunden und ist nun ein Seeker." - GAME_GAMEOVER_HIDERS_FOUND: "Alle Hider wurden gefunden." - GAME_GAMEOVER_SEEKERS_QUIT: "All Seeker haben das Spiel verlassen." - GAME_GAMEOVER_TIME: "Seekers haben keine Spielzeit mehr. Die Hiders haben gewonnen!" - GAME_SETUP: "Spiel wurde noch nicht eingerichtet. Führe &c/hs setup&f aus, um die Einrichtungsschritte zu sehen." - GAME_INGAME: "Du bist bereits in der Lobby oder im Spiel." - GAME_NOT_INGAME: "Du bist weder in einer Lobby noch in einem Spiel." - GAME_INPROGRESS: "Es läuft bereits ein Spiel." - GAME_NOT_INPROGRESS: "Es läuft kein Spiel." - GAME_JOIN: "{PLAYER} hat die Hide and Seek Lobby betreten." - GAME_JOIN_SPECTATOR: "Du bist als Beobachter einem laufenden Spiel beigetreten." - GAME_LEAVE: "{PLAYER} hat die Hide and Seek Lobby verlassen." - CONFIG_RELOAD: "Konfiguration neu geladen." - MAPSAVE_INPROGRESS: "Weltkarte wird aktuell gespeichert. Versuche es später nochmal." - MAPSAVE_START: "Starte Speichervorgang der Weltkarte" - MAPSAVE_WARNING: "All commands will be disabled whenthe save is in progress. Do not turn off the server." - MAPSAVE_END: "Speichervorgang abgeschlossen." - MAPSAVE_ERROR: "Aktuelle Weltkarte konnte nicht gefunden werden." - WORLDBORDER_DISABLE: "World Border ausgeschaltet." - WORLDBORDER_INVALID_INPUT: "Ungültiger Wert: {AMOUNT}" - WORLDBORDER_MIN_SIZE: "World Border darf nicht geringer als 100 Blöcke sein." - WORLDBORDER_POSITION: "Spawn muss mindestens 100 Blöcke vom Zentrum der World Border entfernt sein." - WORLDBORDER_ENABLE: "Setze World Border zentriert von dieser Position aus. Größe: {AMOUNT}. Verzögerung: {AMOUNT}." - WORLDBORDER_DECREASING: "World Norder schrumpoft 100 Blöcke über die nächsten 30 Sekunden!" - TAUNTED: "$c$oOh nein! Du wurdest geärgert!" - TAUNT: "Ein zufälliger Hider wird in den nächsten 30 Sekunden geärgert." - TAUNT_ACTIVATE: "Ärgern wurde aktiviert" - ERROR_GAME_SPAWN: "Bitte erst die Spawn-Position für das Spiel festlegen." - SETUP: "&f&lFühre die folgenden Schritte zur Einrichtung aus:" - SETUP_GAME: "&c&l- &fTeleport-Position für den Spielbeginn festlegen mit /hs setspawn" - SETUP_LOBBY: "&c&l- &fTeleport-Position für die Lobby festlegen mit /hs setlobby" - SETUP_EXIT: "&c&l- &fTeleport-Position für das Spielende festlegen mit /hs setexit" - SETUP_SAVEMAP: "&c&l- &fHide and Seek Weltkarte speichern mit /hs savemap (nach /hs setspawn)" - SETUP_COMPLETE: "Alles eingerichtet! Hide and Seek ist spielbereit." - GAME_SPAWN: "Teleport-Position für Spielbeginn festgelegt" - LOBBY_SPAWN: "Teleport-Position für Lobby festgelegt" - EXIT_SPAWN: "Teleport-Position für Spielende festgelegt" - START_MIN_PLAYERS: "Um das Spiel zu starten benötigst du mindestens {AMOUNT} Spieler." - START_INVALID_NAME: "Ungültiger Spieler: {PLAYER}." - START_COUNTDOWN: "Die Hider haben {AMOUNT} Sekunden Zeit sich zu verstecken!" - START: "Los, Seeker! Es ist Zeit, die Hider zu finden." - STOP: "Das Spiel wurde gestoppt." - HIDERS_SUBTITLE: "Verstecke dich gut vor den Seekern!" - SEEKERS_SUBTITLE: "Finde alle Hider!" diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index c6b5ecd..7d16cae 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -82,6 +82,11 @@ prefix: gameover: '&aGame Over > &f' warning: '&cWarning > &f' +# Changes the default plugin language. Currently, Supported localizations are: +# en-US (United States) +# de-DE (German) +local: "en-US" + # ---------------------------------------------------------- # # ONLY EDIT BEYOND THIS POINT IF YOU KNOW WHAT YOU ARE DOING # # ---------------------------------------------------------- # diff --git a/src/main/resources/lang/localization_de-DE.yml b/src/main/resources/lang/localization_de-DE.yml new file mode 100644 index 0000000..d8930f8 --- /dev/null +++ b/src/main/resources/lang/localization_de-DE.yml @@ -0,0 +1,60 @@ +#============================================================# +# +--------------------------------------------------------+ # +# | Kenshins Hide and Seek | # +# | German language file | # +# | by HerrMelodious | # +# +--------------------------------------------------------+ # +#============================================================# + +Localization: + COMMAND_PLAYER_ONLY: "Dieser Befehl kann nur als Spieler ausgeführt werden." + COMMAND_NOT_ALLOWED: "Es ist dir nicht gestattet diesen Befehl auszuführen." + COMMAND_ERROR: "Ein unbekannter Fehler ist aufgetreten." + GAME_PLAYER_DEATH: "&c{PLAYER}&f ist gestorben." + GAME_PLAYER_FOUND: "&e{PLAYER}&f wurde gefunden und ist nun ein Seeker." + GAME_PLAYER_FOUND_BY: "&e{PLAYER}&f wurde von &c{PLAYER}&f gefunden und ist nun ein Seeker." + GAME_GAMEOVER_HIDERS_FOUND: "Alle Hider wurden gefunden." + GAME_GAMEOVER_SEEKERS_QUIT: "All Seeker haben das Spiel verlassen." + GAME_GAMEOVER_TIME: "Seekers haben keine Spielzeit mehr. Die Hiders haben gewonnen!" + GAME_SETUP: "Spiel wurde noch nicht eingerichtet. Führe &c/hs setup&f aus, um die Einrichtungsschritte zu sehen." + GAME_INGAME: "Du bist bereits in der Lobby oder im Spiel." + GAME_NOT_INGAME: "Du bist weder in einer Lobby noch in einem Spiel." + GAME_INPROGRESS: "Es läuft bereits ein Spiel." + GAME_NOT_INPROGRESS: "Es läuft kein Spiel." + GAME_JOIN: "{PLAYER} hat die Hide and Seek Lobby betreten." + GAME_JOIN_SPECTATOR: "Du bist als Beobachter einem laufenden Spiel beigetreten." + GAME_LEAVE: "{PLAYER} hat die Hide and Seek Lobby verlassen." + CONFIG_RELOAD: "Konfiguration neu geladen." + MAPSAVE_INPROGRESS: "Weltkarte wird aktuell gespeichert. Versuche es später nochmal." + MAPSAVE_START: "Starte Speichervorgang der Weltkarte" + MAPSAVE_WARNING: "All commands will be disabled whenthe save is in progress. Do not turn off the server." + MAPSAVE_END: "Speichervorgang abgeschlossen." + MAPSAVE_ERROR: "Aktuelle Weltkarte konnte nicht gefunden werden." + WORLDBORDER_DISABLE: "World Border ausgeschaltet." + WORLDBORDER_INVALID_INPUT: "Ungültiger Wert: {AMOUNT}" + WORLDBORDER_MIN_SIZE: "World Border darf nicht geringer als 100 Blöcke sein." + WORLDBORDER_POSITION: "Spawn muss mindestens 100 Blöcke vom Zentrum der World Border entfernt sein." + WORLDBORDER_ENABLE: "Setze World Border zentriert von dieser Position aus. Größe: {AMOUNT}. Verzögerung: {AMOUNT}." + WORLDBORDER_DECREASING: "World Norder schrumpoft 100 Blöcke über die nächsten 30 Sekunden!" + TAUNTED: "$c$oOh nein! Du wurdest geärgert!" + TAUNT: "Ein zufälliger Hider wird in den nächsten 30 Sekunden geärgert." + TAUNT_ACTIVATE: "Ärgern wurde aktiviert" + ERROR_GAME_SPAWN: "Bitte erst die Spawn-Position für das Spiel festlegen." + SETUP: "&f&lFühre die folgenden Schritte zur Einrichtung aus:" + SETUP_GAME: "&c&l- &fTeleport-Position für den Spielbeginn festlegen mit /hs setspawn" + SETUP_LOBBY: "&c&l- &fTeleport-Position für die Lobby festlegen mit /hs setlobby" + SETUP_EXIT: "&c&l- &fTeleport-Position für das Spielende festlegen mit /hs setexit" + SETUP_SAVEMAP: "&c&l- &fHide and Seek Weltkarte speichern mit /hs savemap (nach /hs setspawn)" + SETUP_COMPLETE: "Alles eingerichtet! Hide and Seek ist spielbereit." + GAME_SPAWN: "Teleport-Position für Spielbeginn festgelegt" + LOBBY_SPAWN: "Teleport-Position für Lobby festgelegt" + EXIT_SPAWN: "Teleport-Position für Spielende festgelegt" + START_MIN_PLAYERS: "Um das Spiel zu starten benötigst du mindestens {AMOUNT} Spieler." + START_INVALID_NAME: "Ungültiger Spieler: {PLAYER}." + START_COUNTDOWN: "Die Hider haben {AMOUNT} Sekunden Zeit sich zu verstecken!" + START: "Los, Seeker! Es ist Zeit, die Hider zu finden." + STOP: "Das Spiel wurde gestoppt." + HIDERS_SUBTITLE: "Verstecke dich gut vor den Seekern!" + SEEKERS_SUBTITLE: "Finde alle Hider!" + +type: "de-DE" diff --git a/src/main/resources/lang/localization_en-US.yml b/src/main/resources/lang/localization_en-US.yml new file mode 100644 index 0000000..19c79b7 --- /dev/null +++ b/src/main/resources/lang/localization_en-US.yml @@ -0,0 +1,64 @@ +#============================================================# +# +--------------------------------------------------------+ # +# | Kenshins Hide and Seek | # +# | English language file | # +# | by KenshinEto | # +# +--------------------------------------------------------+ # +#============================================================# + +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." + 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." + GAME_GAMEOVER_HIDERS_FOUND: "All hiders have been found." + GAME_GAMEOVER_SEEKERS_QUIT: "All seekers have quit." + GAME_GAMEOVER_TIME: "Seekers ran out of time. Hiders win!" + 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 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 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: "Couldn't find current map." + WORLDBORDER_DISABLE: "Disabled world border." + WORLDBORDER_INVALID_INPUT: "Invalid integer {AMOUNT}." + 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: "World 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 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" + LOBBY_SPAWN: "Set lobby position to current location" + EXIT_SPAWN: "Set exit position to current location" + 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!" + 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: "Successfully set bounds at this position ({AMOUNT}/2)." + NOT_AT_ZERO: "Please do not set at a location containing a coordinate at 0." + +type: "en-US" \ No newline at end of file diff --git a/src/main/resources/localization.yml b/src/main/resources/localization.yml index e73ee80..2acb0fc 100644 --- a/src/main/resources/localization.yml +++ b/src/main/resources/localization.yml @@ -53,5 +53,6 @@ Localization: BOUNDS: "Successfully set bounds at this position ({AMOUNT}/2)." NOT_AT_ZERO: "Please do not set at a location containing a coordinate at 0." -# DO NOT EDIT +# DO NOT EDIT IT OR IT MAY BREAK OR RESET FILE version: 2 +type: "en-US" \ No newline at end of file -- cgit v1.2.3-freya