mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Tiered Bins, better tier management!
This commit is contained in:
1 parent
a5c5a093fa
commit
38a68541c4
35 files changed
+409
-323
No files matched your search
@@ -17,6 +17,7 @@ import mekanism.common.Tier.BaseTier;
|
||||
import mekanism.common.base.IActiveState;
|
||||
import mekanism.common.base.IBlockCTM;
|
||||
import mekanism.common.base.IBoundingBlock;
|
||||
import mekanism.common.base.ITierItem;
|
||||
import mekanism.common.content.tank.TankUpdateProtocol;
|
||||
import mekanism.common.inventory.InventoryBin;
|
||||
import mekanism.common.item.ItemBlockBasic;
|
||||
@@ -99,6 +100,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
{
|
||||
public IIcon[][] icons = new IIcon[16][16];
|
||||
public IIcon[][] binIcons = new IIcon[16][16];
|
||||
|
||||
public CTMData[][] ctms = new CTMData[16][4];
|
||||
|
||||
@@ -118,11 +120,15 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
@Override
|
||||
public IIcon getIcon(ItemStack stack, int side)
|
||||
{
|
||||
if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 3)
|
||||
if(BasicType.get(stack) == BasicType.BIN)
|
||||
{
|
||||
return binIcons[((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()][side];
|
||||
}
|
||||
else if(BasicType.get(stack) == BasicType.INDUCTION_CELL)
|
||||
{
|
||||
return icons[3][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()];
|
||||
}
|
||||
else if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 4)
|
||||
else if(BasicType.get(stack) == BasicType.INDUCTION_PROVIDER)
|
||||
{
|
||||
return icons[4][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()];
|
||||
}
|
||||
@@ -176,9 +182,16 @@ 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(ICON_BASE);
|
||||
|
||||
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));
|
||||
MekanismRenderer.loadDynamicTextures(register, "BinBasic", binIcons[0], DefIcon.getActivePair(register.registerIcon("mekanism:BinBasicSide"), 3, 4, 5),
|
||||
new DefIcon(register.registerIcon("mekanism:BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:BinBasicTopOn"), 6));
|
||||
MekanismRenderer.loadDynamicTextures(register, "BinAdvanced", binIcons[1], DefIcon.getActivePair(register.registerIcon("mekanism:BinAdvancedSide"), 3, 4, 5),
|
||||
new DefIcon(register.registerIcon("mekanism:BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:BinAdvancedTopOn"), 6));
|
||||
MekanismRenderer.loadDynamicTextures(register, "BinElite", binIcons[2], DefIcon.getActivePair(register.registerIcon("mekanism:BinEliteSide"), 3, 4, 5),
|
||||
new DefIcon(register.registerIcon("mekanism:BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:BinEliteTopOn"), 6));
|
||||
MekanismRenderer.loadDynamicTextures(register, "BinUltimate", binIcons[3], DefIcon.getActivePair(register.registerIcon("mekanism:BinUltimateSide"), 3, 4, 5),
|
||||
new DefIcon(register.registerIcon("mekanism:BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:BinUltimateTopOn"), 6));
|
||||
|
||||
icons[7][0] = ctms[7][0].mainTextureData.icon;
|
||||
icons[8][0] = register.registerIcon("mekanism:SteelCasing");
|
||||
@@ -243,10 +256,10 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
switch(meta)
|
||||
{
|
||||
case 6:
|
||||
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z);
|
||||
TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(x, y, z);
|
||||
|
||||
boolean active = MekanismUtils.isActive(world, x, y, z);
|
||||
return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)];
|
||||
return binIcons[tileEntity.tier.ordinal()][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)];
|
||||
case 14:
|
||||
TileEntityThermalEvaporationController tileEntity1 = (TileEntityThermalEvaporationController)world.getTileEntity(x, y, z);
|
||||
|
||||
@@ -289,8 +302,6 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
case BASIC_BLOCK_1:
|
||||
switch(meta)
|
||||
{
|
||||
case 6:
|
||||
return icons[meta][side];
|
||||
case 14:
|
||||
if(side == 2)
|
||||
{
|
||||
@@ -327,6 +338,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
{
|
||||
case INDUCTION_CELL:
|
||||
case INDUCTION_PROVIDER:
|
||||
case BIN:
|
||||
for(BaseTier tier : BaseTier.values())
|
||||
{
|
||||
if(tier.isObtainable())
|
||||
@@ -492,7 +504,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
return true;
|
||||
}
|
||||
|
||||
if(bin.getItemCount() < bin.MAX_STORAGE)
|
||||
if(bin.getItemCount() < bin.tier.storage)
|
||||
{
|
||||
if(bin.addTicks == 0 && entityplayer.getCurrentEquippedItem() != null)
|
||||
{
|
||||
@@ -509,7 +521,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
|
||||
for(int i = 0; i < inv.length; i++)
|
||||
{
|
||||
if(bin.getItemCount() == bin.MAX_STORAGE)
|
||||
if(bin.getItemCount() == bin.tier.storage)
|
||||
{
|
||||
break;
|
||||
}
|
||||
@@ -821,8 +833,9 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(x, y, z);
|
||||
InventoryBin inv = new InventoryBin(ret);
|
||||
|
||||
((ITierItem)ret.getItem()).setBaseTier(ret, tileEntity.tier.getBaseTier());
|
||||
inv.setItemCount(tileEntity.getItemCount());
|
||||
|
||||
|
||||
if(tileEntity.getItemCount() > 0)
|
||||
{
|
||||
inv.setItemType(tileEntity.itemType);
|
||||
|
||||
Reference in new issue
Block a user