Transition to Maven

16 files changed, 59 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index f0fde81a..9c0573a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,13 @@
+# Eclipse stuff
+/.classpath
+/.project
+/.settings
 
-/jarjar
-/build
-/build.xml
-/manifest.mf
+# netbeans
 /nbproject
-/dist
\ No newline at end of file
+
+# maven
+/target
+
+# vim
+.*.sw[a-p]
diff --git a/pom.xml b/pom.xml
new file mode 100755
index 00000000..cbfb2c74
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,48 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

+  <modelVersion>4.0.0</modelVersion>

+  <groupId>org.bukkit</groupId>

+  <artifactId>craftbukkit</artifactId>

+  <version>0.0.1-SNAPSHOT</version>

+  <name>CraftBukkit</name>

+  <url>http://www.bukkit.org</url>

+  <repositories>

+    <repository>

+      <id>tmp-repo</id>

+      <url>http://dl.dwim.org/~ebroes/maven</url>

+    </repository>

+  </repositories>

+  <dependencies>

+    <dependency>

+      <groupId>org.bukkit</groupId>

+      <artifactId>bukkit</artifactId>

+      <version>0.0.1-SNAPSHOT</version>

+      <type>jar</type>

+      <scope>compile</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.bukkit</groupId>

+      <artifactId>minecraft-server</artifactId>

+      <version>1.1_02</version>

+      <type>jar</type>

+      <scope>compile</scope>

+    </dependency>

+  </dependencies>

+  <!-- to add the manifest with the Main-Class -->

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-jar-plugin</artifactId>

+        <version>2.3.1</version>

+        <configuration>

+          <archive>

+            <manifest>

+              <mainClass>org.bukkit.craftbukkit.Main</mainClass>

+            </manifest>

+          </archive>

+        </configuration>

+      </plugin>

+    </plugins>

+  </build>

+</project>

diff --git a/src/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
index 86405a89..86405a89 100644
--- a/src/net/minecraft/server/BlockFlowing.java
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
diff --git a/src/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8d49cfa6..8d49cfa6 100644
--- a/src/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
diff --git a/src/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 1168a6df..1168a6df 100644
--- a/src/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
diff --git a/src/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index dac524b8..dac524b8 100644
--- a/src/net/minecraft/server/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
diff --git a/src/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 431cb0ac..431cb0ac 100644
--- a/src/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
diff --git a/src/org/bukkit/craftbukkit/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/CraftBlock.java
index f67d14bf..f67d14bf 100644
--- a/src/org/bukkit/craftbukkit/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftBlock.java
diff --git a/src/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index 003ee0f4..003ee0f4 100644
--- a/src/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
diff --git a/src/org/bukkit/craftbukkit/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/CraftEntity.java
index efbb7f28..efbb7f28 100644
--- a/src/org/bukkit/craftbukkit/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftEntity.java
diff --git a/src/org/bukkit/craftbukkit/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java
index b03f0967..b03f0967 100644
--- a/src/org/bukkit/craftbukkit/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java
diff --git a/src/org/bukkit/craftbukkit/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java
index 8f753386..8f753386 100644
--- a/src/org/bukkit/craftbukkit/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java
diff --git a/src/org/bukkit/craftbukkit/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
index a8a368dc..a8a368dc 100644
--- a/src/org/bukkit/craftbukkit/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
diff --git a/src/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1fe1ee44..1fe1ee44 100644
--- a/src/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
diff --git a/src/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 5e6d20d7..5e6d20d7 100644
--- a/src/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
diff --git a/src/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index d2543b5e..d2543b5e 100644
--- a/src/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java