2.0.26 更新 TabooLib 版本，兼容 @parallel 接口

Bkm016 · Bkm016 · commit c8e536733a89 · 2025-01-06T15:03:01.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,10 +18,12 @@ subprojects {
             install(Bukkit, BukkitUI, BukkitNavigation, BukkitUtil, BukkitHook)
             install(BukkitNMSUtil)
             install(MinecraftEffect, MinecraftChat)
+            // repoTabooLib = project.repositories.mavenLocal().url.toString()
         }
-        version { taboolib = "6.2.1-df22fb1" }
+        version { taboolib = "6.2.2" }
     }
     repositories {
+        mavenLocal()
         maven { url = uri("https://repo.spongepowered.org/maven") }
         mavenCentral()
     }
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=ink.ptms.adyeshach
-version=2.0.25
+version=2.0.26
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.incremental.useClasspathSnapshot=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Mar 08 11:48:15 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
diff --git a/project/common-impl-nms-j17/build.gradle.kts b/project/common-impl-nms-j17/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 dependencies {
     compileOnly("org.joml:joml:1.10.2")
     compileOnly("ink.ptms.core:v12004:12004:mapped")
@@ -12,9 +14,4 @@ dependencies {
     compileOnly(project(":project:api-data-serializer"))
 }
 
-configure<JavaPluginConvention> {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
 taboolib { subproject = true }
diff --git a/project/common-impl-nms-paper-1.19.4/build.gradle.kts b/project/common-impl-nms-paper-1.19.4/build.gradle.kts
@@ -3,9 +3,9 @@ dependencies {
     compileOnly(project(":project:common-impl-nms"))
 }
 
-configure<JavaPluginConvention> {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
+//configure<JavaPluginConvention> {
+//    sourceCompatibility = JavaVersion.VERSION_17
+//    targetCompatibility = JavaVersion.VERSION_17
+//}
 
 taboolib { subproject = true }
diff --git a/project/common-impl-nms-paper-1.20/build.gradle.kts b/project/common-impl-nms-paper-1.20/build.gradle.kts
@@ -4,9 +4,9 @@ dependencies {
     compileOnly(project(":project:common-impl-nms"))
 }
 
-configure<JavaPluginConvention> {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
+//configure<JavaPluginConvention> {
+//    sourceCompatibility = JavaVersion.VERSION_17
+//    targetCompatibility = JavaVersion.VERSION_17
+//}
 
 taboolib { subproject = true }
diff --git a/project/common-impl/src/main/kotlin/ink/ptms/adyeshach/impl/DefaultAdyeshachEntityMetadataRegistry.kt b/project/common-impl/src/main/kotlin/ink/ptms/adyeshach/impl/DefaultAdyeshachEntityMetadataRegistry.kt
@@ -1,6 +1,7 @@
 package ink.ptms.adyeshach.impl
 
 import ink.ptms.adyeshach.core.AdyeshachEntityMetadataRegistry
+import ink.ptms.adyeshach.core.AdyeshachParallelTask
 import ink.ptms.adyeshach.core.entity.EntityInstance
 import ink.ptms.adyeshach.core.entity.Meta
 import ink.ptms.adyeshach.core.entity.type.AdyIronGolem
@@ -14,6 +15,7 @@ import taboolib.common.platform.PlatformFactory
 import taboolib.common.platform.function.registerLifeCycleTask
 import taboolib.common.platform.function.releaseResourceFile
 import taboolib.common.util.unsafeLazy
+import taboolib.platform.bukkit.parallel
 import java.util.concurrent.ConcurrentHashMap
 
 /**
@@ -34,7 +36,7 @@ class DefaultAdyeshachEntityMetadataRegistry : AdyeshachEntityMetadataRegistry {
     }
 
     init {
-        registerLifeCycleTask(LifeCycle.ENABLE) {
+        parallel(AdyeshachParallelTask.DESCRIPTION_INIT) {
             descriptionMeta.init()
             descriptionUnusedMeta.init()
         }
diff --git a/project/common-impl/src/main/kotlin/ink/ptms/adyeshach/impl/DefaultAdyeshachEntityTypeRegistry.kt b/project/common-impl/src/main/kotlin/ink/ptms/adyeshach/impl/DefaultAdyeshachEntityTypeRegistry.kt
@@ -2,6 +2,7 @@ package ink.ptms.adyeshach.impl
 
 import ink.ptms.adyeshach.core.Adyeshach
 import ink.ptms.adyeshach.core.AdyeshachEntityTypeRegistry
+import ink.ptms.adyeshach.core.AdyeshachParallelTask
 import ink.ptms.adyeshach.core.entity.EntityBase
 import ink.ptms.adyeshach.core.entity.EntityInstance
 import ink.ptms.adyeshach.core.entity.EntitySize
@@ -18,11 +19,13 @@ import taboolib.common.LifeCycle
 import taboolib.common.platform.Awake
 import taboolib.common.platform.PlatformFactory
 import taboolib.common.platform.function.info
-import taboolib.common.platform.function.registerLifeCycleTask
 import taboolib.common.platform.function.releaseResourceFile
+import taboolib.common.util.execution
+import taboolib.common.util.t
 import taboolib.common.util.unsafeLazy
 import taboolib.library.reflex.Reflex.Companion.invokeConstructor
 import taboolib.module.nms.AsmClassLoader
+import taboolib.platform.bukkit.parallel
 
 /**
  * Adyeshach
@@ -56,17 +59,18 @@ class DefaultAdyeshachEntityTypeRegistry : AdyeshachEntityTypeRegistry {
 
     /** 所有实体对象的原件，用于克隆实体 */
     val originEntityBaseMap = HashMap<EntityTypes, EntityBase>()
-        get() {
-            if (field.isEmpty()) {
-                val time = System.currentTimeMillis()
-                field.putAll(generateEntityBase())
-                info("Proxy classes has been generated (${System.currentTimeMillis() - time}ms)")
-            }
-            return field
-        }
 
     init {
-        registerLifeCycleTask(LifeCycle.ENABLE, 999) { originEntityBaseMap }
+        // 生成实体类
+        parallel(AdyeshachParallelTask.GENERATE_ENTITY_CLASS, dependOn = AdyeshachParallelTask.DESCRIPTION_INIT) {
+            val (_, cost) = execution { originEntityBaseMap += generateEntityBase() }
+            info(
+                """
+                    代理类已生成，用时 $cost 毫秒。
+                    Proxy classes has been generated, cost $cost ms.
+                """.t()
+            )
+        }
         // 注册生成回调
         prepareGenerate(object : AdyeshachEntityTypeRegistry.GenerateCallback {
 
diff --git a/project/common-impl/src/main/kotlin/ink/ptms/adyeshach/impl/PluginMetrics.kt b/project/common-impl/src/main/kotlin/ink/ptms/adyeshach/impl/PluginMetrics.kt
@@ -4,13 +4,13 @@ import ink.ptms.adyeshach.core.Adyeshach
 import ink.ptms.adyeshach.core.entity.manager.ManagerType
 import ink.ptms.adyeshach.core.event.AdyeshachEntityCreateEvent
 import taboolib.common.LifeCycle
-import taboolib.common.platform.Awake
 import taboolib.common.platform.Platform
 import taboolib.common.platform.event.SubscribeEvent
 import taboolib.module.metrics.Metrics
 import taboolib.module.metrics.charts.AdvancedPie
 import taboolib.module.metrics.charts.SingleLineChart
 import taboolib.platform.BukkitPlugin
+import taboolib.platform.bukkit.Parallel
 
 object PluginMetrics {
 
@@ -19,7 +19,7 @@ object PluginMetrics {
 
     private var createdEntities = 0
 
-    @Awake(LifeCycle.ACTIVE)
+    @Parallel(runOn = LifeCycle.ENABLE)
     private fun init() {
         metrics = Metrics(8827, BukkitPlugin.getInstance().description.version, Platform.BUKKIT)
         metrics.addCustomChart(SingleLineChart("entities") {
diff --git a/project/common/src/main/kotlin/ink/ptms/adyeshach/core/AdyeshachParallelTask.kt b/project/common/src/main/kotlin/ink/ptms/adyeshach/core/AdyeshachParallelTask.kt
@@ -0,0 +1,8 @@
+package ink.ptms.adyeshach.core
+
+object AdyeshachParallelTask {
+
+    const val DESCRIPTION_INIT = "adyeshach_description_init"
+
+    const val GENERATE_ENTITY_CLASS = "adyeshach_generate_entity_class"
+}
diff --git a/project/module-legacy-api/src/main/kotlin/ink/ptms/adyeshach/internal/listener/ListenerGameEvent.kt b/project/module-legacy-api/src/main/kotlin/ink/ptms/adyeshach/internal/listener/ListenerGameEvent.kt
@@ -16,6 +16,7 @@ import taboolib.module.configuration.Configuration
 import taboolib.module.kether.KetherShell
 import taboolib.module.kether.ScriptContext
 import taboolib.module.kether.printKetherErrorMessage
+import taboolib.platform.bukkit.Parallel
 import taboolib.platform.util.sendLang
 import java.io.File
 
@@ -29,7 +30,7 @@ object ListenerGameEvent {
         init()
     }
 
-    @Awake(LifeCycle.ENABLE)
+    @Parallel
     fun init() {
         val file = File(getDataFolder(), "event.yml")
         if (file.exists()) {

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,12 @@ subprojects {`
`18`	`18`	`install(Bukkit, BukkitUI, BukkitNavigation, BukkitUtil, BukkitHook)`
`19`	`19`	`install(BukkitNMSUtil)`
`20`	`20`	`install(MinecraftEffect, MinecraftChat)`
	`21`	`+ // repoTabooLib = project.repositories.mavenLocal().url.toString()`
`21`	`22`	`}`
`22`		`- version { taboolib = "6.2.1-df22fb1" }`
	`23`	`+ version { taboolib = "6.2.2" }`
`23`	`24`	`}`
`24`	`25`	`repositories {`
	`26`	`+ mavenLocal()`
`25`	`27`	`maven { url = uri("https://repo.spongepowered.org/maven") }`
`26`	`28`	`mavenCentral()`
`27`	`29`	`}`