mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge branch 'development' into 1.8.9
This commit is contained in:
commit
0cb18773aa
1288 files changed
+11316
-7212
No files matched your search
@@ -16,8 +16,12 @@ import mekanism.common.base.ITileComponent;
|
||||
import mekanism.common.base.ITileNetwork;
|
||||
import mekanism.common.block.states.BlockStateMachine.MachineType;
|
||||
import mekanism.common.block.states.BlockStateMachine;
|
||||
import mekanism.common.frequency.Frequency;
|
||||
import mekanism.common.frequency.FrequencyManager;
|
||||
import mekanism.common.frequency.IFrequencyHandler;
|
||||
import mekanism.common.network.PacketDataRequest.DataRequestMessage;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.common.security.ISecurityTile;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -30,7 +34,7 @@ import net.minecraftforge.fml.common.Optional.Interface;
|
||||
import net.minecraftforge.fml.common.Optional.Method;
|
||||
|
||||
@Interface(iface = "ic2.api.tile.IWrenchable", modid = "IC2")
|
||||
public abstract class TileEntityBasicBlock extends TileEntity implements IWrenchable, ITileNetwork, IChunkLoadHandler
|
||||
public abstract class TileEntityBasicBlock extends TileEntity implements IWrenchable, ITileNetwork, IChunkLoadHandler, IFrequencyHandler
|
||||
{
|
||||
/** The direction this block is facing. */
|
||||
public EnumFacing facing;
|
||||
@@ -138,6 +142,17 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void invalidate()
|
||||
{
|
||||
super.invalidate();
|
||||
|
||||
for(ITileComponent component : components)
|
||||
{
|
||||
component.invalidate();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void validate()
|
||||
@@ -284,4 +299,15 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench
|
||||
{
|
||||
updatePower();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Frequency getFrequency(FrequencyManager manager)
|
||||
{
|
||||
if(manager == Mekanism.securityFrequencies && this instanceof ISecurityTile)
|
||||
{
|
||||
return ((ISecurityTile)this).getSecurity().getFrequency();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user