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

Merge branch 'development' into 1.8

Browse source 
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
This commit is contained in:
Aidan C. Brady 2014-11-16 01:08:08 -05:00
commit 53b5a25558
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -774,33 +774,39 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
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;
@ -813,12 +819,14 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public boolean isWired(PipeWire wire)
{
return false;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public boolean isWireActive(PipeWire wire)
{
return false;