diff --git a/src/common/net/uberkat/obsidian/common/BlockCombiner.java b/src/common/net/uberkat/obsidian/common/BlockCombiner.java index 44c443a09..ee9da5f91 100644 --- a/src/common/net/uberkat/obsidian/common/BlockCombiner.java +++ b/src/common/net/uberkat/obsidian/common/BlockCombiner.java @@ -59,24 +59,16 @@ public class BlockCombiner extends BlockContainer { int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - if (var6 == 0) + switch(var6) { - world.setBlockMetadataWithNotify(par2, par3, par4, 2); - } - - if (var6 == 1) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 5); - } - - if (var6 == 2) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 3); - } - - if (var6 == 3) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 4); + case 0: + world.setBlockMetadataWithNotify(par2, par3, par4, 2); + case 1: + world.setBlockMetadataWithNotify(par2, par3, par4, 5); + case 2: + world.setBlockMetadataWithNotify(par2, par3, par4, 3); + case 3: + world.setBlockMetadataWithNotify(par2, par3, par4, 4); } } @@ -114,17 +106,6 @@ public class BlockCombiner extends BlockContainer @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, int par2, int par3, int par4, Random par5Random) { - if(currentFrontTextureIndex < 15 && currentFrontTextureIndex > -1) - { - currentFrontTextureIndex++; - world.markBlockAsNeedsUpdate(par2, par3, par4); - } - else if(currentFrontTextureIndex == 15) - { - currentFrontTextureIndex = 0; - world.markBlockAsNeedsUpdate(par2, par3, par4); - } - int metadata = world.getBlockMetadata(par2, par3, par4); if (isActive) { @@ -134,25 +115,20 @@ public class BlockCombiner extends BlockContainer float var10 = 0.52F; float var11 = par5Random.nextFloat() * 0.6F - 0.3F; - if (metadata == 4) + switch(metadata) { - world.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 5) - { - world.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 2) - { - world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 3) - { - world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); + case 4: + world.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + case 5: + world.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + case 2: + world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); + case 3: + world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); } } } diff --git a/src/common/net/uberkat/obsidian/common/BlockCrusher.java b/src/common/net/uberkat/obsidian/common/BlockCrusher.java index b55503164..9a874fa8d 100644 --- a/src/common/net/uberkat/obsidian/common/BlockCrusher.java +++ b/src/common/net/uberkat/obsidian/common/BlockCrusher.java @@ -57,24 +57,16 @@ public class BlockCrusher extends BlockContainer { int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - if (var6 == 0) + switch(var6) { - world.setBlockMetadataWithNotify(par2, par3, par4, 2); - } - - if (var6 == 1) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 5); - } - - if (var6 == 2) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 3); - } - - if (var6 == 3) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 4); + case 0: + world.setBlockMetadataWithNotify(par2, par3, par4, 2); + case 1: + world.setBlockMetadataWithNotify(par2, par3, par4, 5); + case 2: + world.setBlockMetadataWithNotify(par2, par3, par4, 3); + case 3: + world.setBlockMetadataWithNotify(par2, par3, par4, 4); } } @@ -121,25 +113,20 @@ public class BlockCrusher extends BlockContainer float var10 = 0.52F; float var11 = par5Random.nextFloat() * 0.6F - 0.3F; - if (metadata == 4) + switch(metadata) { - world.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 5) - { - world.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 2) - { - world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 3) - { - world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); + case 4: + world.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + case 5: + world.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + case 2: + world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); + case 3: + world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); } } } diff --git a/src/common/net/uberkat/obsidian/common/BlockEnrichmentChamber.java b/src/common/net/uberkat/obsidian/common/BlockEnrichmentChamber.java index 6bda4081a..d6a6ce0c7 100644 --- a/src/common/net/uberkat/obsidian/common/BlockEnrichmentChamber.java +++ b/src/common/net/uberkat/obsidian/common/BlockEnrichmentChamber.java @@ -26,24 +26,16 @@ public class BlockEnrichmentChamber extends BlockContainer { int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - if (var6 == 0) + switch(var6) { - world.setBlockMetadataWithNotify(par2, par3, par4, 2); - } - - if (var6 == 1) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 5); - } - - if (var6 == 2) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 3); - } - - if (var6 == 3) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 4); + case 0: + world.setBlockMetadataWithNotify(par2, par3, par4, 2); + case 1: + world.setBlockMetadataWithNotify(par2, par3, par4, 5); + case 2: + world.setBlockMetadataWithNotify(par2, par3, par4, 3); + case 3: + world.setBlockMetadataWithNotify(par2, par3, par4, 4); } } @@ -124,25 +116,20 @@ public class BlockEnrichmentChamber extends BlockContainer float var10 = 0.52F; float var11 = par5Random.nextFloat() * 0.6F - 0.3F; - if (metadata == 4) + switch(metadata) { - world.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 5) - { - world.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 2) - { - world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 3) - { - world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); + case 4: + world.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + case 5: + world.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + case 2: + world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); + case 3: + world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); } } } diff --git a/src/common/net/uberkat/obsidian/common/BlockPlatinumCompressor.java b/src/common/net/uberkat/obsidian/common/BlockPlatinumCompressor.java index d303e2673..42dab7fd0 100644 --- a/src/common/net/uberkat/obsidian/common/BlockPlatinumCompressor.java +++ b/src/common/net/uberkat/obsidian/common/BlockPlatinumCompressor.java @@ -59,24 +59,16 @@ public class BlockPlatinumCompressor extends BlockContainer { int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - if (var6 == 0) + switch(var6) { - world.setBlockMetadataWithNotify(par2, par3, par4, 2); - } - - if (var6 == 1) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 5); - } - - if (var6 == 2) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 3); - } - - if (var6 == 3) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 4); + case 0: + world.setBlockMetadataWithNotify(par2, par3, par4, 2); + case 1: + world.setBlockMetadataWithNotify(par2, par3, par4, 5); + case 2: + world.setBlockMetadataWithNotify(par2, par3, par4, 3); + case 3: + world.setBlockMetadataWithNotify(par2, par3, par4, 4); } } @@ -114,17 +106,6 @@ public class BlockPlatinumCompressor extends BlockContainer @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, int par2, int par3, int par4, Random par5Random) { - if(currentTextureIndex < 15 && currentTextureIndex > -1) - { - currentTextureIndex++; - world.markBlockAsNeedsUpdate(par2, par3, par4); - } - else if(currentTextureIndex == 15) - { - currentTextureIndex = 0; - world.markBlockAsNeedsUpdate(par2, par3, par4); - } - int metadata = world.getBlockMetadata(par2, par3, par4); if (isActive) { @@ -134,25 +115,20 @@ public class BlockPlatinumCompressor extends BlockContainer float var10 = 0.52F; float var11 = par5Random.nextFloat() * 0.6F - 0.3F; - if (metadata == 4) + switch(metadata) { - world.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 5) - { - world.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 2) - { - world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 3) - { - world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); + case 4: + world.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + case 5: + world.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + case 2: + world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); + case 3: + world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); } } } diff --git a/src/common/net/uberkat/obsidian/common/BlockTheoreticalElementizer.java b/src/common/net/uberkat/obsidian/common/BlockTheoreticalElementizer.java index fc63fa4ef..9d5985f41 100644 --- a/src/common/net/uberkat/obsidian/common/BlockTheoreticalElementizer.java +++ b/src/common/net/uberkat/obsidian/common/BlockTheoreticalElementizer.java @@ -31,24 +31,16 @@ public class BlockTheoreticalElementizer extends BlockContainer { int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - if (var6 == 0) + switch(var6) { - world.setBlockMetadataWithNotify(par2, par3, par4, 2); - } - - if (var6 == 1) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 5); - } - - if (var6 == 2) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 3); - } - - if (var6 == 3) - { - world.setBlockMetadataWithNotify(par2, par3, par4, 4); + case 0: + world.setBlockMetadataWithNotify(par2, par3, par4, 2); + case 1: + world.setBlockMetadataWithNotify(par2, par3, par4, 5); + case 2: + world.setBlockMetadataWithNotify(par2, par3, par4, 3); + case 3: + world.setBlockMetadataWithNotify(par2, par3, par4, 4); } } @@ -166,32 +158,26 @@ public class BlockTheoreticalElementizer extends BlockContainer int metadata = world.getBlockMetadata(par2, par3, par4); if (isActive) { - updateTexture(world, par2, par3, par4); float var7 = (float)par2 + 0.5F; float var8 = (float)par3 + 0.0F + par5Random.nextFloat() * 6.0F / 16.0F; float var9 = (float)par4 + 0.5F; float var10 = 0.52F; float var11 = par5Random.nextFloat() * 0.6F - 0.3F; - if (metadata == 4) + switch(metadata) { - world.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 5) - { - world.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 2) - { - world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - } - else if (metadata == 3) - { - world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); - world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); + case 4: + world.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + case 5: + world.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); + case 2: + world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); + case 3: + world.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); + world.spawnParticle("reddust", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); } } }