1.8.7 upgrade

NerdNu · Jul 25, 2015 · d374036 · d374036
1 parent 52c5f4a
commit d374036
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>nu.nerd</groupId>
   <artifactId>KitchenSink</artifactId>
   <name>KitchenSink</name>
-  <version>0.9.2</version>
+  <version>0.9.4</version>
   <build>
     <sourceDirectory>${basedir}/src</sourceDirectory>
     <defaultGoal>clean package</defaultGoal>
@@ -81,12 +81,12 @@
       <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
     </repository>
     <repository>
-      <id>shadowvolt-repo</id>
+      <id>thezomg-repo</id>
       <url>http://ci.shadowvolt.com/plugin/repository/everything/</url>
     </repository>
     <repository>
-      <id>thezomg-repo</id>
-      <url>http://maven.thezomg.com/content/groups/public/</url>
+      <id>kitteh-repo</id>
+      <url>http://repo.kitteh.org/content/groups/public</url>
     </repository>
   </repositories>
   <pluginRepositories>
@@ -99,19 +99,20 @@
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>bukkit</artifactId>
-      <version>1.8.3-R0.1-SNAPSHOT</version>
+      <version>1.8.7-R0.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
-      <version>1.8.3-R0.1-SNAPSHOT</version>
-      <scope>compile</scope>
+      <version>1.8.7-R0.1-SNAPSHOT</version>
+      <scope>system</scope>
+      <systemPath>C:\Users\c45y\Desktop\BuildTools\craftbukkit-1.8.7.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>de.bananaco</groupId>
       <artifactId>bPermissions</artifactId>
-      <version>1.0.0</version>
+      <version>2.10.9d</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nu.nerd</groupId>
 	<artifactId>KitchenSink</artifactId>
-	<version>0.9.3</version>
+	<version>0.9.4</version>
 	<packaging>jar</packaging>
 	<name>KitchenSink</name>
 	<properties>
@@ -34,18 +34,18 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>1.8.3-R0.1-SNAPSHOT</version>
+			<version>1.8.7-R0.1-SNAPSHOT</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
 			<groupId>org.bukkit</groupId>
-			<artifactId>craftbukkit</artifactId>
-			<version>1.8.3-R0.1-SNAPSHOT</version>
+                        <artifactId>craftbukkit</artifactId>
+                        <version>1.8.7-R0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>de.bananaco</groupId>
 			<artifactId>bPermissions</artifactId>
-			<version>1.0.0</version>
+			<version>2.10.9d</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -64,14 +64,14 @@
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 		</repository>
-		<repository>
-			<id>shadowvolt-repo</id>
-			<url>http://ci.shadowvolt.com/plugin/repository/everything/</url>
-		</repository>
 		<repository>
 			<id>thezomg-repo</id>
-			<url>http://maven.thezomg.com/content/groups/public/</url>
+			<url>http://ci.shadowvolt.com/plugin/repository/everything/</url>
 		</repository>
+                <repository>
+                    <id>kitteh-repo</id>
+                    <url>http://repo.kitteh.org/content/groups/public</url>
+                </repository>
 	</repositories>
 	<build>
 		<sourceDirectory>${basedir}/src</sourceDirectory>

diff --git a/src/nu/nerd/kitchensink/KitchenSink.java b/src/nu/nerd/kitchensink/KitchenSink.java
@@ -16,7 +16,7 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.craftbukkit.v1_8_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Boat;
 import org.bukkit.entity.EntityType;

diff --git a/src/nu/nerd/kitchensink/KitchenSinkListener.java b/src/nu/nerd/kitchensink/KitchenSinkListener.java
@@ -4,15 +4,15 @@
 import java.util.*;
 import java.util.Map.Entry;
 
-import net.minecraft.server.v1_8_R2.MovingObjectPosition;
-import net.minecraft.server.v1_8_R2.Vec3D;
-import net.minecraft.server.v1_8_R2.EntityArrow;
+import net.minecraft.server.v1_8_R3.MovingObjectPosition;
+import net.minecraft.server.v1_8_R3.Vec3D;
+import net.minecraft.server.v1_8_R3.EntityArrow;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftArrow;
 
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.NoteBlock;
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftArrow;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Ageable;
 import org.bukkit.entity.Entity;