From ba033fea5b3e2b5cd3541be0987bcce44096d21f Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Thu, 23 Aug 2012 20:03:40 -0400 Subject: [PATCH] Revert "Cleanup" This reverts commit b6528deae87a85b57ff4a91ed342bb8be41eef3c. --- .../obsidian/common/BlockCombiner.java | 68 +++++++++++++------ .../uberkat/obsidian/common/BlockCrusher.java | 57 ++++++++++------ .../common/BlockEnrichmentChamber.java | 57 ++++++++++------ .../common/BlockPlatinumCompressor.java | 68 +++++++++++++------ .../common/BlockTheoreticalElementizer.java | 58 ++++++++++------ 5 files changed, 198 insertions(+), 110 deletions(-) diff --git a/src/common/net/uberkat/obsidian/common/BlockCombiner.java b/src/common/net/uberkat/obsidian/common/BlockCombiner.java index ee9da5f91..44c443a09 100644 --- a/src/common/net/uberkat/obsidian/common/BlockCombiner.java +++ b/src/common/net/uberkat/obsidian/common/BlockCombiner.java @@ -59,16 +59,24 @@ public class BlockCombiner extends BlockContainer { int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - switch(var6) + if (var6 == 0) { - 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); + 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); } } @@ -106,6 +114,17 @@ 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) { @@ -115,20 +134,25 @@ public class BlockCombiner extends BlockContainer float var10 = 0.52F; float var11 = par5Random.nextFloat() * 0.6F - 0.3F; - switch(metadata) + if (metadata == 4) { - 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); + 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); } } } diff --git a/src/common/net/uberkat/obsidian/common/BlockCrusher.java b/src/common/net/uberkat/obsidian/common/BlockCrusher.java index 9a874fa8d..b55503164 100644 --- a/src/common/net/uberkat/obsidian/common/BlockCrusher.java +++ b/src/common/net/uberkat/obsidian/common/BlockCrusher.java @@ -57,16 +57,24 @@ public class BlockCrusher extends BlockContainer { int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - switch(var6) + if (var6 == 0) { - 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); + 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); } } @@ -113,20 +121,25 @@ public class BlockCrusher extends BlockContainer float var10 = 0.52F; float var11 = par5Random.nextFloat() * 0.6F - 0.3F; - switch(metadata) + if (metadata == 4) { - 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); + 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); } } } diff --git a/src/common/net/uberkat/obsidian/common/BlockEnrichmentChamber.java b/src/common/net/uberkat/obsidian/common/BlockEnrichmentChamber.java index d6a6ce0c7..6bda4081a 100644 --- a/src/common/net/uberkat/obsidian/common/BlockEnrichmentChamber.java +++ b/src/common/net/uberkat/obsidian/common/BlockEnrichmentChamber.java @@ -26,16 +26,24 @@ public class BlockEnrichmentChamber extends BlockContainer { int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - switch(var6) + if (var6 == 0) { - 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); + 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); } } @@ -116,20 +124,25 @@ public class BlockEnrichmentChamber extends BlockContainer float var10 = 0.52F; float var11 = par5Random.nextFloat() * 0.6F - 0.3F; - switch(metadata) + if (metadata == 4) { - 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); + 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); } } } diff --git a/src/common/net/uberkat/obsidian/common/BlockPlatinumCompressor.java b/src/common/net/uberkat/obsidian/common/BlockPlatinumCompressor.java index 42dab7fd0..d303e2673 100644 --- a/src/common/net/uberkat/obsidian/common/BlockPlatinumCompressor.java +++ b/src/common/net/uberkat/obsidian/common/BlockPlatinumCompressor.java @@ -59,16 +59,24 @@ public class BlockPlatinumCompressor extends BlockContainer { int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - switch(var6) + if (var6 == 0) { - 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); + 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); } } @@ -106,6 +114,17 @@ 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) { @@ -115,20 +134,25 @@ public class BlockPlatinumCompressor extends BlockContainer float var10 = 0.52F; float var11 = par5Random.nextFloat() * 0.6F - 0.3F; - switch(metadata) + if (metadata == 4) { - 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); + 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); } } } diff --git a/src/common/net/uberkat/obsidian/common/BlockTheoreticalElementizer.java b/src/common/net/uberkat/obsidian/common/BlockTheoreticalElementizer.java index 9d5985f41..fc63fa4ef 100644 --- a/src/common/net/uberkat/obsidian/common/BlockTheoreticalElementizer.java +++ b/src/common/net/uberkat/obsidian/common/BlockTheoreticalElementizer.java @@ -31,16 +31,24 @@ public class BlockTheoreticalElementizer extends BlockContainer { int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - switch(var6) + if (var6 == 0) { - 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); + 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); } } @@ -158,26 +166,32 @@ 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; - switch(metadata) + if (metadata == 4) { - 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); + 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); } } }