Merge pull request #4 from Micalhl/dev

[*] 问题修复(1.5.4): 更新 TabooLib 至 6.1, 修复头颅物品在高版本的显示
Polar-Pumpkin · Feb 6, 2024 · cf3f710 · cf3f710
2 parents fda1cb7 + fbd43b4
commit cf3f710
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 45 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     `java-library`
     `maven-publish`
-    kotlin("jvm") version "1.5.31"
+    kotlin("jvm") version "1.8.22"
 }
 
 repositories {
@@ -19,15 +19,21 @@ dependencies {
     compileOnly(kotlin("stdlib"))
     compileOnly(fileTree("libs"))
 
-    implementation("io.izzel.taboolib:common:${taboolibVersion}")
-    implementation("io.izzel.taboolib:common-5:${taboolibVersion}")
-    implementation("io.izzel.taboolib:module-kether:${taboolibVersion}")
-    implementation("io.izzel.taboolib:module-configuration:${taboolibVersion}")
-    implementation("io.izzel.taboolib:module-database:${taboolibVersion}")
-    implementation("io.izzel.taboolib:module-ui:${taboolibVersion}")
-    implementation("io.izzel.taboolib:module-chat:${taboolibVersion}")
-    implementation("io.izzel.taboolib:module-lang:${taboolibVersion}")
-    implementation("io.izzel.taboolib:platform-bukkit:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:common:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:common-legacy-api:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:common-env:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:common-platform-api:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:common-reflex:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:common-util:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:module-bukkit-util:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:module-bukkit-xseries:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:module-kether:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:module-configuration:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:module-database:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:module-ui:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:module-chat:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:module-lang:${taboolibVersion}")
+    compileOnly("io.izzel.taboolib:platform-bukkit:${taboolibVersion}")
 }
 
 java {

diff --git a/gradle.properties b/gradle.properties
@@ -8,4 +8,4 @@ kotlin.incremental.java=true
 kotlin.caching.enabled=true
 kotlin.parallel.tasks.in.project=true
 
-taboolibVersion=6.0.11-27
+taboolibVersion=6.1.0
diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/container/Maps.kt b/src/main/kotlin/org/serverct/parrot/parrotx/container/Maps.kt
@@ -1,10 +1,8 @@
-@file:Isolated
 @file:Suppress("MemberVisibilityCanBePrivate", "unused")
 
 package org.serverct.parrot.parrotx.container
 
 import com.google.common.collect.Range
-import taboolib.common.Isolated
 import java.util.*
 
 abstract class LazyMap<K, V>(val loaded: MutableMap<K, V> = HashMap()) : Map<K, V> by loaded {

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/feature/Confirmation.kt b/src/main/kotlin/org/serverct/parrot/parrotx/feature/Confirmation.kt
@@ -1,11 +1,9 @@
 @file:Suppress("unused", "MemberVisibilityCanBePrivate")
-@file:Isolated
 
 package org.serverct.parrot.parrotx.feature
 
 import org.bukkit.entity.Player
 import org.bukkit.event.player.PlayerQuitEvent
-import taboolib.common.Isolated
 import taboolib.common.platform.event.EventPriority
 import taboolib.common.platform.event.SubscribeEvent
 import taboolib.common.platform.function.submit
@@ -25,7 +23,6 @@ fun Player.confirm(name: String, message: String? = null, vararg args: Any, buil
     Confirmations.schedule(this, name, builder)
 }
 
-@Isolated
 object Confirmations {
 
     private val scheduled: MutableMap<UUID, Confirmation> = HashMap()
@@ -54,7 +51,6 @@ object Confirmations {
 
 }
 
-@Isolated
 class Confirmation(val name: String, builder: Confirmation.() -> Unit) {
 
     var isCancelled: Boolean = false

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/feature/Fatality.kt b/src/main/kotlin/org/serverct/parrot/parrotx/feature/Fatality.kt
@@ -1,11 +1,9 @@
-@file:Isolated
 @file:Suppress("unused")
 
 package org.serverct.parrot.parrotx.feature
 
 import org.bukkit.Bukkit
 import org.bukkit.event.player.PlayerLoginEvent
-import taboolib.common.Isolated
 import taboolib.common.platform.event.EventPriority
 import taboolib.common.platform.event.SubscribeEvent
 import taboolib.common.platform.function.pluginId
@@ -27,7 +25,6 @@ inline fun <R> important(action: () -> R): Result<R> {
     }
 }
 
-@Isolated
 internal object LoginListener {
     @SubscribeEvent(EventPriority.LOWEST, true)
     fun onLogin(event: PlayerLoginEvent) {

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/feature/Input.kt b/src/main/kotlin/org/serverct/parrot/parrotx/feature/Input.kt
@@ -1,11 +1,9 @@
-@file:Isolated
 @file:Suppress("unused", "MemberVisibilityCanBePrivate")
 
 package org.serverct.parrot.parrotx.feature
 
 import org.bukkit.entity.Player
 import org.bukkit.event.player.AsyncPlayerChatEvent
-import taboolib.common.Isolated
 import taboolib.common.platform.event.EventPriority
 import taboolib.common.platform.event.SubscribeEvent
 import taboolib.common.platform.function.submit
@@ -26,7 +24,6 @@ fun Player.input(name: String, message: String? = null, vararg args: Any, builde
     Inputs.schedule(this, name, builder)
 }
 
-@Isolated
 object Inputs {
 
     private val scheduled: MutableMap<UUID, Input> = HashMap()
@@ -64,7 +61,6 @@ object Inputs {
 
 }
 
-@Isolated
 class Input(val name: String, builder: Input.() -> Unit) {
 
     var isCancelled: Boolean = false

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/feature/Selection.kt b/src/main/kotlin/org/serverct/parrot/parrotx/feature/Selection.kt
@@ -1,4 +1,3 @@
-@file:Isolated
 @file:Suppress("unused", "MemberVisibilityCanBePrivate")
 
 package org.serverct.parrot.parrotx.feature
@@ -10,7 +9,6 @@ import org.bukkit.event.player.PlayerInteractEvent
 import org.bukkit.event.player.PlayerQuitEvent
 import org.bukkit.inventory.EquipmentSlot
 import org.serverct.parrot.parrotx.function.format
-import taboolib.common.Isolated
 import taboolib.common.platform.event.EventPriority
 import taboolib.common.platform.event.SubscribeEvent
 import taboolib.module.chat.colored
@@ -28,7 +26,6 @@ fun Player.select(name: String, message: String? = null, vararg args: Any, build
     Selections.schedule(this, name, builder)
 }
 
-@Isolated
 object Selections {
 
     private val scheduled: MutableMap<UUID, Selection> = HashMap()
@@ -71,7 +68,6 @@ object Selections {
 
 }
 
-@Isolated
 class Selection(val name: String, builder: Selection.() -> Unit) {
 
     var isCompleted: Boolean = false

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/function/Exception.kt b/src/main/kotlin/org/serverct/parrot/parrotx/function/Exception.kt
@@ -1,9 +1,7 @@
-@file:Isolated
 @file:Suppress("unused")
 
 package org.serverct.parrot.parrotx.function
 
-import taboolib.common.Isolated
 import taboolib.common.platform.function.warning
 
 @Deprecated("Duplicate stack trace", ReplaceWith("this because reason"))

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/function/Item.kt b/src/main/kotlin/org/serverct/parrot/parrotx/function/Item.kt
@@ -60,7 +60,7 @@ infix fun ItemStack.textured(input: String): ItemStack {
     }
 
     return modifyMeta<SkullMeta> {
-        val profile = GameProfile(UUID.randomUUID(), null)
+        val profile = GameProfile(UUID.randomUUID(), "null")
         val texture = if (input.length in 60..100) encodeTexture(input) else input
         profile.properties.put("textures", Property("textures", texture, "${pluginId}_TexturedSkull"))
         setProperty("profile", profile)

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/function/Player.kt b/src/main/kotlin/org/serverct/parrot/parrotx/function/Player.kt
@@ -1,4 +1,3 @@
-@file:Isolated
 @file:Suppress("unused")
 
 package org.serverct.parrot.parrotx.function
@@ -8,7 +7,6 @@ import org.bukkit.Material
 import org.bukkit.OfflinePlayer
 import org.bukkit.block.BlockFace
 import org.bukkit.entity.Player
-import taboolib.common.Isolated
 import taboolib.platform.util.sendInfoMessage
 import taboolib.platform.util.sendLang
 

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/function/Value.kt b/src/main/kotlin/org/serverct/parrot/parrotx/function/Value.kt
@@ -1,11 +1,9 @@
-@file:Isolated
 @file:Suppress("unused")
 
 package org.serverct.parrot.parrotx.function
 
 import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
-import taboolib.common.Isolated
 import java.util.*
 import java.util.concurrent.TimeUnit
 

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/mechanism/Reloadable.kt b/src/main/kotlin/org/serverct/parrot/parrotx/mechanism/Reloadable.kt
@@ -1,10 +1,7 @@
-@file:Isolated
-
 package org.serverct.parrot.parrotx.mechanism
 
 import com.google.common.collect.HashMultimap
 import com.google.common.collect.Multimap
-import taboolib.common.Isolated
 import taboolib.common.LifeCycle
 import taboolib.common.inject.ClassVisitor
 import taboolib.common.platform.Awake
@@ -15,13 +12,11 @@ import taboolib.module.configuration.Configuration
 import java.util.function.Consumer
 import java.util.function.Supplier
 
-@Isolated
 @Target(AnnotationTarget.FUNCTION, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
 annotation class Reloadable
 
 @Awake
-@Isolated
 @Suppress("unused")
 object Reloadables : ClassVisitor() {
 

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/ui/extension/Mapped.kt b/src/main/kotlin/org/serverct/parrot/parrotx/ui/extension/Mapped.kt
@@ -7,7 +7,7 @@ import taboolib.module.ui.buildMenu
 import taboolib.module.ui.type.Linked
 
 @Suppress("unused")
-class Mapped<E>(title: String) : Menu(title) {
+class Mapped<E>(override var title: String) : Menu {
 
     private lateinit var config: MenuConfiguration
     private lateinit var template: String

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/util/KetherUtil.kt b/src/main/kotlin/org/serverct/parrot/parrotx/util/KetherUtil.kt
@@ -1,11 +1,9 @@
 package org.serverct.parrot.parrotx.util
 
-import taboolib.common.Isolated
 import taboolib.library.kether.ParsedAction
 import taboolib.module.kether.ScriptFrame
 import java.util.concurrent.CompletableFuture
 
-@Isolated
 @Suppress("unused")
 object KetherUtil {
 

diff --git a/src/main/kotlin/org/serverct/parrot/parrotx/util/PlayerFreezer.kt b/src/main/kotlin/org/serverct/parrot/parrotx/util/PlayerFreezer.kt
@@ -5,15 +5,13 @@ import org.bukkit.entity.Player
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
 import org.bukkit.event.player.PlayerToggleFlightEvent
-import taboolib.common.Isolated
 import taboolib.common.LifeCycle
 import taboolib.common.platform.Awake
 import taboolib.common.platform.event.SubscribeEvent
 import taboolib.common.platform.function.info
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 
-@Isolated
 @Suppress("MemberVisibilityCanBePrivate", "unused")
 object PlayerFreezer {