diff --git a/src/minecraft/dark/assembly/common/machine/NetworkAssembly.java b/src/minecraft/dark/assembly/common/machine/NetworkAssembly.java index 8b0f59a9..4bb94b01 100644 --- a/src/minecraft/dark/assembly/common/machine/NetworkAssembly.java +++ b/src/minecraft/dark/assembly/common/machine/NetworkAssembly.java @@ -10,8 +10,8 @@ import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.block.IElectrical; import universalelectricity.core.block.IElectricalStorage; import universalelectricity.core.vector.Vector3; -import dark.core.interfaces.INetworkEnergyPart; -import dark.core.interfaces.INetworkPart; +import dark.api.parts.INetworkEnergyPart; +import dark.api.parts.INetworkPart; import dark.core.prefab.tilenetwork.NetworkSharedPower; public class NetworkAssembly extends NetworkSharedPower diff --git a/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java b/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java index d4f45e52..5614a67d 100644 --- a/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java +++ b/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java @@ -9,8 +9,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.electricity.ElectricityPack; import universalelectricity.core.vector.Vector3; +import dark.api.parts.INetworkEnergyPart; import dark.assembly.common.AssemblyLine; -import dark.core.interfaces.INetworkEnergyPart; import dark.core.prefab.TileEntityMachine; import dark.core.prefab.tilenetwork.NetworkSharedPower; import dark.core.prefab.tilenetwork.NetworkTileEntities; @@ -100,7 +100,7 @@ public abstract class TileEntityAssembly extends TileEntityMachine implements IN } @Override - public boolean canTileConnect(TileEntity entity, ForgeDirection dir) + public boolean canTileConnect(Connection type, ForgeDirection dir) { return true; } @@ -115,7 +115,7 @@ public abstract class TileEntityAssembly extends TileEntityMachine implements IN for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { TileEntity tileEntity = new Vector3(this).modifyPositionFromSide(dir).getTileEntity(this.worldObj); - if (tileEntity instanceof TileEntityAssembly && ((TileEntityAssembly) tileEntity).canTileConnect(this, dir.getOpposite())) + if (tileEntity instanceof TileEntityAssembly && ((TileEntityAssembly) tileEntity).canTileConnect(Connection.NETWORK, dir.getOpposite())) { this.getTileNetwork().merge(((TileEntityAssembly) tileEntity).getTileNetwork(), this); connectedTiles.add(tileEntity);