mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
TileNetwork capability now working in full, fixed up Logistical Transporter packet management
This commit is contained in:
1 parent
87910ba233
commit
4ddcb151a1
10 files changed
+98
-37
No files matched your search
@@ -62,5 +62,6 @@ public class Capabilities
|
||||
LogisticalTransporter.register();
|
||||
|
||||
Configurable.register();
|
||||
TileNetwork.register();
|
||||
}
|
||||
}
|
||||
@@ -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<Object> getNetworkedData(ArrayList<Object> data)
|
||||
{
|
||||
return data;
|
||||
}
|
||||
|
||||
public static void register()
|
||||
{
|
||||
CapabilityManager.INSTANCE.register(ITileNetwork.class, new NullStorage<>(), TileNetwork.class);
|
||||
}
|
||||
}
|
||||
@@ -93,17 +93,6 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
|
||||
"DiversionTransporterVertical", "DiversionTransporterHorizontal"});
|
||||
}
|
||||
|
||||
/*
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void renderDynamic(Vector3 pos, float f, int pass)
|
||||
{
|
||||
if(pass == 0)
|
||||
{
|
||||
RenderPartTransmitter.getInstance().renderContents(this, f, pos);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onWorldSeparate()
|
||||
{
|
||||
@@ -111,10 +100,9 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
|
||||
|
||||
if(!getWorld().isRemote)
|
||||
{
|
||||
PathfinderCache.onChanged(new Coord4D(getPos(), getWorld().provider.getDimensionId()));
|
||||
PathfinderCache.onChanged(new Coord4D(getPos(), getWorld()));
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
@Override
|
||||
protected boolean isValidTransmitter(TileEntity tileEntity)
|
||||
@@ -205,21 +193,13 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@Override
|
||||
public void onWorldJoin()
|
||||
{
|
||||
super.onWorldJoin();
|
||||
|
||||
if(getWorld().isRemote)
|
||||
{
|
||||
Mekanism.packetHandler.sendToServer(new DataRequestMessage(new Coord4D(getPos(), getWorld().provider.getDimensionId())));
|
||||
}
|
||||
else {
|
||||
PathfinderCache.onChanged(getPos());
|
||||
}
|
||||
PathfinderCache.onChanged(new Coord4D(getPos(), getWorld()));
|
||||
}
|
||||
*/
|
||||
|
||||
@Override
|
||||
public InventoryNetwork createNewNetwork()
|
||||
|
||||
@@ -72,8 +72,6 @@ import net.minecraftforge.common.property.ExtendedBlockState;
|
||||
import net.minecraftforge.common.property.IExtendedBlockState;
|
||||
import net.minecraftforge.common.property.IUnlistedProperty;
|
||||
|
||||
import com.sun.xml.internal.bind.v2.TODO;
|
||||
|
||||
public abstract class PartSidedPipe extends Multipart implements IOccludingPart, /*ISlotOccludingPart, ISidedHollowConnect, JIconHitEffects, INeighborTileChange,*/ ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, ITickable
|
||||
{
|
||||
public static AxisAlignedBB[] smallSides = new AxisAlignedBB[7];
|
||||
@@ -714,6 +712,22 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
|
||||
protected void markDirtyAcceptor(EnumFacing side) {}
|
||||
|
||||
public abstract void onWorldJoin();
|
||||
|
||||
public abstract void onWorldSeparate();
|
||||
|
||||
@Override
|
||||
public void onRemoved()
|
||||
{
|
||||
onWorldSeparate();
|
||||
super.onRemoved();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUnloaded()
|
||||
{
|
||||
onWorldSeparate();
|
||||
super.onRemoved();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAdded()
|
||||
@@ -729,9 +743,6 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
|
||||
{
|
||||
onWorldJoin();
|
||||
super.onLoaded();
|
||||
|
||||
//refreshConnections(); TODO causes StackOverflow. Why?
|
||||
//notifyTileChange();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -747,7 +758,6 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
|
||||
{
|
||||
boolean prevPowered = redstonePowered;
|
||||
refreshConnections();
|
||||
|
||||
if(prevPowered != redstonePowered)
|
||||
{
|
||||
markDirtyTransmitters();
|
||||
@@ -941,13 +951,13 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
|
||||
@Override
|
||||
public boolean hasCapability(Capability<?> 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> T getCapability(Capability<T> capability, EnumFacing facing)
|
||||
{
|
||||
if(capability == Capabilities.CONFIGURABLE_CAPABILITY)
|
||||
if(capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == Capabilities.TILE_NETWORK_CAPABILITY)
|
||||
{
|
||||
return (T)this;
|
||||
}
|
||||
|
||||
@@ -64,6 +64,9 @@ public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onWorldSeparate() {}
|
||||
|
||||
@Override
|
||||
public void onUnloaded()
|
||||
|
||||
@@ -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<ConfigurationU
|
||||
public IMessage onMessage(ConfigurationUpdateMessage message, MessageContext context)
|
||||
{
|
||||
TileEntity tile = message.coord4D.getTileEntity(PacketHandler.getPlayer(context).worldObj);
|
||||
ITileNetwork network = MekanismUtils.getCapability(tile, Capabilities.TILE_NETWORK_CAPABILITY, null);
|
||||
|
||||
if(tile instanceof ISideConfiguration)
|
||||
{
|
||||
@@ -40,7 +42,7 @@ public class PacketConfigurationUpdate implements IMessageHandler<ConfigurationU
|
||||
config.getConfig().setEjecting(message.transmission, !config.getConfig().isEjecting(message.transmission));
|
||||
}
|
||||
else if(message.packetType == ConfigurationPacket.SIDE_DATA)
|
||||
{
|
||||
{
|
||||
if(message.clickType == 0)
|
||||
{
|
||||
MekanismUtils.incrementOutput((ISideConfiguration)tile, message.transmission, message.configIndex);
|
||||
@@ -55,7 +57,7 @@ public class PacketConfigurationUpdate implements IMessageHandler<ConfigurationU
|
||||
}
|
||||
|
||||
tile.markDirty();
|
||||
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(message.coord4D, ((ITileNetwork)tile).getNetworkedData(new ArrayList())), new Range4D(message.coord4D));
|
||||
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(message.coord4D, network.getNetworkedData(new ArrayList())), new Range4D(message.coord4D));
|
||||
}
|
||||
else if(message.packetType == ConfigurationPacket.EJECT_COLOR)
|
||||
{
|
||||
@@ -96,7 +98,7 @@ public class PacketConfigurationUpdate implements IMessageHandler<ConfigurationU
|
||||
|
||||
for(EntityPlayer p : ((TileEntityBasicBlock)config).playersUsing)
|
||||
{
|
||||
Mekanism.packetHandler.sendTo(new TileEntityMessage(message.coord4D, ((ITileNetwork)tile).getNetworkedData(new ArrayList())), (EntityPlayerMP)p);
|
||||
Mekanism.packetHandler.sendTo(new TileEntityMessage(message.coord4D, network.getNetworkedData(new ArrayList())), (EntityPlayerMP)p);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -49,9 +49,11 @@ public class PacketDataRequest implements IMessageHandler<DataRequestMessage, IM
|
||||
}
|
||||
}
|
||||
|
||||
if(tileEntity instanceof ITileNetwork)
|
||||
if(MekanismUtils.hasCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null))
|
||||
{
|
||||
Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), ((ITileNetwork)tileEntity).getNetworkedData(new ArrayList<Object>())), (EntityPlayerMP)player);
|
||||
ITileNetwork network = MekanismUtils.getCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null);
|
||||
|
||||
Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), network.getNetworkedData(new ArrayList<Object>())), (EntityPlayerMP)player);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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<TileEntityMessage, IMes
|
||||
{
|
||||
TileEntity tileEntity = message.coord4D.getTileEntity(PacketHandler.getPlayer(context).worldObj);
|
||||
|
||||
if(tileEntity instanceof ITileNetwork)
|
||||
if(MekanismUtils.hasCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null))
|
||||
{
|
||||
ITileNetwork network = MekanismUtils.getCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null);
|
||||
|
||||
try {
|
||||
((ITileNetwork)tileEntity).handlePacketData(message.storedBuffer);
|
||||
network.handlePacketData(message.storedBuffer);
|
||||
} catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ import mekanism.common.base.ITileComponent;
|
||||
import mekanism.common.base.ITileNetwork;
|
||||
import mekanism.common.block.states.BlockStateMachine;
|
||||
import mekanism.common.block.states.BlockStateMachine.MachineType;
|
||||
import mekanism.common.capabilities.Capabilities;
|
||||
import mekanism.common.frequency.Frequency;
|
||||
import mekanism.common.frequency.FrequencyManager;
|
||||
import mekanism.common.frequency.IFrequencyHandler;
|
||||
@@ -31,6 +32,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ITickable;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
import net.minecraftforge.fml.common.Optional.Interface;
|
||||
import net.minecraftforge.fml.common.Optional.Method;
|
||||
@@ -210,6 +212,20 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench
|
||||
component.write(nbtTags);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasCapability(Capability<?> capability, EnumFacing facing)
|
||||
{
|
||||
return capability == Capabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing)
|
||||
{
|
||||
if(capability == Capabilities.TILE_NETWORK_CAPABILITY)
|
||||
return (T)this;
|
||||
return super.getCapability(capability, facing);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2")
|
||||
|
||||
@@ -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> T getCapability(Capability<T> capability, EnumFacing facing)
|
||||
{
|
||||
if(capability == Capabilities.TILE_NETWORK_CAPABILITY)
|
||||
return (T)this;
|
||||
return super.getCapability(capability, facing);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user