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

Merge branch 'master' into development

Browse source
This commit is contained in:
Aidan C. Brady 2014-11-16 11:45:13 -05:00
commit a699a4b860
1 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -667,31 +667,6 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
}
}
@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)
{
@ -777,6 +752,34 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
{
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")