Skip to content

Commit

Permalink
refactor: Remove the modpack added hint
Browse files Browse the repository at this point in the history
  • Loading branch information
ci010 committed Jan 29, 2024
1 parent d2690d5 commit a281dc4
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 67 deletions.
5 changes: 1 addition & 4 deletions xmcl-keystone-ui/src/composables/curseforgeInstall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { CurseForgeServiceKey, CurseforgeUpstream, InstanceInstallServiceKey, In
import { InjectionKey, Ref } from 'vue'
import { getCurseforgeProjectModel } from './curseforge'
import { useDialog } from './dialog'
import { kInstanceFiles } from './instanceFiles'
import { AddInstanceDialogKey } from './instanceTemplates'
import { InstanceInstallDialog } from './instanceUpdate'
import { kInstanceVersionDiagnose } from './instanceVersionDiagnose'
Expand All @@ -15,8 +16,6 @@ import { useNotifier } from './notifier'
import { useResourceUrisDiscovery } from './resources'
import { useService } from './service'
import { useSWRVModel } from './swrv'
import { kInstanceFiles } from './instanceFiles'
import { kModpackNotification } from './modpackNotification'

export const kCurseforgeInstall: InjectionKey<ReturnType<typeof useCurseforgeInstall>> = Symbol('CurseforgeInstall')

Expand Down Expand Up @@ -125,12 +124,10 @@ export function useCurseforgeInstallModpack(icon: Ref<string | undefined>) {
const { installFile } = useService(CurseForgeServiceKey)
const { install, mutate } = injection(kInstanceFiles)
const { fix } = injection(kInstanceVersionDiagnose)
const { ignore } = injection(kModpackNotification)
const { currentRoute, push } = useRouter()
const installModpack = async (f: File) => {
const result = await installFile({ file: f, type: 'modpacks', icon: icon.value })
const resource = result.resource
ignore(resource.path)
const config = resolveModpackInstanceConfig(resource)

if (!config) return
Expand Down
58 changes: 0 additions & 58 deletions xmcl-keystone-ui/src/composables/modpackNotification.ts

This file was deleted.

3 changes: 0 additions & 3 deletions xmcl-keystone-ui/src/composables/modrinthInstall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { AddInstanceDialogKey } from './instanceTemplates'
import { InstanceInstallDialog } from './instanceUpdate'
import { kInstanceVersionDiagnose } from './instanceVersionDiagnose'
import { kInstances } from './instances'
import { kModpackNotification } from './modpackNotification'
import { useNotifier } from './notifier'
import { useService } from './service'

Expand Down Expand Up @@ -94,12 +93,10 @@ export function useModrinthInstallModpack(icon: Ref<string | undefined>) {
const { installVersion } = useService(ModrinthServiceKey)
const { install, mutate } = injection(kInstanceFiles)
const { fix } = injection(kInstanceVersionDiagnose)
const { ignore } = injection(kModpackNotification)
const { currentRoute, push } = useRouter()
const installModpack = async (v: ProjectVersion) => {
const result = await installVersion({ version: v, icon: icon.value })
const resource = result.resources[0]
ignore(resource.path)
const config = resolveModpackInstanceConfig(resource)

if (!config) return
Expand Down
2 changes: 0 additions & 2 deletions xmcl-keystone-ui/src/windows/main/Context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { kJavaContext, useJavaContext } from '@/composables/java'
import { kLaunchTask, useLaunchTask } from '@/composables/launchTask'
import { kModsSearch, useModsSearch } from '@/composables/modSearch'
import { kModUpgrade, useModUpgrade } from '@/composables/modUpgrade'
import { kModpackNotification, useModpackNotification } from '@/composables/modpackNotification'
import { kNotificationQueue, useNotificationQueue } from '@/composables/notifier'
import { kPeerState, usePeerState } from '@/composables/peers'
import { kResourcePackSearch, useResourcePackSearch } from '@/composables/resourcePackSearch'
Expand Down Expand Up @@ -89,7 +88,6 @@ export default defineComponent({
const userDiagnose = useUserDiagnose(user.userProfile)

provide(kDatabaseStatus, useDatabaseStatus())
provide(kModpackNotification, useModpackNotification(queue))

provide(kUserContext, user)
provide(kJavaContext, java)
Expand Down

0 comments on commit a281dc4

Please sign in to comment.