tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Default icons for all Mekanism blocks - fixes particle issues

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-22 00:47:59 -05:00
parent dd96064a3f
commit 9a2d47ad4b
5 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/common/block/BlockBasic.java
View file

@ -91,6 +91,8 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
public IIcon[][] icons = new IIcon[16][6];
public CTMData[][] ctms = new CTMData[16][4];
public static String ICON_BASE = "mekanism:SteelCasing";
public BasicBlock blockType;

5
src/main/java/mekanism/common/block/BlockBounding.java
View file

@ -34,7 +34,10 @@ public class BlockBounding extends Block implements IPeripheralProvider
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register) {}
public void registerBlockIcons(IIconRegister register)
{
blockIcon = register.registerIcon(BlockBasic.ICON_BASE);
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int facing, float playerX, float playerY, float playerZ)

7
src/main/java/mekanism/common/block/BlockEnergyCube.java
View file

@ -56,8 +56,6 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider;
@Interface(iface = "dan200.computercraft.api.peripheral.IPeripheralProvider", modid = "ComputerCraft")
public class BlockEnergyCube extends BlockContainer implements IPeripheralProvider
{
public IIcon[][] icons = new IIcon[256][256];
public BlockEnergyCube()
{
super(Material.iron);
@ -68,7 +66,10 @@ public class BlockEnergyCube extends BlockContainer implements IPeripheralProvid
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register) {}
public void registerBlockIcons(IIconRegister register)
{
blockIcon = register.registerIcon(BlockBasic.ICON_BASE);
}
@Override
public void onNeighborBlockChange(World world, int x, int y, int z, Block block)

5
src/main/java/mekanism/common/block/BlockGasTank.java
View file

@ -44,7 +44,10 @@ public class BlockGasTank extends BlockContainer
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register) {}
public void registerBlockIcons(IIconRegister register)
{
blockIcon = register.registerIcon("mekanism:SteelCasing");
}
@Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack itemstack)

31
src/main/java/mekanism/common/block/BlockMachine.java
View file

@ -156,6 +156,8 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider;
public class BlockMachine extends BlockContainer implements ISpecialBounds, IPeripheralProvider
{
public IIcon[][] icons = new IIcon[16][16];
public IIcon BASE_ICON;
public MachineBlock blockType;
@ -172,21 +174,23 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register)
{
BASE_ICON = register.registerIcon("mekanism:SteelCasing");
switch(blockType)
{
case MACHINE_BLOCK_1:
icons[0][0] = register.registerIcon("mekanism:EnrichmentChamberFrontOff");
icons[0][1] = register.registerIcon("mekanism:EnrichmentChamberFrontOn");
icons[0][2] = register.registerIcon("mekanism:SteelCasing");
icons[0][2] = BASE_ICON;
icons[1][0] = register.registerIcon("mekanism:OsmiumCompressorFrontOff");
icons[1][1] = register.registerIcon("mekanism:OsmiumCompressorFrontOn");
icons[1][2] = register.registerIcon("mekanism:SteelCasing");
icons[1][2] = BASE_ICON;
icons[2][0] = register.registerIcon("mekanism:CombinerFrontOff");
icons[2][1] = register.registerIcon("mekanism:CombinerFrontOn");
icons[2][2] = register.registerIcon("mekanism:SteelCasing");
icons[2][2] = BASE_ICON;
icons[3][0] = register.registerIcon("mekanism:CrusherFrontOff");
icons[3][1] = register.registerIcon("mekanism:CrusherFrontOn");
icons[3][2] = register.registerIcon("mekanism:SteelCasing");
icons[3][2] = BASE_ICON;
icons[5][0] = register.registerIcon("mekanism:BasicFactoryFront");
icons[5][1] = register.registerIcon("mekanism:BasicFactorySide");
icons[5][2] = register.registerIcon("mekanism:BasicFactoryTop");
@ -198,7 +202,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
icons[7][2] = register.registerIcon("mekanism:EliteFactoryTop");
icons[9][0] = register.registerIcon("mekanism:PurificationChamberFrontOff");
icons[9][1] = register.registerIcon("mekanism:PurificationChamberFrontOn");
icons[9][2] = register.registerIcon("mekanism:SteelCasing");
icons[9][2] = BASE_ICON;
icons[10][0] = register.registerIcon("mekanism:EnergizedSmelterFrontOff");
icons[10][1] = register.registerIcon("mekanism:EnergizedSmelterFrontOn");
icons[10][2] = register.registerIcon("mekanism:SteelCasing");
@ -207,14 +211,14 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
case MACHINE_BLOCK_2:
icons[3][0] = register.registerIcon("mekanism:ChemicalInjectionChamberFrontOff");
icons[3][1] = register.registerIcon("mekanism:ChemicalInjectionChamberFrontOn");
icons[3][2] = register.registerIcon("mekanism:SteelCasing");
icons[3][2] = BASE_ICON;
icons[5][0] = register.registerIcon("mekanism:PrecisionSawmillFrontOff");
icons[5][1] = register.registerIcon("mekanism:PrecisionSawmillFrontOn");
icons[5][2] = register.registerIcon("mekanism:SteelCasing");
icons[5][2] = BASE_ICON;
break;
case MACHINE_BLOCK_3:
icons[0][0] = register.registerIcon("mekanism:AmbientAccumulator");
icons[2][0] = register.registerIcon("mekanism:SteelCasing");
icons[2][0] = BASE_ICON;
icons[3][0] = register.registerIcon("mekanism:OredictionificatorBack");
icons[3][1] = register.registerIcon("mekanism:OredictionificatorFront");
icons[3][2] = register.registerIcon("mekanism:OredictionificatorPort");
@ -406,7 +410,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
return icons[meta][1];
}
default:
return icons[11][0];
return icons[meta][0] != null ? icons[meta][0] : BASE_ICON;
}
case MACHINE_BLOCK_2:
switch(meta)
@ -421,13 +425,11 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
return icons[meta][2];
}
default:
return icons[meta][0];
return icons[meta][0] != null ? icons[meta][0] : BASE_ICON;
}
case MACHINE_BLOCK_3:
switch(meta)
{
default:
return icons[meta][0];
case 3:
if(side == 3)
{
@ -444,9 +446,11 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
else {
return icons[3][3];
}
default:
return icons[meta][0] != null ? icons[meta][0] : BASE_ICON;
}
default:
return null;
return BASE_ICON;
}
}
@ -530,6 +534,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
return icons[meta][0];
}
}
return null;
}