Get capabilities off the ground

This commit is contained in:
Ben Spiers committed 2016-05-04 12:45:12 +01:00
1 parent 1d389d9219
commit 384cf174bb
39 files changed
+776 -245

No files matched your search

@@ -1,22 +0,0 @@
package mekanism.api;
import mekanism.api.energy.ICableOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.energy.IStrictEnergyStorage;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
/**
* Created by ben on 30/04/16.
*/
public class Capabilities
{
@CapabilityInject(IStrictEnergyStorage.class)
public static Capability<IStrictEnergyStorage> ENERGY_STORAGE_CAPABILITY = null;
@CapabilityInject(IStrictEnergyAcceptor.class)
public static Capability<IStrictEnergyAcceptor> ENERGY_ACCEPTOR_CAPABILITY = null;
@CapabilityInject(ICableOutputter.class)
public static Capability<ICableOutputter> CABLE_OUTPUTTER_CAPABILITY = null;
}
@@ -7,8 +7,9 @@ import java.util.Collections;
import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.capabilities.Capabilities;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
@@ -89,7 +90,7 @@ public final class GasTransmission
*/
public static boolean canConnect(TileEntity tileEntity, EnumFacing side)
{
if(tileEntity instanceof ITubeConnection && (!(tileEntity instanceof ITransmitterTile) || TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), TransmissionType.GAS)))
if(tileEntity instanceof ITubeConnection && (!(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) || TransmissionType.checkTransmissionType(tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()), TransmissionType.GAS)))
{
if(((ITubeConnection)tileEntity).canTubeConnect(side.getOpposite()))
{
@@ -1,6 +0,0 @@
package mekanism.api.transmitters;
public interface ITransmitterTile<A, N extends DynamicNetwork<A, N>>
{
public IGridTransmitter<A, N> getTransmitter();
}
+2 -54
View File
@@ -16,9 +16,6 @@ import mekanism.api.MekanismAPI;
import mekanism.api.MekanismAPI.BoxBlacklistEvent;
import mekanism.api.MekanismConfig.general;
import mekanism.api.MekanismConfig.usage;
import mekanism.api.energy.ICableOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasNetwork.GasTransferEvent;
import mekanism.api.gas.GasRegistry;
@@ -48,6 +45,7 @@ import mekanism.common.base.IModule;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.capabilities.CableOutputter;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.capabilities.StrictEnergyAcceptor;
import mekanism.common.capabilities.StrictEnergyStorage;
import mekanism.common.chunkloading.ChunkManager;
@@ -1305,7 +1303,7 @@ public class Mekanism
InfuseRegistry.registerInfuseType(new InfuseType("BIO", "mekanism:infuse/Bio").setUnlocalizedName("bio"));
InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", "mekanism:infuse/Obsidian").setUnlocalizedName("obsidian"));
registerCapabilities();
Capabilities.registerCapabilities();
}
@EventHandler
@@ -1418,56 +1416,6 @@ public class Mekanism
logger.info("Hooking complete.");
}
public void registerCapabilities()
{
CapabilityManager.INSTANCE.register(IStrictEnergyStorage.class, new IStorage<IStrictEnergyStorage>() {
@Override
public NBTBase writeNBT(Capability<IStrictEnergyStorage> capability, IStrictEnergyStorage instance, EnumFacing side)
{
NBTTagCompound tag = new NBTTagCompound();
tag.setDouble("maxEnergy", instance.getMaxEnergy());
tag.setDouble("energyStored", instance.getEnergy());
return tag;
}
@Override
public void readNBT(Capability<IStrictEnergyStorage> capability, IStrictEnergyStorage instance, EnumFacing side, NBTBase nbt)
{
if(nbt instanceof NBTTagCompound)
instance.setEnergy(((NBTTagCompound)nbt).getDouble("energyStored"));
}
}, StrictEnergyStorage.class);
CapabilityManager.INSTANCE.register(IStrictEnergyAcceptor.class, new IStorage<IStrictEnergyAcceptor>() {
@Override
public NBTBase writeNBT(Capability<IStrictEnergyAcceptor> capability, IStrictEnergyAcceptor instance, EnumFacing side)
{
NBTTagCompound tag = new NBTTagCompound();
tag.setDouble("maxEnergy", instance.getMaxEnergy());
tag.setDouble("energyStored", instance.getEnergy());
return tag;
}
@Override
public void readNBT(Capability<IStrictEnergyAcceptor> capability, IStrictEnergyAcceptor instance, EnumFacing side, NBTBase nbt)
{
if(nbt instanceof NBTTagCompound)
instance.setEnergy(((NBTTagCompound)nbt).getDouble("energyStored"));
}
}, StrictEnergyAcceptor.class);
CapabilityManager.INSTANCE.register(ICableOutputter.class, new IStorage<ICableOutputter>() {
@Override
public NBTBase writeNBT(Capability<ICableOutputter> capability, ICableOutputter instance, EnumFacing side)
{
return new NBTTagCompound();
}
@Override
public void readNBT(Capability<ICableOutputter> capability, ICableOutputter instance, EnumFacing side, NBTBase nbt)
{
}
}, CableOutputter.class);
}
@SubscribeEvent
public void onEnergyTransferred(EnergyTransferEvent event)
@@ -2,7 +2,7 @@ package mekanism.common.base;
import ic2.api.energy.tile.IEnergySink;
import mekanism.api.Capabilities;
import mekanism.common.capabilities.Capabilities;
import mekanism.api.Coord4D;
import mekanism.api.MekanismConfig.general;
import mekanism.api.energy.IStrictEnergyAcceptor;
@@ -1,12 +0,0 @@
package mekanism.common.base;
import mekanism.api.transmitters.IBlockableConnection;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.common.InventoryNetwork;
import net.minecraft.inventory.IInventory;
public interface ITransporterTile extends ITransmitterTile<IInventory,InventoryNetwork>, IBlockableConnection
{
public ILogisticalTransporter getTransmitter();
}
@@ -1,8 +1,12 @@
package mekanism.common.capabilities;
import mekanism.api.energy.ICableOutputter;
import mekanism.common.capabilities.StorageHelper.NullStorage;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.common.util.INBTSerializable;
/**
* Created by ben on 30/04/16.
@@ -14,4 +18,9 @@ public class CableOutputter implements ICableOutputter
{
return true;
}
public static void register()
{
CapabilityManager.INSTANCE.register(ICableOutputter.class, new NullStorage<>(), CableOutputter.class);
}
}
@@ -0,0 +1,66 @@
package mekanism.common.capabilities;
import mekanism.api.IAlloyInteraction;
import mekanism.api.IConfigurable;
import mekanism.api.IHeatTransfer;
import mekanism.api.energy.ICableOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.api.gas.IGasHandler;
import mekanism.api.transmitters.IBlockableConnection;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.common.base.ILogisticalTransporter;
import mekanism.common.base.ITileNetwork;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
/**
* Created by ben on 30/04/16.
*/
public class Capabilities
{
@CapabilityInject(IStrictEnergyStorage.class)
public static Capability<IStrictEnergyStorage> ENERGY_STORAGE_CAPABILITY = null;
@CapabilityInject(IStrictEnergyAcceptor.class)
public static Capability<IStrictEnergyAcceptor> ENERGY_ACCEPTOR_CAPABILITY = null;
@CapabilityInject(ICableOutputter.class)
public static Capability<ICableOutputter> CABLE_OUTPUTTER_CAPABILITY = null;
@CapabilityInject(IConfigurable.class)
public static Capability<IConfigurable> CONFIGURABLE_CAPABILITY = null;
@CapabilityInject(IGasHandler.class)
public static Capability<IGasHandler> GAS_HANDLER_CAPABILITY = null;
@CapabilityInject(IHeatTransfer.class)
public static Capability<IHeatTransfer> HEAT_TRANSFER_CAPABILITY = null;
@CapabilityInject(IBlockableConnection.class)
public static Capability<IBlockableConnection> BLOCKABLE_CONNECTION_CAPABILITY = null;
@CapabilityInject(IGridTransmitter.class)
public static Capability<IGridTransmitter> GRID_TRANSMITTER_CAPABILITY = null;
@CapabilityInject(ILogisticalTransporter.class)
public static Capability<ILogisticalTransporter> LOGISTICAL_TRANSPORTER_CAPABILITY = null;
@CapabilityInject(IAlloyInteraction.class)
public static Capability<IAlloyInteraction> ALLOY_INTERACTION_CAPABILITY = null;
@CapabilityInject(ITileNetwork.class)
public static Capability<ITileNetwork> TILE_NETWORK_CAPABILITY = null;
public static void registerCapabilities()
{
StrictEnergyStorage.register();
StrictEnergyAcceptor.register();
CableOutputter.register();
GridTransmitterTile.register();
LogisticalTransporter.register();
}
}
@@ -0,0 +1,168 @@
package mekanism.common.capabilities;
import java.util.Collection;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.capabilities.StorageHelper.NullStorage;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.CapabilityManager;
/**
* Created by ben on 03/05/16.
*/
public class GridTransmitterTile<A, N extends DynamicNetwork<A, N>> implements IGridTransmitter<A, N>
{
@Override
public boolean hasTransmitterNetwork()
{
return false;
}
@Override
public N getTransmitterNetwork()
{
return null;
}
@Override
public void setTransmitterNetwork(N network)
{
}
@Override
public int getTransmitterNetworkSize()
{
return 0;
}
@Override
public int getTransmitterNetworkAcceptorSize()
{
return 0;
}
@Override
public String getTransmitterNetworkNeeded()
{
return null;
}
@Override
public String getTransmitterNetworkFlow()
{
return null;
}
@Override
public String getTransmitterNetworkBuffer()
{
return null;
}
@Override
public double getTransmitterNetworkCapacity()
{
return 0;
}
@Override
public int getCapacity()
{
return 0;
}
@Override
public World world()
{
return null;
}
@Override
public Coord4D coord()
{
return null;
}
@Override
public Coord4D getAdjacentConnectableTransmitterCoord(EnumFacing side)
{
return null;
}
@Override
public A getAcceptor(EnumFacing side)
{
return null;
}
@Override
public boolean isValid()
{
return false;
}
@Override
public boolean isOrphan()
{
return false;
}
@Override
public void setOrphan(boolean orphaned)
{
}
@Override
public N createEmptyNetwork()
{
return null;
}
@Override
public N mergeNetworks(Collection<N> toMerge)
{
return null;
}
@Override
public N getExternalNetwork(Coord4D from)
{
return null;
}
@Override
public void takeShare()
{
}
@Override
public void updateShare()
{
}
@Override
public Object getBuffer()
{
return null;
}
@Override
public TransmissionType getTransmissionType()
{
return null;
}
public static void register()
{
CapabilityManager.INSTANCE.register(IGridTransmitter.class, new NullStorage<>(), GridTransmitterTile.class);
}
}
@@ -0,0 +1,234 @@
package mekanism.common.capabilities;
import java.util.Collection;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.InventoryNetwork;
import mekanism.common.base.ILogisticalTransporter;
import mekanism.common.capabilities.StorageHelper.NullStorage;
import mekanism.common.content.transporter.TransporterStack;
import mekanism.common.tile.TileEntityLogisticalSorter;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.CapabilityManager;
/**
* Created by ben on 03/05/16.
*/
public class LogisticalTransporter implements ILogisticalTransporter
{
@Override
public ItemStack insert(Coord4D original, ItemStack itemStack, EnumColor color, boolean doEmit, int min)
{
return null;
}
@Override
public ItemStack insertRR(TileEntityLogisticalSorter outputter, ItemStack itemStack, EnumColor color, boolean doEmit, int min)
{
return null;
}
@Override
public void entityEntering(TransporterStack stack, int progress)
{
}
@Override
public EnumColor getColor()
{
return null;
}
@Override
public void setColor(EnumColor c)
{
}
@Override
public boolean canEmitTo(TileEntity tileEntity, EnumFacing side)
{
return false;
}
@Override
public boolean canReceiveFrom(TileEntity tileEntity, EnumFacing side)
{
return false;
}
@Override
public double getCost()
{
return 0;
}
@Override
public boolean canConnectMutual(EnumFacing side)
{
return false;
}
@Override
public boolean canConnect(EnumFacing side)
{
return false;
}
@Override
public boolean hasTransmitterNetwork()
{
return false;
}
@Override
public InventoryNetwork getTransmitterNetwork()
{
return null;
}
@Override
public void setTransmitterNetwork(InventoryNetwork network)
{
}
@Override
public int getTransmitterNetworkSize()
{
return 0;
}
@Override
public int getTransmitterNetworkAcceptorSize()
{
return 0;
}
@Override
public String getTransmitterNetworkNeeded()
{
return null;
}
@Override
public String getTransmitterNetworkFlow()
{
return null;
}
@Override
public String getTransmitterNetworkBuffer()
{
return null;
}
@Override
public double getTransmitterNetworkCapacity()
{
return 0;
}
@Override
public int getCapacity()
{
return 0;
}
@Override
public World world()
{
return null;
}
@Override
public Coord4D coord()
{
return null;
}
@Override
public Coord4D getAdjacentConnectableTransmitterCoord(EnumFacing side)
{
return null;
}
@Override
public IInventory getAcceptor(EnumFacing side)
{
return null;
}
@Override
public boolean isValid()
{
return false;
}
@Override
public boolean isOrphan()
{
return false;
}
@Override
public void setOrphan(boolean orphaned)
{
}
@Override
public InventoryNetwork createEmptyNetwork()
{
return null;
}
@Override
public InventoryNetwork mergeNetworks(Collection<InventoryNetwork> toMerge)
{
return null;
}
@Override
public InventoryNetwork getExternalNetwork(Coord4D from)
{
return null;
}
@Override
public void takeShare()
{
}
@Override
public void updateShare()
{
}
@Override
public Object getBuffer()
{
return null;
}
@Override
public TransmissionType getTransmissionType()
{
return null;
}
public static void register()
{
CapabilityManager.INSTANCE.register(ILogisticalTransporter.class, new NullStorage<>(), LogisticalTransporter.class);
}
}
@@ -0,0 +1,51 @@
package mekanism.common.capabilities;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.Capability.IStorage;
import net.minecraftforge.common.util.INBTSerializable;
/**
* Created by ben on 03/05/16.
*/
public class StorageHelper
{
public static class DefaultStorage<T> implements IStorage<T>
{
@Override
public NBTBase writeNBT(Capability<T> capability, T instance, EnumFacing side)
{
if(instance instanceof INBTSerializable)
return ((INBTSerializable)instance).serializeNBT();
return new NBTTagCompound();
}
@Override
public void readNBT(Capability<T> capability, T instance, EnumFacing side, NBTBase nbt)
{
if(instance instanceof INBTSerializable)
{
Class<? extends NBTBase> nbtClass = ((INBTSerializable)instance).serializeNBT().getClass();
if(nbtClass.isInstance(nbt))
{
((INBTSerializable)instance).deserializeNBT(nbtClass.cast(nbt));
}
}
}
}
public static class NullStorage<T> implements IStorage<T>
{
@Override
public NBTBase writeNBT(Capability<T> capability, T instance, EnumFacing side)
{
return new NBTTagCompound();
}
@Override
public void readNBT(Capability<T> capability, T instance, EnumFacing side, NBTBase nbt) {}
}
}
@@ -1,14 +1,23 @@
package mekanism.common.capabilities;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.common.capabilities.StorageHelper.DefaultStorage;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.common.util.INBTSerializable;
/**
* Created by ben on 30/04/16.
*/
public class StrictEnergyAcceptor extends StrictEnergyStorage implements IStrictEnergyAcceptor
public class StrictEnergyAcceptor extends StrictEnergyStorage implements IStrictEnergyAcceptor, INBTSerializable<NBTTagCompound>
{
public StrictEnergyAcceptor()
{
this(0);
}
public StrictEnergyAcceptor(double capacity)
{
super(capacity);
@@ -27,4 +36,23 @@ public class StrictEnergyAcceptor extends StrictEnergyStorage implements IStrict
{
return true;
}
@Override
public NBTTagCompound serializeNBT()
{
return super.serializeNBT();
}
@Override
public void deserializeNBT(NBTTagCompound nbt)
{
super.deserializeNBT(nbt);
}
public static void register()
{
CapabilityManager.INSTANCE.register(IStrictEnergyAcceptor.class, new DefaultStorage<>(), StrictEnergyAcceptor.class);
}
}
@@ -1,14 +1,24 @@
package mekanism.common.capabilities;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.common.capabilities.StorageHelper.DefaultStorage;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.common.util.INBTSerializable;
/**
* Created by ben on 30/04/16.
*/
public class StrictEnergyStorage implements IStrictEnergyStorage
public class StrictEnergyStorage implements IStrictEnergyStorage, INBTSerializable<NBTTagCompound>
{
double energyStored = 0;
double maxEnergy;
private double energyStored = 0;
private double maxEnergy;
public StrictEnergyStorage()
{
this(0);
}
public StrictEnergyStorage(double capacity)
{
@@ -32,4 +42,26 @@ public class StrictEnergyStorage implements IStrictEnergyStorage
{
return maxEnergy;
}
@Override
public NBTTagCompound serializeNBT()
{
NBTTagCompound tag = new NBTTagCompound();
tag.setDouble("maxEnergy", getMaxEnergy());
tag.setDouble("energyStored", getEnergy());
return tag;
}
@Override
public void deserializeNBT(NBTTagCompound nbt)
{
setEnergy(nbt.getDouble("energyStored"));
maxEnergy = nbt.getDouble("maxEnergy");
}
public static void register()
{
CapabilityManager.INSTANCE.register(IStrictEnergyStorage.class, new DefaultStorage<>(), StrictEnergyStorage.class);
}
}
@@ -13,7 +13,7 @@ import mekanism.api.Coord4D;
import mekanism.common.InventoryNetwork;
import mekanism.common.InventoryNetwork.AcceptorData;
import mekanism.common.base.ILogisticalTransporter;
import mekanism.common.base.ITransporterTile;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.transporter.PathfinderCache.PathData;
import mekanism.common.content.transporter.TransporterPathfinder.Pathfinder.DestChecker;
import mekanism.common.content.transporter.TransporterStack.Path;
@@ -72,7 +72,7 @@ public final class TransporterPathfinder
return new Destination(ret, true, null, 0).setPathType(Path.NONE);
}
else {
Destination newPath = TransporterPathfinder.getNewBasePath(((ITransporterTile)start.getTileEntity(worldObj)).getTransmitter(), transportStack, 0);
Destination newPath = TransporterPathfinder.getNewBasePath(start.getTileEntity(worldObj).getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null), transportStack, 0);
if(newPath != null && TransporterManager.didEmit(transportStack.itemStack, newPath.rejected))
{
@@ -188,9 +188,9 @@ public final class TransporterPathfinder
{
TileEntity tile = location.getTileEntity(world);
if(tile instanceof ITransporterTile)
if(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null))
{
score += ((ITransporterTile)tile).getTransmitter().getCost();
score += tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null).getCost();
}
}
@@ -270,14 +270,14 @@ public final class TransporterPathfinder
{
TileEntity tile = path.get(i).getTileEntity(world);
if(!(tile instanceof ITransporterTile))
if(!tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null))
{
return false;
}
ITransporterTile transporterTile = (ITransporterTile)tile;
ILogisticalTransporter transporter = tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null);
if(transporterTile.getTransmitter() == null || (transporterTile.getTransmitter().getColor() != null && transporterTile.getTransmitter().getColor() != stack.color))
if(transporter == null || (transporter.getColor() != null && transporter.getColor() != stack.color))
{
return false;
}
@@ -473,7 +473,7 @@ public final class TransporterPathfinder
if(transportStack.canInsertToTransporter(neighbor.getTileEntity(worldObj), direction))
{
TileEntity tile = neighbor.getTileEntity(worldObj);
double tentativeG = gScore.get(currentNode) + ((ITransporterTile)tile).getTransmitter().getCost();
double tentativeG = gScore.get(currentNode) + tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, direction.getOpposite()).getCost();
if(closedSet.contains(neighbor))
{
@@ -9,7 +9,7 @@ import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.common.PacketHandler;
import mekanism.common.base.ILogisticalTransporter;
import mekanism.common.base.ITransporterTile;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.transporter.TransporterPathfinder.Destination;
import mekanism.common.tile.TileEntityLogisticalSorter;
import mekanism.common.util.TransporterUtils;
@@ -304,14 +304,14 @@ public class TransporterStack
public boolean canInsertToTransporter(TileEntity tileEntity, EnumFacing from)
{
if(!(tileEntity instanceof ITransporterTile))
if(!(tileEntity.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite())))
{
return false;
}
ILogisticalTransporter transporter = ((ITransporterTile)tileEntity).getTransmitter();
ILogisticalTransporter transporter = tileEntity.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite());
if(!((ITransporterTile)tileEntity).canConnectMutual(from.getOpposite()))
if(!tileEntity.getCapability(Capabilities.BLOCKABLE_CONNECTION_CAPABILITY, from.getOpposite()).canConnectMutual(from.getOpposite()))
{
return false;
}
@@ -9,8 +9,9 @@ import mekanism.api.IHeatTransfer;
import mekanism.api.MekanismAPI;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.api.transmitters.TransmitterNetworkRegistry;
import mekanism.common.capabilities.Capabilities;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -36,13 +37,13 @@ public class ItemNetworkReader extends ItemEnergized
TileEntity tileEntity = world.getTileEntity(pos);
boolean drain = !player.capabilities.isCreativeMode;
if(getEnergy(stack) >= ENERGY_PER_USE)
if(getEnergy(stack) >= ENERGY_PER_USE && tileEntity != null)
{
if(tileEntity instanceof ITransmitterTile)
if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()))
{
if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE);
IGridTransmitter transmitter = ((ITransmitterTile)tileEntity).getTransmitter();
IGridTransmitter transmitter = tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite());
player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"));
player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Transmitters: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkSize()));
@@ -67,7 +68,7 @@ public class ItemNetworkReader extends ItemEnergized
return true;
}
else if(tileEntity != null)
else
{
if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE);
@@ -76,10 +77,12 @@ public class ItemNetworkReader extends ItemEnergized
for(EnumFacing iterSide : EnumFacing.VALUES)
{
Coord4D coord = Coord4D.get(tileEntity).offset(iterSide);
TileEntity tile = coord.getTileEntity(world);
if(coord.getTileEntity(world) instanceof ITransmitterTile)
if(tile != null && tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite()))
{
IGridTransmitter transmitter = ((ITransmitterTile)coord.getTileEntity(world)).getTransmitter();
IGridTransmitter transmitter = tile.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite());
if(transmitter.getTransmitterNetwork().possibleAcceptors.containsKey(coord.offset(iterSide.getOpposite())) && !iteratedNetworks.contains(transmitter.getTransmitterNetwork()))
{
@@ -1,12 +1,8 @@
package mekanism.common.multipart;
import java.util.ArrayList;
import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.MekKeyHandler;
import mekanism.client.MekanismKeyHandler;
@@ -16,13 +12,11 @@ import mekanism.common.Tier.BaseTier;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
//import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
@@ -5,14 +5,13 @@ import java.util.Collection;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.transmitters.Transmitter;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraft.util.EnumFacing;
import mcmultipart.block.TileMultipart;
import mcmultipart.multipart.IMultipartContainer;
public class MultipartTransmitter<A, N extends DynamicNetwork<A,N>> extends Transmitter<A, N>
@@ -54,9 +53,9 @@ public class MultipartTransmitter<A, N extends DynamicNetwork<A,N>> extends Tran
return null;
}
if(potentialTransmitterTile instanceof ITransmitterTile)
if(potentialTransmitterTile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()))
{
IGridTransmitter transmitter = ((ITransmitterTile)potentialTransmitterTile).getTransmitter();
IGridTransmitter transmitter = potentialTransmitterTile.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite());
if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType()))
{
@@ -99,9 +98,9 @@ public class MultipartTransmitter<A, N extends DynamicNetwork<A,N>> extends Tran
{
TileEntity tile = from.getTileEntity(world());
if(tile instanceof ITransmitterTile)
if(tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
{
IGridTransmitter transmitter = ((ITransmitterTile)tile).getTransmitter();
IGridTransmitter transmitter = tile.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType()));
{
@@ -10,7 +10,7 @@ import mekanism.common.HashList;
import mekanism.common.InventoryNetwork;
import mekanism.common.Mekanism;
import mekanism.common.base.ILogisticalTransporter;
import mekanism.common.base.ITransporterTile;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.transporter.TransporterManager;
import mekanism.common.content.transporter.TransporterStack;
import mekanism.common.content.transporter.TransporterStack.Path;
@@ -93,8 +93,8 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
{
if(next != null && stack.canInsertToTransporter(stack.getNext(this).getTileEntity(world()), stack.getSide(this)))
{
ITransporterTile nextTile = (ITransporterTile)next.getTileEntity(world());
nextTile.getTransmitter().entityEntering(stack, stack.progress%100);
ILogisticalTransporter nextTile = next.getTileEntity(world()).getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null);
nextTile.entityEntering(stack, stack.progress%100);
remove.add(stack);
continue;
@@ -9,19 +9,17 @@ import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.Range4D;
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.render.RenderPartTransmitter;
import mekanism.common.InventoryNetwork;
import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.TransporterTier;
import mekanism.common.base.ILogisticalTransporter;
import mekanism.common.base.ITransporterTile;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.transporter.InvStack;
import mekanism.common.content.transporter.PathfinderCache;
import mekanism.common.content.transporter.TransporterManager;
import mekanism.common.content.transporter.TransporterStack;
import mekanism.common.network.PacketDataRequest.DataRequestMessage;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.InventoryUtils;
import mekanism.common.util.LangUtils;
@@ -38,6 +36,7 @@ import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
//import net.minecraft.util.IIcon;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.Constants.NBT;
import net.minecraft.util.EnumFacing;
/*
@@ -45,10 +44,8 @@ import codechicken.lib.data.MCDataInput;
import codechicken.lib.data.MCDataOutput;
import codechicken.lib.vec.Vector3;
*/
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class PartLogisticalTransporter extends PartTransmitter<IInventory, InventoryNetwork> implements ITransporterTile
public class PartLogisticalTransporter extends PartTransmitter<IInventory, InventoryNetwork>
{
public Tier.TransporterTier tier = Tier.TransporterTier.BASIC;
@@ -121,7 +118,7 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
@Override
protected boolean isValidTransmitter(TileEntity tileEntity)
{
ILogisticalTransporter transporter = ((ITransporterTile)tileEntity).getTransmitter();
ILogisticalTransporter transporter = tileEntity.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null);
if(getTransmitter().getColor() == null || transporter.getColor() == null || getTransmitter().getColor() == transporter.getColor())
{
@@ -492,4 +489,18 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
super.writeUpdatePacket(packet);
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY)
return (T) getTransmitter();
return super.getCapability(capability, side);
}
}
@@ -3,12 +3,8 @@ package mekanism.common.multipart;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
@@ -16,17 +12,15 @@ import mekanism.api.IConfigurable;
import mekanism.api.MekanismConfig.client;
import mekanism.api.transmitters.IBlockableConnection;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.render.RenderPartTransmitter;
import mekanism.common.MekanismItems;
import mekanism.common.Tier;
import mekanism.common.base.ITileNetwork;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.multipart.TransmitterType.Size;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.client.particle.EffectRenderer;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -40,7 +34,6 @@ import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumFacing;
//import net.minecraft.util.IIcon;
import net.minecraft.util.ITickable;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
/*import codechicken.lib.data.MCDataInput;
@@ -63,17 +56,11 @@ import codechicken.multipart.TSlottedPart;*/
import mcmultipart.block.TileMultipart;
import mcmultipart.multipart.IMultipart;
import mcmultipart.multipart.IOccludingPart;
import mcmultipart.multipart.ISlottedPart;
import mcmultipart.multipart.ISlottedPart.ISlotOccludingPart;
import mcmultipart.multipart.Multipart;
import mcmultipart.multipart.PartSlot;
import mcmultipart.raytrace.PartMOP;
import mcmultipart.raytrace.RayTraceUtils;
import mcmultipart.raytrace.RayTraceUtils.RayTraceResultPart;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public abstract class PartSidedPipe extends Multipart implements IOccludingPart, /*ISlotOccludingPart, ISidedHollowConnect, JIconHitEffects, INeighborTileChange,*/ ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, ITickable
{
public static AxisAlignedBB[] smallSides = new AxisAlignedBB[7];
@@ -281,7 +268,9 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
{
TileEntity tileEntity = getWorld().getTileEntity(getPos().offset(side));
if(tileEntity instanceof ITransmitterTile && TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), getTransmitterType().getTransmission()) && isValidTransmitter(tileEntity))
if(tileEntity != null && tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())
&& TransmissionType.checkTransmissionType(tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()), getTransmitterType().getTransmission())
&& isValidTransmitter(tileEntity))
{
connections |= 1 << side.ordinal();
}
@@ -333,7 +322,9 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
{
TileEntity tileEntity = getWorld().getTileEntity(getPos().offset(side));
if(tileEntity instanceof ITransmitterTile && TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), getTransmitterType().getTransmission()) && isValidTransmitter(tileEntity))
if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())
&& TransmissionType.checkTransmissionType(tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()), getTransmitterType().getTransmission())
&& isValidTransmitter(tileEntity))
{
return true;
}
@@ -8,15 +8,15 @@ import java.util.LinkedHashSet;
import mekanism.api.Coord4D;
import mekanism.api.IAlloyInteraction;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.api.transmitters.TransmitterNetworkRegistry;
import mekanism.common.capabilities.Capabilities;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraft.util.EnumFacing;
public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends PartSidedPipe implements ITransmitterTile<A, N>, IAlloyInteraction
public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends PartSidedPipe implements IAlloyInteraction
{
public MultipartTransmitter<A, N> transmitterDelegate;
@@ -27,7 +27,6 @@ public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends
transmitterDelegate = new MultipartTransmitter<>(this);
}
@Override
public MultipartTransmitter<A, N> getTransmitter()
{
return transmitterDelegate;
@@ -194,4 +193,18 @@ public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends
public abstract void takeShare();
public abstract void updateShare();
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == Capabilities.GRID_TRANSMITTER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.GRID_TRANSMITTER_CAPABILITY)
return (T) getTransmitter();
return super.getCapability(capability, side);
}
}
@@ -5,15 +5,12 @@ import ic2.api.energy.tile.IEnergySource;
import java.util.Collection;
import java.util.List;
import mekanism.api.Capabilities;
import mekanism.api.MekanismConfig.client;
import mekanism.common.capabilities.Capabilities;
import mekanism.api.MekanismConfig.general;
import mekanism.api.energy.EnergyStack;
import mekanism.api.energy.ICableOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.render.RenderPartTransmitter;
import mekanism.common.EnergyNetwork;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
@@ -38,8 +35,6 @@ import cofh.api.energy.IEnergyHandler;
import cofh.api.energy.IEnergyProvider;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, EnergyNetwork> implements IStrictEnergyAcceptor, IEnergyHandler
{
@@ -6,10 +6,10 @@ import java.util.ArrayList;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.common.base.ITileNetwork;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.network.PacketDataRequest.DataRequestMessage;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.TileEntityMultiblock;
@@ -39,9 +39,9 @@ public class PacketDataRequest implements IMessageHandler<DataRequestMessage, IM
((TileEntityMultiblock)tileEntity).sendStructure = true;
}
if(tileEntity instanceof ITransmitterTile)
if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
{
IGridTransmitter transmitter = ((ITransmitterTile)tileEntity).getTransmitter();
IGridTransmitter transmitter = tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
if(transmitter.hasTransmitterNetwork())
{
@@ -13,12 +13,12 @@ import mekanism.api.gas.GasStack;
import mekanism.api.gas.IGasHandler;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.EnergyNetwork;
import mekanism.common.FluidNetwork;
import mekanism.common.PacketHandler;
import mekanism.common.base.EnergyAcceptorWrapper;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
@@ -41,9 +41,9 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
{
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
if(tileEntity instanceof ITransmitterTile)
if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
{
IGridTransmitter transmitter = ((ITransmitterTile)tileEntity).getTransmitter();
IGridTransmitter transmitter = tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
DynamicNetwork network = transmitter.hasTransmitterNetwork() && !message.newNetwork ? transmitter.getTransmitterNetwork() : transmitter.createEmptyNetwork();
network.register();
transmitter.setTransmitterNetwork(network);
@@ -52,9 +52,9 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
{
TileEntity tile = coord.getTileEntity(player.worldObj);
if(tile instanceof ITransmitterTile)
if(tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
{
((ITransmitterTile)tile).getTransmitter().setTransmitterNetwork(network);
tile.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null).setTransmitterNetwork(network);
}
}
@@ -65,9 +65,9 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
{
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
if(tileEntity instanceof ITransmitterTile)
if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
{
IGridTransmitter transmitter = ((ITransmitterTile)tileEntity).getTransmitter();
IGridTransmitter transmitter = tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.ENERGY)
{
@@ -79,9 +79,9 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
{
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
if(tileEntity instanceof ITransmitterTile)
if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
{
IGridTransmitter transmitter = ((ITransmitterTile)tileEntity).getTransmitter();
IGridTransmitter transmitter = tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.GAS)
{
@@ -101,11 +101,11 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
{
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
if(tileEntity instanceof ITransmitterTile)
if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
{
IGridTransmitter transmitter = ((ITransmitterTile)tileEntity).getTransmitter();
IGridTransmitter transmitter = tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
if(transmitter.hasTransmitterNetwork() && ((ITransmitterTile)tileEntity).getTransmitter().getTransmissionType() == TransmissionType.FLUID)
if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.FLUID)
{
FluidNetwork net = ((IGridTransmitter<IFluidHandler, FluidNetwork>)transmitter).getTransmitterNetwork();
@@ -5,6 +5,7 @@ import mekanism.api.Coord4D;
import mekanism.api.IConfigCardAccess.ISpecialConfigData;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.common.base.IAdvancedBoundingBlock;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.integration.IComputerIntegration;
import mekanism.common.util.InventoryUtils;
import net.minecraft.entity.player.EntityPlayer;
@@ -18,6 +19,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
import cofh.api.energy.IEnergyHandler;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
@@ -469,4 +471,21 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
return getInv().getDataType();
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing)
{
return capability == Capabilities.ENERGY_STORAGE_CAPABILITY
|| capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY
|| super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing)
{
if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY)
return (T) this;
return super.getCapability(capability, facing);
}
}
@@ -13,7 +13,7 @@ import mekanism.common.PacketHandler;
import mekanism.common.Tier.BinTier;
import mekanism.common.base.IActiveState;
import mekanism.common.base.ILogisticalTransporter;
import mekanism.common.base.ITransporterTile;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.transporter.TransporterManager;
import mekanism.common.item.ItemBlockBasic;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
@@ -31,7 +31,7 @@ import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.ITickable;
import io.netty.buffer.ByteBuf;
import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
import net.minecraftforge.fml.common.Optional.Interface;
@@ -197,11 +197,11 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento
{
if(bottomStack != null && isActive)
{
TileEntity tile = Coord4D.get(this).offset(EnumFacing.getFront(0)).getTileEntity(worldObj);
TileEntity tile = Coord4D.get(this).offset(EnumFacing.DOWN).getTileEntity(worldObj);
if(tile instanceof ITransporterTile)
if(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, EnumFacing.UP))
{
ILogisticalTransporter transporter = ((ITransporterTile)tile).getTransmitter();
ILogisticalTransporter transporter = tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, EnumFacing.UP);
ItemStack rejects = TransporterUtils.insert(this, transporter, bottomStack, null, true, 0);
@@ -23,9 +23,9 @@ import mekanism.common.base.IActiveState;
import mekanism.common.base.IAdvancedBoundingBlock;
import mekanism.common.base.IRedstoneControl;
import mekanism.common.base.ISustainedData;
import mekanism.common.base.ITransporterTile;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.miner.MItemStackFilter;
import mekanism.common.content.miner.MOreDictFilter;
import mekanism.common.content.miner.MinerFilter;
@@ -301,9 +301,9 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
getTopEject(true, remains);
}
else if(getEjectInv() instanceof ITransporterTile)
else if(getEjectInv().hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()))
{
ItemStack rejected = TransporterUtils.insert(getEjectTile(), ((ITransporterTile)getEjectInv()).getTransmitter(), getTopEject(false, null), null, true, 0);
ItemStack rejected = TransporterUtils.insert(getEjectTile(), getEjectInv().getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()), getTopEject(false, null), null, true, 0);
if(TransporterManager.didEmit(getTopEject(false, null), rejected))
{
@@ -10,11 +10,8 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.EnumSet;
import mekanism.api.Capabilities;
import mekanism.api.Coord4D;
import mekanism.common.capabilities.Capabilities;
import mekanism.api.MekanismConfig.general;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.common.base.IEnergyWrapper;
import mekanism.common.util.MekanismUtils;
import net.minecraft.nbt.NBTTagCompound;
@@ -372,7 +369,8 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
@Method(modid = "IC2")
public double injectEnergy(EnumFacing direction, double amount, double voltage)
{
if(Coord4D.get(this).offset(direction).getTileEntity(worldObj) instanceof ITransmitterTile)
TileEntity tile = getWorld().getTileEntity(getPos().offset(direction));
if(tile == null || tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite()))
{
return amount;
}
@@ -402,17 +400,20 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
public boolean hasCapability(net.minecraftforge.common.capabilities.Capability<?> capability, net.minecraft.util.EnumFacing facing)
public boolean hasCapability(Capability<?> capability, EnumFacing facing)
{
return capability == Capabilities.ENERGY_STORAGE_CAPABILITY
|| capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY
|| capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY
|| super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(Capability<T> capability, net.minecraft.util.EnumFacing facing)
public <T> T getCapability(Capability<T> capability, EnumFacing facing)
{
if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY)
if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY)
return (T) this;
if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY)
return (T) this;
return super.getCapability(capability, facing);
}
@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import mekanism.api.Capabilities;
import mekanism.common.capabilities.Capabilities;
import mekanism.api.Coord4D;
import mekanism.api.Range4D;
import mekanism.api.energy.IStrictEnergyStorage;
@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import mekanism.api.Capabilities;
import mekanism.common.capabilities.Capabilities;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.common.Tier.InductionCellTier;
import mekanism.common.util.LangUtils;
@@ -99,5 +99,4 @@ public class TileEntityInductionCell extends TileEntityBasicBlock implements ISt
return (T) this;
return super.getCapability(capability, facing);
}
}
@@ -10,13 +10,12 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.EnumSet;
import mekanism.api.Capabilities;
import mekanism.common.capabilities.Capabilities;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.IConfigurable;
import mekanism.api.MekanismConfig.general;
import mekanism.api.Range4D;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.common.Mekanism;
import mekanism.common.base.IActiveState;
import mekanism.common.base.IEnergyWrapper;
@@ -387,7 +386,8 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
@Method(modid = "IC2")
public double injectEnergy(EnumFacing direction, double amount, double voltage)
{
if(Coord4D.get(this).offset(direction).getTileEntity(worldObj) instanceof ITransmitterTile)
TileEntity tile = getWorld().getTileEntity(getPos().offset(direction));
if(tile == null || tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite()))
{
return amount;
}
@@ -469,17 +469,21 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
public boolean hasCapability(net.minecraftforge.common.capabilities.Capability<?> capability, net.minecraft.util.EnumFacing facing)
public boolean hasCapability(Capability<?> capability, EnumFacing facing)
{
return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || super.hasCapability(capability, facing);
return capability == Capabilities.ENERGY_STORAGE_CAPABILITY
|| capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY
|| capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY
|| super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(Capability<T> capability, net.minecraft.util.EnumFacing facing)
public <T> T getCapability(Capability<T> capability, EnumFacing facing)
{
if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY)
if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY)
return (T) this;
if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY)
return (T) this;
return super.getCapability(capability, facing);
}
}
@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import mekanism.api.Capabilities;
import mekanism.common.capabilities.Capabilities;
import mekanism.api.Coord4D;
import mekanism.api.MekanismConfig.general;
import mekanism.api.energy.ICableOutputter;
@@ -346,15 +346,19 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
}
@Override
public boolean hasCapability(net.minecraftforge.common.capabilities.Capability<?> capability, net.minecraft.util.EnumFacing facing)
public boolean hasCapability(Capability<?> capability, EnumFacing facing)
{
return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || super.hasCapability(capability, facing);
return capability == Capabilities.ENERGY_STORAGE_CAPABILITY
|| capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY
|| super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(Capability<T> capability, net.minecraft.util.EnumFacing facing)
public <T> T getCapability(Capability<T> capability, EnumFacing facing)
{
if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY)
if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY)
return (T) this;
if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY)
return (T) this;
return super.getCapability(capability, facing);
}
@@ -15,8 +15,8 @@ import mekanism.common.base.IActiveState;
import mekanism.common.base.ILogisticalTransporter;
import mekanism.common.base.IRedstoneControl;
import mekanism.common.base.ISustainedData;
import mekanism.common.base.ITransporterTile;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.transporter.Finder.FirstFinder;
import mekanism.common.content.transporter.InvStack;
import mekanism.common.content.transporter.StackSearcher;
@@ -91,7 +91,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
TileEntity back = Coord4D.get(this).offset(facing.getOpposite()).getTileEntity(worldObj);
TileEntity front = Coord4D.get(this).offset(facing).getTileEntity(worldObj);
if(back instanceof IInventory && (front instanceof ITransporterTile || front instanceof IInventory))
if(back instanceof IInventory && (front != null && front.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()) || front instanceof IInventory))
{
IInventory inventory = InventoryUtils.checkChestInv((IInventory)back);
@@ -177,9 +177,9 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
{
ItemStack used = null;
if(front instanceof ITransporterTile)
if(front.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()))
{
ILogisticalTransporter transporter = ((ITransporterTile)front).getTransmitter();
ILogisticalTransporter transporter = front.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite());
if(!roundRobin)
{
@@ -17,7 +17,7 @@ import mekanism.common.SideData;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.base.ITankManager;
import mekanism.common.base.ITileComponent;
import mekanism.common.base.ITransporterTile;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.transporter.TransporterManager;
import mekanism.common.tile.TileEntityContainerBlock;
import mekanism.common.util.InventoryUtils;
@@ -190,13 +190,13 @@ public class TileComponentEjector implements ITileComponent
TileEntity tile = Coord4D.get(tileEntity).offset(side).getTileEntity(tileEntity.getWorld());
ItemStack prev = stack.copy();
if(tile instanceof IInventory && !(tile instanceof ITransporterTile))
if(tile instanceof IInventory && !(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite())))
{
stack = InventoryUtils.putStackInInventory((IInventory)tile, stack, side, false);
}
else if(tile instanceof ITransporterTile)
else if(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite()))
{
ItemStack rejects = TransporterUtils.insert(tileEntity, ((ITransporterTile)tile).getTransmitter(), stack, outputColor, true, 0);
ItemStack rejects = TransporterUtils.insert(tileEntity, tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite()), stack, outputColor, true, 0);
if(TransporterManager.didEmit(stack, rejects))
{
@@ -9,12 +9,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import mekanism.api.Capabilities;
import mekanism.common.capabilities.Capabilities;
import mekanism.api.Coord4D;
import mekanism.api.MekanismConfig.general;
import mekanism.api.energy.ICableOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.base.IEnergyWrapper;
import net.minecraft.tileentity.TileEntity;
@@ -37,9 +35,9 @@ public final class CableUtils
public static boolean isCable(TileEntity tileEntity)
{
if(tileEntity instanceof ITransmitterTile)
if(tileEntity != null && tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
{
return TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), TransmissionType.ENERGY);
return TransmissionType.checkTransmissionType(tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null), TransmissionType.ENERGY);
}
return false;
}
@@ -116,14 +114,16 @@ public final class CableUtils
public static boolean isOutputter(TileEntity tileEntity, EnumFacing side)
{
return (tileEntity instanceof ICableOutputter && ((ICableOutputter)tileEntity).canOutputTo(side.getOpposite())) ||
return tileEntity != null && (
(tileEntity.hasCapability(Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()) && tileEntity.getCapability(Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) ||
(MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(null, side.getOpposite())) ||
(MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite()));
(MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite()))
);
}
public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, EnumFacing side)
{
if(tileEntity instanceof ITransmitterTile)
if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()))
{
return false;
}
@@ -142,9 +142,9 @@ public final class CableUtils
return true;
}
}
else if(tileEntity instanceof ICableOutputter)
else if(tileEntity.hasCapability(Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()))
{
if(((ICableOutputter)tileEntity).canOutputTo(side.getOpposite()))
if(tileEntity.getCapability(Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite()))
{
return true;
}
@@ -1,8 +1,10 @@
package mekanism.common.util;
import mekanism.api.IHeatTransfer;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.common.capabilities.Capabilities;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
public class HeatUtils
{
@@ -21,7 +23,7 @@ public class HeatUtils
source.transferHeatTo(-heatToTransfer);
sink.transferHeatTo(heatToTransfer);
if(!(sink instanceof ITransmitterTile))
if(!(sink instanceof ICapabilityProvider && ((ICapabilityProvider)sink).hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())))
{
heatTransferred[0] += heatToTransfer;
}
@@ -5,8 +5,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.common.capabilities.Capabilities;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
@@ -22,7 +22,7 @@ public final class PipeUtils
public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side)
{
if(tile instanceof ITransmitterTile || !(tile instanceof IFluidHandler))
if(tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IFluidHandler))
return false;
IFluidHandler container = (IFluidHandler)tile;
@@ -5,10 +5,9 @@ import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.api.util.ListUtils;
import mekanism.common.base.ILogisticalTransporter;
import mekanism.common.base.ITransporterTile;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.transporter.TransporterManager;
import mekanism.common.content.transporter.TransporterStack;
import mekanism.common.tile.TileEntityLogisticalSorter;
@@ -38,9 +37,9 @@ public final class TransporterUtils
{
TileEntity tile = tileEntity.coord().offset(orientation).getTileEntity(tileEntity.world());
if(tile instanceof ITransporterTile)
if(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, orientation.getOpposite()))
{
ILogisticalTransporter otherTransporter = ((ITransporterTile)tile).getTransmitter();
ILogisticalTransporter otherTransporter = tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, orientation.getOpposite());
if(otherTransporter.getColor() == null || tileEntity.getColor() == null || otherTransporter.getColor() == tileEntity.getColor())
{
@@ -54,7 +53,7 @@ public final class TransporterUtils
public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side)
{
if(tile instanceof ITransmitterTile || !(tile instanceof IInventory))
if(tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IInventory))
{
return false;
}
@@ -151,7 +150,7 @@ public final class TransporterUtils
{
TileEntity inventory = transporter.coord().offset(orientation).getTileEntity(transporter.world());
if(inventory instanceof IInventory && !(inventory instanceof ITransmitterTile))
if(inventory instanceof IInventory && !(inventory.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, orientation.getOpposite())))
{
inventories[orientation.ordinal()] = (IInventory)inventory;
}