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

Make induction ports work with connected textures.

Browse source
This commit is contained in:
Ben Spiers 2015-03-17 23:43:50 +00:00
parent ad2a354f45
commit 01f37e552e
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,16 +179,14 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
case BASIC_BLOCK_2:
ctms[0][0] = new CTMData("ctm/SolarEvaporationBlock", this, Arrays.asList(0)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock, Arrays.asList(14, 15)).registerIcons(register);
ctms[1][0] = new CTMData("ctm/InductionCasing", this, Arrays.asList(1, 2)).registerIcons(register);
//ctms[2][0] = new CTMData("ctm/InductionPortInput", this, Arrays.asList(1, 2)).registerIcons(register);
//ctms[2][1] = new CTMData("ctm/InductionPortOutput", this, Arrays.asList(1, 2)).registerIcons(register);
ctms[2][0] = new CTMData("ctm/InductionPortInput", this, Arrays.asList(1, 2)).registerIcons(register);
ctms[2][1] = new CTMData("ctm/InductionPortOutput", this, Arrays.asList(1, 2)).registerIcons(register);
//TODO @unpairedbracket, mind fixing this?
icons[0][0] = ctms[0][0].mainTextureData.icon;
icons[1][0] = ctms[1][0].mainTextureData.icon;
//icons[2][0] = ctms[2][0].facingOverride.icon;
//icons[2][1] = ctms[2][1].facingOverride.icon;
icons[2][0] = register.registerIcon("mekanism:InductionPortInput");
icons[2][1] = register.registerIcon("mekanism:InductionPortOutput");
icons[2][0] = ctms[2][0].mainTextureData.icon;
icons[2][1] = ctms[2][1].mainTextureData.icon;
icons[3][0] = register.registerIcon("mekanism:InductionCellBasic");
icons[3][1] = register.registerIcon("mekanism:InductionCellAdvanced");
icons[3][2] = register.registerIcon("mekanism:InductionCellElite");

27
src/main/java/mekanism/common/tile/TileEntityInductionPort.java
View file

@ -17,6 +17,7 @@ import mekanism.api.MekanismConfig.general;
import mekanism.api.Range4D;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.common.Mekanism;
import mekanism.common.base.IActiveState;
import mekanism.common.base.IEnergyWrapper;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.CableUtils;
@ -38,7 +39,7 @@ import cpw.mods.fml.common.Optional.Method;
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2"),
@Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore"),
})
public class TileEntityInductionPort extends TileEntityInductionCasing implements IEnergyWrapper, IConfigurable
public class TileEntityInductionPort extends TileEntityInductionCasing implements IEnergyWrapper, IConfigurable, IActiveState
{
public boolean ic2Registered = false;
@ -447,4 +448,28 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
{
return false;
}
@Override
public boolean getActive()
{
return mode;
}
@Override
public void setActive(boolean active)
{
mode = active;
}
@Override
public boolean renderUpdate()
{
return true;
}
@Override
public boolean lightUpdate()
{
return false;
}
}