DSL: use provider dsl properties as providers

Instead of extracting the configured provider from the ProviderDslProperty, use the flat-mapping property itself as the provider. Otherwise, the property could be gc'd in certain scenarios, preventing subscribers on it from being called.

Author: NichtStudioCode

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

@@ -44,8 +44,8 @@ internal class AnvilWindowDslImpl(
         builder.apply { 
             setUpperGui(upperGui.value)
             addRenameHandler(text)
-            setTextFieldAlwaysEnabled(textFieldAlwaysEnabled.delegate)
-            setResultAlwaysValid(resultAlwaysValid.delegate)
+            setTextFieldAlwaysEnabled(textFieldAlwaysEnabled)
+            setResultAlwaysValid(resultAlwaysValid)
         }
     }
 

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

@@ -44,8 +44,8 @@ internal class BrewingWindowDslImpl(
             setInputGui(inputGui.value)
             setFuelGui(fuelGui.value)
             setResultGui(resultGui.value)
-            setBrewProgress(brewProgress.delegate)
-            setFuelProgress(fuelProgress.delegate)
+            setBrewProgress(brewProgress)
+            setFuelProgress(fuelProgress)
         }
     }
 

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

@@ -43,8 +43,8 @@ internal class CartographyWindowDslImpl(
         builder.apply { 
             setInputGui(inputGui.value)
             setResultGui(resultGui.value)
-            setIcons(icons.delegate)
-            setView(view.delegate)
+            setIcons(icons)
+            setView(view)
         }
     }
 

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

@@ -48,8 +48,8 @@ internal class FurnaceWindowDslImpl(
         builder.apply {
             setInputGui(inputGui.value)
             setResultGui(resultGui.value)
-            setCookProgress(cookProgress.delegate)
-            setBurnProgress(burnProgress.delegate)
+            setCookProgress(cookProgress)
+            setBurnProgress(burnProgress)
             recipeClickHandlers.forEach { handler -> addRecipeClickHandler { RecipeClick(it).handler() } }
         }
     }

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

@@ -46,9 +46,9 @@ internal abstract class GuiDslImpl<G : Gui, B : Gui.Builder<G, B>>(
             }
             applyPreset(ingredients.build())
 
-            setBackground(background.delegate)
-            setFrozen(frozen.delegate)
-            setIgnoreObscuredInventorySlots(ignoreObscuredInventorySlots.delegate)
+            setBackground(background)
+            setFrozen(frozen)
+            setIgnoreObscuredInventorySlots(ignoreObscuredInventorySlots)
         }
     }
 

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

@@ -44,7 +44,7 @@ internal class ItemDslImpl : ItemDsl {
     }
 
     fun build() = Item.builder().apply {
-        setItemProvider(itemProvider.delegate)
+        setItemProvider(itemProvider)
         clickHandlers.forEach { addClickHandler(it) }
         bundleSelectHandlers.forEach { handler -> addBundleSelectHandler { player, bundleSlot -> BundleSelect(player, bundleSlot).handler() }}
     }.build()

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

@@ -58,7 +58,7 @@ internal class MerchantWindowDslImpl(
         super.applyToBuilder(builder)
         builder.apply {
             setUpperGui(upperGui.value)
-            setTrades(trades.delegate)
+            setTrades(trades)
             addTradeSelectHandler { _, trade -> selectedTrade.set(trade) }
         }
     }
@@ -78,8 +78,8 @@ internal class TradeDslImpl : TradeDsl {
         .setFirstInput(firstInput.value)
         .setSecondInput(secondInput.value)
         .setResult(result.value)
-        .setDiscount(discount.delegate)
-        .setAvailable(isAvailable.delegate)
+        .setDiscount(discount)
+        .setAvailable(isAvailable)
         .build()
 
 }

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

@@ -49,8 +49,8 @@ internal abstract class PagedGuiDslImpl<C : Any>(
     override fun applyToBuilder(builder: PagedGui.Builder<C>) {
         super.applyToBuilder(builder)
         builder.apply { 
-            setContent(content.delegate)
-            setPage(page.delegate)
+            setContent(content)
+            setPage(page)
 
             addModifier { gui ->
                 pageCount.set(gui.pageCount)

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

@@ -49,8 +49,8 @@ internal abstract class ScrollGuiDslImpl<C : Any>(
     override fun applyToBuilder(builder: ScrollGui.Builder<C>) {
         super.applyToBuilder(builder)
         builder.apply {
-            setContent(content.delegate)
-            setLine(line.delegate)
+            setContent(content)
+            setLine(line)
 
             addModifier { gui ->
                 lineCount.set(gui.lineCount)

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

@@ -38,7 +38,7 @@ internal class StonecutterWindowDslImpl(
         builder.apply {
             setUpperGui(upperGui.value)
             setButtonsGui(buttonsGui.value)
-            setSelectedSlot(selectedSlot.delegate)
+            setSelectedSlot(selectedSlot)
         }
     }