diff options
Diffstat (limited to 'src/main/java/cat/freya/khs/configuration')
3 files changed, 9 insertions, 15 deletions
diff --git a/src/main/java/cat/freya/khs/configuration/Config.java b/src/main/java/cat/freya/khs/configuration/Config.java index ac5fcb7..1bbbefa 100644 --- a/src/main/java/cat/freya/khs/configuration/Config.java +++ b/src/main/java/cat/freya/khs/configuration/Config.java @@ -21,7 +21,7 @@ public class Config { private static ConfigManager config; - public static String + public static String messagePrefix, errorPrefix, tauntPrefix, @@ -39,7 +39,7 @@ public class Config { databaseUser, databasePass, databaseName; - + public static boolean nameTagsVisible, permissionsRequired, @@ -69,8 +69,8 @@ public class Config { waitTillNoneLeft, gameOverTitle, regenHealth; - - public static int + + public static int minPlayers, gameLength, tauntDelay, @@ -116,7 +116,7 @@ public class Config { public static Location exitPosition; - + public static void loadConfig() { config = ConfigManager.create("config.yml"); @@ -260,7 +260,7 @@ public class Config { regenHealth = config.getBoolean("regenHealth"); } - + public static void addToConfig(String path, Object value) { config.set(path, value); } @@ -285,5 +285,5 @@ public class Config { try{ temp = XItemStack.deserialize(item); } catch(Exception ignored) {} return temp; } - + } diff --git a/src/main/java/cat/freya/khs/configuration/Items.java b/src/main/java/cat/freya/khs/configuration/Items.java index bdc56ad..6419d63 100644 --- a/src/main/java/cat/freya/khs/configuration/Items.java +++ b/src/main/java/cat/freya/khs/configuration/Items.java @@ -16,7 +16,7 @@ import java.util.List; public class Items { public static List<ItemStack> HIDER_ITEMS, SEEKER_ITEMS; - public static ItemStack + public static ItemStack HIDER_HELM, SEEKER_HELM, HIDER_CHEST, SEEKER_CHEST, HIDER_LEGS, SEEKER_LEGS, diff --git a/src/main/java/cat/freya/khs/configuration/Localization.java b/src/main/java/cat/freya/khs/configuration/Localization.java index 8b18696..9708d66 100644 --- a/src/main/java/cat/freya/khs/configuration/Localization.java +++ b/src/main/java/cat/freya/khs/configuration/Localization.java @@ -18,12 +18,6 @@ public class Localization { {"GAME_SETUP", "SETUP_GAME", "SETUP_LOBBY", "SETUP_SEEKER_LOBBY", "SETUP_EXIT", "SETUP_SAVEMAP", "SETUP_BOUNDS"}, {"GAME_PLAYER_FOUND", "GAME_PLAYER_FOUND_BY"} }); - put("de-DE", new String[][]{ - {}, - {"TAUNTED"}, - {"GAME_SETUP", "SETUP_GAME", "SETUP_LOBBY", "SETUP_SEEKER_LOBBY", "SETUP_EXIT", "SETUP_SAVEMAP", "SETUP_BOUNDS"}, - {"GAME_PLAYER_FOUND", "GAME_PLAYER_FOUND_BY"} - }); }}; public static void loadLocalization() { @@ -65,7 +59,7 @@ public class Localization { ); } } - + public static LocalizationString message(String key) { LocalizationString message = LOCAL.get(key); if (message == null) { |