cleanup and updated deps

trichner · Oct 25, 2015 · c78f05d · c78f05d
1 parent 401b8c5
commit c78f05d
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 120 deletions.
diff --git a/lib/chestlootz-1.9.4.jar b/lib/chestlootz-1.9.4.jar
diff --git a/lib/spigot-api-1.8.8-R0.1-SNAPSHOT.jar b/lib/spigot-api-1.8.8-R0.1-SNAPSHOT.jar
diff --git a/lib/spigot1649.jar b/lib/spigot1649.jar
diff --git a/lib/worldedit-bukkit-6.1.jar b/lib/worldedit-bukkit-6.1.jar
diff --git a/pom.xml b/pom.xml
@@ -6,26 +6,15 @@
 
     <groupId>ch.k42.metropolis</groupId>
     <artifactId>metropolis</artifactId>
-    <version>1.0.1-1002</version>
-
-    <repositories>
-        <repository>
-            <id>bukkit-repo</id>
-            <url>http://repo.bukkit.org/content/groups/public</url>
-        </repository>
-        <repository>
-            <id>spigot-repo</id>
-            <url>http://repo.md-5.net/content/groups/public/</url>
-        </repository>
-    </repositories>
+    <version>1.0.2</version>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.7.9-R0.3-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
+            <artifactId>spigot-api</artifactId>
+            <version>1.8.8</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/spigot-api-1.8.8-R0.1-SNAPSHOT.jar</systemPath>
         </dependency>
 
         <!-- Already in bukkit
@@ -38,20 +27,6 @@
         -->
 
         <!-- Local Libraries-->
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1649</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/spigot1649.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.weld.se</groupId>
-            <artifactId>weld-se</artifactId>
-            <version>2.2.1.Final</version>
-        </dependency>
-
         <dependency>
             <groupId>org.worldedit</groupId>
             <artifactId>worldedit</artifactId>
@@ -102,6 +77,11 @@
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.8.8-R0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/src/main/java/ch/k42/metropolis/generator/populators/PopulatorConfig.java b/src/main/java/ch/k42/metropolis/generator/populators/PopulatorConfig.java
@@ -1,8 +1,9 @@
 package ch.k42.metropolis.generator.populators;
 
+import com.google.gson.annotations.Expose;
+
 import java.util.Arrays;
 
-import org.bukkit.craftbukkit.libs.com.google.gson.annotations.Expose;
 
 
 /**

diff --git a/src/main/java/ch/k42/metropolis/grid/urbanGrid/config/GlobalSchematicConfig.java b/src/main/java/ch/k42/metropolis/grid/urbanGrid/config/GlobalSchematicConfig.java
@@ -1,22 +1,21 @@
 package ch.k42.metropolis.grid.urbanGrid.config;
 
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.EntityType;
-
 import ch.k42.metropolis.grid.urbanGrid.enums.ContextType;
 import ch.k42.metropolis.grid.urbanGrid.enums.LootType;
 import ch.k42.metropolis.grid.urbanGrid.enums.RoadType;
 import ch.k42.metropolis.minions.GridRandom;
 import ch.k42.metropolis.minions.Minions;
 import ch.k42.metropolis.minions.Nimmersatt;
-import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
-import org.bukkit.craftbukkit.libs.com.google.gson.GsonBuilder;
-import org.bukkit.craftbukkit.libs.com.google.gson.JsonSyntaxException;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.EntityType;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 /**
  * Created with IntelliJ IDEA.

diff --git a/src/main/java/ch/k42/metropolis/grid/urbanGrid/config/SchematicConfig.java b/src/main/java/ch/k42/metropolis/grid/urbanGrid/config/SchematicConfig.java
@@ -1,16 +1,5 @@
 package ch.k42.metropolis.grid.urbanGrid.config;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-
 import ch.k42.metropolis.grid.urbanGrid.enums.ContextType;
 import ch.k42.metropolis.grid.urbanGrid.enums.Direction;
 import ch.k42.metropolis.grid.urbanGrid.enums.LootType;
@@ -19,8 +8,18 @@
 import ch.k42.metropolis.minions.DecayOption;
 import ch.k42.metropolis.minions.GridRandom;
 import ch.k42.metropolis.minions.Nimmersatt;
-import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
-import org.bukkit.craftbukkit.libs.com.google.gson.JsonSyntaxException;
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 
 /**

diff --git a/src/main/java/ch/k42/metropolis/grid/urbanGrid/context/ContextConfig.java b/src/main/java/ch/k42/metropolis/grid/urbanGrid/context/ContextConfig.java
@@ -1,10 +1,10 @@
 package ch.k42.metropolis.grid.urbanGrid.context;
 
 
-import java.util.Arrays;
-
 import ch.k42.metropolis.grid.urbanGrid.enums.ContextType;
-import org.bukkit.craftbukkit.libs.com.google.gson.annotations.Expose;
+import com.google.gson.annotations.Expose;
+
+import java.util.Arrays;
 
 /**
  * Created by aaronbrewer on 2/4/14.

diff --git a/src/main/java/ch/k42/metropolis/grid/urbanGrid/context/ContextZone.java b/src/main/java/ch/k42/metropolis/grid/urbanGrid/context/ContextZone.java
@@ -3,7 +3,7 @@
 import java.util.Arrays;
 
 import ch.k42.metropolis.grid.urbanGrid.enums.ContextType;
-import org.bukkit.craftbukkit.libs.com.google.gson.annotations.Expose;
+import com.google.gson.annotations.Expose;
 
 /**
  * Created by aaronbrewer on 2/4/14.

diff --git a/src/main/java/ch/k42/metropolis/minions/WeldService.java b/src/main/java/ch/k42/metropolis/minions/WeldService.java
diff --git a/src/main/java/ch/k42/metropolis/plugin/MetropolisPlugin.java b/src/main/java/ch/k42/metropolis/plugin/MetropolisPlugin.java
@@ -1,23 +1,5 @@
 package ch.k42.metropolis.plugin;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.nio.file.Files;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.bukkit.Sound;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.generator.ChunkGenerator;
-import org.bukkit.plugin.java.JavaPlugin;
-
 import ch.k42.metropolis.commands.CommandMetropolisFreder;
 import ch.k42.metropolis.commands.CommandMetropolisGrot;
 import ch.k42.metropolis.commands.CommandMetropolisMaria;
@@ -29,8 +11,25 @@
 import ch.k42.metropolis.grid.urbanGrid.clipboard.ClipboardProviderDB;
 import ch.k42.metropolis.grid.urbanGrid.context.ContextConfig;
 import ch.k42.metropolis.minions.Nimmersatt;
-import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
-import org.bukkit.craftbukkit.libs.com.google.gson.GsonBuilder;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.bukkit.Sound;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.nio.file.Files;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.LinkedList;
+import java.util.List;
 
 
 /**