DSL: ingredients block, improved provider properties

Author: NichtStudioCode

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/AnvilWindowDsl.kt

@@ -6,6 +6,8 @@ import org.bukkit.entity.Player
 import xyz.xenondevs.commons.provider.Provider
 import xyz.xenondevs.commons.provider.mutableProvider
 import xyz.xenondevs.invui.ExperimentalReactiveApi
+import xyz.xenondevs.invui.dsl.property.GuiDslProperty
+import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
 import xyz.xenondevs.invui.window.AnvilWindow
 import xyz.xenondevs.invui.window.addRenameHandler
 import xyz.xenondevs.invui.window.setResultAlwaysValid
@@ -42,8 +44,8 @@ internal class AnvilWindowDslImpl(
         builder.apply { 
             setUpperGui(upperGui.value)
             addRenameHandler(text)
-            setTextFieldAlwaysEnabled(textFieldAlwaysEnabled.value)
-            setResultAlwaysValid(resultAlwaysValid.value)
+            setTextFieldAlwaysEnabled(textFieldAlwaysEnabled.delegate)
+            setResultAlwaysValid(resultAlwaysValid.delegate)
         }
     }
 

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/BrewingWindowDsl.kt

@@ -4,6 +4,8 @@ package xyz.xenondevs.invui.dsl
 
 import org.bukkit.entity.Player
 import xyz.xenondevs.invui.ExperimentalReactiveApi
+import xyz.xenondevs.invui.dsl.property.GuiDslProperty
+import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
 import xyz.xenondevs.invui.window.BrewingWindow
 import xyz.xenondevs.invui.window.setBrewProgress
 import xyz.xenondevs.invui.window.setFuelProgress
@@ -42,8 +44,8 @@ internal class BrewingWindowDslImpl(
             setInputGui(inputGui.value)
             setFuelGui(fuelGui.value)
             setResultGui(resultGui.value)
-            setBrewProgress(brewProgress.value)
-            setFuelProgress(fuelProgress.value)
+            setBrewProgress(brewProgress.delegate)
+            setFuelProgress(fuelProgress.delegate)
         }
     }
 

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/CartographyWindow.kt

@@ -4,6 +4,8 @@ package xyz.xenondevs.invui.dsl
 
 import org.bukkit.entity.Player
 import xyz.xenondevs.invui.ExperimentalReactiveApi
+import xyz.xenondevs.invui.dsl.property.GuiDslProperty
+import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
 import xyz.xenondevs.invui.window.CartographyWindow
 import xyz.xenondevs.invui.window.setIcons
 import xyz.xenondevs.invui.window.setView
@@ -41,8 +43,8 @@ internal class CartographyWindowDslImpl(
         builder.apply { 
             setInputGui(inputGui.value)
             setResultGui(resultGui.value)
-            setIcons(icons.value)
-            setView(view.value)
+            setIcons(icons.delegate)
+            setView(view.delegate)
         }
     }
 

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/CrafterWindowDsl.kt

@@ -3,9 +3,9 @@
 package xyz.xenondevs.invui.dsl
 
 import org.bukkit.entity.Player
-import xyz.xenondevs.commons.provider.MutableProvider
-import xyz.xenondevs.commons.provider.mutableProvider
 import xyz.xenondevs.invui.ExperimentalReactiveApi
+import xyz.xenondevs.invui.dsl.property.GuiDslProperty
+import xyz.xenondevs.invui.dsl.property.MutableProvider2dArrayDslProperty
 import xyz.xenondevs.invui.window.CrafterWindow
 import xyz.xenondevs.invui.window.setSlots
 

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/CraftingWindowDsl.kt

@@ -5,6 +5,7 @@ package xyz.xenondevs.invui.dsl
 import net.kyori.adventure.key.Key
 import org.bukkit.entity.Player
 import xyz.xenondevs.invui.ExperimentalReactiveApi
+import xyz.xenondevs.invui.dsl.property.GuiDslProperty
 import xyz.xenondevs.invui.window.CraftingWindow
 
 @ExperimentalDslApi

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/DslMarkerAnnotations.kt

@@ -0,0 +1,13 @@
+package xyz.xenondevs.invui.dsl
+
+@DslMarker
+internal annotation class GuiDslMarker
+
+@DslMarker
+internal annotation class ItemDslMarker
+
+@DslMarker
+internal annotation class WindowDslMarker
+
+@DslMarker
+internal annotation class TradeDslMarker

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/DslProperties.kt

@@ -5,6 +5,8 @@ package xyz.xenondevs.invui.dsl
 import net.kyori.adventure.key.Key
 import org.bukkit.entity.Player
 import xyz.xenondevs.invui.ExperimentalReactiveApi
+import xyz.xenondevs.invui.dsl.property.GuiDslProperty
+import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
 import xyz.xenondevs.invui.window.FurnaceWindow
 import xyz.xenondevs.invui.window.setBurnProgress
 import xyz.xenondevs.invui.window.setCookProgress
@@ -47,8 +49,8 @@ internal class FurnaceWindowDslImpl(
         builder.apply {
             setInputGui(inputGui.value)
             setResultGui(resultGui.value)
-            setCookProgress(cookProgress.value)
-            setBurnProgress(burnProgress.value)
+            setCookProgress(cookProgress.delegate)
+            setBurnProgress(burnProgress.delegate)
             recipeClickHandlers.forEach { addRecipeClickHandler(it) }
         }
     }

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/FurnaceWindowDsl.kt

@@ -1,6 +1,7 @@
 package xyz.xenondevs.invui.dsl
 
 import org.bukkit.entity.Player
+import xyz.xenondevs.invui.dsl.property.GuiDslProperty
 import xyz.xenondevs.invui.window.GrindstoneWindow
 
 @ExperimentalDslApi