[6.0.10] update chat system & nms api

TabooLib · Feb 9, 2023 · e355bd4 · e355bd4
1 parent 2474a83
commit e355bd4
Show file tree

Hide file tree

Showing 55 changed files with 1,397 additions and 725 deletions.
diff --git a/common/src/main/java/taboolib/common/env/ClassAppender.java b/common/src/main/java/taboolib/common/env/ClassAppender.java
@@ -1,8 +1,8 @@
 package taboolib.common.env;
 
 import sun.misc.Unsafe;
-import taboolib.common.classloader.IsolatedClassLoader;
 import taboolib.common.TabooLibCommon;
+import taboolib.common.classloader.IsolatedClassLoader;
 
 import java.io.File;
 import java.lang.invoke.MethodHandle;

diff --git a/common/src/main/kotlin/taboolib/common/util/VariableReader.kt b/common/src/main/kotlin/taboolib/common/util/VariableReader.kt
@@ -58,7 +58,28 @@ class VariableReader(val start: String = "{{", val end: String = "}}") {
     }
 
     private fun format(str: String): String {
-        return str.replace("\\$start", start).replace("\\$end", end)
+        // 不使用 replace 将 "\" + start 和 "\" + end 替换为 start" 和 end
+        return buildString {
+            var i = 0
+            while (i < str.length) {
+                if (str[i] == '\\') {
+                    // 完整匹配 start 和 end
+                    if (i + start.length < str.length && str.substring(i + 1, i + start.length + 1) == start) {
+                        append(start)
+                        i += start.length + 1
+                    } else if (i + end.length < str.length && str.substring(i + 1, i + end.length + 1) == end) {
+                        append(end)
+                        i += end.length + 1
+                    } else {
+                        append(str[i])
+                        i++
+                    }
+                } else {
+                    append(str[i])
+                    i++
+                }
+            }
+        }
     }
 
     private fun indexOf(source: String, str: String, start: Int = 0): Int {

diff --git a/...nsion-ioc/src/main/kotlin/taboolib/expansion/ioc/database/impl/IOCDatabaseMultipleYaml.kt b/...nsion-ioc/src/main/kotlin/taboolib/expansion/ioc/database/impl/IOCDatabaseMultipleYaml.kt
@@ -3,7 +3,9 @@ package taboolib.expansion.ioc.database.impl
 import taboolib.common.platform.function.getDataFolder
 import taboolib.expansion.ioc.database.IOCDatabase
 import taboolib.expansion.ioc.serialization.SerializationManager
-import taboolib.module.configuration.*
+import taboolib.module.configuration.Configuration
+import taboolib.module.configuration.Type
+import taboolib.module.configuration.createLocal
 import java.io.File
 import java.util.concurrent.ConcurrentHashMap
 

diff --git a/...ion/expansion-ioc/src/main/kotlin/taboolib/expansion/ioc/database/impl/IOCDatabaseYaml.kt b/...ion/expansion-ioc/src/main/kotlin/taboolib/expansion/ioc/database/impl/IOCDatabaseYaml.kt
@@ -1,15 +1,10 @@
 package taboolib.expansion.ioc.database.impl
 
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonPrimitive
-import com.google.gson.JsonSerializer
-import org.bukkit.Material
-import org.bukkit.util.Vector
 import taboolib.expansion.ioc.database.IOCDatabase
 import taboolib.expansion.ioc.serialization.SerializationManager
-import taboolib.library.xseries.parseToMaterial
-import taboolib.module.configuration.*
+import taboolib.module.configuration.Configuration
+import taboolib.module.configuration.Type
+import taboolib.module.configuration.createLocal
 
 open class IOCDatabaseYaml : IOCDatabase {
 

diff --git a/expansion/expansion-ioc/src/main/kotlin/taboolib/expansion/ioc/linker/IOCList.kt b/expansion/expansion-ioc/src/main/kotlin/taboolib/expansion/ioc/linker/IOCList.kt
@@ -2,7 +2,6 @@ package taboolib.expansion.ioc.linker
 
 import taboolib.expansion.ioc.IOCReader
 import taboolib.expansion.ioc.IndexReader
-import taboolib.expansion.ioc.database.IOCDatabase
 import taboolib.expansion.ioc.database.impl.IOCDatabaseYaml
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap

diff --git a/module/module-chat/build.gradle.kts b/module/module-chat/build.gradle.kts
@@ -1,18 +1,17 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 dependencies {
     compileOnly("com.google.code.gson:gson:2.8.7")
     compileOnly("net.md-5:bungeecord-chat:1.17")
     compileOnly(project(":common"))
 }
 
-//tasks {
-//    withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
-//        archiveClassifier.set("")
-//        archiveBaseName.set("${archiveBaseName.get()}-compileOnly")
-//        dependencies {
-//            include(dependency("net.md-5:bungeecord-chat:1.17"))
-//        }
-//    }
-//    build {
-//        dependsOn(shadowJar)
-//    }
-//}
+tasks {
+    withType<ShadowJar> {
+        archiveClassifier.set("")
+        relocate("net.md_5.bungee", "net.md_5.bungee117")
+    }
+    build {
+        dependsOn(shadowJar)
+    }
+}
diff --git a/module/module-chat/src/main/java/taboolib/module/chat/HexColor.java b/module/module-chat/src/main/java/taboolib/module/chat/HexColor.java
@@ -61,7 +61,7 @@ public static String translate(String in) {
                     } catch (IllegalArgumentException ignored) {
                     }
                 } else {
-                    Optional<KnownColor> knownColor = KnownColor.matchKnownColor(toString(match));
+                    Optional<StandardColors> knownColor = StandardColors.match(toString(match));
                     if (knownColor.isPresent()) {
                         chatColor = knownColor.get().toChatColor();
                     }