更新TabooLib

build.gradle.kts

@@ -1,7 +1,9 @@
+import io.izzel.taboolib.gradle.*
+
 plugins {
     `java-library`
     `maven-publish`
-    id("io.izzel.taboolib") version "1.56"
+    id("io.izzel.taboolib") version "2.0.11"
     id("org.jetbrains.kotlin.jvm") version "1.7.10"
 }
 
@@ -18,23 +20,16 @@ taboolib {
             name("xbaimiao")
         }
     }
-    install("common")
-    install("common-5")
-    install("module-chat")
-    install("module-configuration")
-    install("module-database")
-    install("module-lang")
-    install("module-ui")
-    install("module-nms-util")
-    install("module-nms")
-    install("module-kether")
-    install("platform-bukkit")
-    install("expansion-command-helper")
-    classifier = null
-    version = "6.0.12-68"
-    options("skit-kotlin")
-    relocate("kotlin", "libs.kotlin171")
-    relocate("com.xbaimiao.ktor", "libs.kotlin171.ktor")
+    env {
+        install(NMS_UTIL, UI)
+        install(EXPANSION_COMMAND_HELPER, BUKKIT_ALL)
+        install(DATABASE, CHAT, CONFIGURATION, LANG, NMS, KETHER)
+    }
+    version {
+        taboolib = "6.1.1-beta17"
+    }
+//    relocate("kotlin", "libs.kotlin171")
+    relocate("com.xbaimiao.ktor", "com.github.xbaimiao.shoppro.stat")
 }
 
 repositories {
@@ -55,7 +50,7 @@ dependencies {
     compileOnly("pers.neige.neigeitems:NeigeItems:1.15.113")
     compileOnly("public:MMOItems:6.9.4")
     taboo("com.xbaimiao.ktor:ktor-plugins-bukkit:1.0.8")
-    taboo(kotlin("stdlib"))
+//    taboo(kotlin("stdlib"))
     compileOnly(fileTree("libs"))
 }
 
@@ -75,23 +70,3 @@ configure<JavaPluginConvention> {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-publishing {
-    repositories {
-        maven {
-            url = uri("https://repo.tabooproject.org/repository/releases")
-            credentials {
-                username = project.findProperty("taboolibUsername").toString()
-                password = project.findProperty("taboolibPassword").toString()
-            }
-            authentication {
-                create<BasicAuthentication>("basic")
-            }
-        }
-    }
-    publications {
-        create<MavenPublication>("library") {
-            from(components["java"])
-            groupId = project.group.toString()
-        }
-    }
-}

gradle.properties

@@ -1,2 +1,2 @@
 group=com.github.xbaimiao.shoppro
-version=1.2.5
+version=1.2.6-SNAPSHOT

src/main/kotlin/com/github/xbaimiao/shoppro/api/ShopProSellEvent.kt

@@ -4,8 +4,6 @@ import com.github.xbaimiao.shoppro.core.item.ShopItem
 import org.bukkit.entity.Player
 import org.bukkit.event.Event
 import org.bukkit.event.HandlerList
-import org.bukkit.event.inventory.ClickType
-import org.bukkit.inventory.Inventory
 
 class ShopProSellEvent(
     val item: ShopItem,
@@ -21,7 +19,7 @@ class ShopProSellEvent(
         private val handlerList = HandlerList()
 
         @JvmStatic
-        fun getHandlerList(): HandlerList? {
+        fun getHandlerList(): HandlerList {
             return handlerList
         }
     }

src/main/kotlin/com/github/xbaimiao/shoppro/core/item/impl/HeadShopItem.kt

@@ -9,6 +9,7 @@ import org.bukkit.configuration.ConfigurationSection
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import taboolib.library.xseries.XMaterial
+import taboolib.library.xseries.XSkull
 import taboolib.library.xseries.parseToMaterial
 import taboolib.platform.util.ItemBuilder
 import java.util.*
@@ -29,7 +30,7 @@ class HeadShopItem(
 
     override fun vanillaItem(player: Player): ItemStack {
         return taboolib.platform.util.buildItem(material) {
-            skullTexture = ItemBuilder.SkullTexture(head, UUID.randomUUID())
+            skullTexture = XSkull.SkullTexture(head, UUID.randomUUID())
         }
     }
 
@@ -41,7 +42,7 @@ class HeadShopItem(
         return taboolib.platform.util.buildItem(material) {
             this.name = this@HeadShopItem.name
             this.lore.addAll(this@HeadShopItem.lore)
-            skullTexture = ItemBuilder.SkullTexture(head, UUID.randomUUID())
+            skullTexture = XSkull.SkullTexture(head, UUID.randomUUID())
         }
     }
 

src/main/kotlin/com/github/xbaimiao/shoppro/core/item/impl/ItemImpl.kt

@@ -9,8 +9,8 @@ import org.bukkit.configuration.ConfigurationSection
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import taboolib.library.xseries.XMaterial
+import taboolib.library.xseries.XSkull
 import taboolib.module.chat.colored
-import taboolib.platform.util.ItemBuilder
 import taboolib.platform.util.modifyLore
 import java.util.*
 
@@ -54,7 +54,7 @@ class ItemImpl(
             this.lore.addAll(this@ItemImpl.lore)
             custom?.let { customModelData = it }
             head?.let {
-                skullTexture = ItemBuilder.SkullTexture(it, UUID.randomUUID())
+                skullTexture = XSkull.SkullTexture(it, UUID.randomUUID())
             }
         }
     }