From 30006325db48d569d58a5579ce351f9f5eaff7e8 Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Sat, 19 Apr 2014 13:14:14 -0400
Subject: [PATCH] Update CraftBukkit packaging for 1.7.9.

---
 pom.xml                                       |   2 +-
 .../worldedit/bukkit/DefaultNmsBlock.java     |  51 +++++++++++++++---
 .../resources/nmsblocks/CBXNmsBlock_175.class | Bin 13883 -> 13808 bytes
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index ffd217f31..b6b154888 100644
--- a/pom.xml
+++ b/pom.xml
@@ -469,7 +469,7 @@
         <dependency>
           <groupId>org.bukkit</groupId>
           <artifactId>craftbukkit</artifactId>
-          <version>1.7.5-R0.1-SNAPSHOT</version>
+          <version>1.7.9-R0.1-SNAPSHOT</version>
           <scope>compile</scope>
           <type>jar</type>
           <optional>true</optional>
diff --git a/src/bukkit/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java b/src/bukkit/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
index 6f85b39dc..23d5e64e8 100644
--- a/src/bukkit/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
+++ b/src/bukkit/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
@@ -25,9 +25,9 @@ import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.TileEntityBlock;
 import com.sk89q.worldedit.world.DataException;
 import com.sk89q.worldedit.foundation.Block;
-import net.minecraft.server.v1_7_R2.*;
+import net.minecraft.server.v1_7_R3.*;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_7_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_7_R3.CraftWorld;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -51,7 +51,7 @@ public class DefaultNmsBlock extends NmsBlock {
     static {
         Field field;
         try {
-            field = net.minecraft.server.v1_7_R2.Block.class.getDeclaredField("isTileEntity");
+            field = net.minecraft.server.v1_7_R3.Block.class.getDeclaredField("isTileEntity");
             field.setAccessible(true);
         } catch (NoSuchFieldException e) {
             // logger.severe("Could not find NMS block tile entity field!");
@@ -239,7 +239,7 @@ public class DefaultNmsBlock extends NmsBlock {
     }
 
     public static boolean hasTileEntity(int type) {
-        net.minecraft.server.v1_7_R2.Block nmsBlock = getNmsBlock(type);
+        net.minecraft.server.v1_7_R3.Block nmsBlock = getNmsBlock(type);
         if (nmsBlock == null) {
             return false;
         }
@@ -251,8 +251,8 @@ public class DefaultNmsBlock extends NmsBlock {
         }
     }
 
-    public static net.minecraft.server.v1_7_R2.Block getNmsBlock(int type) {
-        return net.minecraft.server.v1_7_R2.Block.e(type);
+    public static net.minecraft.server.v1_7_R3.Block getNmsBlock(int type) {
+        return net.minecraft.server.v1_7_R3.Block.e(type);
     }
 
     /**
@@ -265,7 +265,42 @@ public class DefaultNmsBlock extends NmsBlock {
     private static Tag toNative(NBTBase foreign) {
         // temporary fix since mojang removed names from tags
         // our nbt spec will need to be updated to theirs
-        return toNative(NBTBase.getTagName(foreign.getTypeId()), foreign);
+        return toNative(getTagName(foreign.getTypeId()), foreign);
+    }
+
+    // seriously these two methods are hacky - our jnbt spec needs updating
+    // copied from NMS 1.7.5- code, since it was removed in 1.7.8
+    private static String getTagName(int i) {
+        switch (i) {
+        case 0:
+            return "TAG_End";
+        case 1:
+            return "TAG_Byte";
+        case 2:
+            return "TAG_Short";
+        case 3:
+            return "TAG_Int";
+        case 4:
+            return "TAG_Long";
+        case 5:
+            return "TAG_Float";
+        case 6:
+            return "TAG_Double";
+        case 7:
+            return "TAG_Byte_Array";
+        case 8:
+            return "TAG_String";
+        case 9:
+            return "TAG_List";
+        case 10:
+            return "TAG_Compound";
+        case 11:
+            return "TAG_Int_Array";
+        case 99:
+            return "Any Numeric Tag";
+        default:
+            return "UNKNOWN";
+        }
     }
 
     /**
@@ -431,7 +466,7 @@ public class DefaultNmsBlock extends NmsBlock {
     }
 
     public static boolean isValidBlockType(int type) throws NoClassDefFoundError {
-        return type == 0 || (type >= 1 && net.minecraft.server.v1_7_R2.Block.e(type) != null);
+        return type == 0 || (type >= 1 && net.minecraft.server.v1_7_R3.Block.e(type) != null);
     }
 
 }
diff --git a/src/bukkit/resources/nmsblocks/CBXNmsBlock_175.class b/src/bukkit/resources/nmsblocks/CBXNmsBlock_175.class
index b8eff9075f3c9f2c6d5f6e8ada50eb9efb7d08ff..6afbcdcc592164ebf507fe5ad50442b4af8fa7e2 100644
GIT binary patch
delta 3166
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

delta 3121
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
KqIyY8?7snUu6&*V