fix: Sort optifine version and select correct when load

Voxelum · Oct 27, 2023 · 197ebf5 · 197ebf5
1 parent 6c67fc8
commit 197ebf5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/xmcl-keystone-ui/src/composables/versionList.ts b/xmcl-keystone-ui/src/composables/versionList.ts
@@ -154,7 +154,15 @@ export function useOptifineVersionList(minecraft: Ref<string>, forge: Ref<string
   const { versions, installed, refreshing } = useOptifineVersions(minecraft, forge, local)
 
   const items = computed(() => {
-    return versions.value.map((v) => {
+    return [...versions.value].sort((a, b) => {
+      const { patch, type } = a
+      // compare type first and then the patch
+      const result = type.localeCompare(b.type)
+      if (result === 0) {
+        return -patch.localeCompare(b.patch)
+      }
+      return -result
+    }).map((v) => {
       const key = LockKey.version(`optifine-${minecraft.value}-${v.type}_${v.patch}`)
       const name = v.type + '_' + v.patch
       const result: VersionItem = reactive({

diff --git a/xmcl-keystone-ui/src/views/ModDetailOptifine.vue b/xmcl-keystone-ui/src/views/ModDetailOptifine.vue
@@ -53,7 +53,7 @@ const versions = computed(() => {
   return all.reverse()
 })
 
-selectedVersion.value = versions.value[0]
+selectedVersion.value = versions.value.find(v => v.installed) ?? versions.value[0]
 
 const { data: optifineHome, isValidating: loadingDescription } = useSWRV('/optifine-home', async () => {
   const response = await fetch('https://www.optifine.net/home')