Update for 1.8.7

Howaner · Jun 28, 2015 · 7ca5b85 · 7ca5b85
1 parent 7b21717
commit 7ca5b85
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,5 @@
 <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">
+		 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>de.howaner</groupId>
 	<artifactId>FramePicture</artifactId>
@@ -10,7 +10,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
-	
+
 	<repositories>
 		<repository>
 			<releases>
@@ -36,7 +36,7 @@
 			<url>http://repo.comphenix.net/content/groups/public</url>
 		</repository>
 	</repositories>
-	
+
 	<build>
 		<plugins>
 			<!-- Clean Plugin -->
@@ -74,32 +74,32 @@
 			</plugin>
 		</plugins>
 	</build>
-	
+
 	<dependencies>
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot</artifactId>
-			<version>1.8-R0.1-SNAPSHOT</version>
+			<version>1.8-R0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.comphenix.protocol</groupId>
 			<artifactId>ProtocolLib-Spigot</artifactId>
-			<version>3.6.0-SNAPSHOT</version>
+			<version>3.6.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.milkbowl.vault</groupId>
 			<artifactId>Vault</artifactId>
-			<version>1.4.1</version>
+			<version>1.5.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sk89q</groupId>
 			<artifactId>worldedit</artifactId>
-			<version>5.7-SNAPSHOT</version>
+			<version>6.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sk89q</groupId>
 			<artifactId>worldguard</artifactId>
-			<version>5.9.1-SNAPSHOT</version>
+			<version>6.1.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/src/main/java/de/howaner/FramePicture/FrameManager.java b/src/main/java/de/howaner/FramePicture/FrameManager.java
@@ -19,10 +19,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
-import net.minecraft.server.v1_8_R1.EntityPlayer;
-import net.minecraft.server.v1_8_R1.EntityTracker;
-import net.minecraft.server.v1_8_R1.EntityTrackerEntry;
-import net.minecraft.server.v1_8_R1.WorldServer;
+import net.minecraft.server.v1_8_R3.EntityPlayer;
+import net.minecraft.server.v1_8_R3.EntityTracker;
+import net.minecraft.server.v1_8_R3.EntityTrackerEntry;
+import net.minecraft.server.v1_8_R3.WorldServer;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
@@ -31,7 +31,7 @@
 import org.bukkit.block.BlockFace;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

diff --git a/src/main/java/de/howaner/FramePicture/util/FakeMapCanvas.java b/src/main/java/de/howaner/FramePicture/util/FakeMapCanvas.java
@@ -2,8 +2,8 @@
 
 import java.lang.reflect.Field;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_8_R1.map.CraftMapCanvas;
-import org.bukkit.craftbukkit.v1_8_R1.map.CraftMapView;
+import org.bukkit.craftbukkit.v1_8_R3.map.CraftMapCanvas;
+import org.bukkit.craftbukkit.v1_8_R3.map.CraftMapView;
 
 public class FakeMapCanvas extends CraftMapCanvas {
 

diff --git a/src/main/java/de/howaner/FramePicture/util/Frame.java b/src/main/java/de/howaner/FramePicture/util/Frame.java
@@ -7,18 +7,18 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.logging.Level;
-import net.minecraft.server.v1_8_R1.DataWatcher;
-import net.minecraft.server.v1_8_R1.EntityItemFrame;
-import net.minecraft.server.v1_8_R1.MapIcon;
-import net.minecraft.server.v1_8_R1.PacketPlayOutEntityMetadata;
-import net.minecraft.server.v1_8_R1.PacketPlayOutMap;
+import net.minecraft.server.v1_8_R3.DataWatcher;
+import net.minecraft.server.v1_8_R3.EntityItemFrame;
+import net.minecraft.server.v1_8_R3.MapIcon;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntityMetadata;
+import net.minecraft.server.v1_8_R3.PacketPlayOutMap;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_8_R1.entity.CraftItemFrame;
-import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.v1_8_R1.map.RenderData;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftItemFrame;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_8_R3.map.RenderData;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -119,7 +119,7 @@ private void sendItemMeta(Player player) {
 			ItemStack item = new ItemStack(Material.MAP);
 			item.setDurability(this.getMapId());
 
-			net.minecraft.server.v1_8_R1.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
+			net.minecraft.server.v1_8_R3.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
 			nmsItem.count = 1;
 			nmsItem.a(entity);
 

diff --git a/src/main/java/de/howaner/FramePicture/util/PacketSender.java b/src/main/java/de/howaner/FramePicture/util/PacketSender.java
@@ -3,7 +3,7 @@
 import java.util.Iterator;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import net.minecraft.server.v1_8_R1.Packet;
+import net.minecraft.server.v1_8_R3.Packet;
 import org.bukkit.entity.Player;
 
 public class PacketSender implements Runnable {

diff --git a/src/main/java/de/howaner/FramePicture/util/Utils.java b/src/main/java/de/howaner/FramePicture/util/Utils.java
@@ -7,15 +7,15 @@
 import java.awt.image.BufferedImage;
 import java.lang.reflect.Field;
 import java.util.logging.Level;
-import net.minecraft.server.v1_8_R1.EntityItemFrame;
-import net.minecraft.server.v1_8_R1.NetworkManager;
-import net.minecraft.server.v1_8_R1.Packet;
+import net.minecraft.server.v1_8_R3.EntityItemFrame;
+import net.minecraft.server.v1_8_R3.NetworkManager;
+import net.minecraft.server.v1_8_R3.Packet;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_8_R1.entity.CraftItemFrame;
-import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftItemFrame;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.ItemFrame;
@@ -27,7 +27,7 @@ public class Utils {
 	public static void setFrameItemWithoutSending(ItemFrame entity, ItemStack item) {
 		EntityItemFrame nmsEntity = ((CraftItemFrame)entity).getHandle();
 
-		net.minecraft.server.v1_8_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
+		net.minecraft.server.v1_8_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
 		if (nmsStack != null) {
 			nmsStack.count = 1;
 			nmsStack.a(nmsEntity);
@@ -62,7 +62,7 @@ public static byte[] setCanvasPixel(byte[] buffer, int x, int y, byte color) {
 	public static void sendPacketFast(Player player, Packet packet) {
 		try {
 			NetworkManager netty = ((CraftPlayer)player).getHandle().playerConnection.networkManager;
-			Field field = NetworkManager.class.getDeclaredField("i");
+			Field field = NetworkManager.class.getDeclaredField("channel");
 			field.setAccessible(true);
 			Channel channel = (Channel)field.get(netty);
 

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: FramePicture
-version: 1.7.7
+version: 1.8.7
 author: Howaner
 website: http://howaner.de
 description: You can set Pictures in Frames