Try to fix removed draws not being cleared if inventory didn't fully refresh

Author: 0ffz

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
     id("com.mineinabyss.conventions.copyjar")
     id("com.mineinabyss.conventions.publication")
     id("com.mineinabyss.conventions.testing")
-    id("org.jetbrains.compose") version "1.0.1-rc2"
+    id("org.jetbrains.compose") version "1.1.1"
 }
 
 tasks.withType<KotlinCompile> {
@@ -35,6 +35,7 @@ dependencies {
     compileOnly(kotlin("stdlib-jdk8"))
     compileOnly(Deps.kotlinx.coroutines)
     compileOnly(Deps.kotlin.reflect)
+    compileOnly(Deps.minecraft.anvilgui)
     // TODO update to jitpack in idofront
     compileOnly("com.github.okkero:Skedule:v1.2.6")
 
@@ -43,5 +44,8 @@ dependencies {
         exclude("org.jetbrains.kotlin")
         exclude("org.jetbrains.kotlinx")
     }
+    api(compose.foundation)
+
+//    api(compose.foundation)
     implementation("com.mineinabyss:idofront:$idofrontVersion")
 }

gradle.properties

@@ -1,6 +1,6 @@
 kotlin.code.style=official
 group=com.mineinabyss
-version=0.3
+version=0.4-alpha
 kotlinVersion=1.6.10
 serverVersion=1.17.1-R0.1-SNAPSHOT
 idofrontConventions=1.6.10-55

src/main/kotlin/com/mineinabyss/guiy/components/Item.kt

@@ -17,8 +17,8 @@ fun Item(itemStack: ItemStack, modifier: Modifier = Modifier) {
         },
         renderer = { node ->
             val inv = canvas
-            for(x in 0 until node.width)
-                for(y in 0 until node.height)
+            for (x in 0 until node.width)
+                for (y in 0 until node.height)
                     set(inv, x, y, itemStack)
         },
         modifier = Modifier.sizeIn(minWidth = 1, minHeight = 1).then(modifier)

src/main/kotlin/com/mineinabyss/guiy/components/canvases/Inventory.kt

@@ -1,5 +1,6 @@
 package com.mineinabyss.guiy.components.canvases
 
+import androidx.compose.foundation.layout.Row
 import androidx.compose.runtime.*
 import com.mineinabyss.guiy.guiyPlugin
 import com.mineinabyss.guiy.inventory.GuiyInventoryHolder
@@ -91,6 +92,7 @@ fun GuiyOwner.Inventory(
         }
     }
 
+    inventory.clear() //TODO check if this works
     CompositionLocalProvider(LocalInventory provides inventory) {
         Layout(
             measurePolicy = StaticMeasurePolicy,

src/main/kotlin/com/mineinabyss/guiy/components/canvases/InventoryScope.kt

@@ -0,0 +1,52 @@
+package com.mineinabyss.guiy.navigation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.remember
+import com.mineinabyss.guiy.guiyPlugin
+import com.okkero.skedule.schedule
+import org.bukkit.entity.Player
+
+
+class Navigator<T>(val default: () -> T) {
+    private val screen: T? get() = screens.lastOrNull()
+    private val screens = mutableStateListOf<T>()
+    private val universal = mutableStateListOf<UniversalScreens>()
+
+    init {
+        open(default())
+    }
+
+    fun back() = universal.removeLastOrNull() ?: screens.removeLastOrNull()
+    fun open(screen: T) = screens.add(screen)
+    fun open(screen: UniversalScreens) = universal.add(screen)
+
+    fun reset() {
+        screens.clear()
+        open(default())
+    }
+
+    /**
+     * Entrypoint for handling composition based on screen.
+     *
+     * Includes universal defaults like an Anvil screen.
+     */
+    @Composable
+    fun withScreen(players: Set<Player>, onEmpty: () -> Unit, run: @Composable (T) -> Unit) {
+        if (universal.isNotEmpty()) {
+            when (val screen = universal.first()) {
+                is UniversalScreens.Anvil -> LaunchedEffect(screen) {
+                    guiyPlugin.schedule {
+                        screen.builder.open(players.first()).inventory
+                    }
+                }
+            }
+        } else screen?.let { run(it) } ?: onEmpty()
+    }
+}
+
+@Composable
+fun <T> rememberNavigation(default: () -> T) = remember {
+    Navigator(default)
+}

src/main/kotlin/com/mineinabyss/guiy/navigation/Navigator.kt

@@ -0,0 +1,7 @@
+package com.mineinabyss.guiy.navigation
+
+import net.wesjd.anvilgui.AnvilGUI
+
+sealed class UniversalScreens {
+    class Anvil(val builder: AnvilGUI.Builder): UniversalScreens()
+}