From edf3c8556e39105555e803ea87961d3625ac8082 Mon Sep 17 00:00:00 2001
From: headhunter45 <headhunter3@gmail.com>
Date: Wed, 8 Feb 2012 05:58:21 -0800
Subject: [PATCH] made world configurable

---
 Metropolis/Plugin.jardesc                     |  2 +-
 .../plugins/metropolis/MetropolisPlugin.java  | 29 ++++++++++---------
 Metropolis/src/config.yml                     |  3 +-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Metropolis/Plugin.jardesc b/Metropolis/Plugin.jardesc
index 4339f0c..f716b10 100644
--- a/Metropolis/Plugin.jardesc
+++ b/Metropolis/Plugin.jardesc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="WINDOWS-1252" standalone="no"?>
 <jardesc>
-    <jar path="C:/Users/Tom/Desktop/MC Servers/plugins/Metropolis-0.3.jar"/>
+    <jar path="C:/Users/Tom/Desktop/MC Servers/plugins/Metropolis-0.4.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/Metropolis/Plugin.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
diff --git a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java b/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
index 5ac6b98..be046b0 100644
--- a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
+++ b/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
@@ -25,7 +25,6 @@ import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 
 public class MetropolisPlugin extends JavaPlugin {
 	public static final Logger log=Logger.getLogger("Minecraft");
-	public static final String DEFAULT_WORLD_NAME = "world";
 	
 	public PluginDescriptionFile pdf = null;
 	public WorldGuardPlugin worldGuard = null;
@@ -45,6 +44,7 @@ public class MetropolisPlugin extends JavaPlugin {
 	int roadLevel = 62;
 	int spaceAboveRoad = 2;
 	int roadMaterial = 4;
+	String worldName = "world";
 	
 	@Override
 	public void onDisable() {
@@ -56,6 +56,20 @@ public class MetropolisPlugin extends JavaPlugin {
 	public void onEnable() {
 		pdf = getDescription();
 		
+		Configuration config = getConfig();
+		config.options().copyDefaults(true);
+		
+		plotSizeX = config.getInt("plot.sizeX");
+		plotSizeZ = config.getInt("plot.sizeZ");
+		roadWidth = config.getInt("road.width");
+		spaceAboveRoad = config.getInt("road.clearSpaceAbove");
+		roadLevel = config.getInt("road.level");
+		roadMaterial = config.getInt("road.material");
+		worldName =config.getString("worldname");
+		
+		saveConfig();
+		
+		
 		Plugin plugin = getServer().getPluginManager().getPlugin("WorldGuard");
 		if(plugin == null || !(plugin instanceof WorldGuardPlugin)){
 			throw new RuntimeException("WorldGuard must be loaded first");
@@ -69,7 +83,7 @@ public class MetropolisPlugin extends JavaPlugin {
 		}
 		worldEdit = (WorldEditPlugin) plugin;
 		
-		world = getServer().getWorld(DEFAULT_WORLD_NAME);
+		world = getServer().getWorld(worldName);
 		
 		regionManager = worldGuard.getRegionManager(world);
 	
@@ -101,17 +115,6 @@ public class MetropolisPlugin extends JavaPlugin {
 
 		log.info(String.format("%s enabled", pdf.getFullName()));
 		
-		Configuration config = getConfig();
-		config.options().copyDefaults(true);
-		
-		plotSizeX = config.getInt("plot.sizeX");
-		plotSizeZ = config.getInt("plot.sizeZ");
-		roadWidth = config.getInt("road.width");
-		spaceAboveRoad = config.getInt("road.clearSpaceAbove");
-		roadLevel = config.getInt("road.level");
-		roadMaterial = config.getInt("road.material");
-		
-		saveConfig();
 		
 		getCommand("metropolis-home-generate").setExecutor(new MetropolisHomeGenerateCommand(this));
 		
diff --git a/Metropolis/src/config.yml b/Metropolis/src/config.yml
index 0fe1375..e4d0b54 100644
--- a/Metropolis/src/config.yml
+++ b/Metropolis/src/config.yml
@@ -5,4 +5,5 @@ road:
   width: 4
   clearSpaceAbove: 66
   level: 62
-  material: 4
\ No newline at end of file
+  material: 4
+worldname: world