Update slots after interaction instead of during

This removes the window slot updating exception in interaction handling context. Instead, dirty slots are now updated immediately after the interaction. This has the benefit that multiple notifyWindows to the same slot during an interaction will now also only result in one update (item provider retrieval).

Author: NichtStudioCode

invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomContainerMenu.java

@@ -76,11 +76,6 @@ public abstract class CustomContainerMenu {
      */
     private static final long PING_TIMEOUT_MS = 10_000;
 
-    /**
-     * A thread local that stores whether the current thread is an interaction handling context (i.e. handling a click).
-     */
-    private static final ThreadLocal<Boolean> interactionContext = ThreadLocal.withInitial(() -> false);
-    
     /**
      * Hash generator for {@link HashedStack}.
      */
@@ -165,16 +160,6 @@ protected CustomContainerMenu(MenuType<?> menuType, org.bukkit.entity.Player pla
         this.proxy = new ContainerMenuProxy();
     }
 
-    /**
-     * Checks whether the current thread is an interaction handling context, i.e.
-     * currently handling a click packet.
-     *
-     * @return Whether we are currently in an interaction handling context
-     */
-    public static boolean isInInteractionHandlingContext() {
-        return interactionContext.get();
-    }
-    
     /**
      * Puts an {@link org.bukkit.inventory.ItemStack} into the specified slot.
      *
@@ -602,12 +587,10 @@ protected void handleButtonClick(int buttonId) {
      */
     protected void runInInteractionContext(Runnable run) {
         try {
-            interactionContext.set(true);
             run.run();
+            getWindowEvents().updateSlots();
         } catch (Throwable t) {
             InvUI.getInstance().handleException("An exception occurred while handling a window interaction", t);
-        } finally {
-            interactionContext.set(false);
         }
     }
     //</editor-fold>

invui/src/main/java/xyz/xenondevs/invui/internal/menu/WindowEventListener.java

@@ -17,4 +17,6 @@ public interface WindowEventListener {
 
     void handlePong(int id);
 
+    void updateSlots();
+    
 }

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

@@ -189,16 +189,22 @@ protected void setMenuItem(int slot, @Nullable ItemStack itemStack) {
     }
 
     public void notifyUpdate(int slot) {
-        if (CustomContainerMenu.isInInteractionHandlingContext()) {
-            update(slot);
-        } else {
-            synchronized (dirtySlots) {
-                dirtySlots.set(slot);
-            }
+        synchronized (dirtySlots) {
+            dirtySlots.set(slot);
         }
     }
 
     public void handleTick() {
+        updateSlots();
+        
+        if (titleSupplier instanceof AnimatedTitle)
+            updateTitle();
+        
+        menu.sendChangesToRemote();
+    }
+    
+    @Override
+    public void updateSlots() {
         synchronized (dirtySlots) {
             int slot = 0;
             while ((slot = dirtySlots.nextSetBit(slot)) != -1) {
@@ -207,11 +213,6 @@ public void handleTick() {
             }
             dirtySlots.clear();
         }
-        
-        if (titleSupplier instanceof AnimatedTitle)
-            updateTitle();
-        
-        menu.sendChangesToRemote();
     }
 
     @Override