fix: Shader pack & resource pack does not linked

Voxelum · Oct 27, 2023 · 6c67fc8 · 6c67fc8
1 parent 7fbf8af
commit 6c67fc8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/xmcl-keystone-ui/src/composables/instanceResourcePack.ts b/xmcl-keystone-ui/src/composables/instanceResourcePack.ts
@@ -1,9 +1,10 @@
 import { PackMeta } from '@xmcl/resourcepack'
-import { GameOptions, isPersistedResource, packFormatVersionRange, Resource, ResourceDomain } from '@xmcl/runtime-api'
+import { GameOptions, InstanceResourcePacksServiceKey, isPersistedResource, packFormatVersionRange, Resource, ResourceDomain } from '@xmcl/runtime-api'
 import { computed, Ref, InjectionKey } from 'vue'
 
 import unknownPack from '@/assets/unknown_pack.png'
 import { useDomainResources } from './resources'
+import { useService } from './service'
 
 export interface InstanceResourcePack extends PackMeta.Pack {
   /**
@@ -46,7 +47,12 @@ export const kInstanceResourcePacks: InjectionKey<ReturnType<typeof useInstanceR
 /**
  * The hook return a reactive resource pack array.
  */
-export function useInstanceResourcePacks(gameOptions: Ref<GameOptions | undefined>) {
+export function useInstanceResourcePacks(path: Ref<string>, gameOptions: Ref<GameOptions | undefined>) {
+  const { link } = useService(InstanceResourcePacksServiceKey)
+  watch(path, (v) => {
+    link(v)
+  }, { immediate: true })
+
   const { resources, refresh, refreshing } = useDomainResources(ResourceDomain.ResourcePacks)
   const allResourcePacks = computed(() => resources.value.map(r => getResourcePackItem(r)))
   /**

diff --git a/xmcl-keystone-ui/src/composables/instanceShaderPack.ts b/xmcl-keystone-ui/src/composables/instanceShaderPack.ts
@@ -0,0 +1,11 @@
+import { InstanceShaderPacksServiceKey } from '@xmcl/runtime-api'
+import { useService } from './service'
+import { Ref } from 'vue'
+
+export function useInstanceShaderPacks(instancePath: Ref<string>) {
+  const { link } = useService(InstanceShaderPacksServiceKey)
+
+  watch(instancePath, () => {
+    link(instancePath.value)
+  }, { immediate: true })
+}
diff --git a/xmcl-keystone-ui/src/windows/main/Context.ts b/xmcl-keystone-ui/src/windows/main/Context.ts
@@ -14,6 +14,7 @@ import { kInstanceLaunch, useInstanceLaunch } from '@/composables/instanceLaunch
 import { kInstanceModsContext, useInstanceMods } from '@/composables/instanceMods'
 import { kInstanceOptions, useInstanceOptions } from '@/composables/instanceOptions'
 import { kInstanceResourcePacks, useInstanceResourcePacks } from '@/composables/instanceResourcePack'
+import { useInstanceShaderPacks } from '@/composables/instanceShaderPack'
 import { kInstanceVersion, useInstanceVersion } from '@/composables/instanceVersion'
 import { kInstanceVersionDiagnose, useInstanceVersionDiagnose } from '@/composables/instanceVersionDiagnose'
 import { kInstances, useInstances } from '@/composables/instances'
@@ -66,7 +67,8 @@ export default defineComponent({
     const instanceDefaultSource = useInstanceDefaultSource(instance.path)
     const options = useInstanceOptions(instance.instance)
     const saves = useInstanceSaves(instance.instance)
-    const resourcePacks = useInstanceResourcePacks(options.gameOptions)
+    const resourcePacks = useInstanceResourcePacks(instance.path, options.gameOptions)
+    useInstanceShaderPacks(instance.path)
     const instanceMods = useInstanceMods(instance.path, instance.runtime, instanceJava.java)
     const files = useInstanceFiles(instance.path)
     const task = useLaunchTask(instance.path, instance.runtime, instanceVersion.versionHeader)