Use (Mutable)Property for Window state

NichtStudioCode · NichtStudioCode · commit 037d08b3654d · 2025-04-22T11:55:08.000+02:00
diff --git a/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/AnvilWindowExtensions.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/AnvilWindowExtensions.kt
@@ -0,0 +1,9 @@
+package xyz.xenondevs.invui.window
+
+import xyz.xenondevs.commons.provider.MutableProvider
+import xyz.xenondevs.invui.ExperimentalReactiveApi
+
+@Suppress("UNCHECKED_CAST")
+@ExperimentalReactiveApi
+fun AnvilWindow.Builder.addRenameHandler(handler: MutableProvider<String>): AnvilWindow.Builder =
+    addRenameHandler(handler::set)
diff --git a/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/CrafterWindowExtensions.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/CrafterWindowExtensions.kt
@@ -0,0 +1,22 @@
+package xyz.xenondevs.invui.window
+
+import xyz.xenondevs.commons.provider.MutableProvider
+import xyz.xenondevs.invui.ExperimentalReactiveApi
+import xyz.xenondevs.invui.MutablePropertyAdapter
+import xyz.xenondevs.invui.gui.Slot
+
+@ExperimentalReactiveApi
+fun CrafterWindow.Builder.setSlot(slot: Int, provider: MutableProvider<Boolean>): CrafterWindow.Builder =
+    setSlot(slot, MutablePropertyAdapter(provider))
+
+@ExperimentalReactiveApi
+fun CrafterWindow.Builder.setSlot(x: Int, y: Int, provider: MutableProvider<Boolean>): CrafterWindow.Builder =
+    setSlot(x, y, MutablePropertyAdapter(provider))
+
+@ExperimentalReactiveApi
+fun CrafterWindow.Builder.setSlot(slot: Slot, provider: MutableProvider<Boolean>): CrafterWindow.Builder =
+    setSlot(slot, MutablePropertyAdapter(provider))
+
+@ExperimentalReactiveApi
+fun CrafterWindow.Builder.setSlots(slots: List<MutableProvider<Boolean>>): CrafterWindow.Builder =
+    setSlots(slots.map { MutablePropertyAdapter(it) })
diff --git a/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/MerchantWindowExtensions.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/MerchantWindowExtensions.kt
@@ -0,0 +1,29 @@
+package xyz.xenondevs.invui.window
+
+import xyz.xenondevs.commons.provider.Provider
+import xyz.xenondevs.invui.ExperimentalReactiveApi
+import xyz.xenondevs.invui.PropertyAdapter
+
+@ExperimentalReactiveApi
+fun MerchantWindow.Builder.setTrades(trades: Provider<List<MerchantWindow.Trade>>): MerchantWindow.Builder =
+    setTrades(PropertyAdapter(trades))
+
+@ExperimentalReactiveApi
+fun MerchantWindow.Builder.setLevel(level: Provider<Int>): MerchantWindow.Builder =
+    setLevel(PropertyAdapter(level))
+
+@ExperimentalReactiveApi
+fun MerchantWindow.Builder.setProgress(progress: Provider<Double>): MerchantWindow.Builder =
+    setProgress(PropertyAdapter(progress))
+
+@ExperimentalReactiveApi
+fun MerchantWindow.Builder.setRestockMessageEnabled(restockMessageEnabled: Provider<Boolean>): MerchantWindow.Builder =
+    setRestockMessageEnabled(PropertyAdapter(restockMessageEnabled))
+
+@ExperimentalReactiveApi
+fun MerchantWindow.Trade.Builder.setDiscount(discount: Provider<Int>): MerchantWindow.Trade.Builder =
+    setDiscount(PropertyAdapter(discount))
+
+@ExperimentalReactiveApi
+fun MerchantWindow.Trade.Builder.setAvailable(available: Provider<Boolean>): MerchantWindow.Trade.Builder =
+    setAvailable(PropertyAdapter(available))
diff --git a/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/ReactiveWindows.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/ReactiveWindows.kt
diff --git a/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/StonecutterWindowExtensions.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/StonecutterWindowExtensions.kt
@@ -0,0 +1,9 @@
+package xyz.xenondevs.invui.window
+
+import xyz.xenondevs.commons.provider.MutableProvider
+import xyz.xenondevs.invui.ExperimentalReactiveApi
+import xyz.xenondevs.invui.MutablePropertyAdapter
+
+@ExperimentalReactiveApi
+fun StonecutterWindow.Builder.setSelectedSlot(provider: MutableProvider<Int>): StonecutterWindow.Builder =
+    setSelectedSlot(MutablePropertyAdapter(provider))
diff --git a/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/WindowExtensions.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/window/WindowExtensions.kt
@@ -0,0 +1,13 @@
+package xyz.xenondevs.invui.window
+
+import net.kyori.adventure.text.Component
+import xyz.xenondevs.commons.provider.MutableProvider
+import xyz.xenondevs.commons.provider.Provider
+import xyz.xenondevs.invui.ExperimentalReactiveApi
+
+@Suppress("UNCHECKED_CAST")
+@ExperimentalReactiveApi
+fun <S : Window.Builder<*, *>> S.setTitle(provider: Provider<Component>): S {
+    addModifier { window -> provider.observeWeak(window) { weakWindow -> weakWindow.updateTitle() } }
+    return setTitleSupplier(provider) as S
+}
diff --git a/invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomCrafterMenu.java b/invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomCrafterMenu.java
@@ -80,7 +80,7 @@ private void handleSlotStateChange(ServerboundContainerSlotStateChangedPacket pa
         dataSlots[slot] = value;
         
         if (slotStateChangeHandler != null)
-            slotStateChangeHandler.accept(slot, packet.newState());
+            slotStateChangeHandler.accept(slot, !packet.newState());
     }
     
 }
diff --git a/invui/src/main/java/xyz/xenondevs/invui/internal/util/CollectionUtils.java b/invui/src/main/java/xyz/xenondevs/invui/internal/util/CollectionUtils.java
@@ -2,7 +2,10 @@
 
 import xyz.xenondevs.invui.InvUI;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.logging.Level;
 
 public class CollectionUtils {
@@ -28,4 +31,21 @@ public static <T> void forEachCatching(Iterable<? extends T> iterable, Consumer<
         }
     }
     
+    /**
+     * Creates a new {@link List} of the specified size, filled with the results of the
+     * specified {@link Function initializer}.
+     *
+     * @param size        The size of the list to create
+     * @param initializer The {@link Function} to use to initialize the elements of the list
+     * @param <T>         The type of the elements in the list
+     * @return A new {@link List} of the specified size, filled with the results of the
+     */
+    public static <T> List<T> create(int size, Function<? super Integer, ? extends T> initializer) {
+        var list = new ArrayList<T>();
+        for (int i = 0; i < size; i++) {
+            list.add(initializer.apply(i));
+        }
+        return list;
+    }
+    
 }
diff --git a/invui/src/main/java/xyz/xenondevs/invui/internal/util/ItemUtils2.java b/invui/src/main/java/xyz/xenondevs/invui/internal/util/ItemUtils2.java
@@ -20,7 +20,7 @@
 @SuppressWarnings("UnstableApiUsage")
 public class ItemUtils2 {
     
-    private static final ItemStack NON_EMPTY_PLACEHOLDER = new ItemBuilder(Material.STONE)
+    private static final ItemStack NON_EMPTY_PLACEHOLDER = new ItemBuilder(Material.BARRIER)
         .hideTooltip(true)
         .set(DataComponentTypes.ITEM_MODEL, Key.key("air"))
         .build();
diff --git a/invui/src/main/java/xyz/xenondevs/invui/window/CrafterWindow.java b/invui/src/main/java/xyz/xenondevs/invui/window/CrafterWindow.java
@@ -4,6 +4,7 @@
 import org.jspecify.annotations.Nullable;
 import xyz.xenondevs.invui.gui.Gui;
 import xyz.xenondevs.invui.gui.Slot;
+import xyz.xenondevs.invui.state.MutableProperty;
 
 import java.util.List;
 import java.util.function.BiConsumer;
@@ -189,6 +190,51 @@ default Builder setResultGui(Gui.Builder<?, ?> builder) {
          */
         Builder addSlotToggleHandler(BiConsumer<? super Integer, ? super Boolean> handler);
         
+        /**
+         * Sets the property that contains the disabled state of the slot at the given index.
+         *
+         * @param slot  The slot index
+         * @param state The property that contains the disabled state of the slot
+         * @return This {@link Builder}
+         * @throws IllegalArgumentException If the slot index is out of bounds (0-8)
+         */
+        Builder setSlot(int slot, MutableProperty<Boolean> state);
+        
+        /**
+         * Sets the property that contains the disabled state of the slot at the given coordinates.
+         *
+         * @param x     The x coordinate of the slot
+         * @param y     The y coordinate of the slot
+         * @param state The property that contains the disabled state of the slot
+         * @return This {@link Builder}
+         * @throws IllegalArgumentException If the slot coordinates are out of bounds (0-2, 0-2)
+         */
+        default Builder setSlot(int x, int y, MutableProperty<Boolean> state) {
+            return setSlot(x + y * 3, state);
+        }
+        
+        /**
+         * Sets the property that contains the disabled state of the slot at the given coordinates.
+         *
+         * @param slot  The slot
+         * @param state The property that contains the disabled state of the slot
+         * @return This {@link Builder}
+         * @throws IllegalArgumentException If the slot coordinates are out of bounds (0-2, 0-2)
+         */
+        default Builder setSlot(Slot slot, MutableProperty<Boolean> state) {
+            return setSlot(slot.x(), slot.y(), state);
+        }
+        
+        /**
+         * Sets the slot properties that contain the disabled state of the slots, ordered by their slot index.
+         * The given list must contain exactly 9 properties.
+         *
+         * @param slots The slot properties that contain the disabled state of the slots
+         * @return This {@link Builder}
+         * @throws IllegalArgumentException If the list does not contain exactly 9 properties
+         */
+        Builder setSlots(List<? extends MutableProperty<Boolean>> slots);
+        
     }
     
 }
diff --git a/invui/src/main/java/xyz/xenondevs/invui/window/CrafterWindowImpl.java b/invui/src/main/java/xyz/xenondevs/invui/window/CrafterWindowImpl.java
@@ -8,6 +8,8 @@
 import xyz.xenondevs.invui.gui.AbstractGui;
 import xyz.xenondevs.invui.gui.Gui;
 import xyz.xenondevs.invui.internal.menu.CustomCrafterMenu;
+import xyz.xenondevs.invui.internal.util.CollectionUtils;
+import xyz.xenondevs.invui.state.MutableProperty;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,9 +19,12 @@
 
 final class CrafterWindowImpl extends AbstractSplitWindow<CustomCrafterMenu> implements CrafterWindow {
     
+    private static final int CRAFTING_SLOTS = 9;
+    
     private final AbstractGui craftingGui;
     private final AbstractGui resultGui;
     private final AbstractGui lowerGui;
+    private final List<? extends MutableProperty<Boolean>> slots;
     private final List<BiConsumer<? super Integer, ? super Boolean>> slotToggleHandlers;
     
     CrafterWindowImpl(
@@ -28,6 +33,7 @@ final class CrafterWindowImpl extends AbstractSplitWindow<CustomCrafterMenu> imp
         AbstractGui craftingGui,
         AbstractGui resultGui,
         AbstractGui lowerGui,
+        List<? extends MutableProperty<Boolean>> slots,
         List<BiConsumer<? super Integer, ? super Boolean>> slotToggleHandlers,
         boolean closeable
     ) {
@@ -40,12 +46,20 @@ final class CrafterWindowImpl extends AbstractSplitWindow<CustomCrafterMenu> imp
         this.craftingGui = craftingGui;
         this.resultGui = resultGui;
         this.lowerGui = lowerGui;
+        this.slots = slots;
         this.slotToggleHandlers = slotToggleHandlers;
-        
-        menu.setSlotStateChangeHandler(this::handleSlotToggled);
+       
+        for (int i = 0; i < CRAFTING_SLOTS; i++) {
+            int slot = i;
+            MutableProperty<Boolean> property = slots.get(i);
+            property.observeWeak(this, thisRef -> thisRef.menu.setSlotDisabled(slot, property.get()));
+            menu.setSlotDisabled(i, property.get());
+        }
+        menu.setSlotStateChangeHandler(this::playerToggleSlot);
     }
     
-    private void handleSlotToggled(int slot, boolean disabled) {
+    private void playerToggleSlot(int slot, boolean disabled) {
+        slots.get(slot).set(disabled);
         for (var handler : slotToggleHandlers) {
             handler.accept(slot, disabled);
         }
@@ -54,6 +68,7 @@ private void handleSlotToggled(int slot, boolean disabled) {
     @Override
     public void setSlotDisabled(int slot, boolean disabled) {
         menu.setSlotDisabled(slot, disabled);
+        slots.get(slot).set(disabled);
     }
     
     @Override
@@ -96,6 +111,7 @@ static final class BuilderImpl
         private Supplier<? extends Gui> craftingGuiSupplier = () -> Gui.empty(3, 3);
         private Supplier<? extends Gui> resultGuiSupplier = () -> Gui.empty(1, 1);
         private final List<BiConsumer<? super Integer, ? super Boolean>> slotToggleHandlers = new ArrayList<>();
+        private final List<MutableProperty<Boolean>> slots = CollectionUtils.create(9, i -> MutableProperty.of(false));
         
         @Override
         public CrafterWindow.Builder setCraftingGui(Supplier<? extends Gui> guiSupplier) {
@@ -122,6 +138,25 @@ public CrafterWindow.Builder addSlotToggleHandler(BiConsumer<? super Integer, ?
             return this;
         }
         
+        @Override
+        public CrafterWindow.Builder setSlot(int slot, MutableProperty<Boolean> state) {
+            if (slot < 0 || slot >= CRAFTING_SLOTS)
+                throw new IllegalArgumentException("Slot must be between 0 and 8");
+            slots.set(slot, state);
+            return this;
+        }
+        
+        @Override
+        public CrafterWindow.Builder setSlots(List<? extends MutableProperty<Boolean>> slots) {
+            if (slots.size() != CRAFTING_SLOTS)
+                throw new IllegalArgumentException("Slots must contain exactly " + CRAFTING_SLOTS + " properties");
+            
+            for (int i = 0; i < CRAFTING_SLOTS; i++) {
+                this.slots.set(i, slots.get(i));
+            }
+            return this;
+        }
+        
         @Override
         public CrafterWindowImpl build(Player viewer) {
             var window = new CrafterWindowImpl(
@@ -130,6 +165,7 @@ public CrafterWindowImpl build(Player viewer) {
                 (AbstractGui) craftingGuiSupplier.get(),
                 (AbstractGui) resultGuiSupplier.get(),
                 supplyLowerGui(viewer),
+                slots,
                 slotToggleHandlers,
                 closeable
             );
diff --git a/invui/src/main/java/xyz/xenondevs/invui/window/MerchantWindow.java b/invui/src/main/java/xyz/xenondevs/invui/window/MerchantWindow.java
diff --git a/invui/src/main/java/xyz/xenondevs/invui/window/MerchantWindowImpl.java b/invui/src/main/java/xyz/xenondevs/invui/window/MerchantWindowImpl.java
diff --git a/invui/src/main/java/xyz/xenondevs/invui/window/StonecutterWindow.java b/invui/src/main/java/xyz/xenondevs/invui/window/StonecutterWindow.java
diff --git a/invui/src/main/java/xyz/xenondevs/invui/window/StonecutterWindowImpl.java b/invui/src/main/java/xyz/xenondevs/invui/window/StonecutterWindowImpl.java

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ private void handleSlotStateChange(ServerboundContainerSlotStateChangedPacket pa`
`80`	`80`	`dataSlots[slot] = value;`
`81`	`81`
`82`	`82`	`if (slotStateChangeHandler != null)`
`83`		`- slotStateChangeHandler.accept(slot, packet.newState());`
	`83`	`+ slotStateChangeHandler.accept(slot, !packet.newState());`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`}`