Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prepare for MC 1.5.1 (specifically, Bukkit renames).

Browse Source
This commit is contained in:
wizjany 2013-03-20 00:11:27 -04:00
parent 422cba101d
commit 58a7a2ed4f
3 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -125,7 +125,7 @@
<dependency> <!-- NMS blocks --> <dependency> <!-- NMS blocks -->
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<version>1.5-R0.1-SNAPSHOT</version> <version>1.5.1-R0.1-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
<type>jar</type> <type>jar</type>
<optional>true</optional> <optional>true</optional>
@ -138,13 +138,7 @@
<scope>test</scope> <scope>test</scope>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

44
src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
View File

@ -25,23 +25,23 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.minecraft.server.v1_5_R1.NBTBase; import net.minecraft.server.v1_5_R2.NBTBase;
import net.minecraft.server.v1_5_R1.NBTTagByte; import net.minecraft.server.v1_5_R2.NBTTagByte;
import net.minecraft.server.v1_5_R1.NBTTagByteArray; import net.minecraft.server.v1_5_R2.NBTTagByteArray;
import net.minecraft.server.v1_5_R1.NBTTagCompound; import net.minecraft.server.v1_5_R2.NBTTagCompound;
import net.minecraft.server.v1_5_R1.NBTTagDouble; import net.minecraft.server.v1_5_R2.NBTTagDouble;
import net.minecraft.server.v1_5_R1.NBTTagEnd; import net.minecraft.server.v1_5_R2.NBTTagEnd;
import net.minecraft.server.v1_5_R1.NBTTagFloat; import net.minecraft.server.v1_5_R2.NBTTagFloat;
import net.minecraft.server.v1_5_R1.NBTTagInt; import net.minecraft.server.v1_5_R2.NBTTagInt;
import net.minecraft.server.v1_5_R1.NBTTagIntArray; import net.minecraft.server.v1_5_R2.NBTTagIntArray;
import net.minecraft.server.v1_5_R1.NBTTagList; import net.minecraft.server.v1_5_R2.NBTTagList;
import net.minecraft.server.v1_5_R1.NBTTagLong; import net.minecraft.server.v1_5_R2.NBTTagLong;
import net.minecraft.server.v1_5_R1.NBTTagShort; import net.minecraft.server.v1_5_R2.NBTTagShort;
import net.minecraft.server.v1_5_R1.NBTTagString; import net.minecraft.server.v1_5_R2.NBTTagString;
import net.minecraft.server.v1_5_R1.TileEntity; import net.minecraft.server.v1_5_R2.TileEntity;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.craftbukkit.v1_5_R1.CraftWorld; import org.bukkit.craftbukkit.v1_5_R2.CraftWorld;
import com.sk89q.jnbt.ByteArrayTag; import com.sk89q.jnbt.ByteArrayTag;
import com.sk89q.jnbt.ByteTag; import com.sk89q.jnbt.ByteTag;
@ -81,7 +81,7 @@ public class DefaultNmsBlock extends NmsBlock {
static { static {
Field field; Field field;
try { try {
field = net.minecraft.server.v1_5_R1.Block.class.getDeclaredField("isTileEntity"); field = net.minecraft.server.v1_5_R2.Block.class.getDeclaredField("isTileEntity");
field.setAccessible(true); field.setAccessible(true);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
// logger.severe("Could not find NMS block tile entity field!"); // 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) { public static boolean hasTileEntity(int type) {
net.minecraft.server.v1_5_R1.Block nmsBlock = getNmsBlock(type); net.minecraft.server.v1_5_R2.Block nmsBlock = getNmsBlock(type);
if (nmsBlock == null) { if (nmsBlock == null) {
return false; return false;
} }
@ -281,11 +281,11 @@ public class DefaultNmsBlock extends NmsBlock {
} }
} }
public static net.minecraft.server.v1_5_R1.Block getNmsBlock(int type) { public static net.minecraft.server.v1_5_R2.Block getNmsBlock(int type) {
if (type < 0 || type >= net.minecraft.server.v1_5_R1.Block.byId.length) { if (type < 0 || type >= net.minecraft.server.v1_5_R2.Block.byId.length) {
return null; return null;
} }
return net.minecraft.server.v1_5_R1.Block.byId[type]; return net.minecraft.server.v1_5_R2.Block.byId[type];
} }
/** /**
@ -439,7 +439,7 @@ public class DefaultNmsBlock extends NmsBlock {
} }
public static boolean isValidBlockType(int type) throws NoClassDefFoundError { public static boolean isValidBlockType(int type) throws NoClassDefFoundError {
return type == 0 || (type >= 1 && type < net.minecraft.server.v1_5_R1.Block.byId.length return type == 0 || (type >= 1 && type < net.minecraft.server.v1_5_R2.Block.byId.length
&& net.minecraft.server.v1_5_R1.Block.byId[type] != null); && net.minecraft.server.v1_5_R2.Block.byId[type] != null);
} }
} }

BIN
src/main/resources/nmsblocks/CBXNmsBlock_15.class Normal file
View File

Binary file not shown.