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

Merge branch 'master' into development

Browse source
This commit is contained in:
Ben Spiers 2014-11-17 22:41:15 +00:00
commit 5749ed4d2a
2 changed files with 8 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/mekanism/common/multipart/MultipartMekanism.java
View file

@ -25,15 +25,15 @@ public class MultipartMekanism implements IPartFactory
"mekanism:restrictive_transporter", "mekanism:diversion_transporter", "mekanism:restrictive_transporter", "mekanism:diversion_transporter",
"mekanism:glow_panel"}); "mekanism:glow_panel"});
MultipartGenerator.registerPassThroughInterface("mekanism.api.transmitters.ITransmitter");
MultipartGenerator.registerPassThroughInterface("mekanism.api.energy.IStrictEnergyAcceptor");
MultipartGenerator.registerPassThroughInterface("mekanism.api.transmitters.IGridTransmitter");
MultipartGenerator.registerPassThroughInterface("mekanism.common.ILogisticalTransporter");
MultipartGenerator.registerPassThroughInterface("cofh.api.energy.IEnergyHandler");
MultipartGenerator.registerPassThroughInterface("mekanism.api.IConfigurable"); MultipartGenerator.registerPassThroughInterface("mekanism.api.IConfigurable");
MultipartGenerator.registerPassThroughInterface("mekanism.common.ITileNetwork"); MultipartGenerator.registerPassThroughInterface("mekanism.api.energy.IStrictEnergyAcceptor");
MultipartGenerator.registerPassThroughInterface("mekanism.api.transmitters.IBlockableConnection");
MultipartGenerator.registerPassThroughInterface("mekanism.api.gas.IGasHandler"); MultipartGenerator.registerPassThroughInterface("mekanism.api.gas.IGasHandler");
MultipartGenerator.registerPassThroughInterface("mekanism.api.transmitters.IBlockableConnection");
MultipartGenerator.registerPassThroughInterface("mekanism.api.transmitters.IGridTransmitter");
MultipartGenerator.registerPassThroughInterface("mekanism.api.transmitters.ITransmitter");
MultipartGenerator.registerPassThroughInterface("mekanism.common.ILogisticalTransporter");
MultipartGenerator.registerPassThroughInterface("mekanism.common.ITileNetwork");
MultipartGenerator.registerPassThroughInterface("cofh.api.energy.IEnergyHandler");
} }
@Override @Override

106
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
View file

@ -41,14 +41,12 @@ import cpw.mods.fml.relauncher.SideOnly;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import buildcraft.api.gates.IGate;
import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipe;
import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile;
import buildcraft.api.transport.PipeWire;
import codechicken.lib.vec.Vector3; import codechicken.lib.vec.Vector3;
@Interface(iface = "buildcraft.api.transport.IPipeTile", modid = "BuildCraftAPI|transport") @Interface(iface = "buildcraft.api.transport.IPipeTile", modid = "BuildCraftAPI|transport")
public class PartLogisticalTransporter extends PartSidedPipe implements ILogisticalTransporter, IPipeTile public class PartLogisticalTransporter extends PartSidedPipe implements ILogisticalTransporter
{ {
public static TransmitterIcons transporterIcons = new TransmitterIcons(3, 2); public static TransmitterIcons transporterIcons = new TransmitterIcons(3, 2);
@ -62,8 +60,6 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
public Set<TransporterStack> needsSync = new HashSet<TransporterStack>(); public Set<TransporterStack> needsSync = new HashSet<TransporterStack>();
public TransporterPipeProxy pipe = new TransporterPipeProxy();
@Override @Override
public String getType() public String getType()
{ {
@ -752,104 +748,4 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
{ {
return 1; return 1;
} }
@Override
@Method(modid = "BuildCraftAPI|transport")
public int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, buildcraft.api.core.EnumColor color) {
return 0;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from)
{
if(doAdd)
{
TileEntity tile = Coord4D.get(tile()).getFromSide(from).getTileEntity(world());
ItemStack rejects = TransporterUtils.insert(tile, this, stack, null, true, 0);
return TransporterManager.getToUse(stack, rejects).stackSize;
}
return 0;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public PipeType getPipeType()
{
return PipeType.ITEM;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public boolean isPipeConnected(ForgeDirection with)
{
return connectionMapContainsSide(getAllCurrentConnections(), with);
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public TileEntity getAdjacentTile(ForgeDirection dir) {
return Coord4D.get(tile()).getFromSide(dir).getTileEntity(world());
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public IPipe getPipe() {
return pipe;
}
@Interface(iface = "buildcraft.api.transport.IPipe", modid = "BuildCraftAPI|transport")
public class TransporterPipeProxy implements IPipe
{
@Override
@Method(modid = "BuildCraftAPI|transport")
public int x() {
return PartLogisticalTransporter.this.x();
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public int y() {
return PartLogisticalTransporter.this.y();
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public int z() {
return PartLogisticalTransporter.this.y();
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public IPipeTile getTile() {
return (IPipeTile)tile();
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public IGate getGate(ForgeDirection side) {
return null;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public boolean hasGate(ForgeDirection side) {
return false;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public boolean isWired(PipeWire wire) {
return false;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public boolean isWireActive(PipeWire wire) {
return false;
}
}
} }