diff --git a/src/main/java/mekanism/common/capabilities/Capabilities.java b/src/main/java/mekanism/common/capabilities/Capabilities.java index 9057ecb86..0f927b2a0 100644 --- a/src/main/java/mekanism/common/capabilities/Capabilities.java +++ b/src/main/java/mekanism/common/capabilities/Capabilities.java @@ -62,5 +62,6 @@ public class Capabilities LogisticalTransporter.register(); Configurable.register(); + TileNetwork.register(); } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/capabilities/TileNetwork.java b/src/main/java/mekanism/common/capabilities/TileNetwork.java new file mode 100644 index 000000000..86a25968d --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/TileNetwork.java @@ -0,0 +1,26 @@ +package mekanism.common.capabilities; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.common.base.ITileNetwork; +import mekanism.common.capabilities.StorageHelper.NullStorage; +import net.minecraftforge.common.capabilities.CapabilityManager; + +public class TileNetwork implements ITileNetwork +{ + @Override + public void handlePacketData(ByteBuf dataStream) throws Exception {} + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + return data; + } + + public static void register() + { + CapabilityManager.INSTANCE.register(ITileNetwork.class, new NullStorage<>(), TileNetwork.class); + } +} diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index cbb41b419..2616efd7e 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -93,17 +93,6 @@ public class PartLogisticalTransporter extends PartTransmitter capability, EnumFacing facing) { - return capability == Capabilities.CONFIGURABLE_CAPABILITY || super.hasCapability(capability, facing); + return capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == Capabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing); } @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == Capabilities.CONFIGURABLE_CAPABILITY) + if(capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == Capabilities.TILE_NETWORK_CAPABILITY) { return (T)this; } diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index 4b8d69a23..a47425285 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -64,6 +64,9 @@ public abstract class PartTransmitter> extends } } } + + @Override + public void onWorldSeparate() {} @Override public void onUnloaded() diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index db4d2efd6..9e30ba81c 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -11,6 +11,7 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITileNetwork; +import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; @@ -30,6 +31,7 @@ public class PacketConfigurationUpdate implements IMessageHandler())), (EntityPlayerMP)player); + ITileNetwork network = MekanismUtils.getCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null); + + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), network.getNetworkedData(new ArrayList())), (EntityPlayerMP)player); } } diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index c455d02bf..f8acda10c 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -7,7 +7,9 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.base.ITileNetwork; +import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.util.MekanismUtils; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -23,10 +25,12 @@ public class PacketTileEntity implements IMessageHandler capability, EnumFacing facing) + { + return capability == Capabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing); + } + + @Override + public T getCapability(Capability capability, EnumFacing facing) + { + if(capability == Capabilities.TILE_NETWORK_CAPABILITY) + return (T)this; + return super.getCapability(capability, facing); + } @Override @Method(modid = "IC2") diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index 85f00c08d..3052691cb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -8,12 +8,15 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.ITileNetwork; +import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork { @@ -118,4 +121,18 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork return data; } + + @Override + public boolean hasCapability(Capability capability, EnumFacing facing) + { + return capability == Capabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing); + } + + @Override + public T getCapability(Capability capability, EnumFacing facing) + { + if(capability == Capabilities.TILE_NETWORK_CAPABILITY) + return (T)this; + return super.getCapability(capability, facing); + } }