From 43c154d58e4020633e5974a9025a454de1b75009 Mon Sep 17 00:00:00 2001 From: xbaimiao <3104026189@qq.com> Date: Sun, 7 Apr 2024 22:54:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0TabooLib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 53 +++++-------------- gradle.properties | 2 +- .../xbaimiao/shoppro/api/ShopProSellEvent.kt | 6 +-- .../shoppro/core/item/impl/HeadShopItem.kt | 7 +-- .../shoppro/core/item/impl/ItemImpl.kt | 6 +-- 5 files changed, 24 insertions(+), 50 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e8b2e16..d33c137 100644 --- a/build.gradle.kts +++ b/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 { 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("basic") - } - } - } - publications { - create("library") { - from(components["java"]) - groupId = project.group.toString() - } - } -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 4105011..7a450c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=com.github.xbaimiao.shoppro -version=1.2.5 +version=1.2.6-SNAPSHOT diff --git a/src/main/kotlin/com/github/xbaimiao/shoppro/api/ShopProSellEvent.kt b/src/main/kotlin/com/github/xbaimiao/shoppro/api/ShopProSellEvent.kt index 4b9f351..5c8c3c3 100644 --- a/src/main/kotlin/com/github/xbaimiao/shoppro/api/ShopProSellEvent.kt +++ b/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,9 +19,9 @@ class ShopProSellEvent( private val handlerList = HandlerList() @JvmStatic - fun getHandlerList(): HandlerList? { + fun getHandlerList(): HandlerList { return handlerList } } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/github/xbaimiao/shoppro/core/item/impl/HeadShopItem.kt b/src/main/kotlin/com/github/xbaimiao/shoppro/core/item/impl/HeadShopItem.kt index 1c84101..4274d67 100644 --- a/src/main/kotlin/com/github/xbaimiao/shoppro/core/item/impl/HeadShopItem.kt +++ b/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()) } } @@ -63,4 +64,4 @@ class HeadShopItem( } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/github/xbaimiao/shoppro/core/item/impl/ItemImpl.kt b/src/main/kotlin/com/github/xbaimiao/shoppro/core/item/impl/ItemImpl.kt index 1b158dc..d261804 100644 --- a/src/main/kotlin/com/github/xbaimiao/shoppro/core/item/impl/ItemImpl.kt +++ b/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()) } } } @@ -89,4 +89,4 @@ class ItemImpl( } } -} \ No newline at end of file +}