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

Fixed framed wires not connecting

Browse source
This commit is contained in:
Calclavia 2014-01-21 22:30:49 +08:00
parent 79d22687f6
commit 4990443e9a
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
View file

@ -283,9 +283,9 @@ public class PartFramedWire extends PartAdvancedWire implements TSlottedPart, JN
{ {
if (tile() != null && this.getNetwork() != null) if (tile() != null && this.getNetwork() != null)
{ {
getNetwork().getConnectors().remove(tile()); getNetwork().getConnectors().remove(this);
super.bind(t); super.bind(t);
getNetwork().getConnectors().add((IConductor) tile()); getNetwork().getConnectors().add((IConductor) this);
} }
else else
{ {
@ -374,7 +374,7 @@ public class PartFramedWire extends PartAdvancedWire implements TSlottedPart, JN
try try
{ {
this.getNetwork().removeConnector(this); this.getNetwork().removeConnector(this);
this.getNetwork().split((IConductor) tile()); this.getNetwork().split((IConductor) this);
} }
catch (NullPointerException e) catch (NullPointerException e)
{ {
@ -390,7 +390,10 @@ public class PartFramedWire extends PartAdvancedWire implements TSlottedPart, JN
if (tileEntity instanceof IConductor) if (tileEntity instanceof IConductor)
{ {
this.getNetwork().merge(((IConductor) tileEntity).getNetwork()); IConductor conductor = (IConductor) ((IConductor) tileEntity).getInstance(side.getOpposite());
if (conductor != null)
this.getNetwork().merge(conductor.getNetwork());
} }
} }
} }
@ -445,7 +448,7 @@ public class PartFramedWire extends PartAdvancedWire implements TSlottedPart, JN
return false; return false;
} }
Vector3 connectPos = new Vector3(tile()).modifyPositionFromSide(direction); Vector3 connectPos = new Vector3(tile()).translate(direction);
TileEntity connectTile = connectPos.getTileEntity(world()); TileEntity connectTile = connectPos.getTileEntity(world());
return !isConnectionPrevented(connectTile, direction); return !isConnectionPrevented(connectTile, direction);
} }
@ -537,8 +540,7 @@ public class PartFramedWire extends PartAdvancedWire implements TSlottedPart, JN
this.currentWireConnections = otherCable.currentWireConnections; this.currentWireConnections = otherCable.currentWireConnections;
this.currentAcceptorConnections = otherCable.currentAcceptorConnections; this.currentAcceptorConnections = otherCable.currentAcceptorConnections;
this.setNetwork(otherCable.getNetwork()); this.setNetwork(otherCable.getNetwork());
this.getNetwork().setBufferFor(this, otherCable.getNetwork().getBufferOf(otherCable)); this.getNetwork().setBufferFor(this, otherCable.getInstance(ForgeDirection.UNKNOWN).getNetwork().getBufferOf(otherCable));
} }
} }

11
src/main/java/resonantinduction/electrical/wire/trait/TraitConductor.java
View file

@ -7,6 +7,7 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IConductor;
import universalelectricity.api.energy.IEnergyNetwork; import universalelectricity.api.energy.IEnergyNetwork;
import universalelectricity.api.net.IConnector; import universalelectricity.api.net.IConnector;
import codechicken.multipart.PartMap;
import codechicken.multipart.TMultiPart; import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart; import codechicken.multipart.TileMultipart;
@ -113,6 +114,11 @@ public class TraitConductor extends TileMultipart implements IConductor
} }
} }
if (partMap(PartMap.CENTER.ordinal()) instanceof IConductor)
{
return ((IConductor) partMap(PartMap.CENTER.ordinal())).onReceiveEnergy(from, receive, doReceive);
}
return 0; return 0;
} }
@ -177,6 +183,11 @@ public class TraitConductor extends TileMultipart implements IConductor
} }
} }
if (partMap(PartMap.CENTER.ordinal()) instanceof IConductor)
{
return (IConnector<IEnergyNetwork>) partMap(PartMap.CENTER.ordinal());
}
return null; return null;
} }
} }