From fad30ff23bba40a315d333f829db759314de0a21 Mon Sep 17 00:00:00 2001 From: wizjany Date: Tue, 30 Apr 2013 20:54:59 -0400 Subject: [PATCH] Update for CraftBukkit 1.5.2 package. --- pom.xml | 2 +- .../worldedit/bukkit/DefaultNmsBlock.java | 44 +++++++++--------- .../resources/nmsblocks/CBXNmsBlock_152.class | Bin 0 -> 12540 bytes 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/nmsblocks/CBXNmsBlock_152.class diff --git a/pom.xml b/pom.xml index f27c11edb..af3c960dd 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ org.bukkit craftbukkit - 1.5.1-R0.1-SNAPSHOT + 1.5.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 ce25f5920..22aeac383 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.Map; import java.util.logging.Logger; -import net.minecraft.server.v1_5_R2.NBTBase; -import net.minecraft.server.v1_5_R2.NBTTagByte; -import net.minecraft.server.v1_5_R2.NBTTagByteArray; -import net.minecraft.server.v1_5_R2.NBTTagCompound; -import net.minecraft.server.v1_5_R2.NBTTagDouble; -import net.minecraft.server.v1_5_R2.NBTTagEnd; -import net.minecraft.server.v1_5_R2.NBTTagFloat; -import net.minecraft.server.v1_5_R2.NBTTagInt; -import net.minecraft.server.v1_5_R2.NBTTagIntArray; -import net.minecraft.server.v1_5_R2.NBTTagList; -import net.minecraft.server.v1_5_R2.NBTTagLong; -import net.minecraft.server.v1_5_R2.NBTTagShort; -import net.minecraft.server.v1_5_R2.NBTTagString; -import net.minecraft.server.v1_5_R2.TileEntity; +import net.minecraft.server.v1_5_R3.NBTBase; +import net.minecraft.server.v1_5_R3.NBTTagByte; +import net.minecraft.server.v1_5_R3.NBTTagByteArray; +import net.minecraft.server.v1_5_R3.NBTTagCompound; +import net.minecraft.server.v1_5_R3.NBTTagDouble; +import net.minecraft.server.v1_5_R3.NBTTagEnd; +import net.minecraft.server.v1_5_R3.NBTTagFloat; +import net.minecraft.server.v1_5_R3.NBTTagInt; +import net.minecraft.server.v1_5_R3.NBTTagIntArray; +import net.minecraft.server.v1_5_R3.NBTTagList; +import net.minecraft.server.v1_5_R3.NBTTagLong; +import net.minecraft.server.v1_5_R3.NBTTagShort; +import net.minecraft.server.v1_5_R3.NBTTagString; +import net.minecraft.server.v1_5_R3.TileEntity; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_5_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_5_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_5_R2.Block.class.getDeclaredField("isTileEntity"); + field = net.minecraft.server.v1_5_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 static boolean setSafely(BukkitWorld world, Vector position, } public static boolean hasTileEntity(int type) { - net.minecraft.server.v1_5_R2.Block nmsBlock = getNmsBlock(type); + net.minecraft.server.v1_5_R3.Block nmsBlock = getNmsBlock(type); if (nmsBlock == null) { return false; } @@ -281,11 +281,11 @@ public static boolean hasTileEntity(int type) { } } - public static net.minecraft.server.v1_5_R2.Block getNmsBlock(int type) { - if (type < 0 || type >= net.minecraft.server.v1_5_R2.Block.byId.length) { + public static net.minecraft.server.v1_5_R3.Block getNmsBlock(int type) { + if (type < 0 || type >= net.minecraft.server.v1_5_R3.Block.byId.length) { return null; } - return net.minecraft.server.v1_5_R2.Block.byId[type]; + return net.minecraft.server.v1_5_R3.Block.byId[type]; } /** @@ -439,7 +439,7 @@ private static NBTBase fromNative(Tag foreign) { } public static boolean isValidBlockType(int type) throws NoClassDefFoundError { - return type == 0 || (type >= 1 && type < net.minecraft.server.v1_5_R2.Block.byId.length - && net.minecraft.server.v1_5_R2.Block.byId[type] != null); + return type == 0 || (type >= 1 && type < net.minecraft.server.v1_5_R3.Block.byId.length + && net.minecraft.server.v1_5_R3.Block.byId[type] != null); } } diff --git a/src/main/resources/nmsblocks/CBXNmsBlock_152.class b/src/main/resources/nmsblocks/CBXNmsBlock_152.class new file mode 100644 index 0000000000000000000000000000000000000000..8dda57ec93aac1e3c415f23c99ed10c897517c4e GIT binary patch literal 12540 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 Ro`Soa`)%|`5{{gmI5wZXP literal 0 HcmV?d00001