From 48bff509dd8212d631984d780ff189d04ddacae1 Mon Sep 17 00:00:00 2001 From: wizjany Date: Thu, 20 Jun 2013 18:34:07 -0400 Subject: [PATCH] Bukkit package naming changes for 1.6.1. --- pom.xml | 2 +- .../worldedit/bukkit/DefaultNmsBlock.java | 44 +++++++++--------- .../nmsblocks/CBXNmsBlock_v152_2.class | Bin 0 -> 12552 bytes 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/nmsblocks/CBXNmsBlock_v152_2.class diff --git a/pom.xml b/pom.xml index d01870078..dd872d12f 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ org.bukkit craftbukkit - 1.5.2-R0.1-SNAPSHOT + 1.6-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 22aeac383..65420de19 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_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 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 org.bukkit.World; -import org.bukkit.craftbukkit.v1_5_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_6_R1.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_R3.Block.class.getDeclaredField("isTileEntity"); + field = net.minecraft.server.v1_6_R1.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_5_R3.Block nmsBlock = getNmsBlock(type); + net.minecraft.server.v1_6_R1.Block nmsBlock = getNmsBlock(type); if (nmsBlock == null) { return false; } @@ -281,11 +281,11 @@ public class DefaultNmsBlock extends NmsBlock { } } - 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) { + 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) { return null; } - return net.minecraft.server.v1_5_R3.Block.byId[type]; + return net.minecraft.server.v1_6_R1.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_5_R3.Block.byId.length - && net.minecraft.server.v1_5_R3.Block.byId[type] != null); + 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); } } diff --git a/src/main/resources/nmsblocks/CBXNmsBlock_v152_2.class b/src/main/resources/nmsblocks/CBXNmsBlock_v152_2.class new file mode 100644 index 0000000000000000000000000000000000000000..2a4acd48efdd53cec99a68557329fac3f8f4671c GIT binary patch literal 12552 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 TU3@-I!ClUMH{<*DVvq0tC*u|U literal 0 HcmV?d00001