From f0ec3758343c45ede5a58a0d2455e5789a3007d4 Mon Sep 17 00:00:00 2001
From: FrozenCow <frozencow@gmail.com>
Date: Wed, 5 Jan 2011 19:41:21 +0100
Subject: [PATCH] Put classes in package to be more compatible with Bukkit.

---
 build.xml                                     | 26 +++++++++++++------
 src/DMFlatFileSource.java                     | 13 ----------
 src/DMMySQLSource.java                        | 13 ----------
 src/{ => main/java/org/dynmap}/Cache.java     |  2 ++
 .../java/org/dynmap}/MapListener.java         |  2 ++
 .../java/org/dynmap}/MapManager.java          |  2 ++
 src/{ => main/java/org/dynmap}/MapTile.java   |  2 ++
 .../java/org/dynmap}/TileUpdate.java          |  2 ++
 src/{ => main/java/org/dynmap}/WebServer.java |  2 ++
 .../java/org/dynmap}/WebServerRequest.java    |  2 ++
 src/{ => main/java/org/dynmap}/map.java       |  5 +++-
 src/main/resources/plugin.yml                 |  3 +++
 12 files changed, 39 insertions(+), 35 deletions(-)
 delete mode 100644 src/DMFlatFileSource.java
 delete mode 100644 src/DMMySQLSource.java
 rename src/{ => main/java/org/dynmap}/Cache.java (98%)
 rename src/{ => main/java/org/dynmap}/MapListener.java (99%)
 rename src/{ => main/java/org/dynmap}/MapManager.java (99%)
 rename src/{ => main/java/org/dynmap}/MapTile.java (99%)
 rename src/{ => main/java/org/dynmap}/TileUpdate.java (90%)
 rename src/{ => main/java/org/dynmap}/WebServer.java (98%)
 rename src/{ => main/java/org/dynmap}/WebServerRequest.java (99%)
 rename src/{ => main/java/org/dynmap}/map.java (99%)
 create mode 100644 src/main/resources/plugin.yml

diff --git a/build.xml b/build.xml
index a6cf4921..83f7871f 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,6 @@
 <project name="dynmap" default="dist" basedir=".">
+	<include file="build_parameters.xml"/>
 	<property name="pluginname" value="dynmap"/>
-	<property name="bukkit.jar" location="../../bukkit.jar"/>
-	<property name="plugins" location="../../plugins/"/>
 
 	<property name="src" location="src"/>
 	<property name="bin" location="bin"/>
@@ -12,23 +11,34 @@
 	</target>
 	
 	<target name="compile" depends="init">
-		<javac srcdir="${src}" destdir="${bin}" includeantruntime="false">
-			<classpath>
-				<pathelement location="${bukkit.jar}"/>
-			</classpath>
-		</javac>
+		<javac srcdir="${src}/main/java" destdir="${bin}" classpath="${bukkit.jar}" includeantruntime="false" />
 	</target>
 	
 	<target name="dist" depends="compile">
 		<mkdir dir="${dist}"/>
 		<jar jarfile="${dist}/${pluginname}.jar">
 			<fileset dir="${bin}"/>
-			<fileset file="${src}/plugin.yml"/>
+			<fileset file="${src}/main/resources/plugin.yml"/>
 		</jar>
 	</target>
 	
 	<target name="deploy" depends="dist">
 		<copy file="${dist}/${pluginname}.jar" todir="${plugins}"/>
+		<copy file="colors.txt" todir="${minecraft}"/>
+		<copy todir="${http_root}">
+			<fileset dir="web"/>
+		</copy>
+	</target>
+	
+	<target name="release" depends="dist">
+		<delete file="${pluginname}.zip"/>
+		<zip destfile="${pluginname}.zip">
+			<zipfileset dir="." includes="README.md" fullpath="readme.txt"/>
+			<zipfileset dir="." includes="build.xml"/>
+			<zipfileset dir="${dist}" includes="*.jar"/>
+			<zipfileset dir="${src}" includes="*.java" prefix="src/"/>
+			<zipfileset dir="${web}" includes="**" prefix="web/"/>
+		</zip>
 	</target>
 	
 	<target name="clean">
diff --git a/src/DMFlatFileSource.java b/src/DMFlatFileSource.java
deleted file mode 100644
index c7b5cd62..00000000
--- a/src/DMFlatFileSource.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/* FlatFileSource class wrapper to expose protected properties */
-
-import java.util.List;
-
-public class DMFlatFileSource{/* extends FlatFileSource {
-	public List<Warp> getAllWarps() {
-		return this.warps;
-	}
-	
-	public List<Warp> getAllHomes() {
-		return this.homes;
-	}*/
-}
diff --git a/src/DMMySQLSource.java b/src/DMMySQLSource.java
deleted file mode 100644
index d535117a..00000000
--- a/src/DMMySQLSource.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/* MySQLSource class wrapper to expose protected properties */
-
-import java.util.List;
-
-public class DMMySQLSource{/* extends MySQLSource {
-	public List<Warp> getAllWarps() {
-		return this.warps;
-	}
-	
-	public List<Warp> getAllHomes() {
-		return this.homes;
-	}*/
-}
diff --git a/src/Cache.java b/src/main/java/org/dynmap/Cache.java
similarity index 98%
rename from src/Cache.java
rename to src/main/java/org/dynmap/Cache.java
index 5a4e13ea..0093759a 100644
--- a/src/Cache.java
+++ b/src/main/java/org/dynmap/Cache.java
@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.util.HashMap;
 
 public class Cache<K, V>
diff --git a/src/MapListener.java b/src/main/java/org/dynmap/MapListener.java
similarity index 99%
rename from src/MapListener.java
rename to src/main/java/org/dynmap/MapListener.java
index 880df71f..694d2e6b 100644
--- a/src/MapListener.java
+++ b/src/main/java/org/dynmap/MapListener.java
@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/src/MapManager.java b/src/main/java/org/dynmap/MapManager.java
similarity index 99%
rename from src/MapManager.java
rename to src/main/java/org/dynmap/MapManager.java
index b78c818e..c4bad9b1 100644
--- a/src/MapManager.java
+++ b/src/main/java/org/dynmap/MapManager.java
@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Image;
diff --git a/src/MapTile.java b/src/main/java/org/dynmap/MapTile.java
similarity index 99%
rename from src/MapTile.java
rename to src/main/java/org/dynmap/MapTile.java
index 0aed150a..8bbfdf29 100644
--- a/src/MapTile.java
+++ b/src/main/java/org/dynmap/MapTile.java
@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.util.logging.Logger;
 import java.util.logging.Level;
 
diff --git a/src/TileUpdate.java b/src/main/java/org/dynmap/TileUpdate.java
similarity index 90%
rename from src/TileUpdate.java
rename to src/main/java/org/dynmap/TileUpdate.java
index 0d5ad1f5..f09a58c6 100644
--- a/src/TileUpdate.java
+++ b/src/main/java/org/dynmap/TileUpdate.java
@@ -1,3 +1,5 @@
+package org.dynmap;
+
 /* this class stores a tile update */
 
 public class TileUpdate {
diff --git a/src/WebServer.java b/src/main/java/org/dynmap/WebServer.java
similarity index 98%
rename from src/WebServer.java
rename to src/main/java/org/dynmap/WebServer.java
index 96306448..98047457 100644
--- a/src/WebServer.java
+++ b/src/main/java/org/dynmap/WebServer.java
@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.io.*;
 import java.net.*;
 import java.util.*;
diff --git a/src/WebServerRequest.java b/src/main/java/org/dynmap/WebServerRequest.java
similarity index 99%
rename from src/WebServerRequest.java
rename to src/main/java/org/dynmap/WebServerRequest.java
index 3a2f3279..1d04fbe3 100644
--- a/src/WebServerRequest.java
+++ b/src/main/java/org/dynmap/WebServerRequest.java
@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/map.java b/src/main/java/org/dynmap/map.java
similarity index 99%
rename from src/map.java
rename to src/main/java/org/dynmap/map.java
index 719f8db7..6942f649 100644
--- a/src/map.java
+++ b/src/main/java/org/dynmap/map.java
@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.util.logging.Logger;
 import java.io.IOException;
 
@@ -18,7 +20,6 @@ public class map extends JavaPlugin {
 
 	public map(PluginLoader pluginLoader, Server instance, PluginDescriptionFile desc, File plugin, ClassLoader cLoader) {
 		super(pluginLoader, instance, desc, plugin, cLoader);
-		registerEvents();
 	}
 
 	public World getWorld() {
@@ -39,6 +40,8 @@ public class map extends JavaPlugin {
 		}
 
 		listener = new MapListener(mgr);
+		
+		registerEvents();
 	}
 
 	@Override
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
new file mode 100644
index 00000000..434ec96a
--- /dev/null
+++ b/src/main/resources/plugin.yml
@@ -0,0 +1,3 @@
+name: Dynamic Map
+main: org.dynmap.map
+version: 0.1