Merge pull request #698 from Jie-150/dev/6.3.0

增加js编译方法,支持Reader类编译,修复高版本发送json检查§

Author: Bkm016

module/minecraft/minecraft-chat/src/main/kotlin/taboolib/module/chat/impl/DefaultComponent.kt

@@ -1,5 +1,6 @@
 package taboolib.module.chat.impl
 
+import com.google.gson.JsonParseException
 import net.kyori.adventure.text.Component
 import net.md_5.bungee.api.ChatColor
 import net.md_5.bungee.api.chat.*
@@ -59,9 +60,19 @@ class DefaultComponent() : ComponentText {
 
     override fun sendTo(sender: ProxyCommandSender) {
         if (sender is ProxyPlayer) {
-            sender.sendRawMessage(toRawMessage())
+            val message = toRawMessage()
+            try {
+                sender.sendRawMessage(message)
+            } catch (_: JsonParseException) {
+                sender.sendRawMessage(message.replace('§', '&'))
+            }
         } else {
-            sender.sendMessage(toLegacyText())
+            val message = toLegacyText()
+            try {
+                sender.sendMessage(message)
+            } catch (_: JsonParseException) {
+                sender.sendMessage(message.replace('§', '&'))
+            }
         }
     }
 

module/script/script-javascript/src/main/kotlin/taboolib/common5/NashornCompiler.kt

@@ -12,6 +12,7 @@ import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory
 import taboolib.common.Inject
 import taboolib.common.env.RuntimeDependencies
 import taboolib.common.env.RuntimeDependency
+import java.io.Reader
 import javax.script.Compilable
 import javax.script.CompiledScript
 import javax.script.ScriptEngine
@@ -31,4 +32,8 @@ val scriptEngine: ScriptEngine by lazy {
 
 fun String.compileJS(): CompiledScript? {
     return (scriptEngine as? Compilable)?.compile(this)
+}
+
+fun Reader.compileJS(): CompiledScript? {
+    return (scriptEngine as? Compilable)?.compile(this)
 }