Fix parameter matching for longs and doubles (they take two slots), a…

…nd changes to namespace groups
linkie · Feb 3, 2024 · 4d755df · 4d755df
1 parent 3df8f93
commit 4d755df
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 26 deletions.
diff --git a/frontend/src/app/backend.ts b/frontend/src/app/backend.ts
@@ -60,6 +60,12 @@ export let allNamespaceGroups: string[] = [
     "Fabric",
     "Forge",
     "Quilt",
+    "Others",
+]
+
+export let hiddenNamespaceGroups: string[] = [
+    "Quilt",
+    "Others",
 ]
 
 export let namespaceGroups: { [key: string]: string | string[] } = {
@@ -78,7 +84,7 @@ export let namespaceLocalizations: { [namespace: string]: string } = {
     "mojang": "Mojang (via Intermediary)",
     "mojang_srg": "Mojang (via SRG)",
     "mojang_hashed": "Mojang (via Hashed)",
-    "mcp": "MCP",
+    "mcp": "Legacy MCP",
     "quilt-mappings": "Quilt Mappings",
     "legacy-yarn": "Legacy Yarn",
     "yarrn": "Yarrn",

diff --git a/frontend/src/components/mappings/MappingsEntryBlock.vue b/frontend/src/components/mappings/MappingsEntryBlock.vue
@@ -501,35 +501,48 @@ export default defineComponent({
             let args = [] as string[][]
             // Args can be single char or full class name wrapped with L and ;
             let index = desc.indexOf("(") + 1
+            let array = 0
             while (desc[index] !== ")") {
                 let start = desc[index]
-                if (start === "L") {
+                if (start === "[") {
+                    array++
+                    index++
+                } else if (start === "L") {
                     let end = desc.indexOf(";", index)
                     let arg = desc.substring(index, end + 1)
-                    args.push([arg, onlyClass(beautifyFieldType(arg).replaceAll(".", "/"))])
+                    args.push(["[".repeat(array) + arg, onlyClass(beautifyFieldType(arg).replaceAll(".", "/")) + "[]".repeat(array)])
+                    array = 0
                     index = end + 1
                 } else {
-                    args.push([desc[index], beautifyFieldType(desc[index])])
+                    args.push(["[".repeat(array) + desc[index], beautifyFieldType(desc[index]) + "[]".repeat(array)])
+                    array = 0
                     index++
                 }
             }
             return args
         },
         methodArgs(entry: MappingEntry) {
             let args = this.getMethodArgs(entry)
-            let min = 1000000, max = 0
+            let min = 1000000, max = 0, twoSpaces = 0
             if (entry.args) {
                 Object.keys(entry.args).filter(it => entry.args!!.hasOwnProperty(it)).map(it => +it).forEach(it => {
                     if (it < min) min = it
                     if (it > max) max = it
                 })
+                for (let i = 0; i < args.length - 1; i++) {
+                    if (args[i][0] == "J" || args[i][0] == "D") {
+                        twoSpaces++
+                    }
+                }
+                console.log(Object.values(entry.args), {...entry.args}, [...args], min, max, args.length, max - min + 1 - twoSpaces)
             }
-            let apply = -1
-            if (max - min + 1 == args.length) apply = min
+
+            let apply = false
+            if (max - min + 1 - twoSpaces == args.length) apply = true
             return args.map((arg, index) => {
                 let name = `var${index}`
-                if (entry.args && apply >= 0) {
-                    let argName = entry.args[index + apply]
+                if (entry.args && apply) {
+                    let argName = Object.values(entry.args)[index]
                     if (argName) {
                         name = argName
                     }

diff --git a/frontend/src/components/mappings/MappingsFilterBlock.vue b/frontend/src/components/mappings/MappingsFilterBlock.vue
@@ -3,7 +3,7 @@
         <SubHeader class="mt-[-.25rem] mb-1"> {{ $t("mappings.namespace") }}</SubHeader>
 
         <div v-for="[group, nses] in namespacesGrouped">
-            <div v-if="group !== 'Others'" class="pb-1">
+            <div v-if="!hiddenNamespaceGroups.includes(group)" class="pb-1">
                 <p class="text-xs font-bold uppercase">{{ group }}</p>
                 <div v-for="ns in nses" :class="[
                     namespace === ns.id ? 'font-medium' : 'font-normal opacity-80 decoration-base-400/50 hover:decoration-base-500/70 dark:decoration-base-dark-400/50 dark:hover:decoration-base-dark-400/70',
@@ -16,7 +16,7 @@
 
         <div v-for="[group, nses] in namespacesGrouped"
              :class="[expandNamespaces ? 'expanded' : '', 'expand-height']">
-            <div v-if="group === 'Others'" class="pb-1">
+            <div v-if="hiddenNamespaceGroups.includes(group)" class="pb-1">
                 <p class="text-xs font-bold uppercase">{{ group }}</p>
                 <div v-for="ns in nses" :class="[
                     namespace === ns.id ? 'font-medium' : 'font-normal opacity-80 decoration-base-400/50 hover:decoration-base-500/70 dark:decoration-base-dark-400/50 dark:hover:decoration-base-dark-400/70',
@@ -109,7 +109,7 @@ import {defineComponent, PropType} from "vue"
 import {mapWritableState} from "pinia"
 import {applicableMappingsVersions, useMappingsStore, VersionPossible} from "../../app/mappings-store"
 import SubHeader from "../dependencies/SubHeader.vue"
-import {allNamespaceGroups, namespaceGroups, namespaceLocalizations} from "../../app/backend"
+import {allNamespaceGroups, hiddenNamespaceGroups, namespaceGroups, namespaceLocalizations} from "../../app/backend"
 import {MappingsData, Namespace} from "../../app/mappings-data"
 
 export default defineComponent({
@@ -119,15 +119,16 @@ export default defineComponent({
         return {
             expandNamespaces: false,
             expandTranslations: false,
+            hiddenNamespaceGroups,
         }
     },
     methods: {
         localizeNamespace(namespace?: Namespace | string): string | undefined {
             if (typeof namespace === "string") {
-                return namespaceLocalizations[namespace.toLowerCase()] || namespace.toLowerCase()
+                return this.$t(`namespace.${namespace.toLowerCase()}`) || namespaceLocalizations[namespace.toLowerCase()] || namespace.toLowerCase()
             } else if (namespace) {
                 let id = namespace.id
-                return namespaceLocalizations[id.toLowerCase()] || id.toLowerCase()
+                return this.$t(`namespace.${id.toLowerCase()}`) || namespaceLocalizations[id.toLowerCase()] || id.toLowerCase()
             } else {
                 return undefined
             }

diff --git a/frontend/src/locales/en_US.json b/frontend/src/locales/en_US.json
@@ -80,9 +80,10 @@
     "namespace.mojang": "Mojang (via Intermediary)",
     "namespace.mojang_srg": "Mojang (via SRG)",
     "namespace.mojang_hashed": "Mojang (via Hashed)",
-    "namespace.mcp": "MCP",
+    "namespace.mcp": "Old MCP (<=1.16.5)",
     "namespace.quilt-mappings": "Quilt Mappings",
     "namespace.legacy-yarn": "Legacy Yarn",
+    "namespace.feather": "Feather",
     "namespace.barn": "Barn",
     "namespace.yarrn": "Yarrn",
     "namespace.plasma": "Plasma",

diff --git a/frontend/src/locales/zh_CN.json b/frontend/src/locales/zh_CN.json
@@ -74,17 +74,6 @@
     "mappings.entry.mixin.target": "Mixin 目标：",
     "mappings.entry.at": "AT：",
     "mappings.entry.aw": "AW：",
-    "namespace.yarn": "Yarn",
-    "namespace.mojang_raw": "Mojang",
-    "namespace.mojang": "Mojang (via Intermediary)",
-    "namespace.mojang_srg": "Mojang（via SRG）",
-    "namespace.mojang_hashed": "Mojang（via Hashed）",
-    "namespace.mcp": "MCP",
-    "namespace.quilt-mappings": "Quilt Mappings",
-    "namespace.legacy-yarn": "Legacy Yarn",
-    "namespace.barn": "Barn",
-    "namespace.yarrn": "Yarrn",
-    "namespace.plasma": "Plasma",
     "loader.fabric": "Fabric",
     "loader.forge": "Forge",
     "loader.quilt": "Quilt",