tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

One more fix for connecting panels using connectors after the panel and the controller have been placed

Browse source 
(back-port from 1.12 via 1.11)
This commit is contained in:
malte0811 2017-07-10 20:50:16 +02:00
parent 6c66ce648a
commit 6ca8ca5a0a
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanel.java
View file

@ -304,7 +304,7 @@ public class TileEntityPanel extends TileEntityIWBase implements IDirectionalTil
public void removeAllRSCons() {
for (TileEntityRSPanelConn rs : rsPorts) {
rs.unregisterPanel(this, true);
rs.unregisterPanel(this, true, false);
}
rsPorts.clear();
firstTick = true;

16
src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java
View file

@ -165,7 +165,7 @@ public class TileEntityRSPanelConn extends TileEntityImmersiveConnectable implem
Consumer<byte[]> listener = pc.getRSInputHandler(id, panel);
if (listener != null) {
changeListeners.add(listener);
listener.accept(out);
listener.accept(network.channelValues);
}
pc.registerRSOutput(id, rsOut);
}
@ -173,19 +173,21 @@ public class TileEntityRSPanelConn extends TileEntityImmersiveConnectable implem
connectedPanels.add(panel);
}
public void unregisterPanel(TileEntityPanel panel, boolean remove) {
public void unregisterPanel(TileEntityPanel panel, boolean remove, boolean callPanel) {
out = new byte[16];
PropertyComponents.PanelRenderProperties p = panel.getComponents();
for (PanelComponent pc : p) {
Consumer<byte[]> listener = pc.getRSInputHandler(id, panel);
if (listener != null) {
listener.accept(out);
listener.accept(new byte[16]);
changeListeners.remove(listener);
}
pc.unregisterRSOutput(id, rsOut);
outputs.remove(new PCWrapper(pc));
}
panel.unregisterRS(this);
if (callPanel) {
panel.unregisterRS(this);
}
if (remove) {
connectedPanels.remove(panel);
}
@ -281,7 +283,7 @@ public class TileEntityRSPanelConn extends TileEntityImmersiveConnectable implem
public void onChunkUnload() {
super.onChunkUnload();
for (TileEntityPanel panel : connectedPanels) {
unregisterPanel(panel, false);
unregisterPanel(panel, false, true);
}
}
@ -289,7 +291,7 @@ public class TileEntityRSPanelConn extends TileEntityImmersiveConnectable implem
public void invalidate() {
super.invalidate();
for (TileEntityPanel panel : connectedPanels) {
unregisterPanel(panel, false);
unregisterPanel(panel, false, true);
}
}
@ -302,7 +304,7 @@ public class TileEntityRSPanelConn extends TileEntityImmersiveConnectable implem
TileEntity te = worldObj.getTileEntity(bp);
if (te instanceof TileEntityPanel) {
tes.add((TileEntityPanel) te);
unregisterPanel((TileEntityPanel) te, true);
unregisterPanel((TileEntityPanel) te, true, true);
}
}
id = nbt.getInteger("rsId");