coreモジュールの分離

build.gradle.kts

@@ -1,61 +1,89 @@
 // Gradle 9.0.0 can't run in Java8
 plugins {
-    `java-library`
-    `maven-publish`
-    alias(libs.plugins.ktlint)
-    alias(libs.plugins.shadow)
-    alias(libs.plugins.kotlin.jvm)
-    alias(libs.plugins.kotlin.serialization)
+    id("io.kotest") version "6.1.11"
+    id("com.gradleup.shadow") version "8.3.10"
+    id("org.jetbrains.kotlin.jvm") version "2.3.20"
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.3.20"
 }
 
 group = "be4rjp"
-version = System.getenv("VERSION") ?: "1.0-SNAPSHOT"
 description = "Sclat"
 
-repositories {
-    mavenCentral()
-    maven("https://jitpack.io/")
-    maven("https://repo.papermc.io/repository/maven-public/")
-    exclusiveContent {
-        forRepository {
-            mavenLocal()
+allprojects {
+    apply {
+        plugin("io.kotest")
+        plugin("org.jetbrains.kotlin.jvm")
+        plugin("org.jetbrains.kotlin.plugin.serialization")
+    }
+
+    version = System.getenv("VERSION") ?: "1.0-SNAPSHOT"
+
+    repositories {
+        mavenCentral()
+        maven("https://jitpack.io/")
+        maven("https://repo.papermc.io/repository/maven-public/")
+        exclusiveContent {
+            forRepository {
+                mavenLocal()
+            }
+            filter {
+                includeGroup("org.spigotmc")
+            }
         }
-        filter {
-            includeGroup("org.spigotmc")
+        exclusiveContent {
+            forRepository {
+                maven("https://repo.codemc.io/repository/maven-public/")
+            }
+            filter {
+                includeGroup("org.bstats")
+            }
         }
     }
-    exclusiveContent {
-        forRepository {
-            maven("https://repo.codemc.io/repository/maven-public/")
-        }
-        filter {
-            includeGroup("org.bstats")
+
+    dependencies {
+        compileOnly("org.spigotmc:spigot:1.14.4-R0.1-SNAPSHOT")
+        compileOnly("com.destroystokyo.paper:paper-api:1.14.4-R0.1-SNAPSHOT")
+        compileOnly("com.github.koca2000:NoteBlockAPI:1.6.3")
+        compileOnly("com.github.ucchyocean:LunaChat:3.0.16")
+        compileOnly("net.dmulloy2:ProtocolLib:5.1.0")
+        compileOnly("com.github.Be4rJP:DADADAChecker:1.0.0")
+        compileOnly("com.github.Be4rJP:BlockStudio:-SNAPSHOT")
+
+        implementation("net.mamoe.yamlkt:yamlkt:0.13.0")
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0-rc01")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.22.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.22.0")
+        implementation("org.incendo:cloud-paper:2.0.0-SNAPSHOT") // found newer 2.0.0-beta.10
+        implementation("org.jspecify:jspecify:1.0.0")
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+        implementation("fr.mrmicky:fastboard:2.1.5")
+        implementation("com.akuleshov7:ktoml-core:0.7.1")
+
+        testImplementation("org.jetbrains.kotlin:kotlin-test")
+        testImplementation("io.kotest:kotest-runner-junit5:6.1.11")
+        testImplementation("io.kotest:kotest-assertions-core:6.1.11")
+        testImplementation("io.kotest:kotest-property:6.1.11")
+        testImplementation("io.mockk:mockk:1.14.9")
+        testImplementation("org.spigotmc:spigot:1.14.4-R0.1-SNAPSHOT")
+        testImplementation("com.destroystokyo.paper:paper-api:1.14.4-R0.1-SNAPSHOT")
+        testImplementation("ch.qos.logback:logback-classic:1.4.11")
+    }
+
+    val targetJavaVersion: Int = 11
+
+    kotlin {
+        jvmToolchain(targetJavaVersion)
+    }
+
+    tasks {
+        test {
+            useJUnitPlatform()
         }
     }
 }
 
 dependencies {
-    compileOnly(libs.spigot)
-    compileOnly(libs.noteblockapi)
-    compileOnly(libs.lunachat)
-    compileOnly(libs.protocolLib)
-    compileOnly(libs.dadadachecker)
-    compileOnly(libs.blockstudio)
-    compileOnly(libs.paperApi)
-    implementation(libs.cloudPaper)
-    implementation(libs.jspecify)
-    implementation(libs.kotlin.stdlib)
-    implementation(libs.yamlkt)
-    implementation(libs.fastboard)
-    implementation(libs.bundles.ktoml)
-}
-
-// Project Settings
-val targetJavaVersion: Int = 11
-val defaultEncoding: String = "UTF-8"
-
-kotlin {
-    jvmToolchain(targetJavaVersion)
+    implementation(project("core"))
 }
 
 tasks {
@@ -71,30 +99,3 @@ tasks {
         archiveFileName.set("Sclat.jar")
     }
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            groupId = project.group.toString()
-            artifactId = project.name
-            version = project.version.toString()
-            artifact(tasks.jar)
-        }
-    }
-
-    repositories {
-        maven {
-            name = "azisaba-repo"
-            credentials {
-                username = System.getenv("REPO_USERNAME")
-                password = System.getenv("REPO_PASSWORD")
-            }
-            url =
-                if (project.version.toString().endsWith("-SNAPSHOT")) {
-                    uri("https://repo.azisaba.net/repository/maven-snapshots/")
-                } else {
-                    uri("https://repo.azisaba.net/repository/maven-releases/")
-                }
-        }
-    }
-}

core/build.gradle.kts

@@ -0,0 +1,4 @@
+group = "net.azisaba.sclat"
+
+dependencies {
+}

core/src/main/kotlin/net/azisaba/sclat/core/DelegatedLogger.kt

@@ -0,0 +1,29 @@
+package net.azisaba.sclat.core
+
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import kotlin.reflect.KProperty
+
+/**
+ * Example:
+ * ```kotlin
+ * val logger by DelegatedLogger()
+ * ```
+ */
+class DelegatedLogger {
+    private var logger: Logger? = null
+
+    // TestClass2, KProperty1<*, *>
+    operator fun <T : Any> getValue(
+        thisRef: T,
+        property: KProperty<*>,
+    ): Logger =
+        logger ?: run {
+            val className =
+                thisRef::class.java.name
+                    .removeSuffix("\$Companion")
+                    .split(".")
+                    .last()
+            LoggerFactory.getLogger("$PLUGIN_NAME:$className").also { logger = it }
+        }
+}

src/main/kotlin/be4rjp/sclat/api/Plugins.kt → core/src/main/kotlin/net/azisaba/sclat/core/Plugins.kt

@@ -1,7 +1,6 @@
-package be4rjp.sclat.api
+package net.azisaba.sclat.core
 
-import be4rjp.sclat.sclatLogger
-import org.bukkit.Bukkit
+import org.bukkit.plugin.PluginManager
 import java.util.function.Consumer
 
 enum class Plugins(
@@ -17,45 +16,33 @@ enum class Plugins(
     PROTOCOLLIB("ProtocolLib"),
     ;
 
-    private var _isLoaded: Boolean? = null
-
-    val isLoaded: Boolean
-        get() {
-            if (_isLoaded == null) {
-                _isLoaded = Bukkit.getPluginManager().isPluginEnabled(pluginName)
-            }
-            return _isLoaded!!
-        }
-
-    /**
-     * To support plugman load.
-     */
-    private fun resetLoadedState() {
-        _isLoaded = null
-    }
+    var isLoaded: Boolean = false
+        private set
 
     companion object {
+        private val logger by DelegatedLogger()
+
         /**
          * Initialize check
          *
          * @return is init-check succeeded
          */
         @JvmStatic
-        fun onInit(): Boolean {
-            val missingPlugins = ArrayList<String?>()
+        fun onInit(pluginManager: PluginManager): Boolean {
+            val missingPlugins = ArrayList<String>()
             for (plugin in entries) {
-                plugin.resetLoadedState()
+                plugin.isLoaded = pluginManager.isPluginEnabled(plugin.pluginName)
                 if (!plugin.isLoaded && plugin.isRequired) {
                     missingPlugins.add(plugin.pluginName)
                 }
             }
 
             // If some required plugins are missing
             if (!missingPlugins.isEmpty()) {
-                sclatLogger.error("Some plugins are missing. Please install or enable.")
-                sclatLogger.error("*** Missing required plugins ***")
-                missingPlugins.forEach(Consumer { p: String? -> sclatLogger.error("- {}", p) })
-                sclatLogger.error("********************************")
+                logger.error("Some plugins are missing. Please install or enable.")
+                logger.error("*** Missing required plugins ***")
+                missingPlugins.forEach(Consumer { p: String? -> logger.error("- {}", p) })
+                logger.error("********************************")
                 return false
             }
 

core/src/main/kotlin/net/azisaba/sclat/core/Sclat.kt

@@ -0,0 +1,37 @@
+package net.azisaba.sclat.core
+
+import be4rjp.dadadachecker.DADADACheckerAPI
+import com.comphenix.protocol.ProtocolLibrary
+import com.comphenix.protocol.ProtocolManager
+import net.azisaba.sclat.core.config.SclatConfig
+import org.bukkit.plugin.java.JavaPlugin
+
+class Sclat : JavaPlugin() {
+    private lateinit var protocolManager: ProtocolManager
+    private lateinit var dadadaCheckerApi: DADADACheckerAPI
+    private lateinit var config: SclatConfig
+
+    override fun onEnable() {
+        slfLogger.info("Welcome to Sclat! (=^･ω･^=)")
+
+        if (!Plugins.onInit(server.pluginManager)) {
+            slfLogger.error("✘ Failed to check depend plugins. Disabling...")
+            server.pluginManager.disablePlugin(this)
+            return
+        }
+        slfLogger.info("✔ Checked depend plugins.")
+
+        protocolManager = ProtocolLibrary.getProtocolManager()
+        dadadaCheckerApi = DADADACheckerAPI(this)
+        slfLogger.info("✔ Initialized ProtocolLib and DADADA Checker API.")
+    }
+
+    override fun onDisable() {
+        slfLogger.info("Bye bye! (ﾉ´ヮ`)ﾉ*: ･ﾟ")
+    }
+
+    companion object {
+        // use slfLogger instead because logger was already taken by JavePlugin
+        private val slfLogger by DelegatedLogger()
+    }
+}

core/src/main/kotlin/net/azisaba/sclat/core/Variables.kt

@@ -0,0 +1,3 @@
+package net.azisaba.sclat.core
+
+const val PLUGIN_NAME: String = "Sclat"

src/main/kotlin/be4rjp/sclat/config/Config.kt → core/src/main/kotlin/net/azisaba/sclat/core/config/Config.kt

@@ -1,4 +1,4 @@
-package be4rjp.sclat.config
+package net.azisaba.sclat.core.config
 
 import org.bukkit.Bukkit
 import org.bukkit.configuration.file.FileConfiguration

src/main/kotlin/be4rjp/sclat/api/config/CustomConfig.kt → core/src/main/kotlin/net/azisaba/sclat/core/config/CustomConfig.kt

@@ -1,6 +1,6 @@
-package be4rjp.sclat.api.config
+package net.azisaba.sclat.core.config
 
-import be4rjp.sclat.sclatLogger
+import net.azisaba.sclat.core.DelegatedLogger
 import org.bukkit.configuration.file.FileConfiguration
 import org.bukkit.configuration.file.YamlConfiguration
 import org.bukkit.plugin.Plugin
@@ -20,7 +20,7 @@ class CustomConfig(
         if (configFile.exists()) return
 
         plugin.saveResource(file, false)
-        sclatLogger.info("デフォルトの設定ファイルを書き込みました。")
+        logger.info("デフォルトの設定ファイルを書き込みました。")
     }
 
     fun getConfig(): FileConfiguration? {
@@ -35,7 +35,7 @@ class CustomConfig(
         try {
             getConfig()!!.save(configFile)
         } catch (ex: IOException) {
-            sclatLogger.error("Could not save config to $configFile", ex)
+            logger.error("Could not save config to $configFile", ex)
         }
     }
 
@@ -48,4 +48,8 @@ class CustomConfig(
             YamlConfiguration.loadConfiguration(InputStreamReader(defConfigStream, StandardCharsets.UTF_8)),
         )
     }
+
+    companion object {
+        private val logger by DelegatedLogger()
+    }
 }

src/main/kotlin/be4rjp/sclat/config/LoginBonusRewardConfig.kt → core/src/main/kotlin/net/azisaba/sclat/core/config/LoginBonusRewardConfig.kt

@@ -1,4 +1,4 @@
-package be4rjp.sclat.config
+package net.azisaba.sclat.core.config
 
 import kotlinx.serialization.Serializable