Switch to MCCoroutine, clean up gradle

Author: 0ffz

build.gradle.kts

@@ -27,28 +27,22 @@ repositories {
     mavenCentral()
     google()
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    maven("https://jitpack.io")
+    maven("https://repo.codemc.org/repository/maven-public/")
 }
 
 dependencies {
     // MineInAbyss platform
     compileOnly(libs.kotlinx.coroutines)
+    compileOnly(libs.minecraft.mccoroutine)
     compileOnly(libs.kotlin.reflect)
     compileOnly(libs.minecraft.anvilgui)
-    compileOnly(libs.minecraft.skedule)
 
     // Shaded
     api(compose.runtime) {
         exclude("org.jetbrains.kotlin")
         exclude("org.jetbrains.kotlinx")
     }
 
-    implementation("com.mineinabyss:idofront:$idofrontVersion")
+    implementation(libs.idofront.core)
     implementation(libs.idofront.nms)
 }
-
-tasks {
-    assemble {
-        dependsOn(reobfJar)
-    }
-}

gradle.properties

@@ -4,4 +4,4 @@ version=0.5
 kotlinVersion=1.6.10
 composeVersion=1.1.1
 serverVersion=1.18.2-R0.1-SNAPSHOT
-idofrontVersion=0.9.86
+idofrontVersion=0.10.90

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

@@ -1,6 +1,7 @@
 package com.mineinabyss.guiy.components.canvases
 
 import androidx.compose.runtime.*
+import com.github.shynixn.mccoroutine.bukkit.launch
 import com.mineinabyss.guiy.guiyPlugin
 import com.mineinabyss.guiy.inventory.GuiyInventoryHolder
 import com.mineinabyss.guiy.inventory.GuiyOwner
@@ -11,17 +12,13 @@ import com.mineinabyss.guiy.modifiers.DragScope
 import com.mineinabyss.guiy.modifiers.Modifier
 import com.mineinabyss.guiy.nodes.InventoryCloseScope
 import com.mineinabyss.guiy.nodes.StaticMeasurePolicy
-import com.mineinabyss.idofront.nms.aliases.NMSItemStack
-import com.mineinabyss.idofront.nms.aliases.NMSPlayer
-import com.mineinabyss.idofront.nms.aliases.toNMS
-import com.okkero.skedule.schedule
+import com.mineinabyss.idofront.time.ticks
 import kotlinx.coroutines.delay
 import org.bukkit.Material
 import org.bukkit.entity.Player
 import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.event.inventory.InventoryCloseEvent
 import org.bukkit.inventory.Inventory
-import org.bukkit.inventory.ItemStack
 
 //val LocalHolder: ProvidableCompositionLocal<GuiyInventoryHolder> =
 //    staticCompositionLocalOf { error("No local holder defined") }
@@ -61,8 +58,8 @@ inline fun rememberInventoryHolder(
                             .forEach { it.openInventory(inventory) }
                     }
                 }
-                guiyPlugin.schedule {
-                    waitFor(1)
+                guiyPlugin.launch {
+                    delay(1.ticks)
                     onClose.invoke(scope, player)
                 }
             }
@@ -80,7 +77,7 @@ fun GuiyOwner.Inventory(
     // Close inventory when it switches to a new one
     DisposableEffect(inventory) {
         onDispose {
-            guiyPlugin.schedule {
+            guiyPlugin.launch {
                 inventory.close()
             }
         }
@@ -89,7 +86,7 @@ fun GuiyOwner.Inventory(
     LaunchedEffect(viewers, inventory) {
         val oldViewers = inventory.viewers.toSet()
 
-        guiyPlugin.schedule {
+        guiyPlugin.launch {
             // Close inventory for removed viewers
             (oldViewers - viewers).forEach {
                 it.closeInventory(InventoryCloseEvent.Reason.PLUGIN)

src/main/kotlin/com/mineinabyss/guiy/inventory/GuiyEventListener.kt

@@ -1,11 +1,11 @@
 package com.mineinabyss.guiy.inventory
 
+import com.github.shynixn.mccoroutine.bukkit.launch
 import com.mineinabyss.guiy.guiyPlugin
 import com.mineinabyss.guiy.modifiers.DragScope
 import com.mineinabyss.idofront.nms.aliases.NMSItemStack
 import com.mineinabyss.idofront.nms.aliases.NMSPlayer
 import com.mineinabyss.idofront.nms.aliases.toNMS
-import com.okkero.skedule.schedule
 import kotlinx.coroutines.delay
 import org.bukkit.Material
 import org.bukkit.entity.Player
@@ -47,7 +47,7 @@ class GuiyEventListener : Listener {
         if (inGuiy.isNotEmpty()) {
             isCancelled = true
             result = Event.Result.DEFAULT
-            val newCursor = oldCursor.apply { inGuiy.map { inventory.getItem(it.key)?.amount ?: 0 }.sum()  }
+            val newCursor = oldCursor.apply { inGuiy.map { inventory.getItem(it.key)?.amount ?: 0 }.sum() }
             val event = InventoryDragEvent(
                 view, newCursor, oldCursor, type == DragType.SINGLE, inPlayerInv
             )
@@ -60,7 +60,7 @@ class GuiyEventListener : Listener {
 
                 val scope = DragScope(type, inGuiy, newCursor)
                 guiyHolder.processDrag(scope)
-                guiyPlugin.schedule {
+                guiyPlugin.launch {
                     delay(1)
                     val nmsView = whoClicked.toNMS<NMSPlayer>().containerMenu
                     nmsView.carried = NMSItemStack.fromBukkitCopy(scope.cursor ?: ItemStack(Material.AIR))

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

@@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.remember
+import com.github.shynixn.mccoroutine.bukkit.launch
 import com.mineinabyss.guiy.guiyPlugin
-import com.okkero.skedule.schedule
 import org.bukkit.entity.Player
 
 
@@ -37,7 +37,7 @@ class Navigator<T>(val default: () -> T) {
         if (universal.isNotEmpty()) {
             when (val screen = universal.first()) {
                 is UniversalScreens.Anvil -> LaunchedEffect(screen) {
-                    guiyPlugin.schedule {
+                    guiyPlugin.launch {
                         screen.builder.open(players.first()).inventory
                     }
                 }