fix: Curseforge does not installed to instance

Voxelum · Nov 5, 2023 · bb26555 · bb26555
1 parent 0b14812
commit bb26555
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/xmcl-keystone-ui/src/composables/curseforgeInstall.ts b/xmcl-keystone-ui/src/composables/curseforgeInstall.ts
@@ -66,7 +66,7 @@ export function useCurseforgeInstall(modId: Ref<number>, files: Ref<Pick<File, '
         })
       }
     } else {
-      await installFile({ file, type: type.value, icon: project.value?.logo.url })
+      await installFile({ file, type: type.value, icon: project.value?.logo.url, instancePath: from.value })
     }
   }
   return {

diff --git a/xmcl-keystone-ui/src/views/CurseforgeProject.vue b/xmcl-keystone-ui/src/views/CurseforgeProject.vue
@@ -163,10 +163,10 @@ if (upstream) {
   const latestFileIndex = computed(() => project.value?.latestFilesIndexes.find(f => f.gameVersion === upstream.value.minecraft))
   const current = useLatestCurseforgeResource(modId, latestFileIndex)
   provide(kLatestCurseforgeResource, current)
-  provide(kCurseforgeInstall, useCurseforgeInstall(modId, allFiles, destination, computed(() => props.type), current.resource))
+  provide(kCurseforgeInstall, useCurseforgeInstall(modId, allFiles, path, computed(() => props.type), current.resource))
 } else {
   // Common Curseforge install function
-  provide(kCurseforgeInstall, useCurseforgeInstall(modId, allFiles, destination, computed(() => props.type), computed(() => undefined)))
+  provide(kCurseforgeInstall, useCurseforgeInstall(modId, allFiles, path, computed(() => props.type), computed(() => undefined)))
 }
 
 const gameVersions = computed(() => {

diff --git a/xmcl-keystone-ui/src/views/Mod.vue b/xmcl-keystone-ui/src/views/Mod.vue
@@ -249,7 +249,7 @@ onMounted(() => {
 })
 
 // Reset all filter
-onMounted(() => {
+onUnmounted(() => {
   modrinthCategories.value = []
   curseforgeCategory.value = undefined
 })

diff --git a/xmcl-keystone-ui/src/views/ResourcePack.vue b/xmcl-keystone-ui/src/views/ResourcePack.vue
@@ -174,7 +174,7 @@ const onDrop = (item: ResourcePackProject, id: string) => {
 const toggleCategory = useToggleCategories(modrinthCategories)
 
 // Reset all filter
-onMounted(() => {
+onUnmounted(() => {
   keyword.value = ''
   modrinthCategories.value = []
   curseforgeCategory.value = undefined

diff --git a/xmcl-keystone-ui/src/views/ShaderPack.vue b/xmcl-keystone-ui/src/views/ShaderPack.vue
@@ -122,7 +122,7 @@ const onEnable = (f: ProjectFile) => {
 }
 
 // Reset all filter
-onMounted(() => {
+onUnmounted(() => {
   keyword.value = ''
   modrinthCategories.value = []
 })