From 4d89b67b253fef2a1cf31d39f7a22d6d75ae19fe Mon Sep 17 00:00:00 2001 From: wizjany Date: Fri, 12 Jul 2013 02:04:20 -0400 Subject: [PATCH] Update to MC 1.6.2 --- pom.xml | 2 +- .../worldedit/bukkit/DefaultNmsBlock.java | 44 +++++++++--------- .../resources/nmsblocks/CBXNmsBlock_161.class | Bin 0 -> 12540 bytes 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/nmsblocks/CBXNmsBlock_161.class diff --git a/pom.xml b/pom.xml index 66f9e2968..649616928 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ org.bukkit craftbukkit - 1.6.1-R0.1-SNAPSHOT + 1.6.2-R0.1-SNAPSHOT compile jar true diff --git a/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java b/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java index 65420de19..c6ed98405 100644 --- a/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java +++ b/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java @@ -25,23 +25,23 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import net.minecraft.server.v1_6_R1.NBTBase; -import net.minecraft.server.v1_6_R1.NBTTagByte; -import net.minecraft.server.v1_6_R1.NBTTagByteArray; -import net.minecraft.server.v1_6_R1.NBTTagCompound; -import net.minecraft.server.v1_6_R1.NBTTagDouble; -import net.minecraft.server.v1_6_R1.NBTTagEnd; -import net.minecraft.server.v1_6_R1.NBTTagFloat; -import net.minecraft.server.v1_6_R1.NBTTagInt; -import net.minecraft.server.v1_6_R1.NBTTagIntArray; -import net.minecraft.server.v1_6_R1.NBTTagList; -import net.minecraft.server.v1_6_R1.NBTTagLong; -import net.minecraft.server.v1_6_R1.NBTTagShort; -import net.minecraft.server.v1_6_R1.NBTTagString; -import net.minecraft.server.v1_6_R1.TileEntity; +import net.minecraft.server.v1_6_R2.NBTBase; +import net.minecraft.server.v1_6_R2.NBTTagByte; +import net.minecraft.server.v1_6_R2.NBTTagByteArray; +import net.minecraft.server.v1_6_R2.NBTTagCompound; +import net.minecraft.server.v1_6_R2.NBTTagDouble; +import net.minecraft.server.v1_6_R2.NBTTagEnd; +import net.minecraft.server.v1_6_R2.NBTTagFloat; +import net.minecraft.server.v1_6_R2.NBTTagInt; +import net.minecraft.server.v1_6_R2.NBTTagIntArray; +import net.minecraft.server.v1_6_R2.NBTTagList; +import net.minecraft.server.v1_6_R2.NBTTagLong; +import net.minecraft.server.v1_6_R2.NBTTagShort; +import net.minecraft.server.v1_6_R2.NBTTagString; +import net.minecraft.server.v1_6_R2.TileEntity; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_6_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_6_R2.CraftWorld; import com.sk89q.jnbt.ByteArrayTag; import com.sk89q.jnbt.ByteTag; @@ -81,7 +81,7 @@ public class DefaultNmsBlock extends NmsBlock { static { Field field; try { - field = net.minecraft.server.v1_6_R1.Block.class.getDeclaredField("isTileEntity"); + field = net.minecraft.server.v1_6_R2.Block.class.getDeclaredField("isTileEntity"); field.setAccessible(true); } catch (NoSuchFieldException e) { // logger.severe("Could not find NMS block tile entity field!"); @@ -269,7 +269,7 @@ public class DefaultNmsBlock extends NmsBlock { } public static boolean hasTileEntity(int type) { - net.minecraft.server.v1_6_R1.Block nmsBlock = getNmsBlock(type); + net.minecraft.server.v1_6_R2.Block nmsBlock = getNmsBlock(type); if (nmsBlock == null) { return false; } @@ -281,11 +281,11 @@ public class DefaultNmsBlock extends NmsBlock { } } - public static net.minecraft.server.v1_6_R1.Block getNmsBlock(int type) { - if (type < 0 || type >= net.minecraft.server.v1_6_R1.Block.byId.length) { + public static net.minecraft.server.v1_6_R2.Block getNmsBlock(int type) { + if (type < 0 || type >= net.minecraft.server.v1_6_R2.Block.byId.length) { return null; } - return net.minecraft.server.v1_6_R1.Block.byId[type]; + return net.minecraft.server.v1_6_R2.Block.byId[type]; } /** @@ -439,7 +439,7 @@ public class DefaultNmsBlock extends NmsBlock { } public static boolean isValidBlockType(int type) throws NoClassDefFoundError { - return type == 0 || (type >= 1 && type < net.minecraft.server.v1_6_R1.Block.byId.length - && net.minecraft.server.v1_6_R1.Block.byId[type] != null); + return type == 0 || (type >= 1 && type < net.minecraft.server.v1_6_R2.Block.byId.length + && net.minecraft.server.v1_6_R2.Block.byId[type] != null); } } diff --git a/src/main/resources/nmsblocks/CBXNmsBlock_161.class b/src/main/resources/nmsblocks/CBXNmsBlock_161.class new file mode 100644 index 0000000000000000000000000000000000000000..336c611cb014b8976d3e4c882f94027740d09383 GIT binary patch literal 12540 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