Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

minor change for connections

Browse source
This commit is contained in:
DarkGuardsman 2013-09-04 18:46:06 -04:00
parent cb934a6030
commit cb385a284b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/minecraft/dark/assembly/common/machine/NetworkAssembly.java
View file

@ -10,8 +10,8 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.block.IElectrical; import universalelectricity.core.block.IElectrical;
import universalelectricity.core.block.IElectricalStorage; import universalelectricity.core.block.IElectricalStorage;
import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.Vector3;
import dark.core.interfaces.INetworkEnergyPart; import dark.api.parts.INetworkEnergyPart;
import dark.core.interfaces.INetworkPart; import dark.api.parts.INetworkPart;
import dark.core.prefab.tilenetwork.NetworkSharedPower; import dark.core.prefab.tilenetwork.NetworkSharedPower;
public class NetworkAssembly extends NetworkSharedPower public class NetworkAssembly extends NetworkSharedPower

6
src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java
View file

@ -9,8 +9,8 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.electricity.ElectricityPack; import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.Vector3;
import dark.api.parts.INetworkEnergyPart;
import dark.assembly.common.AssemblyLine; import dark.assembly.common.AssemblyLine;
import dark.core.interfaces.INetworkEnergyPart;
import dark.core.prefab.TileEntityMachine; import dark.core.prefab.TileEntityMachine;
import dark.core.prefab.tilenetwork.NetworkSharedPower; import dark.core.prefab.tilenetwork.NetworkSharedPower;
import dark.core.prefab.tilenetwork.NetworkTileEntities; import dark.core.prefab.tilenetwork.NetworkTileEntities;
@ -100,7 +100,7 @@ public abstract class TileEntityAssembly extends TileEntityMachine implements IN
} }
@Override @Override
public boolean canTileConnect(TileEntity entity, ForgeDirection dir) public boolean canTileConnect(Connection type, ForgeDirection dir)
{ {
return true; return true;
} }
@ -115,7 +115,7 @@ public abstract class TileEntityAssembly extends TileEntityMachine implements IN
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{ {
TileEntity tileEntity = new Vector3(this).modifyPositionFromSide(dir).getTileEntity(this.worldObj); 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); this.getTileNetwork().merge(((TileEntityAssembly) tileEntity).getTileNetwork(), this);
connectedTiles.add(tileEntity); connectedTiles.add(tileEntity);