Update to paper plugin

build.gradle.kts

@@ -37,7 +37,8 @@ allprojects {
 
     dependencies {
         val libs = rootProject.libs
-        implementation(libs.bundles.idofront.core)
+        compileOnly(libs.bundles.idofront.core)
+        testImplementation(libs.bundles.idofront.core)
     }
 
     tasks {

geary-papermc-core/src/main/kotlin/com/mineinabyss/geary/papermc/GearyProductionPaperConfigModule.kt

@@ -6,7 +6,7 @@ import org.bukkit.plugin.java.JavaPlugin
 class GearyProductionPaperConfigModule(
     override val plugin: JavaPlugin,
 ) : GearyPaperConfigModule {
-    override val configHolder = config<GearyPaperConfig>("config", plugin.dataFolder.toPath(), GearyPaperConfig(), mergeUpdates = true)
+    override val configHolder = config("config", plugin.dataFolder.toPath(), GearyPaperConfig())
 
     override val config: GearyPaperConfig by configHolder
 }

geary-papermc-plugin/src/main/kotlin/com/mineinabyss/geary/papermc/plugin/GearyCommands.kt

@@ -168,11 +168,12 @@ internal class GearyCommands : IdofrontCommandExecutor(), TabCompleter {
         ).filter { it.startsWith(args[0]) } else args[0]) {
             "mobs", "m" -> when (if (args.size == 2) return listOf("spawn", "remove", "locate", "info") else args[1]) {
                 "spawn", "s" -> if (args.size == 3) {
-                        return gearyMobs.prefabs.getKeys().filterPrefabs(args[2]).toList()
-                    } else if (args.size == 4) {
-                        val min = args[3].toIntOrNull()?.coerceAtLeast(1) ?: 1
-                        return (min - 1 until min + 100).map { it.toString() }
-                    }
+                    return gearyMobs.prefabs.getKeys().filterPrefabs(args[2]).toList()
+                } else if (args.size == 4) {
+                    val min = args[3].toIntOrNull()?.coerceAtLeast(1) ?: 1
+                    return (min - 1 until min + 100).map { it.toString() }
+                }
+
                 "remove", "rm", "info", "i", "locate" -> if (args.size == 3) {
                     val query = args[2].lowercase()
                     val parts = query.split("+")
@@ -185,6 +186,7 @@ internal class GearyCommands : IdofrontCommandExecutor(), TabCompleter {
                     }.take(20).map { "$withoutLast$it" }.toList()
                 }
             }
+
             "items" -> when (if (args.size == 2) return listOf("give") else args[1]) {
                 "give" -> if (args.size == 3) {
                     return gearyItems.prefabs.getKeys().filterPrefabs(args[2]).toList()

geary-papermc-plugin/src/main/kotlin/com/mineinabyss/geary/papermc/plugin/GearyPluginImpl.kt

@@ -22,7 +22,6 @@ import com.mineinabyss.geary.serialization.dsl.serialization
 import com.mineinabyss.geary.uuid.UUIDTracking
 import com.mineinabyss.idofront.di.DI
 import com.mineinabyss.idofront.messaging.logSuccess
-import com.mineinabyss.idofront.platforms.Platforms
 import com.mineinabyss.idofront.plugin.listeners
 import com.mineinabyss.serialization.formats.YamlFormat
 import okio.FileSystem
@@ -35,10 +34,6 @@ import kotlin.io.path.name
 
 
 class GearyPluginImpl : GearyPlugin() {
-    override fun onLoad() {
-        Platforms.load(this, "mineinabyss")
-    }
-
     override fun onEnable() {
         saveDefaultConfig()
 

geary-papermc-plugin/src/main/resources/paper-plugin.yml

@@ -0,0 +1,20 @@
+name: Geary
+version: ${plugin_version}
+author: Offz
+load: STARTUP
+main: com.mineinabyss.geary.papermc.plugin.GearyPluginImpl
+api-version: '1.20'
+
+prefix: Geary
+description: An Entity Component System written for Spigot
+
+dependencies:
+  server:
+    MythicMobs:
+      required: false
+      load: BEFORE
+      join-classpath: true
+    Idofront:
+      required: true
+      load: BEFORE
+      join-classpath: true

geary-papermc-tracking/build.gradle.kts

@@ -13,8 +13,8 @@ repositories {
 }
 dependencies {
     compileOnly(libs.minecraft.plugin.mythic.dist)
+    compileOnly(libs.idofront.nms)
     implementation(gearyLibs.uuid)
-    implementation(libs.idofront.nms)
     api(project(":geary-papermc-datastore"))
     api(project(":geary-papermc-core"))
 }

geary-tests/build.gradle.kts

@@ -16,6 +16,4 @@ dependencies {
     implementation(project(":"))
 
     testImplementation(libs.minecraft.mockbukkit)
-//    testImplementation(libs.minecraft.papermc)
-
 }

gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
 group=com.mineinabyss
 version=0.26
-idofrontVersion=0.19.14
+idofrontVersion=0.20.1
 gearyVersion=0.23-SNAPSHOT

settings.gradle.kts

@@ -4,6 +4,7 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven("https://repo.mineinabyss.com/releases")
+        maven("https://repo.mineinabyss.com/snapshots")
         maven("https://repo.papermc.io/repository/maven-public/")
     }
 }