From 8567c4ba3c9d855929a9d252c1b779992fbb4c19 Mon Sep 17 00:00:00 2001 From: aPunch Date: Mon, 16 Jan 2012 15:18:47 -0600 Subject: [PATCH] switching to maven --- .gitignore | 1 + build.xml | 41 +++++++ lib/CitizensAPI.jar | Bin 13365 -> 10827 bytes ...{bukkit.jar => bukkit-1.1-R1-SNAPSHOT.jar} | Bin ...it.jar => craftbukkit-1.1-R1-SNAPSHOT.jar} | Bin plugin.yml | 4 + pom.xml | 108 ++++++++++++++++++ src/net/citizensnpcs/npc/CitizensNPC.java | 4 +- 8 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 build.xml rename lib/{bukkit.jar => bukkit-1.1-R1-SNAPSHOT.jar} (100%) rename lib/{craftbukkit.jar => craftbukkit-1.1-R1-SNAPSHOT.jar} (100%) create mode 100644 plugin.yml create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore index ae6d66ba7..e485f23dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /bin /build +/target .classpath .project Citizens.jar \ No newline at end of file diff --git a/build.xml b/build.xml new file mode 100644 index 000000000..5960b3aed --- /dev/null +++ b/build.xml @@ -0,0 +1,41 @@ + + + Citizens build file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar index 065dc1123d1846b519e50ad57c2b85edf845f1a6..07b93b917739a1fc63b6d2859c4f0e68d792453a 100644 GIT binary patch delta 2289 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 SGlGUA0sc{u5Qv8??dgB*>c9&C diff --git a/lib/bukkit.jar b/lib/bukkit-1.1-R1-SNAPSHOT.jar similarity index 100% rename from lib/bukkit.jar rename to lib/bukkit-1.1-R1-SNAPSHOT.jar diff --git a/lib/craftbukkit.jar b/lib/craftbukkit-1.1-R1-SNAPSHOT.jar similarity index 100% rename from lib/craftbukkit.jar rename to lib/craftbukkit-1.1-R1-SNAPSHOT.jar diff --git a/plugin.yml b/plugin.yml new file mode 100644 index 000000000..57a83cb3b --- /dev/null +++ b/plugin.yml @@ -0,0 +1,4 @@ +name: Citizens +authors: [aPunch, fullwall] +version: 2.0 +main: net.citizensnpcs.Citizens \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..c49fa7662 --- /dev/null +++ b/pom.xml @@ -0,0 +1,108 @@ + + + + 4.0.0 + + net.citizensnpcs + citizens + 2.0 + Citizens + + + UTF-8 + 1.1-R1-SNAPSHOT + Unknown + + + + + bukkit-repo + http://repo.bukkit.org/content/groups/repo/ + + + citizensapi-repo + + http://repo.citizensnpcs.net/content/groups/repo/ + + + + + + org.bukkit + craftbukkit + ${craftbukkit.version} + jar + provided + + + net.citizensnpcs + citizensapi + 2.0 + jar + compile + + + + + clean + ${basedir}/src + + + + . + false + ${basedir} + + + . + false + ${basedir}/src + + plugin.yml + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + + org.apache.maven.plugins + maven-shade-plugin + 1.5 + + + package + + shade + + + + + net.citizensnpcs:* + + + + + + + + + + \ No newline at end of file diff --git a/src/net/citizensnpcs/npc/CitizensNPC.java b/src/net/citizensnpcs/npc/CitizensNPC.java index dfba7b1fd..40b74e46d 100644 --- a/src/net/citizensnpcs/npc/CitizensNPC.java +++ b/src/net/citizensnpcs/npc/CitizensNPC.java @@ -3,7 +3,7 @@ package net.citizensnpcs.npc; import java.util.HashSet; import java.util.Set; -import net.citizensnpcs.api.Citizens; +import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCDespawnEvent; import net.citizensnpcs.api.event.NPCSpawnEvent; import net.citizensnpcs.api.npc.trait.Character; @@ -32,7 +32,7 @@ public class CitizensNPC implements NPC { for (Trait trait : traits) { this.traits.add(trait); } - manager = (CitizensNPCManager) Citizens.getNPCManager(); + manager = (CitizensNPCManager) CitizensAPI.getNPCManager(); id = manager.getUniqueID(); }