Fixed Derp....

This commit is contained in:
Gig 2015-06-07 20:47:44 +01:00
parent a8962929cc
commit f240604c4a
2 changed files with 8 additions and 7 deletions

View file

@ -15,7 +15,6 @@ import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockMachineBase; import techreborn.blocks.BlockMachineBase;
import techreborn.client.GuiHandler; import techreborn.client.GuiHandler;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileCentrifuge; import techreborn.tiles.TileCentrifuge;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -74,17 +73,19 @@ public class BlockCentrifuge extends BlockMachineBase {
public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) {
int metadata = blockAccess.getBlockMetadata(x, y, z); int metadata = blockAccess.getBlockMetadata(x, y, z);
TileCentrifuge tileCentrifuge = (TileCentrifuge) blockAccess.getTileEntity(x, y, z); TileCentrifuge tileCentrifuge = (TileCentrifuge) blockAccess.getTileEntity(x, y, z);
if(side == metadata && tileCentrifuge.crafter.isActive()){ if(side >= 2 && tileCentrifuge.crafter.isActive()){
return this.iconFrontOn; return this.iconFrontOn;
} }
if(side == 1 && tileCentrifuge.crafter.isActive()){ if(side == 1 && tileCentrifuge.crafter.isActive()){
return this.iconTopOn; return this.iconTopOn;
} }
return metadata == 0 && side == 3 ? this.iconFront return metadata == 0 && side == 3 ? this.iconFront
: side == 1 ? this.iconTop : : side == 1 ? this.iconTop :
side == 0 ? this.iconBottom: (side == 0 ? this.iconTop side == 0 ? this.iconBottom: (side == 0 ? this.iconTop
: (side == metadata ? this.iconFront : this.blockIcon)); : (side == metadata ? this.iconFront : this.iconFront));
} }
@ -94,7 +95,7 @@ public class BlockCentrifuge extends BlockMachineBase {
return metadata == 0 && side == 3 ? this.iconFront return metadata == 0 && side == 3 ? this.iconFront
: side == 1 ? this.iconTop : : side == 1 ? this.iconTop :
side == 0 ? this.iconBottom: (side == 0 ? this.iconTop side == 0 ? this.iconBottom: (side == 0 ? this.iconTop
: (side == metadata ? this.iconFront : this.blockIcon)); : (side == metadata ? this.iconFront : this.iconFront));
} }

View file

@ -75,7 +75,7 @@ public class BlockGrinder extends BlockMachineBase{
public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) {
int metadata = blockAccess.getBlockMetadata(x, y, z); int metadata = blockAccess.getBlockMetadata(x, y, z);
TileGrinder tileGrinder = (TileGrinder) blockAccess.getTileEntity(x, y, z); TileGrinder tileGrinder = (TileGrinder) blockAccess.getTileEntity(x, y, z);
if(side >= 2 && tileGrinder.crafter.isActive()){ if(side == metadata && tileGrinder.crafter.isActive()){
return this.iconFrontOn; return this.iconFrontOn;
} }
@ -87,7 +87,7 @@ public class BlockGrinder extends BlockMachineBase{
return metadata == 0 && side == 3 ? this.iconFront return metadata == 0 && side == 3 ? this.iconFront
: side == 1 ? this.iconTop : : side == 1 ? this.iconTop :
side == 0 ? this.iconBottom: (side == 0 ? this.iconTop side == 0 ? this.iconBottom: (side == 0 ? this.iconTop
: (side == metadata ? this.iconFront : this.iconFront)); : (side == metadata ? this.iconFront : this.blockIcon));
} }