470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull mod sorting code into its own function

Browse Source
This commit is contained in:
Dev 2023-08-02 08:50:04 +01:00
parent cda89084d3
commit 3876e1ae15
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
project/src/loaders/PreAkiModLoader.ts
View File

@ -145,23 +145,7 @@ export class PreAkiModLoader implements IModLoader
// sort mod order
const missingFromOrderJSON = {};
const sortedMods = mods.sort((prev, next) =>
{
const previndex = this.order[prev];
const nextindex = this.order[next];
// mod is not on the list, move the mod to last
if (previndex === undefined)
{
missingFromOrderJSON[prev] = true;
return 1;
}
else if (nextindex === undefined)
{
missingFromOrderJSON[next] = true;
return -1;
}
return previndex - nextindex;
});
const sortedMods = mods.sort((prev, next) => this.sortMods(prev, next, missingFromOrderJSON));
// log the missing mods from order.json
Object.keys(missingFromOrderJSON).forEach((missingMod) => (this.logger.debug(this.localisationService.getText("modloader-mod_order_missing_from_json", missingMod))));
@ -173,6 +157,28 @@ export class PreAkiModLoader implements IModLoader
}
}
protected sortMods(prev: string, next: string, missingFromOrderJSON: Record<string, boolean>): number
{
const previndex = this.order[prev];
const nextindex = this.order[next];
// mod is not on the list, move the mod to last
if (previndex === undefined)
{
missingFromOrderJSON[prev] = true;
return 1;
}
else if (nextindex === undefined)
{
missingFromOrderJSON[next] = true;
return -1;
}
return previndex - nextindex;
}
/**
* Check for duplicate mods loaded, show error if any
* @param modPackageData Dictionary of mod package.json data