[6.1.0][dev] 优化 nms-proxy 逻辑, 增加 nms-util 预热

TabooLib · Feb 25, 2024 · 7078148 · 7078148
1 parent ea8456d
commit 7078148
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 11 deletions.
diff --git a/common/src/main/java/taboolib/common/PrimitiveLoader.java b/common/src/main/java/taboolib/common/PrimitiveLoader.java
@@ -184,7 +184,7 @@ static void loadFile(File file, boolean isIsolated, boolean isExternal, String[]
                 jar = new File(getCacheFile(), hash + ".jar");
                 // 文件为空 || 开发模式 || 强制重定向
                 if ((!jar.exists() && jar.length() == 0) || (IS_FORCE_DOWNLOAD_IN_DEV_MODE && IS_DEV_MODE) || forceRelocate) {
-                    PrimitiveIO.println("Relocating ...");
+                    // PrimitiveIO.println("Relocating ...");
                     jar.getParentFile().mkdirs();
                     new JarRelocator(PrimitiveIO.copyFile(file, File.createTempFile(file.getName(), ".jar")), jar, rel).run();
                 }

diff --git a/module/module-nms-util/src/main/kotlin/taboolib/module/nms/NMSPreheat.kt b/module/module-nms-util/src/main/kotlin/taboolib/module/nms/NMSPreheat.kt
@@ -0,0 +1,19 @@
+package taboolib.module.nms
+
+import taboolib.common.LifeCycle
+import taboolib.common.platform.Awake
+import java.util.concurrent.CompletableFuture
+
+@Awake(LifeCycle.ENABLE)
+fun nmsPreheat(): CompletableFuture<Void> {
+    return CompletableFuture.runAsync {
+        nmsProxy<NMSEntity>()
+        nmsProxy<NMSItem>()
+        nmsProxy<NMSItemTag>()
+        nmsProxy<NMSLight>()
+        nmsProxy<NMSMessage>()
+        nmsProxy<NMSParticle>()
+        nmsProxy<NMSScoreboard>()
+        nmsProxy<NMSSign>()
+    }
+}
diff --git a/module/module-nms/src/main/kotlin/taboolib/module/nms/MinecraftRemapper.kt b/module/module-nms/src/main/kotlin/taboolib/module/nms/MinecraftRemapper.kt
@@ -3,7 +3,7 @@ package taboolib.module.nms
 import org.objectweb.asm.commons.Remapper
 import org.objectweb.asm.signature.SignatureReader
 import org.objectweb.asm.signature.SignatureWriter
-import taboolib.common.util.unsafeLazy
+import java.util.concurrent.ConcurrentHashMap
 
 /**
  * TabooLib
@@ -22,9 +22,10 @@ open class MinecraftRemapper : Remapper() {
     val obc1 = "org/bukkit/craftbukkit/v1_.*?/".toRegex()
     val obc2 = "org/bukkit/craftbukkit/${MinecraftVersion.minecraftVersion}/"
 
-    val mapping by unsafeLazy {
-        MinecraftVersion.mapping
-    }
+    /**
+     * 缓存类的父类和接口
+     */
+    val parentsCacheMap = ConcurrentHashMap<String, List<String>>()
 
     /**
      * 在 1.17 版本下进行字段转换
@@ -34,8 +35,10 @@ open class MinecraftRemapper : Remapper() {
      */
     override fun mapFieldName(owner: String, name: String, descriptor: String): String {
         if (MinecraftVersion.isUniversal) {
-            val universal = translate(owner).replace('/', '.')
-            return mapping.fields.firstOrNull { it.path == universal && it.translateName == name }?.mojangName ?: name
+            // 当前运行时的 Owner 名称
+            val runningOwner = translate(owner).replace('/', '.')
+            val findPath = parentsCacheMap.getOrPut(runningOwner) { findParents(runningOwner).reversed() }
+            return MinecraftVersion.mapping.fields.find { it.path in findPath && it.translateName == name }?.mojangName ?: name
         }
         return name
     }
@@ -50,8 +53,10 @@ open class MinecraftRemapper : Remapper() {
             }
             SignatureReader(descriptor).accept(signatureWriter)
             val desc = signatureWriter.toString()
-            val universal = translate(owner).replace('/', '.')
-            return mapping.methods.firstOrNull { it.path == universal && it.translateName == name && it.descriptor == desc }?.mojangName ?: name
+            // 当前运行时的 Owner 名称
+            val runningOwner = translate(owner).replace('/', '.')
+            val findPath = parentsCacheMap.getOrPut(runningOwner) { findParents(runningOwner).reversed() }
+            return MinecraftVersion.mapping.methods.find { it.path in findPath && it.translateName == name && it.descriptor == desc }?.mojangName ?: name
         }
         return name
     }
@@ -77,18 +82,39 @@ open class MinecraftRemapper : Remapper() {
             // 将低版本包名替换为高版本包名
             // net/minecraft/server/v1_17_R1/EntityPlayer -> net/minecraft/server/level/EntityPlayer
             if (key.startsWith("net/minecraft/server/v1_")) {
-                mapping.classMap[key.substringAfterLast('/', "")]?.replace('.', '/') ?: key
+                MinecraftVersion.mapping.classMap[key.substringAfterLast('/', "")]?.replace('.', '/') ?: key
             } else {
                 key
             }
         } else {
             // 将高版本包名替换为低版本包名
             // net/minecraft/server/level/EntityPlayer -> net/minecraft/server/v1_17_R1/EntityPlayer
-            if (mapping.classMap.containsValue(key.replace('.', '/'))) {
+            if (MinecraftVersion.mapping.classMap.containsValue(key.replace('.', '/'))) {
                 "net/minecraft/server/${MinecraftVersion.minecraftVersion}/${key.substringAfterLast('/', "")}"
             } else {
                 key.replace(nms1, nms2)
             }
         }
     }
+
+    /**
+     * 获取类的所有父类和接口
+     */
+    fun findParents(owner: String): Set<String> {
+        if (owner.startsWith("net.minecraft") || owner.startsWith("com.mojang")) {
+            try {
+                val find = hashSetOf<String>()
+                find += owner
+                val forName = Class.forName(owner)
+                find += forName.interfaces.map { it.name }
+                val superclass = forName.superclass
+                if (superclass != null && superclass.name != "java.lang.Object") {
+                    find += findParents(superclass.name)
+                }
+                return find
+            } catch (_: Throwable) {
+            }
+        }
+        return hashSetOf(owner)
+    }
 }