Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-10-05 01:57:28 +02:00
Code Issues Projects Releases Wiki Activity

Removed remaining usages of org.bukkit.util.config.Configuration

Browse Source
This commit is contained in:
zml2008 2012-01-23 16:45:52 -08:00
parent 74082f9c68
commit 551ff26a65
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java
View File

@ -19,14 +19,15 @@
package com.sk89q.worldguard.bukkit; package com.sk89q.worldguard.bukkit;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.config.Configuration;
import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.blacklist.Blacklist; import com.sk89q.worldguard.blacklist.Blacklist;
@ -105,8 +106,10 @@ public void load() {
plugin.createDefaultConfiguration( plugin.createDefaultConfiguration(
new File(plugin.getDataFolder(), "config.yml"), "config.yml"); new File(plugin.getDataFolder(), "config.yml"), "config.yml");
Configuration config = plugin.getConfiguration(); YAMLProcessor config = new YAMLProcessor(new File(plugin.getDataFolder(), "config.yml"), true);
config.load(); try {
config.load();
} catch (IOException ignore) {}
suppressTickSyncWarnings = config.getBoolean( suppressTickSyncWarnings = config.getBoolean(
"suppress-tick-sync-warnings", false); "suppress-tick-sync-warnings", false);

14
src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
View File

@ -31,10 +31,10 @@
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.CreatureType; import org.bukkit.entity.CreatureType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.config.Configuration;
import com.sk89q.worldguard.blacklist.Blacklist; import com.sk89q.worldguard.blacklist.Blacklist;
import com.sk89q.worldguard.blacklist.BlacklistLogger; import com.sk89q.worldguard.blacklist.BlacklistLogger;
@ -69,8 +69,8 @@ public class WorldConfiguration {
private WorldGuardPlugin plugin; private WorldGuardPlugin plugin;
private String worldName; private String worldName;
private Configuration parentConfig; private YAMLProcessor parentConfig;
private Configuration config; private YAMLProcessor config;
private File configFile; private File configFile;
private File blacklistFile; private File blacklistFile;
@ -167,12 +167,12 @@ public WorldConfiguration(WorldGuardPlugin plugin, String worldName) {
this.plugin = plugin; this.plugin = plugin;
this.worldName = worldName; this.worldName = worldName;
this.parentConfig = plugin.getConfiguration(); this.parentConfig = new YAMLProcessor(new File(plugin.getDataFolder(), "config.yml"), false);
plugin.createDefaultConfiguration(configFile, "config_world.yml"); plugin.createDefaultConfiguration(configFile, "config_world.yml");
plugin.createDefaultConfiguration(blacklistFile, "blacklist.txt"); plugin.createDefaultConfiguration(blacklistFile, "blacklist.txt");
config = new Configuration(this.configFile); config = new YAMLProcessor(this.configFile, true);
loadConfiguration(); loadConfiguration();
logger.info("WorldGuard: Loaded configuration for world '" + worldName + '"'); logger.info("WorldGuard: Loaded configuration for world '" + worldName + '"');
@ -274,7 +274,9 @@ private Object getProperty(String node) {
* Load the configuration. * Load the configuration.
*/ */
private void loadConfiguration() { private void loadConfiguration() {
config.load(); try {
config.load();
} catch (IOException ignore) {}
opPermissions = getBoolean("op-permissions", true); opPermissions = getBoolean("op-permissions", true);