From 84598e220f9d18deed089b149b66fd2e250189af Mon Sep 17 00:00:00 2001 From: wizjany Date: Fri, 13 Sep 2013 13:17:59 -0400 Subject: [PATCH] Updated Craftbukkit package version for 1.6.4 --- pom.xml | 2 +- .../worldedit/bukkit/DefaultNmsBlock.java | 44 +++++++++--------- .../resources/nmsblocks/CBXNmsBlock_162.class | Bin 0 -> 12540 bytes 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/nmsblocks/CBXNmsBlock_162.class diff --git a/pom.xml b/pom.xml index 2a1e84cdd..93495d25c 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ org.bukkit craftbukkit - 1.6.2-R0.1-SNAPSHOT + 1.6.4-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 c6ed98405..298443475 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_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 net.minecraft.server.v1_6_R3.NBTBase; +import net.minecraft.server.v1_6_R3.NBTTagByte; +import net.minecraft.server.v1_6_R3.NBTTagByteArray; +import net.minecraft.server.v1_6_R3.NBTTagCompound; +import net.minecraft.server.v1_6_R3.NBTTagDouble; +import net.minecraft.server.v1_6_R3.NBTTagEnd; +import net.minecraft.server.v1_6_R3.NBTTagFloat; +import net.minecraft.server.v1_6_R3.NBTTagInt; +import net.minecraft.server.v1_6_R3.NBTTagIntArray; +import net.minecraft.server.v1_6_R3.NBTTagList; +import net.minecraft.server.v1_6_R3.NBTTagLong; +import net.minecraft.server.v1_6_R3.NBTTagShort; +import net.minecraft.server.v1_6_R3.NBTTagString; +import net.minecraft.server.v1_6_R3.TileEntity; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_6_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_6_R3.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_R2.Block.class.getDeclaredField("isTileEntity"); + field = net.minecraft.server.v1_6_R3.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_R2.Block nmsBlock = getNmsBlock(type); + net.minecraft.server.v1_6_R3.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_R2.Block getNmsBlock(int type) { - if (type < 0 || type >= net.minecraft.server.v1_6_R2.Block.byId.length) { + public static net.minecraft.server.v1_6_R3.Block getNmsBlock(int type) { + if (type < 0 || type >= net.minecraft.server.v1_6_R3.Block.byId.length) { return null; } - return net.minecraft.server.v1_6_R2.Block.byId[type]; + return net.minecraft.server.v1_6_R3.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_R2.Block.byId.length - && net.minecraft.server.v1_6_R2.Block.byId[type] != null); + return type == 0 || (type >= 1 && type < net.minecraft.server.v1_6_R3.Block.byId.length + && net.minecraft.server.v1_6_R3.Block.byId[type] != null); } } diff --git a/src/main/resources/nmsblocks/CBXNmsBlock_162.class b/src/main/resources/nmsblocks/CBXNmsBlock_162.class new file mode 100644 index 0000000000000000000000000000000000000000..2d70cfbcbfa29b594e91d78a1d499cf56ec556fd GIT binary patch literal 12540 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