[2.2.0-beta3] Fix

TrPlugins · Sep 15, 2024 · 2b71ff6 · 2b71ff6
1 parent b2a485e
commit 2b71ff6
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 38 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,12 +21,16 @@ subprojects {
                 "bukkit-hook",
                 "bukkit-util",
                 "bukkit-ui",
+                "bukkit-ui-12100",
                 "bukkit-ui-legacy",
-                "bukkit-ui-modern",
                 "bukkit-xseries",
                 "bukkit-xseries-item"
             )
-            install("database-sql")
+            install(
+                "database",
+                "database-alkaid-redis",
+                "database-player"
+            )
             install(
                 "minecraft-chat",
                 "minecraft-command-helper",
@@ -35,26 +39,18 @@ subprojects {
                 "minecraft-metrics"
             )
             install(
-                "nms",
-                "nms-util",
-                "nms-util-stable",
-                "nms-util-unstable",
-                "nms-util-tag",
-                "nms-util-tag-12005",
-                "nms-util-tag-legacy",
-            )
-            install(
-                "database-alkaid-redis",
-                "database-player",
-                "script-javascript"
+                "bukkit-nms",
+                "bukkit-nms-stable",
+                "bukkit-nms-tag",
+                "bukkit-nms-tag-12005",
+                "bukkit-nms-tag-legacy",
             )
+            install("script-javascript")
             install(BUKKIT, BUNGEE, VELOCITY)
             install("platform-bukkit-impl")
-            forceDownloadInDev = false
-            repoTabooLib = "http://mcitd.cn:8081/repository/releases"
         }
         version {
-            taboolib = "6.2.0-beta5-dev"
+            taboolib = "6.2.0-beta5"
             coroutines = null
 //            isSkipKotlin = true
 //            isSkipKotlinRelocate = true
@@ -65,7 +61,6 @@ subprojects {
     repositories {
         mavenLocal()
         mavenCentral()
-        maven("http://mcitd.cn:8081/repository/releases") { isAllowInsecureProtocol = true }
         maven("https://jitpack.io")
         maven("https://oss.sonatype.org/content/repositories/snapshots")
         maven("https://papermc.io/repo/repository/maven-public/")

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=me.arasple.mc.trchat
-version=2.2.0-beta2
+version=2.2.0-beta3
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.incremental.useClasspathSnapshot=true

diff --git a/project/module-compat/build.gradle.kts b/project/module-compat/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
 
     compileOnly("com.discordsrv:discordsrv:1.26.0") { isTransitive = false }
     compileOnly("com.willfp:eco:6.35.1") { isTransitive = false }
-    compileOnly("com.github.LoneDev6:api-itemsadder:3.6.2-beta-r3-b") { isTransitive = false }
+    compileOnly("com.github.LoneDev6:api-itemsadder:3.6.3-beta-14") { isTransitive = false }
     compileOnly("xyz.xenondevs.nova:nova-api:0.12.13") { isTransitive = false }
     compileOnly("io.th0rgal:oraxen:1.170.0") { isTransitive = false }
 }

diff --git a/...e-compat/src/main/kotlin/me/arasple/mc/trchat/module/internal/hook/impl/HookItemsAdder.kt b/...e-compat/src/main/kotlin/me/arasple/mc/trchat/module/internal/hook/impl/HookItemsAdder.kt
@@ -14,10 +14,14 @@ class HookItemsAdder : HookAbstract() {
         if (!isHooked) {
             return message
         }
-        return if (player == null) {
-            FontImageWrapper.replaceFontImages(message)
-        } else {
-            FontImageWrapper.replaceFontImages(player, message)
+        try {
+            return if (player == null) {
+                FontImageWrapper.replaceFontImages(message)
+            } else {
+                FontImageWrapper.replaceFontImages(player, message)
+            }
+        } catch (_: Throwable) {
+            return message
         }
     }
 }
diff --git a/project/module-nms/src/main/kotlin/me/arasple/mc/trchat/api/nms/NMS.kt b/project/module-nms/src/main/kotlin/me/arasple/mc/trchat/api/nms/NMS.kt
@@ -4,7 +4,7 @@ import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import taboolib.common.util.unsafeLazy
 import taboolib.module.chat.ComponentText
-import taboolib.module.nms.LocaleKey
+import taboolib.module.nms.MinecraftLanguage
 import taboolib.module.nms.MinecraftVersion
 import taboolib.module.nms.nmsProxy
 import java.util.*
@@ -27,7 +27,7 @@ abstract class NMS {
 
     abstract fun optimizeNBT(itemStack: ItemStack, nbtWhitelist: Array<String> = whitelistTags): ItemStack
 
-    abstract fun getLocaleKey(itemStack: ItemStack): LocaleKey
+    abstract fun getLocaleKey(itemStack: ItemStack): MinecraftLanguage.LanguageKey
 
     companion object {
 

diff --git a/project/module-nms/src/main/kotlin/me/arasple/mc/trchat/api/nms/NMSImpl.kt b/project/module-nms/src/main/kotlin/me/arasple/mc/trchat/api/nms/NMSImpl.kt
@@ -9,10 +9,10 @@ import org.bukkit.inventory.ItemStack
 import taboolib.common.platform.function.adaptPlayer
 import taboolib.library.reflex.Reflex.Companion.invokeConstructor
 import taboolib.module.chat.ComponentText
-import taboolib.module.nms.LocaleKey
+import taboolib.module.nms.MinecraftLanguage
 import taboolib.module.nms.MinecraftVersion.isUniversal
 import taboolib.module.nms.MinecraftVersion.majorLegacy
-import taboolib.module.nms.NMSItem
+import taboolib.module.nms.NMSItemTag
 import taboolib.module.nms.nmsProxy
 import taboolib.module.nms.sendPacket
 import taboolib.platform.Folia
@@ -130,9 +130,9 @@ class NMSImpl : NMS() {
         return itemStack
     }
 
-    override fun getLocaleKey(itemStack: ItemStack): LocaleKey {
-        val nmsItemStack = nmsProxy<NMSItem>().getNMSCopy(itemStack) as net.minecraft.server.v1_16_R3.ItemStack
+    override fun getLocaleKey(itemStack: ItemStack): MinecraftLanguage.LanguageKey {
+        val nmsItemStack = nmsProxy<NMSItemTag>().getNMSCopy(itemStack) as net.minecraft.server.v1_16_R3.ItemStack
         val nmsItem = nmsItemStack.item
-        return LocaleKey("N", nmsItem.f(nmsItemStack))
+        return MinecraftLanguage.LanguageKey(MinecraftLanguage.LanguageKey.Type.NORMAL, nmsItem.f(nmsItemStack))
     }
 }
diff --git a/project/module-nms/src/main/kotlin/me/arasple/mc/trchat/api/nms/NMSImpl12100.kt b/project/module-nms/src/main/kotlin/me/arasple/mc/trchat/api/nms/NMSImpl12100.kt
@@ -4,7 +4,7 @@ import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import taboolib.common.platform.function.adaptPlayer
 import taboolib.module.chat.ComponentText
-import taboolib.module.nms.LocaleKey
+import taboolib.module.nms.MinecraftLanguage
 import java.util.*
 
 class NMSImpl12100 : NMS() {
@@ -29,7 +29,7 @@ class NMSImpl12100 : NMS() {
         TODO("Not yet implemented")
     }
 
-    override fun getLocaleKey(itemStack: ItemStack): LocaleKey {
+    override fun getLocaleKey(itemStack: ItemStack): MinecraftLanguage.LanguageKey {
         TODO("Not yet implemented")
     }
 }
diff --git a/...-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/function/standard/ItemShow.kt b/...-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/function/standard/ItemShow.kt
@@ -35,7 +35,10 @@ import taboolib.module.chat.Components
 import taboolib.module.chat.impl.DefaultComponent
 import taboolib.module.configuration.ConfigNode
 import taboolib.module.configuration.ConfigNodeTransfer
-import taboolib.module.nms.*
+import taboolib.module.nms.MinecraftVersion
+import taboolib.module.nms.getI18nName
+import taboolib.module.nms.getKey
+import taboolib.module.nms.getLanguageKey
 import taboolib.module.ui.buildMenu
 import taboolib.module.ui.type.Chest
 import taboolib.module.ui.type.PageableChest
@@ -218,7 +221,7 @@ object ItemShow : Function("ITEM") {
         } else {
             try {
                 if (MinecraftVersion.isHigherOrEqual(MinecraftVersion.V1_15)) {
-                    Components.translation(getLocaleKey().path)
+                    Components.translation(getLanguageKey().path)
                 } else {
                     Components.text(getI18nName(player))
                 }
@@ -228,7 +231,7 @@ object ItemShow : Function("ITEM") {
                     Components.translation(NMS.instance.getLocaleKey(this).path)
                 } catch (_: Throwable) {
                     try {
-                        Components.text(nmsProxy<NMSItem>().getKey(this))
+                        Components.text(getKey())
                     } catch (_: Throwable) {
                         Components.text(type.name)
                     }

diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/TrChatBukkit.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/TrChatBukkit.kt
@@ -16,7 +16,6 @@ import taboolib.common.LifeCycle
 import taboolib.common.platform.*
 import taboolib.common.platform.function.console
 import taboolib.common.platform.function.pluginVersion
-import taboolib.common.platform.function.warning
 import taboolib.module.lang.sendLang
 import taboolib.module.nms.MinecraftVersion.majorLegacy
 import taboolib.module.nms.disablePacketListener
@@ -64,7 +63,6 @@ object TrChatBukkit : Plugin() {
         HookPlugin.printInfo()
         reload(console())
         console().sendLang("Plugin-Enabled", pluginVersion)
-        warning("In this version, some functions do not work!")
     }
 
     override fun onDisable() {