geforkt von Mirrors/FastAsyncWorldEdit
Update to MC 1.6.2
Dieser Commit ist enthalten in:
Ursprung
d3adca7c1a
Commit
4d89b67b25
2
pom.xml
2
pom.xml
@ -125,7 +125,7 @@
|
||||
<dependency> <!-- NMS blocks -->
|
||||
<groupId>org.bukkit</groupId>
|
||||
<artifactId>craftbukkit</artifactId>
|
||||
<version>1.6.1-R0.1-SNAPSHOT</version>
|
||||
<version>1.6.2-R0.1-SNAPSHOT</version>
|
||||
<scope>compile</scope>
|
||||
<type>jar</type>
|
||||
<optional>true</optional>
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
BIN
src/main/resources/nmsblocks/CBXNmsBlock_161.class
Normale Datei
BIN
src/main/resources/nmsblocks/CBXNmsBlock_161.class
Normale Datei
Binäre Datei nicht angezeigt.
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren