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

Merge fix changes

Browse source
This commit is contained in:
Aidan C. Brady 2014-11-16 11:45:05 -05:00
parent 53b5a25558
commit de5cc8c76d
1 changed files with 33 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -649,31 +649,6 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
}
}
@Override
public PipeType getPipeType()
{
return PipeType.ITEM;
}
@Override
public int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, buildcraft.api.core.EnumColor color) {
return 0;
}
@Override
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
protected boolean onConfigure(EntityPlayer player, int part, int side)
{
@ -754,6 +729,34 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
{
return 1;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public PipeType getPipeType()
{
return PipeType.ITEM;
}
@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")
@ -764,13 +767,15 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
@Override
@Method(modid = "BuildCraftAPI|transport")
public TileEntity getAdjacentTile(ForgeDirection dir) {
public TileEntity getAdjacentTile(ForgeDirection dir)
{
return Coord4D.get(tile()).getFromSide(dir).getTileEntity(world());
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public IPipe getPipe() {
public IPipe getPipe()
{
return pipe;
}
@ -813,6 +818,7 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public boolean hasGate(ForgeDirection side)
{
return false;