Merge pull request #34 from yukonisen/bukkit

IPv6 解析

Author: dmzz-yyhyy

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "external/ipdb"]
+	path = external/ipdb
+	url = https://github.com/yukonisen/ipdb-java.git

.idea/encodings.xml

@@ -1 +1 @@
-PLUGIN=1.4.2
+PLUGIN=1.5.0

.idea/gradle.xml

@@ -1,8 +1,8 @@
 plugins {
-    kotlin("jvm") version "1.9.22"
+    kotlin("jvm") version "2.2.0"
     id("idea")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("xyz.jpenilla.run-paper") version "2.2.2"
+    id("com.gradleup.shadow") version "8.3.8"
+    id("xyz.jpenilla.run-paper") version "2.3.1"
 }
 
 repositories {
@@ -14,20 +14,25 @@ repositories {
 dependencies {
     implementation("com.google.code.gson:gson:2.10.1")
     compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
-    compileOnly("me.clip:placeholderapi:2.11.4")
+    compileOnly("me.clip:placeholderapi:2.11.6")
     implementation("org.lionsoul:ip2region:2.7.0")
+    implementation("org.bstats:bstats-bukkit:3.1.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
+    implementation(project(":ipdb"))
 }
+
 val pluginVersion = project.parent?.version
 
 tasks {
     shadowJar {
         archiveFileName = "PotatoIPDisplay-Bukkit-${pluginVersion}.jar"
+        relocate("org.bstats","indi.nightfish.potato_ip_display.bstats" )
     }
     runServer {
         // Configure the Minecraft version for our task.
         // This is the only required configuration besides applying the plugin.
         // Your plugin's jar (or shadowJar if present) will be used automatically.
-        minecraftVersion("1.20.4")
+        minecraftVersion("1.21.6")
     }
 }
 

.idea/kotlinc.xml

@@ -1,13 +1,16 @@
 package indi.nightfish.potato_ip_display
 
 import indi.nightfish.potato_ip_display.command.PotatoIpDisplayCommand
-import indi.nightfish.potato_ip_display.integration.PlaceholderIntergration
+import indi.nightfish.potato_ip_display.integration.PlaceholderIntegration
 import indi.nightfish.potato_ip_display.listener.MessageListener
 import indi.nightfish.potato_ip_display.listener.PlayerJoinListener
 import indi.nightfish.potato_ip_display.util.Config
+import indi.nightfish.potato_ip_display.util.ConfigManager
 import indi.nightfish.potato_ip_display.util.UpdateUtil
-import indi.nightfish.potato_ip_display.util.loadConfig
-import me.clip.placeholderapi.metrics.bukkit.Metrics
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import org.bstats.bukkit.Metrics
 import org.bukkit.Bukkit
 import org.bukkit.event.HandlerList
 import org.bukkit.plugin.java.JavaPlugin
@@ -20,6 +23,7 @@ class PotatoIpDisplay : JavaPlugin() {
         lateinit var instance: PotatoIpDisplay
         val plugin by lazy { instance }
     }
+    val pluginScope = CoroutineScope(Dispatchers.Default)
 
     lateinit var conf: Config
 
@@ -40,10 +44,11 @@ class PotatoIpDisplay : JavaPlugin() {
 
     override fun onDisable() {
         super.onDisable()
+        pluginScope.cancel()
         log("Disabled")
     }
 
-    private fun initResources() {
+    fun initResources() {
         val configFile = File(dataFolder, "config.yml")
         val dbFile = File(dataFolder, "ip2region.xdb")
         val authors = this.description.authors
@@ -68,12 +73,12 @@ class PotatoIpDisplay : JavaPlugin() {
 
     fun initPlugin() {
         val pm = Bukkit.getPluginManager()
-        conf = loadConfig(config)
+        conf = ConfigManager.load(this)
 
-        PlaceholderIntergration().unregister()
-        if (conf.papi.enabled) {
-            if (pm.getPlugin("PlaceholderAPI") != null) {
-                PlaceholderIntergration().register()
+        if (pm.getPlugin("PlaceholderAPI") != null) {
+            PlaceholderIntegration().unregister()
+            if (conf.papi.enabled) {
+                PlaceholderIntegration().register()
             } else throw RuntimeException("PlaceholderAPI enabled in config but NOT installed!")
         }