refactor: replace :plugins:plugin-data-driven with :plugins:common module

Author: tksimeji

gradle/libs.versions.toml

@@ -1,4 +1,8 @@
 [versions]
+kotlin = "2.3.0"
+kotlinx-coroutines = "1.10.2"
+kotlinx-serialization = "1.10.0"
+
 bettercommand = "1.4.3"
 betterhud = "1.14.1"
 bettermodel = "2.1.0"
@@ -9,8 +13,6 @@ hikaricp = "7.0.2"
 jnoise = "4.1.0"
 kaml = "0.104.0"
 koin = "4.1.1"
-kotlin = "2.3.0"
-kotlinx-coroutines = "1.10.2"
 mccoroutine = "2.22.0"
 minecraftexposed = "1.0.0-R0.1-SNAPSHOT"
 minecraftserialization = "1.0.0-R0.6-SNAPSHOT"
@@ -30,6 +32,7 @@ shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 [libraries]
 # Language
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
 
 # Dependency Injection (DI)
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }

plugins/build.gradle.kts

@@ -23,8 +23,9 @@ subprojects {
 }
 
 gradle.projectsEvaluated {
-    val pluginShadowJarTasks = subprojects.map { it.tasks.named<ShadowJar>("shadowJar") }
-    val pluginShadowJarFiles = subprojects.map { project ->
+    val pluginProjects = subprojects.filter { it.name.startsWith("plugin-") }
+    val pluginShadowJarTasks = pluginProjects.map { it.tasks.named<ShadowJar>("shadowJar") }
+    val pluginShadowJarFiles = pluginProjects.map { project ->
         project.tasks.named<ShadowJar>("shadowJar").flatMap { it.archiveFile }
     }
 

plugins/common/build.gradle.kts

@@ -0,0 +1,5 @@
+dependencies {
+    compileOnly(libs.kotlinx.serialization.core)
+    compileOnly(libs.minecraftserialization.adventure)
+    compileOnly(libs.minecraftserialization.valueproviders)
+}

…vanilife/datadriven/ItemStackProvider.kt …et/azisaba/vanilife/ItemStackProvider.ktplugins/plugin-data-driven/src/main/kotlin/net/azisaba/vanilife/datadriven/ItemStackProvider.kt renamed to plugins/common/src/main/kotlin/net/azisaba/vanilife/ItemStackProvider.kt plugins/plugin-data-driven/src/main/kotlin/net/azisaba/vanilife/datadriven/ItemStackProvider.kt renamed to plugins/common/src/main/kotlin/net/azisaba/vanilife/ItemStackProvider.kt

@@ -1,4 +1,4 @@
-package net.azisaba.vanilife.datadriven
+package net.azisaba.vanilife
 
 import io.papermc.paper.registry.RegistryAccess
 import io.papermc.paper.registry.RegistryKey

plugins/plugin-data-driven/build.gradle.kts

@@ -1,6 +1,6 @@
 dependencies {
-    compileOnly(project(":plugins:plugin-data-driven"))
     compileOnly(project(":plugins:plugin-runtime"))
+    compileOnly(libs.bettermodel.bukkit.api)
     implementation(libs.entitylib)
     implementation(libs.koin.core)
     implementation(libs.minecraftexposed.adventure)

plugins/plugin-data-driven/src/main/kotlin/net/azisaba/vanilife/datadriven/Main.kt

@@ -4,22 +4,15 @@ import com.github.shynixn.mccoroutine.folia.launch
 import io.papermc.paper.event.player.AsyncChatEvent
 import io.papermc.paper.event.player.AsyncPlayerSpawnLocationEvent
 import io.papermc.paper.registry.keys.EnchantmentKeys
-import io.papermc.paper.registry.keys.ItemTypeKeys
-import io.papermc.paper.registry.keys.SoundEventKeys
 import kotlinx.coroutines.runBlocking
-import net.azisaba.serialization.IntProvider
 import net.azisaba.vanilife.Vanilife
-import net.azisaba.vanilife.datadriven.ItemStackProvider
 import net.azisaba.vanilife.islands.IslandManager
 import net.azisaba.vanilife.islands.wrack.WrackType
-import net.kyori.adventure.sound.Sound
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer
-import org.bukkit.Material
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
-import org.bukkit.inventory.ItemStack
 import org.bukkit.plugin.Plugin
 
 internal class IslandPlayerListener(private val plugin: Plugin, private val service: IslandManager) : Listener {

plugins/plugin-data-driven/src/main/resources/paper-plugin.yml

@@ -11,7 +11,7 @@ import kotlinx.serialization.Serializable
 import kr.toxicity.model.api.BetterModel
 import kr.toxicity.model.api.data.renderer.ModelRenderer
 import net.azisaba.serialization.KeySerializer
-import net.azisaba.vanilife.datadriven.ItemStackProvider
+import net.azisaba.vanilife.ItemStackProvider
 import net.azisaba.vanilife.islands.Island
 import net.kyori.adventure.key.Key
 import net.kyori.adventure.sound.Sound