From fd1bd995ed4c55bdd8267981683f97214b2bc7a0 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sat, 17 Aug 2013 18:07:57 -0400 Subject: [PATCH 01/10] Another version of TFM_ConfigEntry... --- .../TotalFreedomMod/TFM_Config.java | 362 ++++++++++++++++++ 1 file changed, 362 insertions(+) create mode 100644 src/me/StevenLawson/TotalFreedomMod/TFM_Config.java diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java new file mode 100644 index 00000000..bbd4ca24 --- /dev/null +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java @@ -0,0 +1,362 @@ +package me.StevenLawson.TotalFreedomMod; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.EnumMap; +import java.util.List; +import org.apache.commons.io.FileUtils; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.YamlConfiguration; + +public class TFM_Config +{ + public static final String CONFIG_FILENAME = "config.yml"; + public static final File CONFIG_FILE = new File(TotalFreedomMod.plugin.getDataFolder(), CONFIG_FILENAME); + // + private final EnumMap configEntryMap = new EnumMap(TFM_ConfigEntry.class); + + public static enum TFM_ConfigEntry + { + ADMIN_ONLY_MODE(Boolean.class, "admin_only_mode"), + ALLOW_EXPLOSIONS(Boolean.class, "allow_explosions"), + ALLOW_FIRE_PLACE(Boolean.class, "allow_fire_place"), + ALLOW_FIRE_SPREAD(Boolean.class, "allow_fire_spread"), + ALLOW_FLIUD_SPREAD(Boolean.class, "allow_fluid_spread"), + ALLOW_LAVA_DAMAGE(Boolean.class, "allow_lava_damage"), + ALLOW_LAVA_PLACE(Boolean.class, "allow_lava_place"), + ALLOW_TNT_MINECARTS(Boolean.class, "allow_tnt_minecarts"), + ALLOW_WATER_PLACE(Boolean.class, "allow_water_place"), + AUTO_ENTITY_WIPE(Boolean.class, "auto_wipe"), + AUTO_PROTECT_SPAWNPOINTS(Boolean.class, "auto_protect_spawnpoints"), + DISABLE_NIGHT(Boolean.class, "disable_night"), + DISABLE_WEATHER(Boolean.class, "disable_weather"), + GENERATE_FLATLANDS(Boolean.class, "generate_flatlands"), + LANDMINES_ENABLED(Boolean.class, "landmines_enabled"), + MOB_LIMITER_DISABLE_DRAGON(Boolean.class, "mob_limiter_disable_dragon"), + MOB_LIMITER_DISABLE_GHAST(Boolean.class, "mob_limiter_disable_ghast"), + MOB_LIMITER_DISABLE_GIANT(Boolean.class, "mob_limiter_disable_giant"), + MOB_LIMITER_DISABLE_SLIME(Boolean.class, "mob_limiter_disable_slime"), + MOB_LIMITER_ENABLED(Boolean.class, "mob_limiter_enabled"), + MP44_ENABLED(Boolean.class, "mp44_enabled"), + NUKE_MONITOR(Boolean.class, "nuke_monitor"), + PET_PROTECT_ENABLED(Boolean.class, "pet_protect_enabled"), + PREPROCESS_LOG_ENABLED(Boolean.class, "preprocess_log"), + PROTECTED_AREAS_ENABLED(Boolean.class, "protected_areas_enabled"), + TOSSMOB_ENABLED(Boolean.class, "tossmob_enabled"), + TWITTERBOT_ENABLED(Boolean.class, "twitterbot_enabled"), + // + AUTO_PROTECT_RADIUS(Double.class, "auto_protect_radius"), + EXPLOSIVE_RADIUS(Double.class, "explosiveRadius"), + NUKE_MONITOR_RANGE(Double.class, "nuke_monitor_range"), + // + FREECAM_TRIGGER_COUNT(Integer.class, "freecam_trigger_count"), + MOB_LIMITER_MAX(Integer.class, "mob_limiter_max"), + NUKE_MONITOR_COUNT_BREAK(Integer.class, "nuke_monitor_count_break"), + NUKE_MONITOR_COUNT_PLACE(Integer.class, "nuke_monitor_count_place"), + // + FLATLANDS_GENERATION_PARAMS(String.class, "flatlands_generation_params"), + LOGS_REGISTER_PASSWORD(String.class, "logs_register_password"), + LOGS_REGISTER_URL(String.class, "logs_register_url"), + SERVICE_CHECKER_URL(String.class, "service_checker_url"), + TWITTERBOT_SECRET(String.class, "twitterbot_secret"), + TWITTERBOT_URL(String.class, "twitterbot_url"), + // + BLOCKED_COMMANDS(List.class, "blocked_commands"), + HOST_SENDER_NAMES(List.class, "host_sender_names"); + // + private final Class type; + private final String configName; + + private TFM_ConfigEntry(Class type, String configName) + { + this.type = type; + this.configName = configName; + } + + public Class getType() + { + return type; + } + + public String getConfigName() + { + return configName; + } + } + + private TFM_Config() + { + try + { + try + { + InputStream defaultConfig = getDefaultConfig(); + TFM_Config_DefaultsLoader defaultsLoader = new TFM_Config_DefaultsLoader(defaultConfig); + for (TFM_ConfigEntry entry : TFM_ConfigEntry.values()) + { + configEntryMap.put(entry, defaultsLoader.get(entry.getConfigName())); + } + defaultConfig.close(); + } + catch (IOException ex) + { + TFM_Log.severe(ex); + } + + copyDefaultConfig(CONFIG_FILE); + + load(); + } + catch (Exception ex) + { + TFM_Log.severe(ex); + } + } + + public final void load() + { + try + { + YamlConfiguration config = new YamlConfiguration(); + + config.load(CONFIG_FILE); + + for (TFM_ConfigEntry entry : TFM_ConfigEntry.values()) + { + String path = entry.getConfigName(); + if (config.contains(path)) + { + Object value = config.get(path); + if (value == null || entry.getType().isAssignableFrom(value.getClass())) + { + configEntryMap.put(entry, value); + } + else + { + TFM_Log.warning("Value for " + entry.getConfigName() + " is of type " + value.getClass().getSimpleName() + ". Needs to be " + entry.getType().getSimpleName() + ". Using default value."); + } + } + else + { + TFM_Log.warning("Missing configuration entry " + entry.getConfigName() + ". Using default value."); + } + } + } + catch (FileNotFoundException ex) + { + TFM_Log.severe(ex); + } + catch (IOException ex) + { + TFM_Log.severe(ex); + } + catch (InvalidConfigurationException ex) + { + TFM_Log.severe(ex); + } + } + + public String getString(TFM_ConfigEntry entry) + { + try + { + return get(entry, String.class); + } + catch (IllegalArgumentException ex) + { + TFM_Log.severe(ex); + } + return null; + } + + public void setString(TFM_ConfigEntry entry, String value) + { + try + { + set(entry, value, String.class); + } + catch (IllegalArgumentException ex) + { + TFM_Log.severe(ex); + } + } + + public Double getDouble(TFM_ConfigEntry entry) + { + try + { + return get(entry, Double.class); + } + catch (IllegalArgumentException ex) + { + TFM_Log.severe(ex); + } + return null; + } + + public void setDouble(TFM_ConfigEntry entry, Double value) + { + try + { + set(entry, value, Double.class); + } + catch (IllegalArgumentException ex) + { + TFM_Log.severe(ex); + } + } + + public Boolean getBoolean(TFM_ConfigEntry entry) + { + try + { + return get(entry, Boolean.class); + } + catch (IllegalArgumentException ex) + { + TFM_Log.severe(ex); + } + return null; + } + + public void setBoolean(TFM_ConfigEntry entry, Boolean value) + { + try + { + set(entry, value, Boolean.class); + } + catch (IllegalArgumentException ex) + { + TFM_Log.severe(ex); + } + } + + public Integer getInteger(TFM_ConfigEntry entry) + { + try + { + return get(entry, Integer.class); + } + catch (IllegalArgumentException ex) + { + TFM_Log.severe(ex); + } + return null; + } + + public void setInteger(TFM_ConfigEntry entry, Integer value) + { + try + { + set(entry, value, Integer.class); + } + catch (IllegalArgumentException ex) + { + TFM_Log.severe(ex); + } + } + + public List getList(TFM_ConfigEntry entry) + { + try + { + return get(entry, List.class); + } + catch (IllegalArgumentException ex) + { + TFM_Log.severe(ex); + } + return null; + } + + public T get(TFM_ConfigEntry entry, Class type) throws IllegalArgumentException + { + Object value = configEntryMap.get(entry); + try + { + return type.cast(value); + } + catch (ClassCastException ex) + { + throw new IllegalArgumentException(entry.name() + " is not of type " + type.getSimpleName()); + } + } + + public void set(TFM_ConfigEntry entry, T value, Class type) throws IllegalArgumentException + { + if (!type.isAssignableFrom(entry.getType())) + { + throw new IllegalArgumentException(entry.name() + " is not of type " + type.getSimpleName()); + } + if (value != null && !type.isAssignableFrom(value.getClass())) + { + throw new IllegalArgumentException("Value is not of type " + type.getSimpleName()); + } + configEntryMap.put(entry, value); + } + + private static void copyDefaultConfig(File targetFile) + { + if (targetFile.exists()) + { + return; + } + + TFM_Log.info("Installing default configuration file template: " + targetFile.getPath()); + + try + { + InputStream defaultConfig = getDefaultConfig(); + FileUtils.copyInputStreamToFile(getDefaultConfig(), targetFile); + defaultConfig.close(); + } + catch (IOException ex) + { + TFM_Log.severe(ex); + } + } + + private static InputStream getDefaultConfig() + { + return TotalFreedomMod.plugin.getResource(CONFIG_FILENAME); + } + + private static class TFM_Config_DefaultsLoader + { + private YamlConfiguration defaults = null; + + public TFM_Config_DefaultsLoader(InputStream defaultConfig) + { + try + { + defaults = new YamlConfiguration(); + defaults.load(defaultConfig); + } + catch (IOException ex) + { + TFM_Log.severe(ex); + } + catch (InvalidConfigurationException ex) + { + TFM_Log.severe(ex); + } + } + + public Object get(String path) + { + return defaults.get(path); + } + } + + public static TFM_Config getInstance() + { + return TFM_ConfigHolder.INSTANCE; + } + + private static class TFM_ConfigHolder + { + private static final TFM_Config INSTANCE = new TFM_Config(); + } +} From 3e57696a21be18d9e8ea960aced3549a97100345 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sat, 17 Aug 2013 18:24:40 -0400 Subject: [PATCH 02/10] Delegate to TFM_ConfigEntry --- .../TotalFreedomMod/TFM_Config.java | 69 ----------- .../TotalFreedomMod/TFM_ConfigEntry.java | 117 ++++++++++++++++++ 2 files changed, 117 insertions(+), 69 deletions(-) create mode 100644 src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java index bbd4ca24..38d26b6f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java @@ -17,75 +17,6 @@ public class TFM_Config // private final EnumMap configEntryMap = new EnumMap(TFM_ConfigEntry.class); - public static enum TFM_ConfigEntry - { - ADMIN_ONLY_MODE(Boolean.class, "admin_only_mode"), - ALLOW_EXPLOSIONS(Boolean.class, "allow_explosions"), - ALLOW_FIRE_PLACE(Boolean.class, "allow_fire_place"), - ALLOW_FIRE_SPREAD(Boolean.class, "allow_fire_spread"), - ALLOW_FLIUD_SPREAD(Boolean.class, "allow_fluid_spread"), - ALLOW_LAVA_DAMAGE(Boolean.class, "allow_lava_damage"), - ALLOW_LAVA_PLACE(Boolean.class, "allow_lava_place"), - ALLOW_TNT_MINECARTS(Boolean.class, "allow_tnt_minecarts"), - ALLOW_WATER_PLACE(Boolean.class, "allow_water_place"), - AUTO_ENTITY_WIPE(Boolean.class, "auto_wipe"), - AUTO_PROTECT_SPAWNPOINTS(Boolean.class, "auto_protect_spawnpoints"), - DISABLE_NIGHT(Boolean.class, "disable_night"), - DISABLE_WEATHER(Boolean.class, "disable_weather"), - GENERATE_FLATLANDS(Boolean.class, "generate_flatlands"), - LANDMINES_ENABLED(Boolean.class, "landmines_enabled"), - MOB_LIMITER_DISABLE_DRAGON(Boolean.class, "mob_limiter_disable_dragon"), - MOB_LIMITER_DISABLE_GHAST(Boolean.class, "mob_limiter_disable_ghast"), - MOB_LIMITER_DISABLE_GIANT(Boolean.class, "mob_limiter_disable_giant"), - MOB_LIMITER_DISABLE_SLIME(Boolean.class, "mob_limiter_disable_slime"), - MOB_LIMITER_ENABLED(Boolean.class, "mob_limiter_enabled"), - MP44_ENABLED(Boolean.class, "mp44_enabled"), - NUKE_MONITOR(Boolean.class, "nuke_monitor"), - PET_PROTECT_ENABLED(Boolean.class, "pet_protect_enabled"), - PREPROCESS_LOG_ENABLED(Boolean.class, "preprocess_log"), - PROTECTED_AREAS_ENABLED(Boolean.class, "protected_areas_enabled"), - TOSSMOB_ENABLED(Boolean.class, "tossmob_enabled"), - TWITTERBOT_ENABLED(Boolean.class, "twitterbot_enabled"), - // - AUTO_PROTECT_RADIUS(Double.class, "auto_protect_radius"), - EXPLOSIVE_RADIUS(Double.class, "explosiveRadius"), - NUKE_MONITOR_RANGE(Double.class, "nuke_monitor_range"), - // - FREECAM_TRIGGER_COUNT(Integer.class, "freecam_trigger_count"), - MOB_LIMITER_MAX(Integer.class, "mob_limiter_max"), - NUKE_MONITOR_COUNT_BREAK(Integer.class, "nuke_monitor_count_break"), - NUKE_MONITOR_COUNT_PLACE(Integer.class, "nuke_monitor_count_place"), - // - FLATLANDS_GENERATION_PARAMS(String.class, "flatlands_generation_params"), - LOGS_REGISTER_PASSWORD(String.class, "logs_register_password"), - LOGS_REGISTER_URL(String.class, "logs_register_url"), - SERVICE_CHECKER_URL(String.class, "service_checker_url"), - TWITTERBOT_SECRET(String.class, "twitterbot_secret"), - TWITTERBOT_URL(String.class, "twitterbot_url"), - // - BLOCKED_COMMANDS(List.class, "blocked_commands"), - HOST_SENDER_NAMES(List.class, "host_sender_names"); - // - private final Class type; - private final String configName; - - private TFM_ConfigEntry(Class type, String configName) - { - this.type = type; - this.configName = configName; - } - - public Class getType() - { - return type; - } - - public String getConfigName() - { - return configName; - } - } - private TFM_Config() { try diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java new file mode 100644 index 00000000..d32517f7 --- /dev/null +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java @@ -0,0 +1,117 @@ +package me.StevenLawson.TotalFreedomMod; + +import java.util.List; + +public enum TFM_ConfigEntry +{ + ADMIN_ONLY_MODE(Boolean.class, "admin_only_mode"), + ALLOW_EXPLOSIONS(Boolean.class, "allow_explosions"), + ALLOW_FIRE_PLACE(Boolean.class, "allow_fire_place"), + ALLOW_FIRE_SPREAD(Boolean.class, "allow_fire_spread"), + ALLOW_FLIUD_SPREAD(Boolean.class, "allow_fluid_spread"), + ALLOW_LAVA_DAMAGE(Boolean.class, "allow_lava_damage"), + ALLOW_LAVA_PLACE(Boolean.class, "allow_lava_place"), + ALLOW_TNT_MINECARTS(Boolean.class, "allow_tnt_minecarts"), + ALLOW_WATER_PLACE(Boolean.class, "allow_water_place"), + AUTO_ENTITY_WIPE(Boolean.class, "auto_wipe"), + AUTO_PROTECT_SPAWNPOINTS(Boolean.class, "auto_protect_spawnpoints"), + DISABLE_NIGHT(Boolean.class, "disable_night"), + DISABLE_WEATHER(Boolean.class, "disable_weather"), + GENERATE_FLATLANDS(Boolean.class, "generate_flatlands"), + LANDMINES_ENABLED(Boolean.class, "landmines_enabled"), + MOB_LIMITER_DISABLE_DRAGON(Boolean.class, "mob_limiter_disable_dragon"), + MOB_LIMITER_DISABLE_GHAST(Boolean.class, "mob_limiter_disable_ghast"), + MOB_LIMITER_DISABLE_GIANT(Boolean.class, "mob_limiter_disable_giant"), + MOB_LIMITER_DISABLE_SLIME(Boolean.class, "mob_limiter_disable_slime"), + MOB_LIMITER_ENABLED(Boolean.class, "mob_limiter_enabled"), + MP44_ENABLED(Boolean.class, "mp44_enabled"), + NUKE_MONITOR(Boolean.class, "nuke_monitor"), + PET_PROTECT_ENABLED(Boolean.class, "pet_protect_enabled"), + PREPROCESS_LOG_ENABLED(Boolean.class, "preprocess_log"), + PROTECTED_AREAS_ENABLED(Boolean.class, "protected_areas_enabled"), + TOSSMOB_ENABLED(Boolean.class, "tossmob_enabled"), + TWITTERBOT_ENABLED(Boolean.class, "twitterbot_enabled"), + // + AUTO_PROTECT_RADIUS(Double.class, "auto_protect_radius"), + EXPLOSIVE_RADIUS(Double.class, "explosiveRadius"), + NUKE_MONITOR_RANGE(Double.class, "nuke_monitor_range"), + // + FREECAM_TRIGGER_COUNT(Integer.class, "freecam_trigger_count"), + MOB_LIMITER_MAX(Integer.class, "mob_limiter_max"), + NUKE_MONITOR_COUNT_BREAK(Integer.class, "nuke_monitor_count_break"), + NUKE_MONITOR_COUNT_PLACE(Integer.class, "nuke_monitor_count_place"), + // + FLATLANDS_GENERATION_PARAMS(String.class, "flatlands_generation_params"), + LOGS_REGISTER_PASSWORD(String.class, "logs_register_password"), + LOGS_REGISTER_URL(String.class, "logs_register_url"), + SERVICE_CHECKER_URL(String.class, "service_checker_url"), + TWITTERBOT_SECRET(String.class, "twitterbot_secret"), + TWITTERBOT_URL(String.class, "twitterbot_url"), + // + BLOCKED_COMMANDS(List.class, "blocked_commands"), + HOST_SENDER_NAMES(List.class, "host_sender_names"); + // + private final Class type; + private final String configName; + + private TFM_ConfigEntry(Class type, String configName) + { + this.type = type; + this.configName = configName; + } + + public Class getType() + { + return type; + } + + public String getConfigName() + { + return configName; + } + + public String getString() + { + return TFM_Config.getInstance().getString(this); + } + + public void setString(String value) + { + TFM_Config.getInstance().setString(this, value); + } + + public Double getDouble() + { + return TFM_Config.getInstance().getDouble(this); + } + + public void setDouble(Double value) + { + TFM_Config.getInstance().setDouble(this, value); + } + + public Boolean getBoolean() + { + return TFM_Config.getInstance().getBoolean(this); + } + + public void setBoolean(Boolean value) + { + TFM_Config.getInstance().setBoolean(this, value); + } + + public Integer getInteger() + { + return TFM_Config.getInstance().getInteger(this); + } + + public void setInteger(Integer value) + { + TFM_Config.getInstance().setInteger(this, value); + } + + public List getList(TFM_ConfigEntry entry) + { + return TFM_Config.getInstance().getList(this); + } +} From 64b1e568b3f4d7223436ddef4c266b9da13a6566 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sat, 17 Aug 2013 18:28:55 -0400 Subject: [PATCH 03/10] Deprecated old config vars --- .../TotalFreedomMod/TotalFreedomMod.java | 172 ++++++++---------- 1 file changed, 78 insertions(+), 94 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index 946a0336..30fa4871 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -31,7 +31,6 @@ public class TotalFreedomMod extends JavaPlugin public static final long HEARTBEAT_RATE = 5L; //Seconds public static final long SERVICE_CHECKER_RATE = 120L; // - public static final String CONFIG_FILE = "config.yml"; public static final String SUPERADMIN_FILE = "superadmin.yml"; public static final String PERMBAN_FILE = "permban.yml"; public static final String PROTECTED_AREA_FILE = "protectedareas.dat"; @@ -70,7 +69,6 @@ public class TotalFreedomMod extends JavaPlugin setAppProperties(); - loadMainConfig(); loadSuperadminConfig(); loadPermbanConfig(); @@ -231,104 +229,90 @@ public class TotalFreedomMod extends JavaPlugin return true; } // - public static boolean allowFirePlace = false; - public static boolean allowFireSpread = false; - public static boolean allowLavaDamage = false; - public static boolean allowLavaPlace = false; - public static boolean allowWaterPlace = false; - public static boolean allowExplosions = false; - public static boolean allowFliudSpread = false; - public static boolean allowTntMinecarts = false; - public static double explosiveRadius = 4.0D; - public static List blockedCommands = new ArrayList(); - public static boolean autoEntityWipe = true; - public static boolean nukeMonitor = true; - public static int nukeMonitorCountBreak = 100; - public static int nukeMonitorCountPlace = 25; - public static double nukeMonitorRange = 10.0D; - public static int freecamTriggerCount = 10; - public static boolean preprocessLogEnabled = true; - public static boolean disableNight = true; - public static boolean disableWeather = true; - public static boolean landminesEnabled = false; - public static boolean mp44Enabled = false; - public static boolean mobLimiterEnabled = true; - public static int mobLimiterMax = 50; - public static boolean mobLimiterDisableDragon = true; - public static boolean mobLimiterDisableGhast = true; - public static boolean mobLimiterDisableSlime = true; - public static boolean mobLimiterDisableGiant = true; - public static boolean tossmobEnabled = false; - public static boolean generateFlatlands = true; - public static String flatlandsGenerationParams = "16,stone,32,dirt,1,grass"; + @Deprecated public static boolean adminOnlyMode = false; - public static boolean protectedAreasEnabled = true; + @Deprecated + public static boolean allowExplosions = false; + @Deprecated + public static boolean allowFirePlace = false; + @Deprecated + public static boolean allowFireSpread = false; + @Deprecated + public static boolean allowFliudSpread = false; + @Deprecated + public static boolean allowLavaDamage = false; + @Deprecated + public static boolean allowLavaPlace = false; + @Deprecated + public static boolean allowTntMinecarts = false; + @Deprecated + public static boolean allowWaterPlace = false; + @Deprecated + public static boolean autoEntityWipe = true; + @Deprecated public static boolean autoProtectSpawnpoints = true; - public static double autoProtectRadius = 25.0D; - public static List host_sender_names = Arrays.asList("rcon", "remotebukkit"); - public static boolean twitterbotEnabled = false; - public static String twitterbotURL = ""; - public static String twitterbotSecret = ""; + @Deprecated + public static boolean disableNight = true; + @Deprecated + public static boolean disableWeather = true; + @Deprecated + public static boolean generateFlatlands = true; + @Deprecated + public static boolean landminesEnabled = false; + @Deprecated + public static boolean mobLimiterDisableDragon = true; + @Deprecated + public static boolean mobLimiterDisableGhast = true; + @Deprecated + public static boolean mobLimiterDisableGiant = true; + @Deprecated + public static boolean mobLimiterDisableSlime = true; + @Deprecated + public static boolean mobLimiterEnabled = true; + @Deprecated + public static boolean mp44Enabled = false; + @Deprecated + public static boolean nukeMonitor = true; + @Deprecated public static boolean petProtectEnabled = true; + @Deprecated + public static boolean preprocessLogEnabled = true; + @Deprecated + public static boolean protectedAreasEnabled = true; + @Deprecated + public static boolean tossmobEnabled = false; + @Deprecated + public static boolean twitterbotEnabled = false; + @Deprecated + public static double autoProtectRadius = 25.0D; + @Deprecated + public static double explosiveRadius = 4.0D; + @Deprecated + public static double nukeMonitorRange = 10.0D; + @Deprecated + public static int freecamTriggerCount = 10; + @Deprecated + public static int mobLimiterMax = 50; + @Deprecated + public static int nukeMonitorCountBreak = 100; + @Deprecated + public static int nukeMonitorCountPlace = 25; + @Deprecated + public static List blockedCommands = new ArrayList(); + @Deprecated + public static List host_sender_names = Arrays.asList("rcon", "remotebukkit"); + @Deprecated + public static String flatlandsGenerationParams = "16,stone,32,dirt,1,grass"; + @Deprecated public static String logsRegisterPassword = ""; + @Deprecated public static String logsRegisterURL = ""; + @Deprecated public static String serviceCheckerURL = "http://status.mojang.com/check"; - - public static void loadMainConfig() - { - try - { - TFM_Util.createDefaultConfiguration(CONFIG_FILE, plugin_file); - FileConfiguration config = YamlConfiguration.loadConfiguration(new File(plugin.getDataFolder(), CONFIG_FILE)); - - allowFirePlace = config.getBoolean("allow_fire_place", allowFirePlace); - allowFireSpread = config.getBoolean("allow_fire_spread", allowFireSpread); - allowLavaDamage = config.getBoolean("allow_lava_damage", allowLavaDamage); - allowLavaPlace = config.getBoolean("allow_lava_place", allowLavaPlace); - allowWaterPlace = config.getBoolean("allow_water_place", allowWaterPlace); - allowExplosions = config.getBoolean("allow_explosions", allowExplosions); - allowTntMinecarts = config.getBoolean("allow_tnt_minecarts", allowTntMinecarts); - explosiveRadius = config.getDouble("explosiveRadius", explosiveRadius); - blockedCommands = config.getStringList("blocked_commands"); - autoEntityWipe = config.getBoolean("auto_wipe", autoEntityWipe); - nukeMonitor = config.getBoolean("nuke_monitor", nukeMonitor); - nukeMonitorCountBreak = config.getInt("nuke_monitor_count_break", nukeMonitorCountBreak); - nukeMonitorCountPlace = config.getInt("nuke_monitor_count_place", nukeMonitorCountPlace); - nukeMonitorRange = config.getDouble("nuke_monitor_range", nukeMonitorRange); - freecamTriggerCount = config.getInt("freecam_trigger_count", freecamTriggerCount); - preprocessLogEnabled = config.getBoolean("preprocess_log", preprocessLogEnabled); - disableNight = config.getBoolean("disable_night", disableNight); - disableWeather = config.getBoolean("disable_weather", disableWeather); - landminesEnabled = config.getBoolean("landmines_enabled", landminesEnabled); - mp44Enabled = config.getBoolean("mp44_enabled", mp44Enabled); - mobLimiterEnabled = config.getBoolean("mob_limiter_enabled", mobLimiterEnabled); - mobLimiterMax = config.getInt("mob_limiter_max", mobLimiterMax); - mobLimiterDisableDragon = config.getBoolean("mob_limiter_disable_dragon", mobLimiterDisableDragon); - mobLimiterDisableGhast = config.getBoolean("mob_limiter_disable_ghast", mobLimiterDisableGhast); - mobLimiterDisableSlime = config.getBoolean("mob_limiter_disable_slime", mobLimiterDisableSlime); - mobLimiterDisableGiant = config.getBoolean("mob_limiter_disable_giant", mobLimiterDisableGiant); - tossmobEnabled = config.getBoolean("tossmob_enabled", tossmobEnabled); - generateFlatlands = config.getBoolean("generate_flatlands", generateFlatlands); - flatlandsGenerationParams = config.getString("flatlands_generation_params", flatlandsGenerationParams); - allowFliudSpread = config.getBoolean("allow_fluid_spread", allowFliudSpread); - adminOnlyMode = config.getBoolean("admin_only_mode", adminOnlyMode); - protectedAreasEnabled = config.getBoolean("protected_areas_enabled", protectedAreasEnabled); - autoProtectSpawnpoints = config.getBoolean("auto_protect_spawnpoints", autoProtectSpawnpoints); - autoProtectRadius = config.getDouble("auto_protect_radius", autoProtectRadius); - host_sender_names = config.getStringList("host_sender_names"); - twitterbotEnabled = config.getBoolean("twitterbot_enabled", twitterbotEnabled); - twitterbotURL = config.getString("twitterbot_url", twitterbotURL); - twitterbotSecret = config.getString("twitterbot_secret", twitterbotSecret); - petProtectEnabled = config.getBoolean("pet_protect_enabled", petProtectEnabled); - logsRegisterPassword = config.getString("logs_register_password", logsRegisterPassword); - logsRegisterURL = config.getString("logs_register_url", logsRegisterURL); - serviceCheckerURL = config.getString("service_checker_url", serviceCheckerURL); - } - catch (Exception ex) - { - TFM_Log.severe("Error loading main config: " + ex.getMessage()); - } - } + @Deprecated + public static String twitterbotSecret = ""; + @Deprecated + public static String twitterbotURL = ""; public static void loadSuperadminConfig() { From 2827ca98a7211cdb9d384db8afda64ea798208f7 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sun, 18 Aug 2013 14:52:46 -0400 Subject: [PATCH 04/10] Config migration, stage 1 --- .../Commands/Command_adminmode.java | 6 ++--- .../Commands/Command_droptoggle.java | 4 ++-- .../Commands/Command_explosives.java | 5 +++-- .../Commands/Command_fireplace.java | 6 ++--- .../Commands/Command_firespread.java | 10 ++++++--- .../Commands/Command_fluidspread.java | 13 ++--------- .../Commands/Command_landmine.java | 3 ++- .../Commands/Command_lavadmg.java | 13 ++--------- .../Commands/Command_lavaplace.java | 13 ++--------- .../Commands/Command_waterplace.java | 14 ++---------- .../Listener/TFM_BlockListener.java | 15 +++++++------ .../Listener/TFM_EntityListener.java | 13 ++++++----- .../Listener/TFM_PlayerListener.java | 16 +++++++------- .../Listener/TFM_ServerListener.java | 4 ++-- .../TotalFreedomMod/TFM_ConfigEntry.java | 12 ++++++---- .../TotalFreedomMod/TFM_Heartbeat.java | 4 ++-- .../TotalFreedomMod/TFM_ServerInterface.java | 2 +- .../TotalFreedomMod/TotalFreedomMod.java | 22 +------------------ 18 files changed, 65 insertions(+), 110 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java index 0e253245..bb016134 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java @@ -1,8 +1,8 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -21,13 +21,13 @@ public class Command_adminmode extends TFM_Command if (args[0].equalsIgnoreCase("off")) { - TotalFreedomMod.adminOnlyMode = false; + TFM_ConfigEntry.ADMIN_ONLY_MODE.setBoolean(false); TFM_Util.adminAction(sender.getName(), "Opening the server to all players.", true); return true; } else if (args[0].equalsIgnoreCase("on")) { - TotalFreedomMod.adminOnlyMode = true; + TFM_ConfigEntry.ADMIN_ONLY_MODE.setBoolean(true); TFM_Util.adminAction(sender.getName(), "Closing the server to non-superadmins.", true); for (Player player : server.getOnlinePlayers()) { diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_droptoggle.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_droptoggle.java index 2c3f794f..62a4ca9d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_droptoggle.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_droptoggle.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -18,7 +18,7 @@ public class Command_droptoggle extends TFM_Command return false; } TFM_Util.adminAction(sender.getName(), - ((TotalFreedomMod.autoEntityWipe = !args[0].equalsIgnoreCase("off")) ? "Enabled" : "Disabled") + (TFM_ConfigEntry.AUTO_ENTITY_WIPE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "Enabled" : "Disabled") + " automatic entity wiping.", false); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java index 7bfcdd8a..d639b973 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java @@ -1,5 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.command.Command; @@ -33,12 +34,12 @@ public class Command_explosives extends TFM_Command if (args[0].equalsIgnoreCase("on")) { - TotalFreedomMod.allowExplosions = true; + TFM_ConfigEntry.ALLOW_EXPLOSIONS.setBoolean(true); playerMsg("Explosives are now enabled, radius set to " + TotalFreedomMod.explosiveRadius + " blocks."); } else { - TotalFreedomMod.allowExplosions = false; + TFM_ConfigEntry.ALLOW_EXPLOSIONS.setBoolean(false); playerMsg("Explosives are now disabled."); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fireplace.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fireplace.java index c54d8f7b..9cd60711 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fireplace.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fireplace.java @@ -1,6 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -19,12 +19,12 @@ public class Command_fireplace extends TFM_Command if (args[0].equalsIgnoreCase("on")) { - TotalFreedomMod.allowFirePlace = true; + TFM_ConfigEntry.ALLOW_FIRE_PLACE.setBoolean(true); playerMsg("Fire placement is now enabled."); } else { - TotalFreedomMod.allowFirePlace = false; + TFM_ConfigEntry.ALLOW_FIRE_PLACE.setBoolean(false); playerMsg("Fire placement is now disabled."); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_firespread.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_firespread.java index bd9d12e9..a1d4a160 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_firespread.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_firespread.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -18,9 +18,13 @@ public class Command_firespread extends TFM_Command return false; } - playerMsg("Fire spread is now " + ((TotalFreedomMod.allowFireSpread = !args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + "."); + boolean fireSpread = !args[0].equalsIgnoreCase("off"); - TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_FIRE_TICK, TotalFreedomMod.allowFireSpread); + TFM_ConfigEntry.ALLOW_FIRE_SPREAD.setBoolean(fireSpread); + + playerMsg("Fire spread is now " + (fireSpread ? "enabled" : "disabled") + "."); + + TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_FIRE_TICK, fireSpread); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java index 5aa11d74..763bb0d2 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java @@ -1,6 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -17,16 +17,7 @@ public class Command_fluidspread extends TFM_Command return false; } - if (args[0].equalsIgnoreCase("on")) - { - TotalFreedomMod.allowFliudSpread = true; - playerMsg("Lava and water spread is now enabled."); - } - else - { - TotalFreedomMod.allowFliudSpread = false; - playerMsg("Lava and water spread is now disabled."); - } + playerMsg("Lava and water spread is now " + (TFM_ConfigEntry.ALLOW_FLIUD_SPREAD.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + "."); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java index 98c1152b..8d81c604 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java @@ -1,5 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_LandmineData; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.ChatColor; @@ -21,7 +22,7 @@ public class Command_landmine extends TFM_Command { playerMsg("The landmine is currently disabled.", ChatColor.GREEN); } - else if (!TotalFreedomMod.allowExplosions) + else if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) { playerMsg("Explosions are currently disabled.", ChatColor.GREEN); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavadmg.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavadmg.java index 21203f9f..9b30f171 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavadmg.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavadmg.java @@ -1,6 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -17,16 +17,7 @@ public class Command_lavadmg extends TFM_Command return false; } - if (args[0].equalsIgnoreCase("on")) - { - TotalFreedomMod.allowLavaDamage = true; - playerMsg("Lava damage is now enabled."); - } - else - { - TotalFreedomMod.allowLavaDamage = false; - playerMsg("Lava damage is now disabled."); - } + playerMsg("Lava damage is now " + (TFM_ConfigEntry.ALLOW_LAVA_DAMAGE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + "."); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavaplace.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavaplace.java index 1c232760..e9ecb548 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavaplace.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavaplace.java @@ -1,6 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -17,16 +17,7 @@ public class Command_lavaplace extends TFM_Command return false; } - if (args[0].equalsIgnoreCase("on")) - { - TotalFreedomMod.allowLavaPlace = true; - playerMsg("Lava placement is now enabled."); - } - else - { - TotalFreedomMod.allowLavaPlace = false; - playerMsg("Lava placement is now disabled."); - } + playerMsg("Lava placement is now " + (TFM_ConfigEntry.ALLOW_LAVA_PLACE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + "."); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_waterplace.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_waterplace.java index 492f61b0..9fc93b21 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_waterplace.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_waterplace.java @@ -1,6 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -12,22 +12,12 @@ public class Command_waterplace extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (args.length != 1) { return false; } - if (args[0].equalsIgnoreCase("on")) - { - TotalFreedomMod.allowWaterPlace = true; - playerMsg("Water placement is now enabled."); - } - else - { - TotalFreedomMod.allowWaterPlace = false; - playerMsg("Water placement is now disabled."); - } + playerMsg("Water placement is now " + (TFM_ConfigEntry.ALLOW_WATER_PLACE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + "."); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java index e213ce6a..3e589129 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java @@ -1,5 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Listener; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Heartbeat; import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; @@ -23,7 +24,7 @@ public class TFM_BlockListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onBlockBurn(BlockBurnEvent event) { - if (!TotalFreedomMod.allowFireSpread) + if (!TFM_ConfigEntry.ALLOW_FIRE_SPREAD.getBoolean()) { event.setCancelled(true); } @@ -32,7 +33,7 @@ public class TFM_BlockListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onBlockIgnite(BlockIgniteEvent event) { - if (!TotalFreedomMod.allowFirePlace) + if (!TFM_ConfigEntry.ALLOW_FIRE_PLACE.getBoolean()) { event.setCancelled(true); } @@ -185,7 +186,7 @@ public class TFM_BlockListener implements Listener case LAVA: case STATIONARY_LAVA: { - if (TotalFreedomMod.allowLavaPlace) + if (TFM_ConfigEntry.ALLOW_LAVA_PLACE.getBoolean()) { TFM_Log.info(String.format("%s placed lava @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); @@ -203,7 +204,7 @@ public class TFM_BlockListener implements Listener case WATER: case STATIONARY_WATER: { - if (TotalFreedomMod.allowWaterPlace) + if (TFM_ConfigEntry.ALLOW_WATER_PLACE.getBoolean()) { TFM_Log.info(String.format("%s placed water @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); @@ -220,7 +221,7 @@ public class TFM_BlockListener implements Listener } case FIRE: { - if (TotalFreedomMod.allowFirePlace) + if (TFM_ConfigEntry.ALLOW_FIRE_PLACE.getBoolean()) { TFM_Log.info(String.format("%s placed fire @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); @@ -237,7 +238,7 @@ public class TFM_BlockListener implements Listener } case TNT: { - if (TotalFreedomMod.allowExplosions) + if (TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) { TFM_Log.info(String.format("%s placed TNT @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); @@ -264,7 +265,7 @@ public class TFM_BlockListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onBlockFromTo(BlockFromToEvent event) { - if (!TotalFreedomMod.allowFliudSpread) + if (!TFM_ConfigEntry.ALLOW_FLIUD_SPREAD.getBoolean()) { event.setCancelled(true); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java index 7bb6fe46..f638bc0d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java @@ -1,5 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Listener; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.entity.*; import org.bukkit.event.EventHandler; @@ -12,7 +13,7 @@ public class TFM_EntityListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onEntityExplode(EntityExplodeEvent event) { - if (!TotalFreedomMod.allowExplosions) + if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) { event.setCancelled(true); return; @@ -24,7 +25,7 @@ public class TFM_EntityListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onExplosionPrime(ExplosionPrimeEvent event) { - if (!TotalFreedomMod.allowExplosions) + if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) { event.setCancelled(true); return; @@ -36,7 +37,7 @@ public class TFM_EntityListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onEntityCombust(EntityCombustEvent event) { - if (!TotalFreedomMod.allowExplosions) + if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) { event.setCancelled(true); } @@ -49,7 +50,7 @@ public class TFM_EntityListener implements Listener { case LAVA: { - if (!TotalFreedomMod.allowLavaDamage) + if (!TFM_ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean()) { event.setCancelled(true); return; @@ -144,7 +145,7 @@ public class TFM_EntityListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onEntityDeath(EntityDeathEvent event) { - if (TotalFreedomMod.autoEntityWipe) + if (TFM_ConfigEntry.AUTO_ENTITY_WIPE.getBoolean()) { event.setDroppedExp(0); } @@ -153,7 +154,7 @@ public class TFM_EntityListener implements Listener @EventHandler(priority = EventPriority.NORMAL) public void onProjectileHit(ProjectileHitEvent event) { - if (TotalFreedomMod.allowExplosions) + if (TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) { Projectile entity = event.getEntity(); if (event.getEntityType() == EntityType.ARROW && entity.getShooter() instanceof Player) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index c1003baa..8d637697 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -46,7 +46,7 @@ public class TFM_PlayerListener implements Listener { case WATER_BUCKET: { - if (!TotalFreedomMod.allowWaterPlace) + if (!TFM_ConfigEntry.ALLOW_WATER_PLACE.getBoolean()) { player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); player.sendMessage(ChatColor.GRAY + "Water buckets are currently disabled."); @@ -56,7 +56,7 @@ public class TFM_PlayerListener implements Listener } case LAVA_BUCKET: { - if (!TotalFreedomMod.allowLavaPlace) + if (!TFM_ConfigEntry.ALLOW_LAVA_PLACE.getBoolean()) { player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); player.sendMessage(ChatColor.GRAY + "Lava buckets are currently disabled."); @@ -66,7 +66,7 @@ public class TFM_PlayerListener implements Listener } case EXPLOSIVE_MINECART: { - if (!TotalFreedomMod.allowTntMinecarts) + if (!TFM_ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean()) { player.getInventory().clear(player.getInventory().getHeldItemSlot()); player.sendMessage(ChatColor.GRAY + "TNT minecarts are currently disabled."); @@ -118,7 +118,7 @@ public class TFM_PlayerListener implements Listener } case BLAZE_ROD: { - if (TotalFreedomMod.allowExplosions) + if (TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) { if (TFM_SuperadminList.isSeniorAdmin(player, true)) { @@ -150,7 +150,7 @@ public class TFM_PlayerListener implements Listener } case CARROT: { - if (TotalFreedomMod.allowExplosions) + if (TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) { if (TFM_SuperadminList.isSeniorAdmin(player, true)) { @@ -341,7 +341,7 @@ public class TFM_PlayerListener implements Listener TFM_Jumppads.getInstance().PlayerMoveEvent(event); } - if (TotalFreedomMod.landminesEnabled && TotalFreedomMod.allowExplosions) + if (TotalFreedomMod.landminesEnabled && TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) { Iterator landmines = TFM_LandmineData.landmines.iterator(); while (landmines.hasNext()) @@ -571,7 +571,7 @@ public class TFM_PlayerListener implements Listener @EventHandler(priority = EventPriority.NORMAL) public void onPlayerDropItem(PlayerDropItemEvent event) { - if (TotalFreedomMod.autoEntityWipe) + if (TFM_ConfigEntry.AUTO_ENTITY_WIPE.getBoolean()) { if (event.getPlayer().getWorld().getEntities().size() > 750) { @@ -661,7 +661,7 @@ public class TFM_PlayerListener implements Listener } } - if (TotalFreedomMod.adminOnlyMode) + if (TFM_ConfigEntry.ADMIN_ONLY_MODE.getBoolean()) { new BukkitRunnable() { diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java index 9e86c9d2..b2f12177 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java @@ -4,10 +4,10 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import me.StevenLawson.TotalFreedomMod.TFM_CommandBlockerNew; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface; import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Server; @@ -88,7 +88,7 @@ public class TFM_ServerListener implements Listener { event.setMotd(ChatColor.RED + "You are banned."); } - else if (TotalFreedomMod.adminOnlyMode) + else if (TFM_ConfigEntry.ADMIN_ONLY_MODE.getBoolean()) { event.setMotd(ChatColor.RED + "Server is closed."); } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java index d32517f7..d6529b4c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java @@ -75,9 +75,10 @@ public enum TFM_ConfigEntry return TFM_Config.getInstance().getString(this); } - public void setString(String value) + public String setString(String value) { TFM_Config.getInstance().setString(this, value); + return value; } public Double getDouble() @@ -85,9 +86,10 @@ public enum TFM_ConfigEntry return TFM_Config.getInstance().getDouble(this); } - public void setDouble(Double value) + public Double setDouble(Double value) { TFM_Config.getInstance().setDouble(this, value); + return value; } public Boolean getBoolean() @@ -95,9 +97,10 @@ public enum TFM_ConfigEntry return TFM_Config.getInstance().getBoolean(this); } - public void setBoolean(Boolean value) + public Boolean setBoolean(Boolean value) { TFM_Config.getInstance().setBoolean(this, value); + return value; } public Integer getInteger() @@ -105,9 +108,10 @@ public enum TFM_ConfigEntry return TFM_Config.getInstance().getInteger(this); } - public void setInteger(Integer value) + public Integer setInteger(Integer value) { TFM_Config.getInstance().setInteger(this, value); + return value; } public List getList(TFM_ConfigEntry entry) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java index a20f77c1..35a41e1f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java @@ -35,9 +35,9 @@ public class TFM_Heartbeat extends BukkitRunnable playerdata.resetBlockPlaceCount(); } - if (TotalFreedomMod.autoEntityWipe) + if (TFM_ConfigEntry.AUTO_ENTITY_WIPE.getBoolean()) { - TFM_Util.TFM_EntityWiper.wipeEntities(!TotalFreedomMod.allowExplosions, false); + TFM_Util.TFM_EntityWiper.wipeEntities(!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean(), false); } if (TotalFreedomMod.disableWeather) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java index bb244d90..8e29d0c6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java @@ -247,7 +247,7 @@ public class TFM_ServerInterface return; } - if (TotalFreedomMod.adminOnlyMode) + if (TFM_ConfigEntry.ADMIN_ONLY_MODE.getBoolean()) { event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Server is temporarily open to admins only."); return; diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index 30fa4871..c914ae39 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -97,7 +97,7 @@ public class TotalFreedomMod extends JavaPlugin // Initialize game rules TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_DAYLIGHT_CYCLE, !disableNight, false); - TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_FIRE_TICK, allowFireSpread, false); + TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_FIRE_TICK, TFM_ConfigEntry.ALLOW_FIRE_SPREAD.getBoolean(), false); TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_MOB_LOOT, false, false); TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_MOB_SPAWNING, !mobLimiterEnabled, false); TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_TILE_DROPS, false, false); @@ -230,26 +230,6 @@ public class TotalFreedomMod extends JavaPlugin } // @Deprecated - public static boolean adminOnlyMode = false; - @Deprecated - public static boolean allowExplosions = false; - @Deprecated - public static boolean allowFirePlace = false; - @Deprecated - public static boolean allowFireSpread = false; - @Deprecated - public static boolean allowFliudSpread = false; - @Deprecated - public static boolean allowLavaDamage = false; - @Deprecated - public static boolean allowLavaPlace = false; - @Deprecated - public static boolean allowTntMinecarts = false; - @Deprecated - public static boolean allowWaterPlace = false; - @Deprecated - public static boolean autoEntityWipe = true; - @Deprecated public static boolean autoProtectSpawnpoints = true; @Deprecated public static boolean disableNight = true; From f53b67abf1b1098879aef8aeea807c2a082b2689 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sun, 18 Aug 2013 15:27:17 -0400 Subject: [PATCH 05/10] Config migration, stage 2 --- .../Commands/Command_flatlands.java | 4 +- .../Commands/Command_landmine.java | 3 +- .../Commands/Command_moblimiter.java | 30 ++++++------ .../Commands/Command_mp44.java | 4 +- .../Commands/Command_nonuke.java | 14 +++--- .../Commands/Command_petprotect.java | 6 +-- .../Commands/Command_prelog.java | 6 +-- .../Commands/Command_protectarea.java | 4 +- .../Commands/Command_setspawnworld.java | 6 +-- .../Listener/TFM_BlockListener.java | 34 ++++++------- .../Listener/TFM_EntityListener.java | 18 +++---- .../Listener/TFM_PlayerListener.java | 4 +- .../Listener/TFM_WeatherListener.java | 6 +-- .../TotalFreedomMod/TFM_Heartbeat.java | 2 +- .../TotalFreedomMod/TFM_ProtectedArea.java | 2 +- .../TotalFreedomMod/TotalFreedomMod.java | 48 ++----------------- 16 files changed, 74 insertions(+), 117 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_flatlands.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_flatlands.java index 49474425..4da9a27a 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_flatlands.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_flatlands.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -13,7 +13,7 @@ public class Command_flatlands extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (TotalFreedomMod.generateFlatlands) + if (TFM_ConfigEntry.GENERATE_FLATLANDS.getBoolean()) { TFM_Util.gotoWorld(sender, "flatlands"); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java index 8d81c604..e27d0a44 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java @@ -2,7 +2,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_LandmineData; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.Block; @@ -18,7 +17,7 @@ public class Command_landmine extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (!TotalFreedomMod.landminesEnabled) + if (!TFM_ConfigEntry.LANDMINES_ENABLED.getBoolean()) { playerMsg("The landmine is currently disabled.", ChatColor.GREEN); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_moblimiter.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_moblimiter.java index b4e309d6..6b9d551a 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_moblimiter.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_moblimiter.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -20,27 +20,27 @@ public class Command_moblimiter extends TFM_Command if (args[0].equalsIgnoreCase("on")) { - TotalFreedomMod.mobLimiterEnabled = true; + TFM_ConfigEntry.MOB_LIMITER_ENABLED.setBoolean(true); } else if (args[0].equalsIgnoreCase("off")) { - TotalFreedomMod.mobLimiterEnabled = false; + TFM_ConfigEntry.MOB_LIMITER_ENABLED.setBoolean(false); } else if (args[0].equalsIgnoreCase("dragon")) { - TotalFreedomMod.mobLimiterDisableDragon = !TotalFreedomMod.mobLimiterDisableDragon; + TFM_ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.setBoolean(!TFM_ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean()); } else if (args[0].equalsIgnoreCase("giant")) { - TotalFreedomMod.mobLimiterDisableGiant = !TotalFreedomMod.mobLimiterDisableGiant; + TFM_ConfigEntry.MOB_LIMITER_DISABLE_GIANT.setBoolean(!TFM_ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean()); } else if (args[0].equalsIgnoreCase("slime")) { - TotalFreedomMod.mobLimiterDisableSlime = !TotalFreedomMod.mobLimiterDisableSlime; + TFM_ConfigEntry.MOB_LIMITER_DISABLE_SLIME.setBoolean(!TFM_ConfigEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean()); } else if (args[0].equalsIgnoreCase("ghast")) { - TotalFreedomMod.mobLimiterDisableGhast = !TotalFreedomMod.mobLimiterDisableGhast; + TFM_ConfigEntry.MOB_LIMITER_DISABLE_GHAST.setBoolean(!TFM_ConfigEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean()); } else { @@ -53,7 +53,7 @@ public class Command_moblimiter extends TFM_Command { try { - TotalFreedomMod.mobLimiterMax = Math.max(0, Math.min(2000, Integer.parseInt(args[1]))); + TFM_ConfigEntry.MOB_LIMITER_MAX.setInteger(Math.max(0, Math.min(2000, Integer.parseInt(args[1])))); } catch (NumberFormatException nfex) { @@ -61,21 +61,21 @@ public class Command_moblimiter extends TFM_Command } } - if (TotalFreedomMod.mobLimiterEnabled) + if (TFM_ConfigEntry.MOB_LIMITER_ENABLED.getBoolean()) { - sender.sendMessage("Moblimiter enabled. Maximum mobcount set to: " + TotalFreedomMod.mobLimiterMax + "."); + sender.sendMessage("Moblimiter enabled. Maximum mobcount set to: " + TFM_ConfigEntry.MOB_LIMITER_MAX.getInteger() + "."); - playerMsg("Dragon: " + (TotalFreedomMod.mobLimiterDisableDragon ? "disabled" : "enabled") + "."); - playerMsg("Giant: " + (TotalFreedomMod.mobLimiterDisableGiant ? "disabled" : "enabled") + "."); - playerMsg("Slime: " + (TotalFreedomMod.mobLimiterDisableSlime ? "disabled" : "enabled") + "."); - playerMsg("Ghast: " + (TotalFreedomMod.mobLimiterDisableGhast ? "disabled" : "enabled") + "."); + playerMsg("Dragon: " + (TFM_ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean() ? "disabled" : "enabled") + "."); + playerMsg("Giant: " + (TFM_ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean() ? "disabled" : "enabled") + "."); + playerMsg("Slime: " + (TFM_ConfigEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean() ? "disabled" : "enabled") + "."); + playerMsg("Ghast: " + (TFM_ConfigEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean() ? "disabled" : "enabled") + "."); } else { playerMsg("Moblimiter is disabled. No mob restrictions are in effect."); } - TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_MOB_SPAWNING, !TotalFreedomMod.mobLimiterEnabled); + TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_MOB_SPAWNING, !TFM_ConfigEntry.MOB_LIMITER_ENABLED.getBoolean()); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp44.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp44.java index 2cf1f5b8..95223fe0 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp44.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp44.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.command.Command; @@ -16,7 +16,7 @@ public class Command_mp44 extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (!TotalFreedomMod.mp44Enabled) + if (!TFM_ConfigEntry.MP44_ENABLED.getBoolean()) { playerMsg("The mp44 is currently disabled.", ChatColor.GREEN); return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nonuke.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nonuke.java index db39f46a..cef53b12 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nonuke.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nonuke.java @@ -1,6 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -21,7 +21,7 @@ public class Command_nonuke extends TFM_Command { try { - TotalFreedomMod.nukeMonitorRange = Math.max(1.0, Math.min(500.0, Double.parseDouble(args[1]))); + TFM_ConfigEntry.NUKE_MONITOR_RANGE.setDouble(Math.max(1.0, Math.min(500.0, Double.parseDouble(args[1])))); } catch (NumberFormatException nfex) { @@ -32,7 +32,7 @@ public class Command_nonuke extends TFM_Command { try { - TotalFreedomMod.nukeMonitorCountBreak = Math.max(1, Math.min(500, Integer.parseInt(args[2]))); + TFM_ConfigEntry.NUKE_MONITOR_COUNT_BREAK.setInteger(Math.max(1, Math.min(500, Integer.parseInt(args[2])))); } catch (NumberFormatException nfex) { @@ -41,14 +41,14 @@ public class Command_nonuke extends TFM_Command if (args[0].equalsIgnoreCase("on")) { - TotalFreedomMod.nukeMonitor = true; + TFM_ConfigEntry.NUKE_MONITOR.setBoolean(true); playerMsg("Nuke monitor is enabled."); - playerMsg("Anti-freecam range is set to " + TotalFreedomMod.nukeMonitorRange + " blocks."); - playerMsg("Block throttle rate is set to " + TotalFreedomMod.nukeMonitorCountBreak + " blocks destroyed per 5 seconds."); + playerMsg("Anti-freecam range is set to " + TFM_ConfigEntry.NUKE_MONITOR_RANGE.getDouble() + " blocks."); + playerMsg("Block throttle rate is set to " + TFM_ConfigEntry.NUKE_MONITOR_COUNT_BREAK.getInteger() + " blocks destroyed per 5 seconds."); } else { - TotalFreedomMod.nukeMonitor = false; + TFM_ConfigEntry.NUKE_MONITOR.setBoolean(false); playerMsg("Nuke monitor is disabled."); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_petprotect.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_petprotect.java index 31851dab..12b6ad43 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_petprotect.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_petprotect.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -18,11 +18,9 @@ public class Command_petprotect extends TFM_Command return false; } - TotalFreedomMod.petProtectEnabled = !TFM_Util.isStopCommand(args[0]); - TFM_Util.adminAction( sender.getName(), - "Tamed pet protection is now " + (TotalFreedomMod.petProtectEnabled ? "enabled" : "disabled") + ".", + "Tamed pet protection is now " + (TFM_ConfigEntry.PET_PROTECT_ENABLED.setBoolean(!TFM_Util.isStopCommand(args[0])) ? "enabled" : "disabled") + ".", false); return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_prelog.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_prelog.java index 3ec501c2..a9f5926a 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_prelog.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_prelog.java @@ -1,6 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -21,12 +21,12 @@ public class Command_prelog extends TFM_Command if (args[0].equalsIgnoreCase("on")) { - TotalFreedomMod.preprocessLogEnabled = true; + TFM_ConfigEntry.PREPROCESS_LOG_ENABLED.setBoolean(true); playerMsg("Command preprocess logging is now enabled. This will be spammy in the log."); } else { - TotalFreedomMod.preprocessLogEnabled = false; + TFM_ConfigEntry.PREPROCESS_LOG_ENABLED.setBoolean(false); playerMsg("Command preprocess logging is now disabled."); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java index a87084f7..a51cd3ed 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java @@ -1,8 +1,8 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.apache.commons.lang.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -17,7 +17,7 @@ public class Command_protectarea extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (!TotalFreedomMod.protectedAreasEnabled) + if (!TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean()) { playerMsg("Protected areas are currently disabled in the TotalFreedomMod configuration."); return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setspawnworld.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setspawnworld.java index 7bfc9bcc..f8309dbb 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setspawnworld.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setspawnworld.java @@ -1,8 +1,8 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -20,9 +20,9 @@ public class Command_setspawnworld extends TFM_Command playerMsg("Spawn location for this world set to: " + TFM_Util.formatLocation(sender_p.getWorld().getSpawnLocation())); - if (TotalFreedomMod.protectedAreasEnabled && TotalFreedomMod.autoProtectSpawnpoints) + if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean() && TFM_ConfigEntry.AUTO_PROTECT_SPAWNPOINTS.getBoolean()) { - TFM_ProtectedArea.addProtectedArea("spawn_" + sender_p.getWorld().getName(), pos, TotalFreedomMod.autoProtectRadius); + TFM_ProtectedArea.addProtectedArea("spawn_" + sender_p.getWorld().getName(), pos, TFM_ConfigEntry.AUTO_PROTECT_RADIUS.getDouble()); } return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java index 3e589129..4a80111f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java @@ -1,14 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Listener; -import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; -import me.StevenLawson.TotalFreedomMod.TFM_Heartbeat; -import me.StevenLawson.TotalFreedomMod.TFM_Log; -import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; -import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea; -import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager; -import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; -import me.StevenLawson.TotalFreedomMod.TFM_Util; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; +import me.StevenLawson.TotalFreedomMod.*; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; @@ -45,25 +37,27 @@ public class TFM_BlockListener implements Listener Player player = event.getPlayer(); Location block_pos = event.getBlock().getLocation(); - if (TotalFreedomMod.nukeMonitor) + if (TFM_ConfigEntry.NUKE_MONITOR.getBoolean()) { TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); Location player_pos = player.getLocation(); + final double nukeMonitorRange = TFM_ConfigEntry.NUKE_MONITOR_RANGE.getDouble().doubleValue(); + boolean out_of_range = false; if (!player_pos.getWorld().equals(block_pos.getWorld())) { out_of_range = true; } - else if (player_pos.distanceSquared(block_pos) > (TotalFreedomMod.nukeMonitorRange * TotalFreedomMod.nukeMonitorRange)) + else if (player_pos.distanceSquared(block_pos) > (nukeMonitorRange * nukeMonitorRange)) { out_of_range = true; } if (out_of_range) { - if (playerdata.incrementAndGetFreecamDestroyCount() > TotalFreedomMod.freecamTriggerCount) + if (playerdata.incrementAndGetFreecamDestroyCount() > TFM_ConfigEntry.FREECAM_TRIGGER_COUNT.getInteger()) { TFM_Util.bcastMsg(player.getName() + " has been flagged for possible freecam nuking.", ChatColor.RED); TFM_Util.autoEject(player, "Freecam (extended range) block breaking is not permitted on this server."); @@ -82,7 +76,7 @@ public class TFM_BlockListener implements Listener } else { - if (playerdata.incrementAndGetBlockDestroyCount() > TotalFreedomMod.nukeMonitorCountBreak) + if (playerdata.incrementAndGetBlockDestroyCount() > TFM_ConfigEntry.NUKE_MONITOR_COUNT_BREAK.getInteger()) { TFM_Util.bcastMsg(player.getName() + " is breaking blocks too fast!", ChatColor.RED); TFM_Util.autoEject(player, "You are breaking blocks too fast. Nukers are not permitted on this server."); @@ -95,7 +89,7 @@ public class TFM_BlockListener implements Listener } } - if (TotalFreedomMod.protectedAreasEnabled) + if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean()) { if (!TFM_SuperadminList.isUserSuperadmin(player)) { @@ -119,25 +113,27 @@ public class TFM_BlockListener implements Listener Player player = event.getPlayer(); Location block_pos = event.getBlock().getLocation(); - if (TotalFreedomMod.nukeMonitor) + if (TFM_ConfigEntry.NUKE_MONITOR.getBoolean()) { TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); Location player_pos = player.getLocation(); + double nukeMonitorRange = TFM_ConfigEntry.NUKE_MONITOR_RANGE.getDouble().doubleValue(); + boolean out_of_range = false; if (!player_pos.getWorld().equals(block_pos.getWorld())) { out_of_range = true; } - else if (player_pos.distanceSquared(block_pos) > (TotalFreedomMod.nukeMonitorRange * TotalFreedomMod.nukeMonitorRange)) + else if (player_pos.distanceSquared(block_pos) > (nukeMonitorRange * nukeMonitorRange)) { out_of_range = true; } if (out_of_range) { - if (playerdata.incrementAndGetFreecamPlaceCount() > TotalFreedomMod.freecamTriggerCount) + if (playerdata.incrementAndGetFreecamPlaceCount() > TFM_ConfigEntry.FREECAM_TRIGGER_COUNT.getInteger()) { TFM_Util.bcastMsg(player.getName() + " has been flagged for possible freecam building.", ChatColor.RED); TFM_Util.autoEject(player, "Freecam (extended range) block building is not permitted on this server."); @@ -156,7 +152,7 @@ public class TFM_BlockListener implements Listener } else { - if (playerdata.incrementAndGetBlockPlaceCount() > TotalFreedomMod.nukeMonitorCountPlace) + if (playerdata.incrementAndGetBlockPlaceCount() > TFM_ConfigEntry.NUKE_MONITOR_COUNT_PLACE.getInteger()) { TFM_Util.bcastMsg(player.getName() + " is placing blocks too fast!", ChatColor.RED); TFM_Util.autoEject(player, "You are placing blocks too fast."); @@ -169,7 +165,7 @@ public class TFM_BlockListener implements Listener } } - if (TotalFreedomMod.protectedAreasEnabled) + if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean()) { if (!TFM_SuperadminList.isUserSuperadmin(player)) { diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java index f638bc0d..c97b1edf 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java @@ -58,7 +58,7 @@ public class TFM_EntityListener implements Listener } } - if (TotalFreedomMod.petProtectEnabled) + if (TFM_ConfigEntry.PET_PROTECT_ENABLED.getBoolean()) { Entity entity = event.getEntity(); if (entity instanceof Tameable) @@ -74,7 +74,7 @@ public class TFM_EntityListener implements Listener @EventHandler(priority = EventPriority.NORMAL) public void onCreatureSpawn(CreatureSpawnEvent event) { - if (TotalFreedomMod.mobLimiterEnabled) + if (TFM_ConfigEntry.MOB_LIMITER_ENABLED.getBoolean()) { if (event.getSpawnReason().equals(CreatureSpawnEvent.SpawnReason.EGG)) { @@ -86,7 +86,7 @@ public class TFM_EntityListener implements Listener if (spawned instanceof EnderDragon) { - if (TotalFreedomMod.mobLimiterDisableDragon) + if (TFM_ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean()) { event.setCancelled(true); return; @@ -94,7 +94,7 @@ public class TFM_EntityListener implements Listener } else if (spawned instanceof Ghast) { - if (TotalFreedomMod.mobLimiterDisableGhast) + if (TFM_ConfigEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean()) { event.setCancelled(true); return; @@ -102,7 +102,7 @@ public class TFM_EntityListener implements Listener } else if (spawned instanceof Slime) { - if (TotalFreedomMod.mobLimiterDisableSlime) + if (TFM_ConfigEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean()) { event.setCancelled(true); return; @@ -110,7 +110,7 @@ public class TFM_EntityListener implements Listener } else if (spawned instanceof Giant) { - if (TotalFreedomMod.mobLimiterDisableGiant) + if (TFM_ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean()) { event.setCancelled(true); return; @@ -122,7 +122,9 @@ public class TFM_EntityListener implements Listener return; } - if (TotalFreedomMod.mobLimiterMax > 0) + int mobLimiterMax = TFM_ConfigEntry.MOB_LIMITER_MAX.getInteger().intValue(); + + if (mobLimiterMax > 0) { int mobcount = 0; @@ -134,7 +136,7 @@ public class TFM_EntityListener implements Listener } } - if (mobcount > TotalFreedomMod.mobLimiterMax) + if (mobcount > mobLimiterMax) { event.setCancelled(true); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 8d637697..766284f8 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -341,7 +341,7 @@ public class TFM_PlayerListener implements Listener TFM_Jumppads.getInstance().PlayerMoveEvent(event); } - if (TotalFreedomMod.landminesEnabled && TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) + if (TFM_ConfigEntry.LANDMINES_ENABLED.getBoolean() && TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) { Iterator landmines = TFM_LandmineData.landmines.iterator(); while (landmines.hasNext()) @@ -542,7 +542,7 @@ public class TFM_PlayerListener implements Listener } } - if (TotalFreedomMod.preprocessLogEnabled) + if (TFM_ConfigEntry.PREPROCESS_LOG_ENABLED.getBoolean()) { TFM_Log.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", player.getName(), ChatColor.stripColor(player.getDisplayName()), command), true); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_WeatherListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_WeatherListener.java index 27fcec1f..0a7585cf 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_WeatherListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_WeatherListener.java @@ -1,6 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Listener; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -12,7 +12,7 @@ public class TFM_WeatherListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onThunderChange(ThunderChangeEvent event) { - if (event.toThunderState() && TotalFreedomMod.disableWeather) + if (event.toThunderState() && TFM_ConfigEntry.DISABLE_WEATHER.getBoolean()) { event.setCancelled(true); return; @@ -22,7 +22,7 @@ public class TFM_WeatherListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onWeatherChange(WeatherChangeEvent event) { - if (event.toWeatherState() && TotalFreedomMod.disableWeather) + if (event.toWeatherState() && TFM_ConfigEntry.DISABLE_WEATHER.getBoolean()) { event.setCancelled(true); return; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java index 35a41e1f..d2652936 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java @@ -40,7 +40,7 @@ public class TFM_Heartbeat extends BukkitRunnable TFM_Util.TFM_EntityWiper.wipeEntities(!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean(), false); } - if (TotalFreedomMod.disableWeather) + if (TFM_ConfigEntry.DISABLE_WEATHER.getBoolean()) { for (World world : server.getWorlds()) { diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java index 26bd870f..e50b7b6b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java @@ -115,7 +115,7 @@ public class TFM_ProtectedArea implements Serializable public static void autoAddSpawnpoints() { - if (TotalFreedomMod.autoProtectSpawnpoints) + if (TFM_ConfigEntry.AUTO_PROTECT_SPAWNPOINTS.getBoolean()) { for (World world : Bukkit.getWorlds()) { diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index c914ae39..dae9121c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -76,7 +76,7 @@ public class TotalFreedomMod extends JavaPlugin registerEventHandlers(); - if (generateFlatlands) + if (TFM_ConfigEntry.GENERATE_FLATLANDS.getBoolean()) { TFM_Util.wipeFlatlandsIfFlagged(); TFM_Util.generateFlatlands(flatlandsGenerationParams); @@ -84,7 +84,7 @@ public class TotalFreedomMod extends JavaPlugin TFM_AdminWorld.getInstance().getAdminWorld(); - if (disableWeather) + if (TFM_ConfigEntry.DISABLE_WEATHER.getBoolean()) { for (World world : server.getWorlds()) { @@ -96,16 +96,16 @@ public class TotalFreedomMod extends JavaPlugin } // Initialize game rules - TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_DAYLIGHT_CYCLE, !disableNight, false); + TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_DAYLIGHT_CYCLE, !TFM_ConfigEntry.DISABLE_NIGHT.getBoolean(), false); TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_FIRE_TICK, TFM_ConfigEntry.ALLOW_FIRE_SPREAD.getBoolean(), false); TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_MOB_LOOT, false, false); - TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_MOB_SPAWNING, !mobLimiterEnabled, false); + TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_MOB_SPAWNING, !TFM_ConfigEntry.MOB_LIMITER_ENABLED.getBoolean(), false); TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_TILE_DROPS, false, false); TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.MOB_GRIEFING, false, false); TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.NATURAL_REGENERATION, true, false); TFM_GameRuleHandler.commitGameRules(); - if (TotalFreedomMod.protectedAreasEnabled) + if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean()) { TFM_ProtectedArea.loadProtectedAreas(); TFM_ProtectedArea.autoAddSpawnpoints(); @@ -230,34 +230,6 @@ public class TotalFreedomMod extends JavaPlugin } // @Deprecated - public static boolean autoProtectSpawnpoints = true; - @Deprecated - public static boolean disableNight = true; - @Deprecated - public static boolean disableWeather = true; - @Deprecated - public static boolean generateFlatlands = true; - @Deprecated - public static boolean landminesEnabled = false; - @Deprecated - public static boolean mobLimiterDisableDragon = true; - @Deprecated - public static boolean mobLimiterDisableGhast = true; - @Deprecated - public static boolean mobLimiterDisableGiant = true; - @Deprecated - public static boolean mobLimiterDisableSlime = true; - @Deprecated - public static boolean mobLimiterEnabled = true; - @Deprecated - public static boolean mp44Enabled = false; - @Deprecated - public static boolean nukeMonitor = true; - @Deprecated - public static boolean petProtectEnabled = true; - @Deprecated - public static boolean preprocessLogEnabled = true; - @Deprecated public static boolean protectedAreasEnabled = true; @Deprecated public static boolean tossmobEnabled = false; @@ -268,16 +240,6 @@ public class TotalFreedomMod extends JavaPlugin @Deprecated public static double explosiveRadius = 4.0D; @Deprecated - public static double nukeMonitorRange = 10.0D; - @Deprecated - public static int freecamTriggerCount = 10; - @Deprecated - public static int mobLimiterMax = 50; - @Deprecated - public static int nukeMonitorCountBreak = 100; - @Deprecated - public static int nukeMonitorCountPlace = 25; - @Deprecated public static List blockedCommands = new ArrayList(); @Deprecated public static List host_sender_names = Arrays.asList("rcon", "remotebukkit"); From 4494a4c039b0b274b61240f0800802d1dd57b8a0 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sun, 18 Aug 2013 15:52:32 -0400 Subject: [PATCH 06/10] Config migration, stage 3 --- .../Commands/Command_explosives.java | 5 +- .../Commands/Command_logs.java | 13 +- .../Commands/Command_premium.java | 4 +- .../Commands/Command_saconfig.java | 5 +- .../Commands/Command_tossmob.java | 4 +- .../Commands/Command_twitter.java | 5 +- .../Listener/TFM_EntityListener.java | 3 +- .../TotalFreedomMod/TFM_AdminWorld.java | 2 +- .../TotalFreedomMod/TFM_CommandBlocker.java | 164 ------------------ .../TFM_CommandBlockerNew.java | 5 +- .../TotalFreedomMod/TFM_ConfigEntry.java | 2 +- .../TotalFreedomMod/TFM_ProtectedArea.java | 2 +- .../TotalFreedomMod/TFM_ServiceChecker.java | 11 +- .../TotalFreedomMod/TFM_TwitterHandler.java | 39 +++-- .../TotalFreedomMod/TFM_Util.java | 5 +- .../TotalFreedomMod/TotalFreedomMod.java | 29 +--- 16 files changed, 61 insertions(+), 237 deletions(-) delete mode 100644 src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java index d639b973..4849ab03 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java @@ -2,7 +2,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -23,7 +22,7 @@ public class Command_explosives extends TFM_Command { try { - TotalFreedomMod.explosiveRadius = Math.max(1.0, Math.min(30.0, Double.parseDouble(args[1]))); + TFM_ConfigEntry.EXPLOSIVE_RADIUS.setDouble(Math.max(1.0, Math.min(30.0, Double.parseDouble(args[1])))); } catch (NumberFormatException nfex) { @@ -35,7 +34,7 @@ public class Command_explosives extends TFM_Command if (args[0].equalsIgnoreCase("on")) { TFM_ConfigEntry.ALLOW_EXPLOSIONS.setBoolean(true); - playerMsg("Explosives are now enabled, radius set to " + TotalFreedomMod.explosiveRadius + " blocks."); + playerMsg("Explosives are now enabled, radius set to " + TFM_ConfigEntry.EXPLOSIVE_RADIUS.getDouble() + " blocks."); } else { diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java index f1241ee9..fdf8ab47 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java @@ -9,6 +9,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TFM_Superadmin; import me.StevenLawson.TotalFreedomMod.TFM_Util; @@ -46,12 +47,10 @@ public class Command_logs extends TFM_Command public static void updateLogsRegistration(final CommandSender sender, final String targetName, final String targetIP, final LogsRegistrationMode mode) { - if (TotalFreedomMod.logsRegisterURL == null || TotalFreedomMod.logsRegisterPassword == null) - { - return; - } + final String logsRegisterURL = TFM_ConfigEntry.LOGS_REGISTER_URL.getString(); + final String logsRegisterPassword = TFM_ConfigEntry.LOGS_REGISTER_PASSWORD.getString(); - if (TotalFreedomMod.logsRegisterPassword.isEmpty() || TotalFreedomMod.logsRegisterURL.isEmpty()) + if (logsRegisterURL == null || logsRegisterPassword == null || logsRegisterURL.isEmpty() || logsRegisterPassword.isEmpty()) { return; } @@ -68,9 +67,9 @@ public class Command_logs extends TFM_Command sender.sendMessage(ChatColor.YELLOW + "Connecting..."); } - URL url = new URLBuilder(TotalFreedomMod.logsRegisterURL) + URL url = new URLBuilder(logsRegisterURL) .addQueryParameter("mode", mode.toString()) - .addQueryParameter("password", TotalFreedomMod.logsRegisterPassword) + .addQueryParameter("password", logsRegisterPassword) .addQueryParameter("name", targetName) .addQueryParameter("ip", targetIP) .getURL(); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java index 644008df..9deed357 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java @@ -33,7 +33,7 @@ public class Command_premium extends TFM_Command { name = args[0]; } - + final String playername = name; new BukkitRunnable() { @@ -66,7 +66,7 @@ public class Command_premium extends TFM_Command } } }.runTaskAsynchronously(plugin); - + return true; } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java index fc672888..094777a0 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java @@ -1,5 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Superadmin; import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; import me.StevenLawson.TotalFreedomMod.TFM_TwitterHandler; @@ -150,13 +151,13 @@ public class Command_saconfig extends TFM_Command TFM_Util.adminAction(sender.getName(), "Removing " + targetName + " from the superadmin list", true); TFM_SuperadminList.removeSuperadmin(targetName); - if (!TotalFreedomMod.twitterbotEnabled) + if (!TFM_ConfigEntry.TWITTERBOT_ENABLED.getBoolean()) { return true; } // Twitterbot - TFM_TwitterHandler twitterbot = TFM_TwitterHandler.getInstance(plugin); + TFM_TwitterHandler twitterbot = TFM_TwitterHandler.getInstance(); String reply = twitterbot.delTwitter(targetName); if ("ok".equals(reply)) { diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java index b72223c3..dcad7c79 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java @@ -1,8 +1,8 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -19,7 +19,7 @@ public class Command_tossmob extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (!TotalFreedomMod.tossmobEnabled) + if (!TFM_ConfigEntry.TOSSMOB_ENABLED.getBoolean()) { playerMsg("Tossmob is currently disabled."); return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_twitter.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_twitter.java index 1b13382e..da5c949d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_twitter.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_twitter.java @@ -1,5 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_TwitterHandler; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; @@ -15,7 +16,7 @@ public class Command_twitter extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (!TotalFreedomMod.twitterbotEnabled) + if (!TFM_ConfigEntry.TWITTERBOT_ENABLED.getBoolean()) { TFM_Util.playerMsg(sender, "TwitterBot has been disabled in config.", ChatColor.RED); return true; @@ -26,7 +27,7 @@ public class Command_twitter extends TFM_Command return false; } - TFM_TwitterHandler twitterbot = TFM_TwitterHandler.getInstance(plugin); + TFM_TwitterHandler twitterbot = TFM_TwitterHandler.getInstance(); if ("set".equals(args[0])) { diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java index c97b1edf..d01dfe39 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java @@ -1,7 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Listener; import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.entity.*; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -31,7 +30,7 @@ public class TFM_EntityListener implements Listener return; } - event.setRadius((float) TotalFreedomMod.explosiveRadius); + event.setRadius((float) TFM_ConfigEntry.EXPLOSIVE_RADIUS.getDouble().doubleValue()); } @EventHandler(priority = EventPriority.HIGH) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java index 0b2d360d..0be0f849 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java @@ -19,7 +19,7 @@ public class TFM_AdminWorld { private static final long CACHE_CLEAR_FREQUENCY = 30L * 1000L; //30 seconds, milliseconds private static final long TP_COOLDOWN_TIME = 500L; //0.5 seconds, milliseconds - private static final String GENERATION_PARAMETERS = "16,stone,32,dirt,1,grass"; + private static final String GENERATION_PARAMETERS = TFM_ConfigEntry.FLATLANDS_GENERATION_PARAMS.getString(); private static final String ADMINWORLD_NAME = "adminworld"; // private final Map teleportCooldown = new HashMap(); diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java deleted file mode 100644 index 2c18de10..00000000 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java +++ /dev/null @@ -1,164 +0,0 @@ -package me.StevenLawson.TotalFreedomMod; - -import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandMap; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -public class TFM_CommandBlocker -{ - public static boolean isCommandBlocked(String usedcommand, CommandSender sender) - { - - String name = sender.getName(); - usedcommand = usedcommand.toLowerCase().trim(); - - for (String blocked_command : TotalFreedomMod.blockedCommands) - { - String[] parts = blocked_command.split(":"); - if (parts.length < 3 || parts.length > 4) - { - continue; - } - - if (!(usedcommand + " ").startsWith(parts[2] + " ")) - { - - CommandMap commandMap = TFM_CommandLoader.getInstance().getCommandMap(); - if (commandMap == null) - { - continue; - } - - Command command = commandMap.getCommand(parts[2].replaceAll("/", "")); - if (command == null) - { - continue; - } - - boolean block = false; - for (String alias : command.getAliases()) - { - if (usedcommand.replaceAll("/", "").startsWith(alias)) - { - block = true; - break; - } - } - - if (!block) - { - continue; - } - } - - - if (SenderRank.hasPermissions(sender, parts[0])) - { - continue; - } - - // Past this line indicates that the command is blocked. - - // Optional: Send a message - if (parts.length == 4) - { - if ("_".equals(parts[3])) - { - sender.sendMessage(ChatColor.GRAY + "That command is blocked."); - } - else - { - sender.sendMessage(ChatColor.GRAY + TFM_Util.colorise(parts[3])); - } - } - - // Action - if ("b".equals(parts[1])) - { - return true; - } - else if ("a".equals(parts[1])) - { - if (SenderRank.getSenderRank(sender).rank < 2) // Only auto-eject Ops and non-ops - { - TFM_Util.autoEject((Player) sender, "You used a prohibited command: " + usedcommand); - TFM_Util.bcastMsg(name + " was automatically kicked for using harmful commands.", ChatColor.RED); - } - return true; - } - else if ("u".equals(parts[1])) - { - sender.sendMessage("Unknown command. Type \"help\" for help."); - return true; - } - return false; - } - - return false; - } - - public enum SenderRank - { - ANYONE("a", 0), - OP("o", 1), - SUPER("s", 2), - TELNET("t", 3), - SENIOR("c", 4), - NOBODY("n", 5); - private String letter = "n"; - private int rank = 5; - - SenderRank(String letter, int rank) - { - this.letter = letter; - this.rank = rank; - } - - public static boolean hasPermissions(CommandSender sender, String letter) - { - return (getSenderRank(sender).rank >= getSenderRankByLetter(letter).rank); - } - - public static SenderRank getSenderRank(CommandSender sender) - { - if (!(sender instanceof Player)) - { - if (TFM_SuperadminList.isSeniorAdmin(sender)) - { - return SenderRank.SENIOR; - } - else - { - return SenderRank.TELNET; - } - } - - if (TFM_SuperadminList.isUserSuperadmin(sender)) - { - return SenderRank.SUPER; - } - - if (sender.isOp()) - { - return SenderRank.OP; - } - - return SenderRank.ANYONE; - } - - public static SenderRank getSenderRankByLetter(String letter) - { - for (SenderRank rank : SenderRank.values()) - { - if (letter.equals(rank.letter)) - { - return rank; - } - } - return SenderRank.NOBODY; - } - } -} diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java index 478a71b5..e485f012 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java @@ -1,6 +1,7 @@ package me.StevenLawson.TotalFreedomMod; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -20,6 +21,7 @@ public class TFM_CommandBlockerNew parseBlockingRules(); } + @SuppressWarnings("unchecked") public final void parseBlockingRules() { blockedCommands.clear(); @@ -31,7 +33,8 @@ public class TFM_CommandBlockerNew return; } - for (String rawEntry : TotalFreedomMod.blockedCommands) + List _blockedCommands = (List) TFM_ConfigEntry.BLOCKED_COMMANDS.getList(); + for (String rawEntry : _blockedCommands) { String[] parts = rawEntry.split(":"); if (parts.length < 3 || parts.length > 4) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java index d6529b4c..a83329b7 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java @@ -114,7 +114,7 @@ public enum TFM_ConfigEntry return value; } - public List getList(TFM_ConfigEntry entry) + public List getList() { return TFM_Config.getInstance().getList(this); } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java index e50b7b6b..f7c5180b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java @@ -119,7 +119,7 @@ public class TFM_ProtectedArea implements Serializable { for (World world : Bukkit.getWorlds()) { - TFM_ProtectedArea.addProtectedArea("spawn_" + world.getName(), world.getSpawnLocation(), TotalFreedomMod.autoProtectRadius); + TFM_ProtectedArea.addProtectedArea("spawn_" + world.getName(), world.getSpawnLocation(), TFM_ConfigEntry.AUTO_PROTECT_RADIUS.getDouble()); } } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServiceChecker.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServiceChecker.java index 33f321c6..83be63f3 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServiceChecker.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServiceChecker.java @@ -40,9 +40,16 @@ public class TFM_ServiceChecker @Override public void run() { + final String serviceCheckerURL = TFM_ConfigEntry.SERVICE_CHECKER_URL.getString(); + + if (serviceCheckerURL == null || serviceCheckerURL.isEmpty()) + { + return; + } + try { - URL mojang_status = new URL(TotalFreedomMod.serviceCheckerURL); + URL mojang_status = new URL(serviceCheckerURL); BufferedReader in = new BufferedReader(new InputStreamReader(mojang_status.openStream())); JSONArray status_json = (JSONArray) JSONValue.parse(in.readLine()); in.close(); @@ -90,7 +97,7 @@ public class TFM_ServiceChecker } catch (Exception ex) { - TFM_Log.severe("Error updating mojang services from " + TotalFreedomMod.serviceCheckerURL); + TFM_Log.severe("Error updating mojang services from " + serviceCheckerURL); TFM_Log.severe(ex); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java b/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java index 916b6d59..597cbcfa 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java @@ -8,11 +8,8 @@ import org.apache.commons.lang.exception.ExceptionUtils; public class TFM_TwitterHandler { - private TotalFreedomMod plugin; - - private TFM_TwitterHandler(TotalFreedomMod plugin) + private TFM_TwitterHandler() { - this.plugin = plugin; } public String getTwitter(String player) @@ -47,24 +44,32 @@ public class TFM_TwitterHandler private String request(String queryString) { String line = "failed"; - try + + final String twitterbotURL = TFM_ConfigEntry.TWITTERBOT_URL.getString(); + final String twitterbotSecret = TFM_ConfigEntry.TWITTERBOT_SECRET.getString(); + + if (twitterbotURL != null && twitterbotSecret != null && !twitterbotURL.isEmpty() && !twitterbotSecret.isEmpty()) { - URL getUrl = new URL(TotalFreedomMod.twitterbotURL + "?auth=" + TotalFreedomMod.twitterbotSecret + "&" + queryString); - URLConnection urlConnection = getUrl.openConnection(); - // Read the response - BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream())); - line = in.readLine(); - in.close(); - } - catch (Exception ex) - { - TFM_Log.severe(ExceptionUtils.getFullStackTrace(ex)); + try + { + URL getUrl = new URL(twitterbotURL + "?auth=" + twitterbotSecret + "&" + queryString); + URLConnection urlConnection = getUrl.openConnection(); + // Read the response + BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream())); + line = in.readLine(); + in.close(); + } + catch (Exception ex) + { + TFM_Log.severe(ExceptionUtils.getFullStackTrace(ex)); + } } + return line; } - public static TFM_TwitterHandler getInstance(TotalFreedomMod plugin) + public static TFM_TwitterHandler getInstance() { - return new TFM_TwitterHandler(plugin); + return new TFM_TwitterHandler(); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java index 5e1632d3..0f158311 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java @@ -496,7 +496,7 @@ public class TFM_Util public static void generateFlatlands() { - generateFlatlands(TotalFreedomMod.flatlandsGenerationParams); + generateFlatlands(TFM_ConfigEntry.FLATLANDS_GENERATION_PARAMS.getString()); } public static void generateFlatlands(String genParams) @@ -791,9 +791,10 @@ public class TFM_Util } } + @SuppressWarnings("unchecked") public static boolean isFromHostConsole(String sender_name) { - return TotalFreedomMod.host_sender_names.contains(sender_name.toLowerCase()); + return ((List) TFM_ConfigEntry.HOST_SENDER_NAMES.getList()).contains(sender_name.toLowerCase()); } public static List removeDuplicates(List old_list) diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index dae9121c..907b4666 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -79,7 +79,7 @@ public class TotalFreedomMod extends JavaPlugin if (TFM_ConfigEntry.GENERATE_FLATLANDS.getBoolean()) { TFM_Util.wipeFlatlandsIfFlagged(); - TFM_Util.generateFlatlands(flatlandsGenerationParams); + TFM_Util.generateFlatlands(TFM_ConfigEntry.FLATLANDS_GENERATION_PARAMS.getString()); } TFM_AdminWorld.getInstance().getAdminWorld(); @@ -228,33 +228,6 @@ public class TotalFreedomMod extends JavaPlugin return true; } - // - @Deprecated - public static boolean protectedAreasEnabled = true; - @Deprecated - public static boolean tossmobEnabled = false; - @Deprecated - public static boolean twitterbotEnabled = false; - @Deprecated - public static double autoProtectRadius = 25.0D; - @Deprecated - public static double explosiveRadius = 4.0D; - @Deprecated - public static List blockedCommands = new ArrayList(); - @Deprecated - public static List host_sender_names = Arrays.asList("rcon", "remotebukkit"); - @Deprecated - public static String flatlandsGenerationParams = "16,stone,32,dirt,1,grass"; - @Deprecated - public static String logsRegisterPassword = ""; - @Deprecated - public static String logsRegisterURL = ""; - @Deprecated - public static String serviceCheckerURL = "http://status.mojang.com/check"; - @Deprecated - public static String twitterbotSecret = ""; - @Deprecated - public static String twitterbotURL = ""; public static void loadSuperadminConfig() { From 5c32c66390b306aafba119bce44b401da71a1528 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sun, 18 Aug 2013 16:45:35 -0400 Subject: [PATCH 07/10] Finish getting rid of old command blocker. --- appinfo.properties | 6 +++--- buildnumber.properties | 4 ++-- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 2 +- .../TotalFreedomMod/Listener/TFM_ServerListener.java | 8 ++++---- ...TFM_CommandBlockerNew.java => TFM_CommandBlocker.java} | 8 ++++---- src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) rename src/me/StevenLawson/TotalFreedomMod/{TFM_CommandBlockerNew.java => TFM_CommandBlocker.java} (97%) diff --git a/appinfo.properties b/appinfo.properties index a214b7ad..dcab4cdf 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Wed, 14 Aug 2013 15:57:37 +0200 +#Sun, 18 Aug 2013 16:44:40 -0400 program.VERSION=3.00 -program.BUILDNUM=459 -program.BUILDDATE=08/14/2013 03\:57 PM +program.BUILDNUM=461 +program.BUILDDATE=08/18/2013 04\:44 PM diff --git a/buildnumber.properties b/buildnumber.properties index 2bb73b74..8fda936b 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Wed Aug 14 15:57:37 CEST 2013 -build.number=460 +#Sun Aug 18 16:44:40 EDT 2013 +build.number=462 diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 766284f8..bcb20f08 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -550,7 +550,7 @@ public class TFM_PlayerListener implements Listener command = command.toLowerCase().trim(); // Blocked commands - if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(command, event.getPlayer())) + if (TFM_CommandBlocker.getInstance().isCommandBlocked(command, event.getPlayer())) { // CommandBlocker handles messages and broadcasts event.setCancelled(true); diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java index b2f12177..ce809e88 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java @@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Listener; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import me.StevenLawson.TotalFreedomMod.TFM_CommandBlockerNew; +import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker; import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface; import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; @@ -52,7 +52,7 @@ public class TFM_ServerListener implements Listener topLevelCommand = topLevelCommand.toLowerCase().trim(); // We need to make it look like the command is coming from the console, so keep the player's name without the Player instance via dummy: - if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(topLevelCommand, new TFM_ServerListener_DummyCommandSender(player.getName()), false)) + if (TFM_CommandBlocker.getInstance().isCommandBlocked(topLevelCommand, new TFM_ServerListener_DummyCommandSender(player.getName()), false)) { player.sendMessage(ChatColor.GRAY + "That command is blocked."); event.setCancelled(true); @@ -64,7 +64,7 @@ public class TFM_ServerListener implements Listener @EventHandler(priority = EventPriority.NORMAL) public void onRemoteServerCommand(RemoteServerCommandEvent event) { - if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(event.getCommand(), event.getSender())) + if (TFM_CommandBlocker.getInstance().isCommandBlocked(event.getCommand(), event.getSender())) { event.setCommand(""); } @@ -73,7 +73,7 @@ public class TFM_ServerListener implements Listener @EventHandler(priority = EventPriority.NORMAL) public void onServerCommand(ServerCommandEvent event) { - if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(event.getCommand(), event.getSender())) + if (TFM_CommandBlocker.getInstance().isCommandBlocked(event.getCommand(), event.getSender())) { event.setCommand(""); } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java similarity index 97% rename from src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java rename to src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java index e485f012..00d516ae 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java @@ -12,11 +12,11 @@ import org.bukkit.command.CommandMap; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class TFM_CommandBlockerNew +public class TFM_CommandBlocker { private Map blockedCommands = new HashMap(); - private TFM_CommandBlockerNew() + private TFM_CommandBlocker() { parseBlockingRules(); } @@ -319,13 +319,13 @@ public class TFM_CommandBlockerNew } } - public static TFM_CommandBlockerNew getInstance() + public static TFM_CommandBlocker getInstance() { return TFM_CommandBlockerNewHolder.INSTANCE; } private static class TFM_CommandBlockerNewHolder { - private static final TFM_CommandBlockerNew INSTANCE = new TFM_CommandBlockerNew(); + private static final TFM_CommandBlocker INSTANCE = new TFM_CommandBlocker(); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index 907b4666..f6f1ec28 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -152,7 +152,7 @@ public class TotalFreedomMod extends JavaPlugin public void run() { TFM_CommandLoader.getInstance().scan(); - TFM_CommandBlockerNew.getInstance().parseBlockingRules(); + TFM_CommandBlocker.getInstance().parseBlockingRules(); } }.runTaskLater(this, 20L); } From 75ec2330f5ea6714dc4b6e2287c3362d3f00796a Mon Sep 17 00:00:00 2001 From: JeromSar Date: Tue, 20 Aug 2013 17:35:00 +0200 Subject: [PATCH 08/10] Incremented version number, changed startup logic Improved logging, small changes --- appinfo.properties | 8 +-- buildnumber.properties | 4 +- src/config.yml | 12 ++-- .../Commands/TFM_CommandLoader.java | 1 - .../TotalFreedomMod/TFM_ConfigEntry.java | 2 +- .../StevenLawson/TotalFreedomMod/TFM_Log.java | 57 ++++++++--------- .../TotalFreedomMod/TotalFreedomMod.java | 61 +++++++++++-------- src/plugin.yml | 4 +- 8 files changed, 79 insertions(+), 70 deletions(-) diff --git a/appinfo.properties b/appinfo.properties index dcab4cdf..1a6711fd 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Sun, 18 Aug 2013 16:44:40 -0400 +#Tue, 20 Aug 2013 17:31:27 +0200 -program.VERSION=3.00 -program.BUILDNUM=461 -program.BUILDDATE=08/18/2013 04\:44 PM +program.VERSION=3.1 +program.BUILDNUM=469 +program.BUILDDATE=08/20/2013 05\:31 PM diff --git a/buildnumber.properties b/buildnumber.properties index 8fda936b..6a4dc1ca 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sun Aug 18 16:44:40 EDT 2013 -build.number=462 +#Tue Aug 20 17:31:27 CEST 2013 +build.number=470 diff --git a/src/config.yml b/src/config.yml index 59de8495..77229424 100644 --- a/src/config.yml +++ b/src/config.yml @@ -1,4 +1,4 @@ -# TotalFreedomMod v3.00 Configuration +# TotalFreedomMod v3.1 Configuration # by Madgeek1450 and DarthSalamon # Block placement prevention: @@ -12,7 +12,7 @@ allow_tnt_minecarts: false # Explosion management: allow_explosions: false -explosiveRadius: 4.0 +explosive_radius: 4.0 # Blocked commands: # @@ -126,15 +126,15 @@ host_sender_names: # TwitterBot - Used to allow superadmins to verify themselves using twitter twitterbot_enabled: false -twitterbot_url: -twitterbot_secret: +twitterbot_url: '' +twitterbot_secret: '' # Pet Protect - Prevent tamed pets from being killed. pet_protect_enabled: true # Logs Registration -logs_register_password: -logs_register_url: +logs_register_password: '' +logs_register_url: '' # Mojang service checker service_checker_url: http://status.mojang.com/check diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java index bf9cb832..ce8823eb 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java @@ -65,7 +65,6 @@ public class TFM_CommandLoader Command existing = commandMap.getCommand(dynamicCommand.getName()); if (existing != null) { - TFM_Log.info("Replacing command: " + existing.getName()); unregisterCommand(existing, commandMap); } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java index a83329b7..552489e9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java @@ -33,7 +33,7 @@ public enum TFM_ConfigEntry TWITTERBOT_ENABLED(Boolean.class, "twitterbot_enabled"), // AUTO_PROTECT_RADIUS(Double.class, "auto_protect_radius"), - EXPLOSIVE_RADIUS(Double.class, "explosiveRadius"), + EXPLOSIVE_RADIUS(Double.class, "explosive_radius"), NUKE_MONITOR_RANGE(Double.class, "nuke_monitor_range"), // FREECAM_TRIGGER_COUNT(Integer.class, "freecam_trigger_count"), diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java index 04f3accd..8ecdee3f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod; -import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.commons.lang.exception.ExceptionUtils; import org.bukkit.Bukkit; public class TFM_Log @@ -13,43 +13,44 @@ public class TFM_Log throw new AssertionError(); } - private static void log(Level level, String message, boolean raw) - { - logger.log(level, (raw ? "" : "[" + TotalFreedomMod.pluginName + "]: ") + message); - } - public static void info(String message) { - TFM_Log.info(message, false); + TotalFreedomMod.logger.info(message); } - + public static void info(String message, boolean raw) { - TFM_Log.log(Level.INFO, message, raw); + if (raw) + { + TotalFreedomMod.logger.info(message); + } + else + { + info(message); + } } - public static void warning(String message) + public static void severe(Object message) { - TFM_Log.info(message, false); + if (message instanceof Throwable) + { + TotalFreedomMod.logger.severe(ExceptionUtils.getFullStackTrace((Throwable) message)); + } + else + { + TotalFreedomMod.logger.severe(String.valueOf(message)); + } } - public static void warning(String message, boolean raw) + public static void warning(Object message) { - TFM_Log.log(Level.WARNING, message, raw); - } - - public static void severe(String message) - { - TFM_Log.info(message, false); - } - - public static void severe(String message, boolean raw) - { - TFM_Log.log(Level.SEVERE, message, raw); - } - - public static void severe(Throwable ex) - { - logger.log(Level.SEVERE, null, ex); + if (message instanceof Throwable) + { + TotalFreedomMod.logger.warning(ExceptionUtils.getFullStackTrace((Throwable) message)); + } + else + { + TotalFreedomMod.logger.warning(String.valueOf(message)); + } } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index f6f1ec28..7b721a6b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.*; +import java.util.logging.Logger; import me.StevenLawson.TotalFreedomMod.Commands.TFM_Command; import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader; import me.StevenLawson.TotalFreedomMod.Listener.*; @@ -26,8 +27,6 @@ import org.mcstats.Metrics; public class TotalFreedomMod extends JavaPlugin { - public static final Server server = Bukkit.getServer(); - // public static final long HEARTBEAT_RATE = 5L; //Seconds public static final long SERVICE_CHECKER_RATE = 120L; // @@ -45,34 +44,45 @@ public class TotalFreedomMod extends JavaPlugin public static final String CAKE_LYRICS = "But there's no sense crying over every mistake. You just keep on trying till you run out of cake."; public static final String NOT_FROM_CONSOLE = "This command may not be used from the console."; // + public static final Server server = Bukkit.getServer(); + public static TotalFreedomMod plugin = null; + public static File plugin_file = null; + // + public static Logger logger; + // + public static String pluginName = ""; + public static String pluginVersion = ""; + public static String buildNumber = ""; + public static String buildDate = ""; + // public static boolean allPlayersFrozen = false; public static BukkitTask freezePurgeTask = null; public static BukkitTask mutePurgeTask = null; public static boolean lockdownEnabled = false; public static Map fuckoffEnabledFor = new HashMap(); // - public static String pluginVersion = ""; - public static String buildNumber = ""; - public static String buildDate = ""; - public static String pluginName = ""; - // - public static TotalFreedomMod plugin = null; - public static File plugin_file = null; + public static List permbanned_players = new ArrayList(); + public static List permbanned_ips = new ArrayList(); @Override public void onEnable() { TotalFreedomMod.plugin = this; - TotalFreedomMod.plugin_file = getFile(); - - TotalFreedomMod.pluginName = this.getDescription().getName(); + TotalFreedomMod.plugin_file = plugin.getFile(); + TotalFreedomMod.logger = plugin.getLogger(); + TotalFreedomMod.pluginName = plugin.getDescription().getName(); + setAppProperties(); + + logger = plugin.getLogger(); + + TFM_Log.info("Version: " + TotalFreedomMod.pluginVersion + "." + TotalFreedomMod.buildNumber + " by Madgeek1450 and DarthSalamon"); loadSuperadminConfig(); loadPermbanConfig(); - TFM_UserList.getInstance(this); + TFM_UserList.getInstance(plugin); registerEventHandlers(); @@ -91,7 +101,6 @@ public class TotalFreedomMod extends JavaPlugin world.setThundering(false); world.setStorm(false); world.setThunderDuration(0); - world.setThunderDuration(0); } } @@ -129,7 +138,7 @@ public class TotalFreedomMod extends JavaPlugin } // Heartbeat - new TFM_Heartbeat(this).runTaskTimer(plugin, HEARTBEAT_RATE * 20L, HEARTBEAT_RATE * 20L); + new TFM_Heartbeat(plugin).runTaskTimer(plugin, HEARTBEAT_RATE * 20L, HEARTBEAT_RATE * 20L); // metrics @ http://mcstats.org/plugin/TotalFreedomMod try @@ -142,8 +151,6 @@ public class TotalFreedomMod extends JavaPlugin TFM_Log.warning("Failed to submit metrics data: " + ex.getMessage()); } - TFM_Log.info("Plugin Enabled - Version: " + TotalFreedomMod.pluginVersion + "." + TotalFreedomMod.buildNumber + " by Madgeek1450 and DarthSalamon"); - TFM_ServiceChecker.getInstance().getUpdateRunnable().runTaskTimerAsynchronously(plugin, 40L, SERVICE_CHECKER_RATE * 20L); new BukkitRunnable() @@ -154,13 +161,16 @@ public class TotalFreedomMod extends JavaPlugin TFM_CommandLoader.getInstance().scan(); TFM_CommandBlocker.getInstance().parseBlockingRules(); } - }.runTaskLater(this, 20L); + }.runTaskLater(plugin, 20L); + + + TFM_Log.info("Plugin enabled"); } @Override public void onDisable() { - server.getScheduler().cancelTasks(this); + server.getScheduler().cancelTasks(plugin); TFM_Log.info("Plugin disabled"); } @@ -194,7 +204,7 @@ public class TotalFreedomMod extends JavaPlugin { ClassLoader classLoader = TotalFreedomMod.class.getClassLoader(); dispatcher = (TFM_Command) classLoader.loadClass(String.format("%s.%s%s", COMMAND_PATH, COMMAND_PREFIX, cmd.getName().toLowerCase())).newInstance(); - dispatcher.setup(this, sender, dispatcher.getClass()); + dispatcher.setup(plugin, sender, dispatcher.getClass()); } catch (Throwable ex) { @@ -241,9 +251,6 @@ public class TotalFreedomMod extends JavaPlugin TFM_Log.severe("Error loading superadmin list: " + ex.getMessage()); } } - // - public static List permbanned_players = new ArrayList(); - public static List permbanned_ips = new ArrayList(); public static void loadPermbanConfig() { @@ -272,7 +279,8 @@ public class TotalFreedomMod extends JavaPlugin } catch (Exception ex) { - TFM_Log.severe("Error loading permban list: " + ex.getMessage()); + TFM_Log.severe("Error loading permban list!"); + TFM_Log.severe(ex); } } @@ -291,10 +299,10 @@ public class TotalFreedomMod extends JavaPlugin { try { - InputStream in; + InputStream in = plugin.getResource("appinfo.properties"); Properties props = new Properties(); - in = plugin.getClass().getResourceAsStream("/appinfo.properties"); + // in = plugin.getClass().getResourceAsStream("/appinfo.properties"); props.load(in); in.close(); @@ -304,6 +312,7 @@ public class TotalFreedomMod extends JavaPlugin } catch (Exception ex) { + TFM_Log.severe("Could not load App properties!"); TFM_Log.severe(ex); } } diff --git a/src/plugin.yml b/src/plugin.yml index 85b434e7..25765c84 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,7 +1,7 @@ name: TotalFreedomMod main: me.StevenLawson.TotalFreedomMod.TotalFreedomMod -version: 3.00 +version: 3.1 description: Plugin for the Total Freedom server. -authors: [StevenLawson / Madgeek1450, JeromSar / DarthSalamon] +authors: [Madgeek1450, DarthSalamon] # plugin.yml is no longer used to define commands. From 485945047b2fbd0cb6512ef08f5b9a0345232ef5 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Tue, 20 Aug 2013 20:04:06 -0400 Subject: [PATCH 09/10] More logger tweaks. --- appinfo.properties | 6 +- buildnumber.properties | 4 +- .../StevenLawson/TotalFreedomMod/TFM_Log.java | 57 ++++++++++--------- .../TotalFreedomMod/TotalFreedomMod.java | 18 ++---- 4 files changed, 41 insertions(+), 44 deletions(-) diff --git a/appinfo.properties b/appinfo.properties index 1a6711fd..25289c9e 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Tue, 20 Aug 2013 17:31:27 +0200 +#Tue, 20 Aug 2013 20:00:13 -0400 program.VERSION=3.1 -program.BUILDNUM=469 -program.BUILDDATE=08/20/2013 05\:31 PM +program.BUILDNUM=470 +program.BUILDDATE=08/20/2013 08\:00 PM diff --git a/buildnumber.properties b/buildnumber.properties index 6a4dc1ca..25c871e7 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Tue Aug 20 17:31:27 CEST 2013 -build.number=470 +#Tue Aug 20 20:00:13 EDT 2013 +build.number=471 diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java index 8ecdee3f..d5cab8c4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java @@ -1,56 +1,59 @@ package me.StevenLawson.TotalFreedomMod; +import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.commons.lang.exception.ExceptionUtils; import org.bukkit.Bukkit; public class TFM_Log { - private static final Logger logger = Bukkit.getLogger(); + private static final Logger LOGGER = Bukkit.getLogger(); private TFM_Log() { throw new AssertionError(); } - public static void info(String message) + public static void info(Object... params) { - TotalFreedomMod.logger.info(message); + prepareLogMessage(Level.INFO, params); } - - public static void info(String message, boolean raw) + + public static void warning(Object... params) { - if (raw) + prepareLogMessage(Level.WARNING, params); + } + + public static void severe(Object... params) + { + prepareLogMessage(Level.SEVERE, params); + } + + private static void prepareLogMessage(Level level, Object... params) + { + if (params.length == 0) { - TotalFreedomMod.logger.info(message); + return; + } + + Object payload = params[0]; + + if (payload instanceof Throwable) + { + log(level, (Throwable) payload); } else { - info(message); + log(level, payload.toString(), params.length >= 2 && params[1] instanceof Boolean ? (Boolean) params[1] : false); } } - public static void severe(Object message) + private static void log(Level level, String message, boolean raw) { - if (message instanceof Throwable) - { - TotalFreedomMod.logger.severe(ExceptionUtils.getFullStackTrace((Throwable) message)); - } - else - { - TotalFreedomMod.logger.severe(String.valueOf(message)); - } + LOGGER.log(level, (raw ? "" : "[" + TotalFreedomMod.pluginName + "]: ") + message); } - public static void warning(Object message) + private static void log(Level level, Throwable throwable) { - if (message instanceof Throwable) - { - TotalFreedomMod.logger.warning(ExceptionUtils.getFullStackTrace((Throwable) message)); - } - else - { - TotalFreedomMod.logger.warning(String.valueOf(message)); - } + LOGGER.log(level, null, throwable); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index 7b721a6b..f94eb95f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -48,8 +48,6 @@ public class TotalFreedomMod extends JavaPlugin public static TotalFreedomMod plugin = null; public static File plugin_file = null; // - public static Logger logger; - // public static String pluginName = ""; public static String pluginVersion = ""; public static String buildNumber = ""; @@ -69,14 +67,10 @@ public class TotalFreedomMod extends JavaPlugin { TotalFreedomMod.plugin = this; TotalFreedomMod.plugin_file = plugin.getFile(); - TotalFreedomMod.logger = plugin.getLogger(); - TotalFreedomMod.pluginName = plugin.getDescription().getName(); - + setAppProperties(); - - logger = plugin.getLogger(); - + TFM_Log.info("Version: " + TotalFreedomMod.pluginVersion + "." + TotalFreedomMod.buildNumber + " by Madgeek1450 and DarthSalamon"); loadSuperadminConfig(); @@ -162,16 +156,16 @@ public class TotalFreedomMod extends JavaPlugin TFM_CommandBlocker.getInstance().parseBlockingRules(); } }.runTaskLater(plugin, 20L); - - - TFM_Log.info("Plugin enabled"); + + TFM_Log.info("Plugin enabled."); } @Override public void onDisable() { server.getScheduler().cancelTasks(plugin); - TFM_Log.info("Plugin disabled"); + + TFM_Log.info("Plugin disabled."); } @Override From 23907ef7e47762c10f9d5776a5f876a354ee9097 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Tue, 20 Aug 2013 20:44:39 -0400 Subject: [PATCH 10/10] Use plugin/server loggers. --- appinfo.properties | 6 ++-- buildnumber.properties | 4 +-- .../StevenLawson/TotalFreedomMod/TFM_Log.java | 29 ++++++++++++++++--- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/appinfo.properties b/appinfo.properties index 25289c9e..a4b8a692 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Tue, 20 Aug 2013 20:00:13 -0400 +#Tue, 20 Aug 2013 20:43:47 -0400 program.VERSION=3.1 -program.BUILDNUM=470 -program.BUILDDATE=08/20/2013 08\:00 PM +program.BUILDNUM=472 +program.BUILDDATE=08/20/2013 08\:43 PM diff --git a/buildnumber.properties b/buildnumber.properties index 25c871e7..49eb3832 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Tue Aug 20 20:00:13 EDT 2013 -build.number=471 +#Tue Aug 20 20:43:47 EDT 2013 +build.number=473 diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java index d5cab8c4..3698a881 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java @@ -6,8 +6,6 @@ import org.bukkit.Bukkit; public class TFM_Log { - private static final Logger LOGGER = Bukkit.getLogger(); - private TFM_Log() { throw new AssertionError(); @@ -49,11 +47,34 @@ public class TFM_Log private static void log(Level level, String message, boolean raw) { - LOGGER.log(level, (raw ? "" : "[" + TotalFreedomMod.pluginName + "]: ") + message); + LoggerType.getLogger(raw).log(level, message); } private static void log(Level level, Throwable throwable) { - LOGGER.log(level, null, throwable); + LoggerType.SERVER.getLogger().log(level, null, throwable); + } + + private static enum LoggerType + { + SERVER(Bukkit.getLogger()), + PLUGIN(TotalFreedomMod.plugin.getLogger()); + // + private final Logger logger; + + private LoggerType(Logger logger) + { + this.logger = logger; + } + + public Logger getLogger() + { + return logger; + } + + public static Logger getLogger(boolean getRawLogger) + { + return (getRawLogger ? SERVER.getLogger() : PLUGIN.getLogger()); + } } }