diff --git a/wowup-electron/src/app/addon-providers/curse-addon-provider.ts b/wowup-electron/src/app/addon-providers/curse-addon-provider.ts index 68fc9994..ebe6ad79 100644 --- a/wowup-electron/src/app/addon-providers/curse-addon-provider.ts +++ b/wowup-electron/src/app/addon-providers/curse-addon-provider.ts @@ -87,7 +87,7 @@ export class CurseAddonProvider extends AddonProvider { public readonly allowChannelChange = true; public readonly allowEdit = true; public readonly canBatchFetch = true; - public enabled = true; + public enabled = false; public constructor( private _cachingService: CachingService, diff --git a/wowup-electron/src/app/app.component.ts b/wowup-electron/src/app/app.component.ts index 53d04450..d6889353 100644 --- a/wowup-electron/src/app/app.component.ts +++ b/wowup-electron/src/app/app.component.ts @@ -17,6 +17,7 @@ import { TranslateService } from "@ngx-translate/core"; import { ADDON_PROVIDER_CURSEFORGE, + ADDON_PROVIDER_CURSEFORGEV2, ALLIANCE_LIGHT_THEME, ALLIANCE_THEME, CURRENT_THEME_KEY, @@ -262,6 +263,8 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { // If the user has any addons from old Curse that are not ignored prompt them to rescan let cfAddons = await this._addonService.getProviderAddons(ADDON_PROVIDER_CURSEFORGE); + let cf2Addons = await this._addonService.getProviderAddons(ADDON_PROVIDER_CURSEFORGEV2); + cfAddons.push(...cf2Addons); cfAddons = cfAddons.filter((addon) => addon.isIgnored === false); if (!this.sessionService.didPromptCfMigration && cfAddons.length > 0) { this.openCurseMigrationDialog(); diff --git a/wowup-electron/src/app/components/common/curse-migration-dialog/curse-migration-dialog.component.ts b/wowup-electron/src/app/components/common/curse-migration-dialog/curse-migration-dialog.component.ts index f86055fe..53168f36 100644 --- a/wowup-electron/src/app/components/common/curse-migration-dialog/curse-migration-dialog.component.ts +++ b/wowup-electron/src/app/components/common/curse-migration-dialog/curse-migration-dialog.component.ts @@ -1,7 +1,7 @@ import { AfterViewChecked, Component, ElementRef, ViewChild } from "@angular/core"; import { MatDialogRef } from "@angular/material/dialog"; import { BehaviorSubject, map } from "rxjs"; -import { ADDON_PROVIDER_CURSEFORGE } from "../../../../common/constants"; +import { ADDON_PROVIDER_CURSEFORGE, ADDON_PROVIDER_CURSEFORGEV2 } from "../../../../common/constants"; import { AddonService } from "../../../services/addons/addon.service"; import { LinkService } from "../../../services/links/link.service"; import { WarcraftInstallationService } from "../../../services/warcraft/warcraft-installation.service"; @@ -51,7 +51,9 @@ export class CurseMigrationDialogComponent implements AfterViewChecked { // If there are any old Curse addons, re-scan that installation let addons = await this._addonService.getAddons(wowInstall); addons = addons.filter( - (addon) => addon.isIgnored === false && addon.providerName === ADDON_PROVIDER_CURSEFORGE + (addon) => + addon.isIgnored === false && + (addon.providerName === ADDON_PROVIDER_CURSEFORGE || addon.providerName === ADDON_PROVIDER_CURSEFORGEV2) ); if (addons.length > 0) { await this._addonService.rescanInstallation(wowInstall); diff --git a/wowup-electron/src/app/components/options/options-addon-section/options-addon-section.component.html b/wowup-electron/src/app/components/options/options-addon-section/options-addon-section.component.html index ba1a5629..990d6cd0 100644 --- a/wowup-electron/src/app/components/options/options-addon-section/options-addon-section.component.html +++ b/wowup-electron/src/app/components/options/options-addon-section/options-addon-section.component.html @@ -29,7 +29,7 @@