Also Cables no longer glow in the dark :P

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	core/localization/GuiText.java
This commit is contained in:
AlgorithmX2
2014-06-08 21:13:53 -05:00
24 changed files with 226 additions and 70 deletions
+2
View File
@@ -27,6 +27,7 @@ import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.networking.events.MENetworkPowerStorage;
import appeng.api.networking.pathing.IPathingGrid;
import appeng.api.networking.storage.IStackWatcherHost;
import appeng.me.Grid;
import appeng.me.GridNode;
import appeng.me.energy.EnergyThreshold;
import appeng.me.energy.EnergyWatcher;
@@ -379,6 +380,7 @@ public class EnergyGridCache implements IEnergyGrid
return;
publicHasPower = newState;
((Grid) myGrid).setImportantFlag( 0, publicHasPower );
grid.postEvent( new MENetworkPowerStatusChange() );
}
+15 -7
View File
@@ -74,8 +74,8 @@ public class P2PCache implements IGridCache
// AELog.info( "update-" + (t.output ? "output: " : "input: ") + t.freq
// );
updateTunnel( t.freq, t.output );
updateTunnel( t.freq, !t.output );
updateTunnel( t.freq, t.output, true );
updateTunnel( t.freq, !t.output, true );
}
@Override
@@ -98,7 +98,7 @@ public class P2PCache implements IGridCache
else
inputs.put( t.freq, t );
updateTunnel( t.freq, !t.output );
updateTunnel( t.freq, !t.output, false );
}
}
@@ -122,18 +122,26 @@ public class P2PCache implements IGridCache
else
inputs.remove( t.freq );
updateTunnel( t.freq, !t.output );
updateTunnel( t.freq, !t.output, false );
}
}
private void updateTunnel(long freq, boolean updateOutputs)
private void updateTunnel(long freq, boolean updateOutputs, boolean configChange)
{
for (PartP2PTunnel p : outputs.get( freq ))
p.onChange();
{
if ( configChange )
p.onTunnelConfigChange();
p.onTunnelNetworkChange();
}
PartP2PTunnel in = inputs.get( freq );
if ( in != null )
in.onChange();
{
if ( configChange )
in.onTunnelConfigChange();
in.onTunnelNetworkChange();
}
}
public TunnelCollection<PartP2PTunnel> getOutputs(long freq, Class<? extends PartP2PTunnel> c)