28 src/org/getspout/spout/block/mcblock/CustomMinecartTrack.java
View file
@@ -45,21 +45,21 @@
public class CustomMinecartTrack extends BlockMinecartTrack implements CustomMCBlock{
protected BlockMinecartTrack parent;
protected CustomMinecartTrack(BlockMinecartTrack parent) {
super(parent.id, parent.textureId, parent.f());
super(parent.id, parent.textureId, parent.h());
this.parent = parent;

updateField(parent, this, "strength");
updateField(parent, this, "durability");
updateField(parent, this, "bD");
updateField(parent, this, "bE");
updateField(parent, this, "bR");
updateField(parent, this, "bS");
this.minX = parent.minX;
this.minY = parent.minY;
this.minZ = parent.minZ;
this.maxX = parent.maxX;
this.maxY = parent.maxY;
this.maxZ = parent.maxZ;
this.stepSound = parent.stepSound;
this.bM = parent.bM;
this.ca = parent.ca;
this.frictionFactor = parent.frictionFactor;
updateField(parent, this, "name");
}
@@ -82,11 +82,11 @@ public void setExplosionResistance(float resistance) {
}

@Override
protected void h() {
protected void j() {
try{
Method h = Block.class.getDeclaredMethod("h", (Class[])null);
h.setAccessible(true);
h.invoke(parent, (Object[]) null);
Method j = Block.class.getDeclaredMethod("j", (Class[])null);
j.setAccessible(true);
j.invoke(parent, (Object[]) null);
}
catch (Exception e) {
e.printStackTrace();
@@ -99,8 +99,8 @@ public boolean b() {
}

@Override
public float j() {
return parent.j();
public float l() {
return parent.l();
}

@Override
@@ -158,8 +158,8 @@ public boolean a(int i, boolean flag) {
}

@Override
public boolean q_() {
return parent.q_();
public boolean v_() {
return parent.v_();
}

@Override
@@ -208,8 +208,8 @@ public float getDamage(EntityHuman entityhuman) {
}

@Override
public void dropNaturally(World world, int i, int j, int k, int l, float f) {
parent.dropNaturally(world, i, j, k, l, f);
public void dropNaturally(World world, int i, int j, int k, int l, float f, int i1) {
parent.dropNaturally(world, i, j, k, l, f, i1);
}

@Override
26 src/org/getspout/spout/block/mcblock/CustomMushroom.java
View file
@@ -50,16 +50,16 @@ protected CustomMushroom(BlockMushroom parent) {

updateField(parent, this, "strength");
updateField(parent, this, "durability");
updateField(parent, this, "bD");
updateField(parent, this, "bE");
updateField(parent, this, "bR");
updateField(parent, this, "bS");
this.minX = parent.minX;
this.minY = parent.minY;
this.minZ = parent.minZ;
this.maxX = parent.maxX;
this.maxY = parent.maxY;
this.maxZ = parent.maxZ;
this.stepSound = parent.stepSound;
this.bM = parent.bM;
this.ca = parent.ca;
this.frictionFactor = parent.frictionFactor;
updateField(parent, this, "name");
}
@@ -82,11 +82,11 @@ public void setExplosionResistance(float resistance) {
}

@Override
protected void h() {
protected void j() {
try{
Method h = Block.class.getDeclaredMethod("h", (Class[])null);
h.setAccessible(true);
h.invoke(parent, (Object[]) null);
Method j = Block.class.getDeclaredMethod("j", (Class[])null);
j.setAccessible(true);
j.invoke(parent, (Object[]) null);
}
catch (Exception e) {
e.printStackTrace();
@@ -99,8 +99,8 @@ public boolean b() {
}

@Override
public float j() {
return parent.j();
public float l() {
return parent.l();
}

@Override
@@ -158,8 +158,8 @@ public boolean a(int i, boolean flag) {
}

@Override
public boolean q_() {
return parent.q_();
public boolean v_() {
return parent.v_();
}

@Override
@@ -208,8 +208,8 @@ public float getDamage(EntityHuman entityhuman) {
}

@Override
public void dropNaturally(World world, int i, int j, int k, int l, float f) {
parent.dropNaturally(world, i, j, k, l, f);
public void dropNaturally(World world, int i, int j, int k, int l, float f, int i1) {
parent.dropNaturally(world, i, j, k, l, f, i1);
}

@Override
26 src/org/getspout/spout/block/mcblock/CustomStem.java
View file
@@ -51,16 +51,16 @@ protected CustomStem(BlockStem parent) {
updateStemField(parent, this, "a");
updateField(parent, this, "strength");
updateField(parent, this, "durability");
updateField(parent, this, "bD");
updateField(parent, this, "bE");
updateField(parent, this, "bR");
updateField(parent, this, "bS");
this.minX = parent.minX;
this.minY = parent.minY;
this.minZ = parent.minZ;
this.maxX = parent.maxX;
this.maxY = parent.maxY;
this.maxZ = parent.maxZ;
this.stepSound = parent.stepSound;
this.bM = parent.bM;
this.ca = parent.ca;
this.frictionFactor = parent.frictionFactor;
updateField(parent, this, "name");
}
@@ -83,11 +83,11 @@ public void setExplosionResistance(float resistance) {
}

@Override
protected void h() {
protected void j() {
try{
Method h = Block.class.getDeclaredMethod("h", (Class[])null);
h.setAccessible(true);
h.invoke(parent, (Object[]) null);
Method j = Block.class.getDeclaredMethod("j", (Class[])null);
j.setAccessible(true);
j.invoke(parent, (Object[]) null);
}
catch (Exception e) {
e.printStackTrace();
@@ -100,8 +100,8 @@ public boolean b() {
}

@Override
public float j() {
return parent.j();
public float l() {
return parent.l();
}

@Override
@@ -159,8 +159,8 @@ public boolean a(int i, boolean flag) {
}

@Override
public boolean q_() {
return parent.q_();
public boolean v_() {
return parent.v_();
}

@Override
@@ -209,8 +209,8 @@ public float getDamage(EntityHuman entityhuman) {
}

@Override
public void dropNaturally(World world, int i, int j, int k, int l, float f) {
parent.dropNaturally(world, i, j, k, l, f);
public void dropNaturally(World world, int i, int j, int k, int l, float f, int i1) {
parent.dropNaturally(world, i, j, k, l, f, i1);
}

@Override
2 src/org/getspout/spout/chunkcache/ChunkCache.java
View file
@@ -85,7 +85,7 @@ public static byte[] cacheChunk(EntityPlayer[] players, byte[] uncompressedData)
HashUpdate update = pending.removeFirst();
if(update.hashes.length != 0) {
Packet p = new CustomPacket(new PacketCacheHashUpdate(update.add, update.hashes));
p.k = true;
p.l = true;
MapChunkThread.sendPacketSkipQueue(player, p);
}
}
6 src/org/getspout/spout/command/SpoutCommand.java
View file
@@ -73,15 +73,15 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
sender.sendMessage("[Spout] Temporarily setting the motd to: " + args[1]);
sender.sendMessage("[Spout] It will return to its original setting in ~5 mins");
if (motd_temp == null) {
motd_temp = ((CraftServer) Bukkit.getServer()).getHandle().server.p;
motd_temp = ((CraftServer) Bukkit.getServer()).getHandle().server.r;
} else {
Bukkit.getServer().getScheduler().cancelTask(motd_task);
}
((CraftServer) Bukkit.getServer()).getHandle().server.p = args[1];
((CraftServer) Bukkit.getServer()).getHandle().server.r = args[1];
motd_task = Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(p, new Runnable() {
@Override
public void run() {
((CraftServer) Bukkit.getServer()).getHandle().server.p = motd_temp;
((CraftServer) Bukkit.getServer()).getHandle().server.r = motd_temp;
motd_temp = null;
}
}, 20 * 60 * 5);
2 src/org/getspout/spout/inventory/AbstractBlockManager.java
View file
@@ -163,7 +163,7 @@ public float getHardness(org.getspout.spoutapi.material.Block block) {
if(block instanceof CustomBlock) {
id = ((CustomBlock) block).getBlockId();
}
return net.minecraft.server.Block.byId[id].j();
return net.minecraft.server.Block.byId[id].l();
}

@Override
4 src/org/getspout/spout/inventory/CustomMCInventory.java
View file
@@ -131,12 +131,12 @@ public void update() {
}

@Override
public void e() {
public void f() {

}

@Override
public void t_() {
public void g() {

}

4 src/org/getspout/spout/item/mcitem/CustomItemPickaxe.java
View file
@@ -17,7 +17,7 @@ public CustomItemPickaxe(int i, EnumToolMaterial etm) {

@Override
public boolean a(Block block) {
return block.id == Block.OBSIDIAN.id ? this.a.d() == 3 : (block.id != Block.DIAMOND_BLOCK.id && block.id != Block.DIAMOND_ORE.id ? (block.id != Block.GOLD_BLOCK.id && block.id != Block.GOLD_ORE.id ? (block.id != Block.IRON_BLOCK.id && block.id != Block.IRON_ORE.id ? (block.id != Block.LAPIS_BLOCK.id && block.id != Block.LAPIS_ORE.id ? (block.id != Block.REDSTONE_ORE.id && block.id != Block.GLOWING_REDSTONE_ORE.id ? (block.material == Material.STONE ? true : block.material == Material.ORE) : this.a.d() >= 2) : this.a.d() >= 1) : this.a.d() >= 1) : this.a.d() >= 2) : this.a.d() >= 2);
return block.id == Block.OBSIDIAN.id ? this.b.d() == 3 : (block.id != Block.DIAMOND_BLOCK.id && block.id != Block.DIAMOND_ORE.id ? (block.id != Block.GOLD_BLOCK.id && block.id != Block.GOLD_ORE.id ? (block.id != Block.IRON_BLOCK.id && block.id != Block.IRON_ORE.id ? (block.id != Block.LAPIS_BLOCK.id && block.id != Block.LAPIS_ORE.id ? (block.id != Block.REDSTONE_ORE.id && block.id != Block.GLOWING_REDSTONE_ORE.id ? (block.material == Material.STONE ? true : block.material == Material.ORE) : this.b.d() >= 2) : this.b.d() >= 1) : this.b.d() >= 1) : this.b.d() >= 2) : this.b.d() >= 2);
}

/**
@@ -30,7 +30,7 @@ public static void replacePickaxes() {
ItemPickaxe pickaxe = (ItemPickaxe)Item.byId[i];
EnumToolMaterial etm = null;
try {
Field tool = ItemTool.class.getDeclaredField("a");
Field tool = ItemTool.class.getDeclaredField("b");
tool.setAccessible(true);
etm = (EnumToolMaterial) tool.get(pickaxe);
}
2 src/org/getspout/spout/item/mcitem/CustomItemSpade.java
View file
@@ -30,7 +30,7 @@ public static void replaceSpades() {
ItemSpade spade = (ItemSpade)Item.byId[i];
EnumToolMaterial etm = null;
try {
Field tool = ItemTool.class.getDeclaredField("a");
Field tool = ItemTool.class.getDeclaredField("b");
tool.setAccessible(true);
etm = (EnumToolMaterial) tool.get(spade);
}