tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixes wrong interface names for BuildCraft Transport

Browse source 
Conflicts:
	src/main/java/appeng/parts/misc/PartStorageBus.java
	src/main/java/appeng/parts/p2p/PartP2PItems.java
This commit is contained in:
thatsIch 2015-06-13 23:42:40 +02:00 committed by thatsIch
parent 51ed55510c
commit a62d9bfcbf
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/appeng/parts/misc/PartStorageBus.java
View file

@ -85,7 +85,7 @@ import appeng.util.prioitylist.PrecisePriorityList;
// TODO: BC Integration // TODO: BC Integration
//@Interface( iname = "BuildCraftCore", iface = "buildcraft.api.transport.IPipeConnection" ) //@Interface( iname = "BuildCraftTransport", iface = "buildcraft.api.transport.IPipeConnection" )
public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver<IAEItemStack>, IPriorityHost public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver<IAEItemStack>, IPriorityHost
{ {
final BaseActionSource mySrc; final BaseActionSource mySrc;
@ -561,7 +561,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
// TODO: BC PIPE INTEGRATION // TODO: BC PIPE INTEGRATION
/* /*
@Override @Override
@Method( iname = "BuildCraftCore" ) @Method( iname = "BuildCraftTransport" )
public ConnectOverride overridePipeConnection( PipeType type, ForgeDirection with ) public ConnectOverride overridePipeConnection( PipeType type, ForgeDirection with )
{ {
return type == PipeType.ITEM && with == this.side ? ConnectOverride.CONNECT : ConnectOverride.DISCONNECT; return type == PipeType.ITEM && with == this.side ? ConnectOverride.CONNECT : ConnectOverride.DISCONNECT;

4
src/main/java/appeng/parts/p2p/PartP2PItems.java
View file

@ -53,7 +53,7 @@ import appeng.util.inv.WrapperMCISidedInventory;
// TODO: BC Integration // TODO: BC Integration
//@Integration.Interface( iface = "buildcraft.api.transport.IPipeConnection", iname = "BuildCraftCore" ) //@Integration.Interface( iface = "buildcraft.api.transport.IPipeConnection", iname = "BuildCraftTransport" )
public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements ISidedInventory, IGridTickable public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements ISidedInventory, IGridTickable
{ {
@ -404,7 +404,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements ISidedI
// TODO: BC Integration // TODO: BC Integration
// @Override // @Override
// @Method( iname = "BuildCraftCore" ) // @Method( iname = "BuildCraftTransport" )
// public ConnectOverride overridePipeConnection( PipeType type, ForgeDirection with ) // public ConnectOverride overridePipeConnection( PipeType type, ForgeDirection with )
// { // {
// return this.side == with && type == PipeType.ITEM ? ConnectOverride.CONNECT : ConnectOverride.DEFAULT; // return this.side == with && type == PipeType.ITEM ? ConnectOverride.CONNECT : ConnectOverride.DEFAULT;