From 7af44c742beaf07628d15fe785e919e8b2d9007e Mon Sep 17 00:00:00 2001
From: headhunter45 <headhunter3@gmail.com>
Date: Wed, 8 Feb 2012 04:33:21 -0800
Subject: [PATCH] v0.2 Added configuration options

---
 Metropolis/Plugin.jardesc                     |  2 +-
 .../plugins/metropolis/MetropolisPlugin.java  | 34 +++++++++++++++----
 Metropolis/src/config.yml                     |  8 +++++
 Metropolis/src/plugin.yml                     |  2 +-
 4 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 Metropolis/src/config.yml

diff --git a/Metropolis/Plugin.jardesc b/Metropolis/Plugin.jardesc
index e685cfc..99cc6f8 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.1.jar"/>
+    <jar path="C:/Users/Tom/Desktop/MC Servers/plugins/Metropolis-0.2.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 53ce2d9..3b94188 100644
--- a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
+++ b/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
@@ -4,10 +4,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import org.bukkit.World;
 import org.bukkit.block.Block;
+import org.bukkit.configuration.Configuration;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
@@ -34,12 +36,15 @@ public class MetropolisPlugin extends JavaPlugin {
 	private List<PlayerHome> _occupiedHomes;
 	
 	private LoginListener _loginListener = null;
+	
 	int size = 0;
+	
 	int plotSizeX = 24;
 	int plotSizeZ = 24;
 	int roadWidth = 4;
 	int roadLevel = 62;
 	int spaceAboveRoad = 2;
+	int roadMaterial = 4;
 	
 	@Override
 	public void onDisable() {
@@ -94,6 +99,25 @@ 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");
+		
+		/*
+		Set<String>strings = config.getKeys(true);
+		log.info(String.valueOf(strings.size()));
+		for(String str : strings){
+			log.info(str);
+		}
+		*/
+		
 	}
 	/*
 	private void setupDatabase() {
@@ -171,7 +195,7 @@ public class MetropolisPlugin extends JavaPlugin {
 			for(x=plotCuboid.minX; x<plotCuboid.minX + roadWidth/2; x++){
 				for(z=plotCuboid.minZ; z<=plotCuboid.maxZ; z++){
 					Block block = world.getBlockAt(x, y, z);
-					block.setTypeId(4);
+					block.setTypeId(roadMaterial);
 					for(int y1 = 0; y1 < spaceAboveRoad; y1++){
 						block = world.getBlockAt(x, y+y1+1, z);
 						block.setTypeId(0);
@@ -183,7 +207,7 @@ public class MetropolisPlugin extends JavaPlugin {
 			for(x=plotCuboid.maxX - roadWidth/2+1; x<=plotCuboid.maxX; x++){
 				for(z=plotCuboid.minZ; z<=plotCuboid.maxZ; z++){
 					Block block = world.getBlockAt(x, y, z);
-					block.setTypeId(4);
+					block.setTypeId(roadMaterial);
 					for(int y1 = 0; y1 < spaceAboveRoad; y1++){
 						block = world.getBlockAt(x, y+y1+1, z);
 						block.setTypeId(0);
@@ -195,7 +219,7 @@ public class MetropolisPlugin extends JavaPlugin {
 			for(z=plotCuboid.minZ; z<plotCuboid.minZ + roadWidth/2; z++){
 				for(x=plotCuboid.minX; x<=plotCuboid.maxX; x++){
 					Block block = world.getBlockAt(x, y, z);
-					block.setTypeId(4);
+					block.setTypeId(roadMaterial);
 					for(int y1 = 0; y1 < spaceAboveRoad; y1++){
 						block = world.getBlockAt(x, y+y1+1, z);
 						block.setTypeId(0);
@@ -207,15 +231,13 @@ public class MetropolisPlugin extends JavaPlugin {
 			for(z=plotCuboid.maxZ - roadWidth/2+1; z<=plotCuboid.maxZ; z++){
 				for(x=plotCuboid.minX; x<=plotCuboid.maxX; x++){
 					Block block = world.getBlockAt(x, y, z);
-					block.setTypeId(4);
+					block.setTypeId(roadMaterial);
 					for(int y1 = 0; y1 < spaceAboveRoad; y1++){
 						block = world.getBlockAt(x, y+y1+1, z);
 						block.setTypeId(0);
 					}
 				}
 			}
-			
-			
 		}
 	}
 
diff --git a/Metropolis/src/config.yml b/Metropolis/src/config.yml
new file mode 100644
index 0000000..0fe1375
--- /dev/null
+++ b/Metropolis/src/config.yml
@@ -0,0 +1,8 @@
+plot:
+  sizeX: 24
+  sizeZ: 24
+road:
+  width: 4
+  clearSpaceAbove: 66
+  level: 62
+  material: 4
\ No newline at end of file
diff --git a/Metropolis/src/plugin.yml b/Metropolis/src/plugin.yml
index b3c18ad..860c170 100644
--- a/Metropolis/src/plugin.yml
+++ b/Metropolis/src/plugin.yml
@@ -1,6 +1,6 @@
 name: Metropolis
 main: com.majinnaibu.bukkit.plugins.metropolis.MetropolisPlugin
 depend: [WorldEdit, WorldGuard]
-version: 0.1
+version: 0.2
 database: true