internal: simplify IConnectable mask change events

core/src/main/java/mrtjp/projectred/core/part/IConnectableCenterPart.java

@@ -58,7 +58,7 @@ default boolean connectStraight(IConnectable part, int s, int edgeRot) {
             connMap |= 0x01 << s;
             if (connMap != getConnMap()) {
                 setConnMap(connMap);
-                onMaskChanged();
+                maskChangeEvent(false, true);
             }
             return true;
         }
@@ -72,7 +72,7 @@ default boolean connectInternal(IConnectable part, int s) {
             connMap |= 0x40 << s;
             if (connMap != getConnMap()) {
                 setConnMap(connMap);
-                onMaskChanged();
+                maskChangeEvent(true, false);
             }
             return true;
         }

core/src/main/java/mrtjp/projectred/core/part/IConnectableFacePart.java

@@ -138,7 +138,7 @@ default boolean connectCorner(IConnectable part, int r, int edgeRot) {
             if (setRenderFlag(part)) connMap |= 0x100000 << r;
             if (connMap != getConnMap()) {
                 setConnMap(connMap);
-                onMaskChanged();
+                maskChangeEvent(false, true);
             }
             return true;
         }
@@ -152,7 +152,7 @@ default boolean connectStraight(IConnectable part, int r, int edgeRot) {
             connMap |= 0x10 << r;
             if (connMap != getConnMap()) {
                 setConnMap(connMap);
-                onMaskChanged();
+                maskChangeEvent(false, true);
             }
             return true;
         }
@@ -166,7 +166,7 @@ default boolean connectInternal(IConnectable part, int r) {
             connMap |= 0x100 << r;
             if (connMap != getConnMap()) {
                 setConnMap(connMap);
-                onMaskChanged();
+                maskChangeEvent(true, false);
             }
             return true;
         }

core/src/main/java/mrtjp/projectred/core/part/IConnectablePart.java

@@ -44,35 +44,42 @@ public interface IConnectablePart extends IConnectable {
     boolean updateInternalConns();
 
     /**
-     * Start update chain starting from an internal change outward
+     * Updates internal connections first, then updates open conns.
+     * If open conns change, then external conns are updated.
      * <p>
-     * When using this method be sure to call TConnectableCommons#onMaskChanged()
-     * as needed as it is not called for you.
-     *
-     * @return true if a new connection was added or one was removed
+     * Use this when an internal part change occurs.
      */
-    default boolean updateOutward() {
-        boolean changed = updateInternalConns();
-        if (updateOpenConns()) changed |= updateExternalConns();
-        return changed;
+    default void updateOutward() {
+        // Update internal conns first
+        boolean internal = updateInternalConns();
+        // If open conns changed, update external conns as well
+        boolean external = updateOpenConns() && updateExternalConns();
+        maskChangeEvent(internal, external);
     }
 
     /**
-     * Start update chain starting from an external change inward
+     * Full update for internal and external connections.
      * <p>
-     * When using this method be sure to call TConnectableCommons#onMaskChanged()
-     * as needed as it is not called for you.
-     *
-     * @return true if a new connection was added or one was removed
+     * Use when part is added, etc.
      */
-    default boolean updateInward() {
+    default void updateInsideAndOutside() {
         updateOpenConns();
-        boolean changed = updateInternalConns();
-        changed |= updateExternalConns();
-        return changed;
+        boolean internal = updateInternalConns();
+        boolean external = updateExternalConns();
+        maskChangeEvent(internal, external);
     }
 
-    void notifyAllExternals();
+    /**
+     * Update external connections only.
+     * <p>
+     * Use when only neighbors have changed and not any other part
+     */
+    default void updateOutside() {
+        boolean external = updateExternalConns();
+        maskChangeEvent(false, external);
+    }
+
+    void maskChangeEvent(boolean internalChange, boolean externalChange);
 
-    void onMaskChanged();
+    void notifyAllExternals();
 }

integration/src/main/java/mrtjp/projectred/integration/part/GatePart.java

@@ -244,7 +244,7 @@ public void onNeighborBlockChanged(BlockPos from) {
             if (dropIfCantStay()) {
                 return;
             }
-            updateExternalConns();
+            updateOutside();
             onChange();
         }
     }
@@ -254,7 +254,7 @@ public void onAdded() {
         super.onAdded();
         if (!level().isClientSide) {
             gateLogicSetup();
-            updateInward();
+            updateInsideAndOutside();
             onChange();
         }
     }
@@ -290,7 +290,7 @@ protected void onChange() {
     }
 
     @Override
-    public void onMaskChanged() {
+    public void maskChangeEvent(boolean internalChange, boolean externalChange) {
         // Client doesn't need connmap, wont send
     }
     //endregion
@@ -440,7 +440,7 @@ public InteractionResult activate(Player player, PartRayTraceResult hit, ItemSta
 
     protected void configure() {
         if (gateLogicCycleShape()) {
-            updateInward();
+            updateInsideAndOutside();
             tile().setChanged();
             tile().notifyPartChange(this);
             sendShapeUpdate();
@@ -451,7 +451,7 @@ protected void configure() {
 
     protected void rotate() {
         setRotation((getRotation() + 1) % 4);
-        updateInward();
+        updateInsideAndOutside();
         tile().setChanged();
         tile().notifyPartChange(this);
         sendOrientationUpdate();

transmission/src/main/java/mrtjp/projectred/transmission/part/BaseCenterWirePart.java

@@ -180,27 +180,23 @@ public SoundType getPlacementSound(UseOnContext context) {
     public void onPartChanged(@Nullable MultiPart part) {
         super.onPartChanged(part);
         if (!level().isClientSide) {
-            if (updateOutward()) {
-                onMaskChanged();
-            }
+            updateOutward();
         }
     }
 
     @Override
     public void onNeighborBlockChanged(BlockPos from) {
         super.onNeighborBlockChanged(from);
         if (!level().isClientSide) {
-            if (updateExternalConns()) {
-                onMaskChanged();
-            }
+            updateOutside();
         }
     }
 
     @Override
     public void onAdded() {
         super.onAdded();
         if (!level().isClientSide) {
-            if (updateInward()) onMaskChanged();
+            updateInsideAndOutside();
         }
     }
 
@@ -342,8 +338,10 @@ public boolean discoverOpen(int s) {
     }
 
     @Override
-    public void onMaskChanged() {
-        sendConnUpdate();
+    public void maskChangeEvent(boolean internalChange, boolean externalChange) {
+        if (internalChange || externalChange) {
+            sendConnUpdate();
+        }
     }
     //endregion
 }

transmission/src/main/java/mrtjp/projectred/transmission/part/BaseFaceWirePart.java

@@ -136,9 +136,7 @@ public SoundType getPlacementSound(UseOnContext context) {
     public void onPartChanged(@Nullable MultiPart part) {
         super.onPartChanged(part);
         if (!level().isClientSide) {
-            if (updateOutward()) {
-                onMaskChanged();
-            }
+            updateOutward();
         }
     }
 
@@ -147,17 +145,15 @@ public void onNeighborBlockChanged(BlockPos from) {
         super.onNeighborBlockChanged(from);
         if (!level().isClientSide) {
             if (dropIfCantStay()) return;
-            if (updateExternalConns()) {
-                onMaskChanged();
-            }
+            updateOutside();
         }
     }
 
     @Override
     public void onAdded() {
         super.onAdded();
         if (!level().isClientSide) {
-            if (updateInward()) onMaskChanged();
+            updateInsideAndOutside();
         }
     }
 
@@ -260,8 +256,10 @@ public boolean discoverOpen(int r) {
     }
 
     @Override
-    public void onMaskChanged() {
-        sendConnUpdate();
+    public void maskChangeEvent(boolean internalChange, boolean externalChange) {
+        if (internalChange || externalChange) {
+            sendConnUpdate();
+        }
     }
     //endregion
 }

transmission/src/main/java/mrtjp/projectred/transmission/part/BundledCablePart.java

@@ -1,7 +1,6 @@
 package mrtjp.projectred.transmission.part;
 
 import codechicken.lib.vec.Rotation;
-import codechicken.multipart.api.part.MultiPart;
 import mrtjp.projectred.api.IBundledEmitter;
 import mrtjp.projectred.api.IBundledTile;
 import mrtjp.projectred.api.IConnectable;
@@ -11,7 +10,6 @@
 import mrtjp.projectred.core.RedstonePropagator;
 import mrtjp.projectred.core.part.IPropagationFacePart;
 import mrtjp.projectred.transmission.WireType;
-import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 
@@ -72,42 +70,14 @@ public void load(CompoundTag tag) {
         super.load(tag);
         setSignal(tag.getByteArray("signal"));
     }
+    //endregion
 
+    //region IConnectableFacePart overrides
     @Override
-    public void onPartChanged(@Nullable MultiPart part) {
-        if (!level().isClientSide) {
-            RedstonePropagator.logCalculation();
-            if (updateOutward()) {
-                onMaskChanged();
-                RedstonePropagator.propagateTo(this, FORCE);
-            } else {
-                RedstonePropagator.propagateTo(this, RISING);
-            }
-        }
-    }
-
-    @Override
-    public void onNeighborBlockChanged(BlockPos from) {
-        if (!level().isClientSide) {
-            if (dropIfCantStay()) {
-                return;
-            }
-            RedstonePropagator.logCalculation();
-            if (updateExternalConns()) {
-                onMaskChanged();
-                RedstonePropagator.propagateTo(this, FORCE);
-            } else {
-                RedstonePropagator.propagateTo(this, RISING);
-            }
-        }
-    }
-
-    @Override
-    public void onAdded() {
-        super.onAdded();
-        if (!level().isClientSide) {
-            RedstonePropagator.propagateTo(this, RISING);
-        }
+    public void maskChangeEvent(boolean internalChange, boolean externalChange) {
+        super.maskChangeEvent(internalChange, externalChange);
+        RedstonePropagator.logCalculation();
+        RedstonePropagator.propagateTo(this, internalChange || externalChange ? FORCE : RISING);
     }
     //endregion
 

transmission/src/main/java/mrtjp/projectred/transmission/part/FacePowerWire.java

@@ -8,7 +8,6 @@
 import mrtjp.projectred.core.power.IPowerConnectable;
 import mrtjp.projectred.core.power.PowerConductor;
 import mrtjp.projectred.transmission.WireType;
-import net.minecraft.core.BlockPos;
 
 import javax.annotation.Nullable;
 import java.util.LinkedList;
@@ -37,18 +36,6 @@ public List<PowerConductor> getConnectedConductors() {
         return connectedConductors;
     }
 
-    @Override
-    public void onMaskChanged() {
-        super.onMaskChanged();
-        cacheInvalid = true;
-    }
-
-    @Override
-    public void onNeighborBlockChanged(BlockPos from) {
-        super.onNeighborBlockChanged(from);
-        cacheInvalid = true;
-    }
-
     private void recacheConductors() {
         connectedConductors.clear();
 
@@ -89,6 +76,12 @@ private void recacheConductors() {
     }
 
     //region Connections
+    @Override
+    public void maskChangeEvent(boolean internalChange, boolean externalChange) {
+        // Invalidate even if conns have not changed (adjacent conductors may have moved, etc)
+        cacheInvalid = true;
+    }
+
     @Override
     public boolean discoverCornerOverride(int absDir) {
         int r = IConnectableFacePart.absoluteRot(this, absDir);