mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Bins now use the dynamic texture render system
This commit is contained in:
1 parent
babc934079
commit
3ba0dd5172
5 files changed
+33
-40
No files matched your search
@@ -9,6 +9,8 @@ import mekanism.api.Coord4D;
|
||||
import mekanism.api.Range4D;
|
||||
import mekanism.api.energy.IEnergizedItem;
|
||||
import mekanism.api.energy.IStrictEnergyStorage;
|
||||
import mekanism.client.render.MekanismRenderer;
|
||||
import mekanism.client.render.MekanismRenderer.DefIcon;
|
||||
import mekanism.client.render.MekanismRenderer.ICustomBlockIcon;
|
||||
import mekanism.common.CTMData;
|
||||
import mekanism.common.ItemAttacher;
|
||||
@@ -88,7 +90,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
*/
|
||||
public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
{
|
||||
public IIcon[][] icons = new IIcon[16][6];
|
||||
public IIcon[][] icons = new IIcon[16][16];
|
||||
|
||||
public CTMData[][] ctms = new CTMData[16][4];
|
||||
|
||||
@@ -160,11 +162,10 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
icons[3][0] = register.registerIcon("mekanism:CoalBlock");
|
||||
icons[4][0] = register.registerIcon("mekanism:RefinedGlowstone");
|
||||
icons[5][0] = register.registerIcon("mekanism:SteelBlock");
|
||||
icons[6][0] = register.registerIcon("mekanism:BinSide");
|
||||
icons[6][1] = register.registerIcon("mekanism:BinTop");
|
||||
icons[6][2] = register.registerIcon("mekanism:BinFront");
|
||||
icons[6][3] = register.registerIcon("mekanism:BinTopOn");
|
||||
icons[6][4] = register.registerIcon("mekanism:BinFrontOn");
|
||||
|
||||
MekanismRenderer.loadDynamicTextures(register, "Bin", icons[6], DefIcon.getActivePair(register.registerIcon("mekanism:BinSide"), 3, 4, 5),
|
||||
new DefIcon(register.registerIcon("mekanism:BinTop"), 0), new DefIcon(register.registerIcon("mekanism:BinTopOn"), 6));
|
||||
|
||||
icons[7][0] = register.registerIcon("mekanism:TeleporterFrame");
|
||||
icons[8][0] = register.registerIcon("mekanism:SteelCasing");
|
||||
icons[9][0] = ctms[9][0].mainTextureData.icon;
|
||||
@@ -203,6 +204,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
icons[4][1] = ctms[4][1].mainTextureData.icon;
|
||||
icons[4][2] = ctms[4][2].mainTextureData.icon;
|
||||
icons[4][3] = ctms[4][3].mainTextureData.icon;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -221,17 +223,8 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
case 6:
|
||||
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z);
|
||||
|
||||
if(side == 0 || side == 1)
|
||||
{
|
||||
return MekanismUtils.isActive(world, x, y, z) ? icons[meta][3] : icons[meta][1];
|
||||
}
|
||||
else if(side == tileEntity.facing)
|
||||
{
|
||||
return MekanismUtils.isActive(world, x, y, z) ? icons[meta][4] : icons[meta][2];
|
||||
}
|
||||
else {
|
||||
return icons[meta][0];
|
||||
}
|
||||
boolean active = MekanismUtils.isActive(world, x, y, z);
|
||||
return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)];
|
||||
case 14:
|
||||
TileEntitySolarEvaporationController tileEntity1 = (TileEntitySolarEvaporationController)world.getTileEntity(x, y, z);
|
||||
|
||||
@@ -275,17 +268,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
switch(meta)
|
||||
{
|
||||
case 6:
|
||||
if(side == 0 || side == 1)
|
||||
{
|
||||
return icons[meta][1];
|
||||
}
|
||||
else if(side == 3)
|
||||
{
|
||||
return icons[meta][2];
|
||||
}
|
||||
else {
|
||||
return icons[meta][0];
|
||||
}
|
||||
return icons[meta][side];
|
||||
case 14:
|
||||
if(side == 3)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user