From 2726696652179a5ead7dc07dd39edf7dfda687f7 Mon Sep 17 00:00:00 2001 From: mbax Date: Mon, 4 Nov 2013 07:07:38 -0600 Subject: Update CraftBukkit to Minecraft 1.7.2 --- .../net/minecraft/server/BlockDiodeAbstract.java | 164 ++++++++++----------- 1 file changed, 81 insertions(+), 83 deletions(-) (limited to 'src/main/java/net/minecraft/server/BlockDiodeAbstract.java') diff --git a/src/main/java/net/minecraft/server/BlockDiodeAbstract.java b/src/main/java/net/minecraft/server/BlockDiodeAbstract.java index 6d205d91..474c0117 100644 --- a/src/main/java/net/minecraft/server/BlockDiodeAbstract.java +++ b/src/main/java/net/minecraft/server/BlockDiodeAbstract.java @@ -8,29 +8,29 @@ public abstract class BlockDiodeAbstract extends BlockDirectional { protected final boolean a; - protected BlockDiodeAbstract(int i, boolean flag) { - super(i, Material.ORIENTABLE); + protected BlockDiodeAbstract(boolean flag) { + super(Material.ORIENTABLE); this.a = flag; this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F); } - public boolean b() { + public boolean d() { return false; } public boolean canPlace(World world, int i, int j, int k) { - return !world.w(i, j - 1, k) ? false : super.canPlace(world, i, j, k); + return !World.a((IBlockAccess) world, i, j - 1, k) ? false : super.canPlace(world, i, j, k); } - public boolean f(World world, int i, int j, int k) { - return !world.w(i, j - 1, k) ? false : super.f(world, i, j, k); + public boolean j(World world, int i, int j, int k) { + return !World.a((IBlockAccess) world, i, j - 1, k) ? false : super.j(world, i, j, k); } public void a(World world, int i, int j, int k, Random random) { int l = world.getData(i, j, k); - if (!this.e((IBlockAccess) world, i, j, k, l)) { - boolean flag = this.d(world, i, j, k, l); + if (!this.g((IBlockAccess) world, i, j, k, l)) { // CraftBukkit - Cast world to IBlockAccess to call the right method. + boolean flag = this.a(world, i, j, k, l); if (this.a && !flag) { // CraftBukkit start @@ -39,7 +39,7 @@ public abstract class BlockDiodeAbstract extends BlockDirectional { } // CraftBukkit end - world.setTypeIdAndData(i, j, k, this.j().id, l, 2); + world.setTypeAndData(i, j, k, this.i(), l, 2); } else if (!this.a) { // CraftBukkit start if (CraftEventFactory.callRedstoneChange(world, i, j, k, 0, 15).getNewCurrent() != 15) { @@ -47,15 +47,15 @@ public abstract class BlockDiodeAbstract extends BlockDirectional { } // CraftBukkit end - world.setTypeIdAndData(i, j, k, this.i().id, l, 2); + world.setTypeAndData(i, j, k, this.e(), l, 2); if (!flag) { - world.a(i, j, k, this.i().id, this.h(l), -1); + world.a(i, j, k, this.e(), this.k(l), -1); } } } } - public int d() { + public int b() { return 36; } @@ -73,85 +73,85 @@ public abstract class BlockDiodeAbstract extends BlockDirectional { if (!this.c(i1)) { return 0; } else { - int j1 = j(i1); + int j1 = l(i1); - return j1 == 0 && l == 3 ? this.d(iblockaccess, i, j, k, i1) : (j1 == 1 && l == 4 ? this.d(iblockaccess, i, j, k, i1) : (j1 == 2 && l == 2 ? this.d(iblockaccess, i, j, k, i1) : (j1 == 3 && l == 5 ? this.d(iblockaccess, i, j, k, i1) : 0))); + return j1 == 0 && l == 3 ? this.f(iblockaccess, i, j, k, i1) : (j1 == 1 && l == 4 ? this.f(iblockaccess, i, j, k, i1) : (j1 == 2 && l == 2 ? this.f(iblockaccess, i, j, k, i1) : (j1 == 3 && l == 5 ? this.f(iblockaccess, i, j, k, i1) : 0))); } } - public void doPhysics(World world, int i, int j, int k, int l) { - if (!this.f(world, i, j, k)) { - this.c(world, i, j, k, world.getData(i, j, k), 0); + public void doPhysics(World world, int i, int j, int k, Block block) { + if (!this.j(world, i, j, k)) { + this.b(world, i, j, k, world.getData(i, j, k), 0); world.setAir(i, j, k); - world.applyPhysics(i + 1, j, k, this.id); - world.applyPhysics(i - 1, j, k, this.id); - world.applyPhysics(i, j, k + 1, this.id); - world.applyPhysics(i, j, k - 1, this.id); - world.applyPhysics(i, j - 1, k, this.id); - world.applyPhysics(i, j + 1, k, this.id); + world.applyPhysics(i + 1, j, k, this); + world.applyPhysics(i - 1, j, k, this); + world.applyPhysics(i, j, k + 1, this); + world.applyPhysics(i, j, k - 1, this); + world.applyPhysics(i, j - 1, k, this); + world.applyPhysics(i, j + 1, k, this); } else { - this.f(world, i, j, k, l); + this.b(world, i, j, k, block); } } - protected void f(World world, int i, int j, int k, int l) { - int i1 = world.getData(i, j, k); + protected void b(World world, int i, int j, int k, Block block) { + int l = world.getData(i, j, k); - if (!this.e((IBlockAccess) world, i, j, k, i1)) { - boolean flag = this.d(world, i, j, k, i1); + if (!this.g((IBlockAccess) world, i, j, k, l)) { + boolean flag = this.a(world, i, j, k, l); - if ((this.a && !flag || !this.a && flag) && !world.a(i, j, k, this.id)) { + if ((this.a && !flag || !this.a && flag) && !world.a(i, j, k, (Block) this)) { byte b0 = -1; - if (this.h(world, i, j, k, i1)) { + if (this.i(world, i, j, k, l)) { b0 = -3; } else if (this.a) { b0 = -2; } - world.a(i, j, k, this.id, this.k_(i1), b0); + world.a(i, j, k, this, this.b(l), b0); } } } - public boolean e(IBlockAccess iblockaccess, int i, int j, int k, int l) { + public boolean g(IBlockAccess iblockaccess, int i, int j, int k, int l) { return false; } - protected boolean d(World world, int i, int j, int k, int l) { - return this.e(world, i, j, k, l) > 0; + protected boolean a(World world, int i, int j, int k, int l) { + return this.h(world, i, j, k, l) > 0; } - protected int e(World world, int i, int j, int k, int l) { - int i1 = j(l); + protected int h(World world, int i, int j, int k, int l) { + int i1 = l(l); int j1 = i + Direction.a[i1]; int k1 = k + Direction.b[i1]; int l1 = world.getBlockFacePower(j1, j, k1, Direction.d[i1]); - return l1 >= 15 ? l1 : Math.max(l1, world.getTypeId(j1, j, k1) == Block.REDSTONE_WIRE.id ? world.getData(j1, j, k1) : 0); + return l1 >= 15 ? l1 : Math.max(l1, world.getType(j1, j, k1) == Blocks.REDSTONE_WIRE ? world.getData(j1, j, k1) : 0); } - protected int f(IBlockAccess iblockaccess, int i, int j, int k, int l) { - int i1 = j(l); + protected int h(IBlockAccess iblockaccess, int i, int j, int k, int l) { + int i1 = l(l); switch (i1) { case 0: case 2: - return Math.max(this.g(iblockaccess, i - 1, j, k, 4), this.g(iblockaccess, i + 1, j, k, 5)); + return Math.max(this.i(iblockaccess, i - 1, j, k, 4), this.i(iblockaccess, i + 1, j, k, 5)); case 1: case 3: - return Math.max(this.g(iblockaccess, i, j, k + 1, 3), this.g(iblockaccess, i, j, k - 1, 2)); + return Math.max(this.i(iblockaccess, i, j, k + 1, 3), this.i(iblockaccess, i, j, k - 1, 2)); default: return 0; } } - protected int g(IBlockAccess iblockaccess, int i, int j, int k, int l) { - int i1 = iblockaccess.getTypeId(i, j, k); + protected int i(IBlockAccess iblockaccess, int i, int j, int k, int l) { + Block block = iblockaccess.getType(i, j, k); - return this.e(i1) ? (i1 == Block.REDSTONE_WIRE.id ? iblockaccess.getData(i, j, k) : iblockaccess.getBlockPower(i, j, k, l)) : 0; + return this.a(block) ? (block == Blocks.REDSTONE_WIRE ? iblockaccess.getData(i, j, k) : iblockaccess.getBlockPower(i, j, k, l)) : 0; } public boolean isPowerSource() { @@ -162,49 +162,49 @@ public abstract class BlockDiodeAbstract extends BlockDirectional { int l = ((MathHelper.floor((double) (entityliving.yaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4; world.setData(i, j, k, l, 3); - boolean flag = this.d(world, i, j, k, l); + boolean flag = this.a(world, i, j, k, l); if (flag) { - world.a(i, j, k, this.id, 1); + world.a(i, j, k, this, 1); } } public void onPlace(World world, int i, int j, int k) { - this.h_(world, i, j, k); + this.e(world, i, j, k); } - protected void h_(World world, int i, int j, int k) { - int l = j(world.getData(i, j, k)); + protected void e(World world, int i, int j, int k) { + int l = l(world.getData(i, j, k)); if (l == 1) { - world.g(i + 1, j, k, this.id); - world.c(i + 1, j, k, this.id, 4); + world.e(i + 1, j, k, this); + world.b(i + 1, j, k, this, 4); } if (l == 3) { - world.g(i - 1, j, k, this.id); - world.c(i - 1, j, k, this.id, 5); + world.e(i - 1, j, k, this); + world.b(i - 1, j, k, this, 5); } if (l == 2) { - world.g(i, j, k + 1, this.id); - world.c(i, j, k + 1, this.id, 2); + world.e(i, j, k + 1, this); + world.b(i, j, k + 1, this, 2); } if (l == 0) { - world.g(i, j, k - 1, this.id); - world.c(i, j, k - 1, this.id, 3); + world.e(i, j, k - 1, this); + world.b(i, j, k - 1, this, 3); } } public void postBreak(World world, int i, int j, int k, int l) { if (this.a) { - world.applyPhysics(i + 1, j, k, this.id); - world.applyPhysics(i - 1, j, k, this.id); - world.applyPhysics(i, j, k + 1, this.id); - world.applyPhysics(i, j, k - 1, this.id); - world.applyPhysics(i, j - 1, k, this.id); - world.applyPhysics(i, j + 1, k, this.id); + world.applyPhysics(i + 1, j, k, this); + world.applyPhysics(i - 1, j, k, this); + world.applyPhysics(i, j, k + 1, this); + world.applyPhysics(i, j, k - 1, this); + world.applyPhysics(i, j - 1, k, this); + world.applyPhysics(i, j + 1, k, this); } super.postBreak(world, i, j, k, l); @@ -214,30 +214,28 @@ public abstract class BlockDiodeAbstract extends BlockDirectional { return false; } - protected boolean e(int i) { - Block block = Block.byId[i]; - - return block != null && block.isPowerSource(); + protected boolean a(Block block) { + return block.isPowerSource(); } - protected int d(IBlockAccess iblockaccess, int i, int j, int k, int l) { + protected int f(IBlockAccess iblockaccess, int i, int j, int k, int l) { return 15; } - public static boolean f(int i) { - return Block.DIODE_OFF.g(i) || Block.REDSTONE_COMPARATOR_OFF.g(i); + public static boolean d(Block block) { + return Blocks.DIODE_OFF.e(block) || Blocks.REDSTONE_COMPARATOR_OFF.e(block); } - public boolean g(int i) { - return i == this.i().id || i == this.j().id; + public boolean e(Block block) { + return block == this.e() || block == this.i(); } - public boolean h(World world, int i, int j, int k, int l) { - int i1 = j(l); + public boolean i(World world, int i, int j, int k, int l) { + int i1 = l(l); - if (f(world.getTypeId(i - Direction.a[i1], j, k - Direction.b[i1]))) { + if (d(world.getType(i - Direction.a[i1], j, k - Direction.b[i1]))) { int j1 = world.getData(i - Direction.a[i1], j, k - Direction.b[i1]); - int k1 = j(j1); + int k1 = l(j1); return k1 != i1; } else { @@ -245,17 +243,17 @@ public abstract class BlockDiodeAbstract extends BlockDirectional { } } - protected int h(int i) { - return this.k_(i); + protected int k(int i) { + return this.b(i); } - protected abstract int k_(int i); + protected abstract int b(int i); - protected abstract BlockDiodeAbstract i(); + protected abstract BlockDiodeAbstract e(); - protected abstract BlockDiodeAbstract j(); + protected abstract BlockDiodeAbstract i(); - public boolean i(int i) { - return this.g(i); + public boolean c(Block block) { + return this.e(block); } } -- cgit v1.2.3