Use new pageCount and lineCount providers from gui for dsl

Author: NichtStudioCode

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

@@ -3,13 +3,16 @@
 package xyz.xenondevs.invui.dsl
 
 import xyz.xenondevs.commons.provider.Provider
+import xyz.xenondevs.commons.provider.flatten
 import xyz.xenondevs.commons.provider.mutableProvider
+import xyz.xenondevs.commons.provider.provider
 import xyz.xenondevs.invui.ExperimentalReactiveApi
 import xyz.xenondevs.invui.dsl.property.MutableProviderDslProperty
 import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
 import xyz.xenondevs.invui.gui.Gui
 import xyz.xenondevs.invui.gui.IngredientPreset
 import xyz.xenondevs.invui.gui.PagedGui
+import xyz.xenondevs.invui.gui.pageCountProvider
 import xyz.xenondevs.invui.gui.setContent
 import xyz.xenondevs.invui.gui.setPage
 import xyz.xenondevs.invui.inventory.Inventory
@@ -42,20 +45,18 @@ internal abstract class PagedGuiDslImpl<C : Any>(
     presets: List<IngredientPreset>
 ) : GuiDslImpl<PagedGui<C>, PagedGui.Builder<C>>(structure, presets), PagedGuiDsl<C> {
 
+    private val internalPageCount = mutableProvider { provider(0) }
+    
     override val content = ProviderDslProperty(emptyList<C>())
     override val page = MutableProviderDslProperty(0)
-    override val pageCount = mutableProvider(0)
+    override val pageCount = internalPageCount.flatten()
 
     override fun applyToBuilder(builder: PagedGui.Builder<C>) {
         super.applyToBuilder(builder)
         builder.apply { 
             setContent(content)
             setPage(page)
-            
-            addModifier { gui ->
-                pageCount.set(gui.pageCount)
-                gui.addPageCountChangeHandler { _, p -> pageCount.set(p) }
-            }
+            addModifier { internalPageCount.set(it.pageCountProvider) }
         }
     }
 

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

@@ -3,13 +3,17 @@
 package xyz.xenondevs.invui.dsl
 
 import xyz.xenondevs.commons.provider.Provider
+import xyz.xenondevs.commons.provider.flatten
 import xyz.xenondevs.commons.provider.mutableProvider
+import xyz.xenondevs.commons.provider.provider
 import xyz.xenondevs.invui.ExperimentalReactiveApi
 import xyz.xenondevs.invui.dsl.property.MutableProviderDslProperty
 import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
 import xyz.xenondevs.invui.gui.Gui
 import xyz.xenondevs.invui.gui.IngredientPreset
 import xyz.xenondevs.invui.gui.ScrollGui
+import xyz.xenondevs.invui.gui.lineCountProvider
+import xyz.xenondevs.invui.gui.maxLineProvider
 import xyz.xenondevs.invui.gui.setContent
 import xyz.xenondevs.invui.gui.setLine
 import xyz.xenondevs.invui.inventory.Inventory
@@ -43,9 +47,12 @@ internal abstract class ScrollGuiDslImpl<C : Any>(
     presets: List<IngredientPreset>
 ) : GuiDslImpl<ScrollGui<C>, ScrollGui.Builder<C>>(structure, presets), ScrollGuiDsl<C> {
 
+    private val internalLineCount = mutableProvider { provider(0) }
+    private val internalMaxLine = mutableProvider { provider(0) }
+    
     override val content = ProviderDslProperty(emptyList<C>())
     override val line = MutableProviderDslProperty(0)
-    override val lineCount = mutableProvider(0)
+    override val lineCount = internalLineCount.flatten()
     override val maxLine = mutableProvider(0)
 
     override fun applyToBuilder(builder: ScrollGui.Builder<C>) {
@@ -55,10 +62,8 @@ internal abstract class ScrollGuiDslImpl<C : Any>(
             setLine(line)
 
             addModifier { gui ->
-                lineCount.set(gui.lineCount)
-                maxLine.set(gui.maxLine)
-                gui.addLineCountChangeHandler { _, l -> lineCount.set(l) }
-                gui.addLineCountChangeHandler { _, _ -> maxLine.set(gui.maxLine) }
+                internalLineCount.set(gui.lineCountProvider)
+                internalMaxLine.set(gui.maxLineProvider)
             }
         }
     }