From cd5bba842b2b3c5fd4f4e025d6cf2f44a9cddfc4 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Wed, 12 Oct 2011 15:33:31 -0400 Subject: [PATCH] Changed config methods, missing config.yml --- .../TotalFreedomMod/TFM_Cmds_Admin.java | 19 ++++++----- .../TotalFreedomMod/TotalFreedomMod.java | 34 ++++++++++--------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Cmds_Admin.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Cmds_Admin.java index e7c2f0cb..24cbc841 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Cmds_Admin.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Cmds_Admin.java @@ -1,5 +1,6 @@ package me.StevenLawson.TotalFreedomMod; +import java.io.File; import java.util.Arrays; import java.util.List; import java.util.Random; @@ -13,6 +14,8 @@ import org.bukkit.Material; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; @@ -337,11 +340,11 @@ public class TFM_Cmds_Admin implements CommandExecutor sender.sendMessage("Nuke monitor is disabled."); } - plugin.reloadConfig(); - plugin.getConfig().set("nuke_monitor", plugin.nukeMonitor); - plugin.getConfig().set("nuke_monitor_range", plugin.nukeMonitorRange); - plugin.getConfig().set("nuke_monitor_count", plugin.nukeMonitorCountBreak); - plugin.saveConfig(); + FileConfiguration config = YamlConfiguration.loadConfiguration(new File(plugin.getDataFolder(), "config.yml")); + config.set("nuke_monitor", plugin.nukeMonitor); + config.set("nuke_monitor_range", plugin.nukeMonitorRange); + config.set("nuke_monitor_count", plugin.nukeMonitorCountBreak); + config.save(new File(plugin.getDataFolder(), "config.yml")); } else { @@ -370,9 +373,9 @@ public class TFM_Cmds_Admin implements CommandExecutor sender.sendMessage("Command preprocess logging is now disabled."); } - plugin.reloadConfig(); - plugin.getConfig().set("preprocess_log", plugin.preprocessLogEnabled); - plugin.saveConfig(); + FileConfiguration config = YamlConfiguration.loadConfiguration(new File(plugin.getDataFolder(), "config.yml")); + config.set("preprocess_log", plugin.preprocessLogEnabled); + config.save(new File(plugin.getDataFolder(), "config.yml")); } else { diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index c2057fbf..4ab777ab 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -20,6 +20,8 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.command.CommandSender; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.*; import org.bukkit.event.Event; import org.bukkit.plugin.PluginManager; @@ -221,23 +223,23 @@ public class TotalFreedomMod extends JavaPlugin { createDefaultConfiguration("config.yml"); - reloadConfig(); + FileConfiguration config = YamlConfiguration.loadConfiguration(new File(getDataFolder(), "config.yml")); - allowExplosions = getConfig().getBoolean("allow_explosions", false); - allowFirePlace = getConfig().getBoolean("allow_fire_place", false); - allowFireSpread = getConfig().getBoolean("allow_fire_spread", false); - allowLavaDamage = getConfig().getBoolean("allow_lava_damage", false); - allowLavaPlace = getConfig().getBoolean("allow_lava_place", false); - allowWaterPlace = getConfig().getBoolean("allow_water_place", false); - autoEntityWipe = getConfig().getBoolean("auto_wipe", true); - explosiveRadius = getConfig().getDouble("explosiveRadius", 4.0D); - nukeMonitor = getConfig().getBoolean("nuke_monitor", true); - nukeMonitorCountBreak = getConfig().getInt("nuke_monitor_count", 100); - nukeMonitorRange = getConfig().getDouble("nuke_monitor_range", 10.0D); - preprocessLogEnabled = getConfig().getBoolean("preprocess_log", true); - freecamTriggerCount = getConfig().getInt("freecam_trigger_count", 10); + allowExplosions = config.getBoolean("allow_explosions", false); + allowFirePlace = config.getBoolean("allow_fire_place", false); + allowFireSpread = config.getBoolean("allow_fire_spread", false); + allowLavaDamage = config.getBoolean("allow_lava_damage", false); + allowLavaPlace = config.getBoolean("allow_lava_place", false); + allowWaterPlace = config.getBoolean("allow_water_place", false); + autoEntityWipe = config.getBoolean("auto_wipe", true); + explosiveRadius = config.getDouble("explosiveRadius", 4.0D); + nukeMonitor = config.getBoolean("nuke_monitor", true); + nukeMonitorCountBreak = config.getInt("nuke_monitor_count", 100); + nukeMonitorRange = config.getDouble("nuke_monitor_range", 10.0D); + preprocessLogEnabled = config.getBoolean("preprocess_log", true); + freecamTriggerCount = config.getInt("freecam_trigger_count", 10); - superadmins = (List) getConfig().getList("superadmins", null); + superadmins = (List) config.getList("superadmins", null); if (superadmins == null) { superadmins = new ArrayList(); @@ -245,7 +247,7 @@ public class TotalFreedomMod extends JavaPlugin superadmins.add("markbyron"); } - superadmin_ips = (List) getConfig().getList("superadmin_ips", null); + superadmin_ips = (List) config.getList("superadmin_ips", null); if (superadmin_ips == null) { superadmin_ips = new ArrayList();