Add raw mojang namespace

linkie · Feb 1, 2024 · 9cab540 · 9cab540
1 parent ac7c3ce
commit 9cab540
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 17 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -28,7 +28,7 @@ configurations {
 }
 
 dependencies {
-    implementation("me.shedaniel:linkie-core:1.0.118")
+    implementation("me.shedaniel:linkie-core:1.0.119")
     implementation("io.ktor:ktor-server-cors:2.2.3")
     implementation("io.ktor:ktor-server-content-negotiation:2.2.3")
     implementation("io.ktor:ktor-server-status-pages:2.2.3")

diff --git a/backend/src/main/kotlin/me/shedaniel/linkie/web/deps/Deps.kt b/backend/src/main/kotlin/me/shedaniel/linkie/web/deps/Deps.kt
@@ -154,6 +154,7 @@ fun startLinkie() {
             LinkieConfig.DEFAULT.copy(
                 namespaces = listOf(
                     YarnNamespace,
+                    MojangRawNamespace,
                     MojangNamespace,
                     MojangSrgNamespace,
                     MojangHashedNamespace,

diff --git a/frontend/src/app/backend.ts b/frontend/src/app/backend.ts
@@ -41,7 +41,7 @@ export function reqSource<T = any>(namespace: string, version: string, className
     return HTTP.get(`/api/source`, {
         params: {
             namespace,
-            'class': className,
+            "class": className,
             version,
         },
     })
@@ -55,9 +55,17 @@ export function reqStatusSource<T = any>(namespace: string): Promise<AxiosRespon
     return HTTP.get(`/api/status/sources/${namespace}`)
 }
 
+export let allNamespaceGroups: string[] = [
+    "Official",
+    "Fabric",
+    "Forge",
+    "Quilt",
+]
+
 export let namespaceGroups: { [key: string]: string | string[] } = {
     "yarn": "Fabric",
     "mojang": "Fabric",
+    "mojang_raw": "Official",
     "mojang_srg": "Forge",
     "mojang_hashed": "Quilt",
     "mcp": "Forge",
@@ -66,9 +74,10 @@ export let namespaceGroups: { [key: string]: string | string[] } = {
 
 export let namespaceLocalizations: { [namespace: string]: string } = {
     "yarn": "Yarn",
-    "mojang": "Mojang (Intermediary)",
-    "mojang_srg": "Mojang (SRG)",
-    "mojang_hashed": "Mojang (Hashed)",
+    "mojang_raw": "Mojang",
+    "mojang": "Mojang (via Intermediary)",
+    "mojang_srg": "Mojang (via SRG)",
+    "mojang_hashed": "Mojang (via Hashed)",
     "mcp": "MCP",
     "quilt-mappings": "Quilt Mappings",
     "legacy-yarn": "Legacy Yarn",

diff --git a/frontend/src/components/mappings/MappingsFilterBlock.vue b/frontend/src/components/mappings/MappingsFilterBlock.vue
@@ -2,7 +2,7 @@
     <div class="flex flex-col">
         <SubHeader class="mt-[-.25rem] mb-1"> {{ $t("mappings.namespace") }}</SubHeader>
 
-        <div v-for="[group, nses] in Object.entries(namespacesGrouped)">
+        <div v-for="[group, nses] in namespacesGrouped">
             <div v-if="group !== 'Others'" class="pb-1">
                 <p class="text-xs font-bold uppercase">{{ group }}</p>
                 <div v-for="ns in nses" :class="[
@@ -14,7 +14,7 @@
             </div>
         </div>
 
-        <div v-for="[group, nses] in Object.entries(namespacesGrouped)"
+        <div v-for="[group, nses] in namespacesGrouped"
              :class="[expandNamespaces ? 'expanded' : '', 'expand-height']">
             <div v-if="group === 'Others'" class="pb-1">
                 <p class="text-xs font-bold uppercase">{{ group }}</p>
@@ -74,7 +74,7 @@
                 {{ $t("mappings.translation.n/a") }}
             </div>
             <div :class="[expandTranslations ? 'expanded' : '', 'expand-height']">
-                <div v-for="[group, nses] in Object.entries(namespacesGrouped)" class="pb-1">
+                <div v-for="[group, nses] in namespacesGrouped" class="pb-1">
                     <p class="text-xs font-bold uppercase">{{ group }}</p>
                     <div v-for="ns in nses">
                         <div v-if="ns?.id !== namespace" :class="[
@@ -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 {namespaceGroups, namespaceLocalizations} from "../../app/backend"
+import {allNamespaceGroups, namespaceGroups, namespaceLocalizations} from "../../app/backend"
 import {MappingsData, Namespace} from "../../app/mappings-data"
 
 export default defineComponent({
@@ -144,7 +144,7 @@ export default defineComponent({
         namespaces(): Namespace[] {
             return this.data.namespaces
         },
-        namespacesGrouped(): { [group: string]: Namespace[] } {
+        namespacesGrouped(): [string, Namespace[]][] {
             let groups = {} as { [group: string]: Namespace[] }
             for (let ns in this.namespaces) {
                 let groupsApplicable = namespaceGroups[this.namespaces[ns].id] ?? "Others"
@@ -162,7 +162,7 @@ export default defineComponent({
                 //sort
                 groups[groupsKey].sort((a, b) => (this.localizeNamespace(a) ?? "").localeCompare(this.localizeNamespace(b) ?? ""))
             }
-            return groups
+            return Object.entries(groups).sort((a, b) => allNamespaceGroups.indexOf(a[0]) - allNamespaceGroups.indexOf(b[0]))
         },
         firstNamespace(): Namespace | undefined {
             return this.namespaces[0]

diff --git a/frontend/src/locales/en_US.json b/frontend/src/locales/en_US.json
@@ -76,9 +76,10 @@
     "mappings.entry.at": "AT:",
     "mappings.entry.aw": "AW:",
     "namespace.yarn": "Yarn",
-    "namespace.mojang": "Mojang",
-    "namespace.mojang_srg": "Mojang (SRG)",
-    "namespace.mojang_hashed": "Mojang (Hashed)",
+    "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",

diff --git a/frontend/src/locales/zh_CN.json b/frontend/src/locales/zh_CN.json
@@ -75,9 +75,10 @@
     "mappings.entry.at": "AT：",
     "mappings.entry.aw": "AW：",
     "namespace.yarn": "Yarn",
-    "namespace.mojang": "Mojang",
-    "namespace.mojang_srg": "Mojang（SRG）",
-    "namespace.mojang_hashed": "Mojang（Hashed）",
+    "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",