diff options
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/configuration')
5 files changed, 59 insertions, 25 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java index 0000c30..ee7aa18 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java @@ -137,16 +137,16 @@ public class Config { announceMessagesToNonPlayers = config.getBoolean("announceMessagesToNonPlayers"); //Prefix - char SYMBOLE = '\u00A7'; - String SYMBOLE_STRING = String.valueOf(SYMBOLE); + char SYMBOL = '\u00A7'; + String SYMBOL_STRING = String.valueOf(SYMBOL); - messagePrefix = config.getString("prefix.default").replace("&", SYMBOLE_STRING); - errorPrefix = config.getString("prefix.error").replace("&", SYMBOLE_STRING); - tauntPrefix = config.getString("prefix.taunt").replace("&", SYMBOLE_STRING); - worldBorderPrefix = config.getString("prefix.border").replace("&", SYMBOLE_STRING); - abortPrefix = config.getString("prefix.abort").replace("&", SYMBOLE_STRING); - gameOverPrefix = config.getString("prefix.gameover").replace("&", SYMBOLE_STRING); - warningPrefix = config.getString("prefix.warning").replace("&", SYMBOLE_STRING); + messagePrefix = config.getString("prefix.default").replace("&", SYMBOL_STRING); + errorPrefix = config.getString("prefix.error").replace("&", SYMBOL_STRING); + tauntPrefix = config.getString("prefix.taunt").replace("&", SYMBOL_STRING); + worldBorderPrefix = config.getString("prefix.border").replace("&", SYMBOL_STRING); + abortPrefix = config.getString("prefix.abort").replace("&", SYMBOL_STRING); + gameOverPrefix = config.getString("prefix.gameover").replace("&", SYMBOL_STRING); + warningPrefix = config.getString("prefix.warning").replace("&", SYMBOL_STRING); // Locations exitPosition = new Location( @@ -211,8 +211,7 @@ public class Config { try { countdownDisplay = CountdownDisplay.valueOf(config.getString("hideCountdownDisplay")); } catch (IllegalArgumentException e) { - countdownDisplay = CountdownDisplay.CHAT; - Main.getInstance().getLogger().warning("hideCountdownDisplay: "+config.getString("hideCountdownDisplay")+" is not a valid configuration option!"); + throw new RuntimeException("hideCountdownDisplay: "+config.getString("hideCountdownDisplay")+", is not a valid configuration option!"); } blockedInteracts = new ArrayList<>(); List<String> tempInteracts = config.getStringList("blockedInteracts"); @@ -255,8 +254,7 @@ public class Config { databaseType = config.getString("databaseType").toUpperCase(); if(!databaseType.equals("SQLITE") && !databaseType.equals("MYSQL")){ - Main.getInstance().getLogger().warning("databaseType: "+databaseType+" is not a valid configuration option!"); - databaseType = "SQLITE"; + throw new RuntimeException("databaseType: "+databaseType+" is not a valid configuration option!"); } delayedRespawn = config.getBoolean("delayedRespawn.enabled"); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java index b7671c2..eda8470 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java @@ -344,6 +344,8 @@ public class ConfigManager { private String convert(Object o) { if(o instanceof String) { return "\"" + o + "\""; + } else if (o instanceof Boolean) { + return (boolean)o ? "true" : "false"; } return o.toString(); } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java index 72ab366..6f3f88b 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java @@ -31,8 +31,15 @@ public class Localization { public static final Map<String,LocalizationString> DEFAULT_LOCAL = new HashMap<>(); private static final Map<String,String[][]> CHANGES = new HashMap<String,String[][]>() {{ - put("en-US", new String[][]{{"WORLDBORDER_DECREASING"},{"START","TAUNTED"},{"GAME_SETUP"}}); - put("de-DE", new String[][]{{},{"TAUNTED"}}); + put("en-US", new String[][]{ + {"WORLDBORDER_DECREASING"}, + {"START","TAUNTED"}, + {"GAME_SETUP", "SETUP_GAME", "SETUP_LOBBY", "SETUP_SEEKER_LOBBY", "SETUP_EXIT", "SETUP_SAVEMAP", "SETUP_BOUNDS"} + }); + put("de-DE", new String[][]{ + {}, + {"TAUNTED"} + }); }}; public static void loadLocalization() { diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java index 5e9b6ae..406f161 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java @@ -6,10 +6,10 @@ import java.util.List; import net.tylermurphy.hideAndSeek.Main; import net.tylermurphy.hideAndSeek.game.events.Border; -import net.tylermurphy.hideAndSeek.world.VoidGenerator; import net.tylermurphy.hideAndSeek.world.WorldLoader; import org.bukkit.*; import org.bukkit.util.Vector; +import org.jetbrains.annotations.NotNull; import static net.tylermurphy.hideAndSeek.configuration.Config.*; @@ -118,6 +118,7 @@ public class Map { this.zBoundMax = z; } + @NotNull public Location getGameSpawn() { if(mapSaveEnabled) { return new Location( @@ -131,6 +132,7 @@ public class Map { } } + @NotNull public String getGameSpawnName() { if(mapSaveEnabled) return "hs_"+ spawnWorldName; @@ -138,30 +140,37 @@ public class Map { return spawnWorldName; } + @NotNull public Location getSpawn() { return spawnPosition; } + @NotNull public String getSpawnName() { return spawnWorldName; } + @NotNull public Location getLobby() { return lobbyPosition; } + @NotNull public String getLobbyName() { return lobbyWorldName; } + @NotNull public Location getSeekerLobby() { return seekerLobbyPosition; } + @NotNull public String getSeekerLobbyName() { return seekerLobbyWorldName; } + @NotNull public Location getGameSeekerLobby() { if(mapSaveEnabled) { return new Location( @@ -179,6 +188,7 @@ public class Map { return worldBorderSize > 0; } + @NotNull public Vector getWorldBorderPos() { return new Vector( xWorldBorder, @@ -187,6 +197,7 @@ public class Map { ); } + @NotNull public Vector getWorldBorderData() { return new Vector( worldBorderSize, @@ -195,6 +206,7 @@ public class Map { ); } + @NotNull public Border getWorldBorder() { return worldBorder; } @@ -203,10 +215,12 @@ public class Map { return blockhunt; } + @NotNull public List<Material> getBlockHunt() { return blockhuntBlocks; } + @NotNull public Vector getBoundsMin() { return new Vector( xBoundMin, @@ -215,6 +229,7 @@ public class Map { ); } + @NotNull public Vector getBoundsMax() { return new Vector( xBoundMax, @@ -223,20 +238,23 @@ public class Map { ); } + @NotNull public String getName() { return name; } + @NotNull public WorldLoader getWorldLoader() { return worldLoader; } public boolean isNotSetup() { - if (spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0 || !Map.worldExists(spawnWorldName)) return true; - if (lobbyPosition.getBlockX() == 0 && lobbyPosition.getBlockY() == 0 && lobbyPosition.getBlockZ() == 0 || !Map.worldExists(lobbyWorldName)) return true; - if (exitPosition == null || exitPosition.getBlockX() == 0 && exitPosition.getBlockY() == 0 && exitPosition.getBlockZ() == 0 || !Map.worldExists(exitWorld) ) return true; - if (seekerLobbyPosition.getBlockX() == 0 && seekerLobbyPosition.getBlockY() == 0 && seekerLobbyPosition.getBlockZ() == 0 || !Map.worldExists(seekerLobbyWorldName)) return true; - if (mapSaveEnabled && !Map.worldExists(getGameSpawnName())) return true; + if (spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0 || Map.worldDoesntExist(spawnWorldName)) return true; + if (lobbyPosition.getBlockX() == 0 && lobbyPosition.getBlockY() == 0 && lobbyPosition.getBlockZ() == 0 || Map.worldDoesntExist(lobbyWorldName)) return true; + if (exitPosition == null || exitPosition.getBlockX() == 0 && exitPosition.getBlockY() == 0 && exitPosition.getBlockZ() == 0 || Map.worldDoesntExist(exitWorld)) return true; + if (seekerLobbyPosition.getBlockX() == 0 && seekerLobbyPosition.getBlockY() == 0 && seekerLobbyPosition.getBlockZ() == 0 || Map.worldDoesntExist(seekerLobbyWorldName)) return true; + if (mapSaveEnabled && Map.worldDoesntExist(getGameSpawnName())) return true; + if (blockhunt && blockhuntBlocks.isEmpty()) return true; if(isWorldBorderEnabled() && new Vector(spawnPosition.getX(), 0, spawnPosition.getZ()).distance(new Vector(xWorldBorder, 0, zWorldBorder)) > 100) return true; return xBoundMin == 0 || zBoundMin == 0 || xBoundMax == 0 || zBoundMax == 0; @@ -246,9 +264,13 @@ public class Map { return spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0; } - public static boolean worldExists(String worldName) { + public boolean isBoundsNotSetup() { + return xBoundMin == 0 || zBoundMin == 0 || xBoundMax == 0 || zBoundMax == 0; + } + + public static boolean worldDoesntExist(String worldName) { File destination = new File(Main.getInstance().getWorldContainer()+File.separator+worldName); - return destination.isDirectory(); + return !destination.isDirectory(); } } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Maps.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Maps.java index ff1b396..a27a542 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Maps.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Maps.java @@ -11,15 +11,19 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; import com.cryptomorin.xseries.XMaterial; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class Maps { private static final HashMap<String, Map> MAPS = new HashMap<>(); + @Nullable public static Map getMap(String name) { return MAPS.get(name); } + @Nullable public static Map getRandomMap() { Optional<Map> map; if(MAPS.values().size() > 0) { @@ -45,6 +49,7 @@ public class Maps { return status; } + @NotNull public static Collection<Map> getAllMaps() { return MAPS.values(); } @@ -102,7 +107,7 @@ public class Maps { private static Location setSpawn(ConfigurationSection data, String spawn) { String worldName = data.getString("spawns."+spawn+".world"); if(worldName == null) return new Location(null, 0, 0, 0); - if(!Map.worldExists(worldName)) return new Location(null, 0, 0, 0); + if(Map.worldDoesntExist(worldName)) return new Location(null, 0, 0, 0); World world = Bukkit.getWorld(worldName); double x = data.getDouble("spawns."+spawn+".x"); double y = data.getDouble("spawns."+spawn+".y"); @@ -141,7 +146,7 @@ public class Maps { private static void saveSpawn(ConfigurationSection data, Location spawn, String name, Map map) { String worldName = getWorldName(name, map); - if(worldName == null || !Map.worldExists(worldName)) { + if(worldName == null || Map.worldDoesntExist(worldName)) { data.set("spawns." + name + ".world", "world"); } else { data.set("spawns." + name + ".world", worldName); |