[2.2.0-beta2] 1.21.1

TrPlugins · Sep 7, 2024 · b2a485e · b2a485e
1 parent 1d6f577
commit b2a485e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 137 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,10 @@ subprojects {
                 "bukkit-hook",
                 "bukkit-util",
                 "bukkit-ui",
-                "bukkit-xseries"
+                "bukkit-ui-legacy",
+                "bukkit-ui-modern",
+                "bukkit-xseries",
+                "bukkit-xseries-item"
             )
             install("database-sql")
             install(
@@ -33,7 +36,12 @@ subprojects {
             )
             install(
                 "nms",
-                "nms-util"
+                "nms-util",
+                "nms-util-stable",
+                "nms-util-unstable",
+                "nms-util-tag",
+                "nms-util-tag-12005",
+                "nms-util-tag-legacy",
             )
             install(
                 "database-alkaid-redis",
@@ -42,13 +50,11 @@ subprojects {
             )
             install(BUKKIT, BUNGEE, VELOCITY)
             install("platform-bukkit-impl")
-//            install(UNIVERSAL, DATABASE, KETHER, METRICS, NMS_UTIL)
-//            install(EXPANSION_REDIS, EXPANSION_JAVASCRIPT, EXPANSION_PLAYER_DATABASE)
-//            install(BUKKIT_ALL, BUNGEE, VELOCITY)
+            forceDownloadInDev = false
             repoTabooLib = "http://mcitd.cn:8081/repository/releases"
         }
         version {
-            taboolib = "6.2.0-beta4-dev"
+            taboolib = "6.2.0-beta5-dev"
             coroutines = null
 //            isSkipKotlin = true
 //            isSkipKotlinRelocate = true

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

diff --git a/...t/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/function/Function.kt b/...t/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/function/Function.kt
@@ -3,7 +3,6 @@ package me.arasple.mc.trchat.module.display.function
 import me.arasple.mc.trchat.api.event.TrChatReloadEvent
 import me.arasple.mc.trchat.module.internal.script.Reaction
 import org.bukkit.entity.Player
-import taboolib.common.io.getInstance
 import taboolib.common.io.runningClassesWithoutLibrary
 import taboolib.common.platform.ProxyCommandSender
 import taboolib.common.platform.ProxyPlayer
@@ -39,8 +38,8 @@ abstract class Function(val id: String) {
         fun reload(customFunctions: List<CustomFunction>) {
             functions.clear()
             functions.addAll(runningClassesWithoutLibrary
-                .filter { it.isAnnotationPresent(StandardFunction::class.java) }
-                .mapNotNull { it.getInstance()?.get() as? Function }
+                .filter { it.hasAnnotation(StandardFunction::class.java) }
+                .mapNotNull { it.getInstance() as? Function }
             )
             functions.addAll(customFunctions)
             TrChatReloadEvent.Function(functions).call()

diff --git a/...bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/function/standard/ImageShow.kt b/...bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/function/standard/ImageShow.kt
diff --git a/...-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/command/main/CommandViews.kt b/...-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/command/main/CommandViews.kt
@@ -2,7 +2,6 @@ package me.arasple.mc.trchat.module.internal.command.main
 
 import me.arasple.mc.trchat.module.conf.file.Settings
 import me.arasple.mc.trchat.module.display.function.standard.EnderChestShow
-import me.arasple.mc.trchat.module.display.function.standard.ImageShow
 import me.arasple.mc.trchat.module.display.function.standard.InventoryShow
 import me.arasple.mc.trchat.module.display.function.standard.ItemShow
 import org.bukkit.entity.Player
@@ -12,7 +11,6 @@ import taboolib.common.platform.Platform
 import taboolib.common.platform.PlatformSide
 import taboolib.common.platform.command.PermissionDefault
 import taboolib.common.platform.command.command
-import taboolib.common5.util.decodeBase64
 import taboolib.expansion.createHelper
 import taboolib.module.lang.sendLang
 import taboolib.platform.util.sendLang
@@ -78,23 +76,5 @@ object CommandViews {
                 createHelper()
             }
         }
-        command("view-image", permissionDefault = PermissionDefault.TRUE) {
-            dynamic("image") {
-                execute<Player> { sender, _, argument ->
-                    val url = argument.decodeBase64().decodeToString()
-                    ImageShow.cache.getIfPresent(url)?.sendTo(sender)
-                        ?: kotlin.run {
-                            ImageShow.computeAndCache(url)
-                            sender.sendLang("Function-Image-Show-Unavailable")
-                        }
-                }
-            }
-            incorrectSender { sender, _ ->
-                sender.sendLang("Command-Not-Player")
-            }
-            incorrectCommand { _, _, _, _ ->
-                createHelper()
-            }
-        }
     }
 }