Merge pull request #128 from Nexus-Mods/w3-friendly-lo-entry-names

W3: adding user friendly names to the load order entries

game-witcher3/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.6.7]
+
+- Added user friendly names to the load order entries.
+
+## [1.6.5-6]
+
+- Removed dlc load order entries.
+
 ## [1.6.4] - 2024-06-12
 
 - Fixed incorrect detection of load order entry names for mixed mods

game-witcher3/info.json

@@ -1,6 +1,6 @@
 {
   "name": "Game: The Witcher 3",
   "author": "Black Tree Gaming Ltd.",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "description": "Support for The Witcher 3"
 }

game-witcher3/loadOrder.tsx

@@ -57,14 +57,32 @@ class TW3LoadOrder implements types.ILoadOrderGameInfo {
     if (activeProfile?.id === undefined) {
       return Promise.resolve([]);
     }
-    const findName = (val: string) => this.readableNames?.[val] || val;
+    const findName = (entry: { name: string, VK?: string }) => {
+      if (this.readableNames?.[entry.name] !== undefined) {
+        return this.readableNames[entry.name];
+      }
+
+      if (entry.VK === undefined) {
+        return entry.name;
+      }
+
+      const state = this.mApi.getState();
+      const mods: { [modId: string]: types.IMod } = util.getSafe(state, ['persistent', 'mods', GAME_ID], {});
+      const mod: types.IMod = mods[entry.VK];
+      if (mod === undefined) {
+        return entry.name;
+      }
+
+      return `${util.renderModName(mod)} (${entry.name})`;
+    };
+
     try {
       const unsorted: { [key: string]: any } = await IniStructure.getInstance(this.mApi, () => this.mPriorityManager).readStructure();
       const entries = Object.keys(unsorted).sort((a, b) => unsorted[a].Priority - unsorted[b].Priority).reduce((accum, iter, idx) => {
         const entry = unsorted[iter];
         accum[iter.startsWith(LOCKED_PREFIX) ? 'locked' : 'regular'].push({
           id: iter,
-          name: findName(iter),
+          name: findName({ name: iter, VK: entry.VK }),
           enabled: entry.Enabled === '1',
           modId: entry?.VK ?? iter,
           locked: iter.startsWith(LOCKED_PREFIX),