Skip slot element traversal for periodic updates

Author: NichtStudioCode

invui/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java

@@ -101,15 +101,15 @@ non-sealed abstract class AbstractWindow<M extends CustomContainerMenu> implemen
         menu.setWindow(this);
     }
 
-    protected void update(int slot) {
+    protected void update(int slot, boolean structural) {
         SlotElement.GuiLink root = getGuiAt(slot);
         if (root == null)
             return;
 
         List<SlotElement> path = elementsDisplayed.get(slot);
 
         // if path has changed, viewers need to be updated
-        if (!root.checkTraverse(path)) {
+        if (structural && !root.checkTraverse(path)) {
             unregisterAsViewer(slot, path);
             path = root.traverse();
 
@@ -224,12 +224,9 @@ private void updateAndFlush(UpdateType updateType, int pingId) {
     }
 
     private UpdateType updateSlots() {
-        BitSet toUpdate;
-        synchronized (dirtySlots) {
-            toUpdate = (BitSet) dirtySlots.clone();
-            dirtySlots.clear();
-        }
+        boolean changedAny = false;
 
+        // periodic updates (cannot be structural, only item or inventory element)
         for (int slot = 0; slot < size; slot++) {
             if (slot >= elementsDisplayed.size())
                 continue;
@@ -239,14 +236,22 @@ private UpdateType updateSlots() {
                 continue;
 
             var updatePeriod = path.getLast().getUpdatePeriod();
-            if (updatePeriod > 0 && windowTick % updatePeriod == 0)
-                toUpdate.set(slot);
+            if (updatePeriod > 0 && windowTick % updatePeriod == 0) {
+                update(slot, false);
+                changedAny = true;
+            }
+        }
+        
+        // updates from notifyWindows (can be structural, ex. gui slot element change)
+        BitSet toUpdate;
+        synchronized (dirtySlots) {
+            toUpdate = (BitSet) dirtySlots.clone();
+            dirtySlots.clear();
         }
 
-        boolean changedAny = false;
         int slot = 0;
         while ((slot = toUpdate.nextSetBit(slot)) != -1) {
-            update(slot);
+            update(slot, true);
             changedAny = true;
             slot++;
         }
@@ -526,7 +531,7 @@ public void open() {
 
             // init items
             for (int i = 0; i < size; i++) {
-                update(i);
+                update(i, true);
             }
             postItemInit();
 

invui/src/main/java/xyz/xenondevs/invui/window/BrewingWindowImpl.java

@@ -59,11 +59,11 @@ public BrewingWindowImpl(
     }
 
     @Override
-    protected void update(int slot) {
+    protected void update(int slot, boolean structural) {
         switch (slot) {
             case BREW_PROGRESS_MAGIC_SLOT -> menu.setBrewProgress(getBrewProgress());
             case FUEL_PROGRESS_MAGIC_SLOT -> menu.setFuelProgress(getFuelProgress());
-            default -> super.update(slot);
+            default -> super.update(slot, structural);
         }
     }
 

invui/src/main/java/xyz/xenondevs/invui/window/CartographyWindowImpl.java

@@ -74,11 +74,11 @@ protected void setMenuItem(int slot, @Nullable ItemStack itemStack) {
     }
 
     @Override
-    protected void update(int slot) {
+    protected void update(int slot, boolean structural) {
         switch (slot) {
             case VIEW_MAGIC_SLOT -> menu.setView(getView());
             case ICONS_MAGIC_SLOT -> menu.setIcons(getIcons(), isOpen());
-            default -> super.update(slot);
+            default -> super.update(slot, structural);
         }
     }
 

invui/src/main/java/xyz/xenondevs/invui/window/CrafterWindowImpl.java

@@ -53,18 +53,18 @@ final class CrafterWindowImpl extends AbstractSplitWindow<CustomCrafterMenu> imp
         for (int i = 0; i < CRAFTING_SLOTS; i++) {
             int slot = i;
             MutableProperty<Boolean> property = slots.get(slot);
-            property.observeWeak(this, thisRef -> thisRef.update(SLOTS_MAGIC_SLOT_OFFSET + slot));
+            property.observeWeak(this, thisRef -> thisRef.update(SLOTS_MAGIC_SLOT_OFFSET + slot, false));
             menu.setSlotDisabled(slot, isSlotDisabled(slot));
         }
         menu.setSlotStateChangeHandler(this::playerToggleSlot);
     }
 
     @Override
-    protected void update(int slot) {
+    protected void update(int slot, boolean structural) {
         if (slot >= SLOTS_MAGIC_SLOT_OFFSET && slot < SLOTS_MAGIC_SLOT_OFFSET + CRAFTING_SLOTS) {
             menu.setSlotDisabled(slot - SLOTS_MAGIC_SLOT_OFFSET, isSlotDisabled(slot - SLOTS_MAGIC_SLOT_OFFSET));
         } else {
-            super.update(slot);
+            super.update(slot, structural);
         }
     }
 

invui/src/main/java/xyz/xenondevs/invui/window/FurnaceWindowImpl.java

@@ -61,11 +61,11 @@ public FurnaceWindowImpl(
     }
 
     @Override
-    protected void update(int slot) {
+    protected void update(int slot, boolean structural) {
         switch (slot) {
             case COOK_PROGRESS_MAGIC_SLOT -> menu.setCookProgress(getCookProgress());
             case BURN_PROGRESS_MAGIC_SLOT -> menu.setBurnProgress(getBurnProgress());
-            default -> super.update(slot);
+            default -> super.update(slot, structural);
         }
     }
 

invui/src/main/java/xyz/xenondevs/invui/window/MerchantWindowImpl.java

@@ -145,12 +145,12 @@ protected void unregisterAsViewer() {
     }
 
     @Override
-    protected void update(int slot) {
+    protected void update(int slot, boolean structural) {
         switch (slot) {
             case TRADES_REBUILD_MAGIC_SLOT -> rebuildTrades();
             case TRADES_RESEND_MAGIC_SLOT ->
                 menu.sendTrades(activeTrades, getLevel(), getProgress(), isRestockMessageEnabled());
-            default -> super.update(slot);
+            default -> super.update(slot, structural);
         }
     }
 

invui/src/main/java/xyz/xenondevs/invui/window/StonecutterWindowImpl.java

@@ -78,11 +78,11 @@ public StonecutterWindowImpl(
     }
 
     @Override
-    protected void update(int slot) {
+    protected void update(int slot, boolean structural) {
         if (slot == selectedSlotMagicSlot) {
             menu.setSelectedSlot(getSelectedSlot());
         } else {
-            super.update(slot);
+            super.update(slot, structural);
         }
     }