Merge pull request #158 from BUTR/dev

Release 1.1.4

changelog.txt

@@ -1,4 +1,7 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.4
+* Using Bannerlord version comparison instead of semver on installation
+---------------------------------------------------------------------------------------------------
 Version: 1.1.3
 * Added reload button for Mod Options Tab
 * Install Harmony when installing BLSE

package.json

@@ -1,6 +1,6 @@
 {
   "name": "game-mount-and-blade-ii-bannerlord-butr",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "A Vortex extension for Mount and Blade II: Bannerlord mod management.",
   "author": "BUTR Team & Nexus Mods",
   "license": "GPL-3.0+",
@@ -63,7 +63,7 @@
     "webpack-node-externals": "^3.0.0"
   },
   "dependencies": {
-    "@butr/vortexextensionnative": "1.0.128",
+    "@butr/vortexextensionnative": "1.0.129",
     "ticks-to-date": "^1.0.6"
   },
   "resolutions": {

src/blse/utils.ts

@@ -1,5 +1,5 @@
-import { gte } from 'semver';
 import { actions, selectors, types, util } from 'vortex-api';
+import { BannerlordModuleManager } from '@butr/vortexextensionnative';
 import { BLSE_MOD_ID, BLSE_URL, GAME_ID, HARMONY_MOD_ID } from '../common';
 import { downloadAndEnableLatestModVersion, hasPersistentBannerlordMods } from '../vortex';
 import { LocalizationManager } from '../localization';
@@ -23,7 +23,18 @@ export const findBLSEMod = (mods: IBannerlordModStorage): IBannerlordMod | undef
     if (!prev) {
       return iter;
     }
-    return gte(iter.attributes?.version ?? '0.0.0', prev.attributes?.version ?? '0.0.0') ? iter : prev;
+    const compareResult = BannerlordModuleManager.compareVersions(
+      BannerlordModuleManager.parseApplicationVersion(iter.attributes?.version ?? ''),
+      BannerlordModuleManager.parseApplicationVersion(prev.attributes?.version ?? '')
+    );
+    switch (compareResult) {
+      case 1:
+        return iter;
+      case -1:
+        return prev;
+      default:
+        return iter;
+    }
   }, undefined);
 };
 

src/vortex/modFinder.ts

@@ -1,5 +1,5 @@
-import { gte } from 'semver';
-import { selectors, types, util } from 'vortex-api';
+import { selectors, types } from 'vortex-api';
+import { BannerlordModuleManager } from '@butr/vortexextensionnative';
 import { GAME_ID } from '../common';
 import { hasPersistentBannerlordMods } from '../vortex';
 import { IBannerlordMod, IBannerlordModStorage } from '../types';
@@ -22,7 +22,18 @@ export const findMod = (mods: IBannerlordModStorage, moduleId: string): IBannerl
     if (!prev) {
       return iter;
     }
-    return gte(iter.attributes?.version ?? '0.0.0', prev.attributes?.version ?? '0.0.0') ? iter : prev;
+    const compareResult = BannerlordModuleManager.compareVersions(
+      BannerlordModuleManager.parseApplicationVersion(iter.attributes?.version ?? ''),
+      BannerlordModuleManager.parseApplicationVersion(prev.attributes?.version ?? '')
+    );
+    switch (compareResult) {
+      case 1:
+        return iter;
+      case -1:
+        return prev;
+      default:
+        return iter;
+    }
   }, undefined);
 };
 

yarn.lock

@@ -22,10 +22,10 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@butr/[email protected].128":
-  version "1.0.128"
-  resolved "https://registry.yarnpkg.com/@butr/vortexextensionnative/-/vortexextensionnative-1.0.128.tgz#35f9c556069a83f612af229c112ca8a5e923fd42"
-  integrity sha512-uzXRpGtlhHAwj4jDJWFuQXZfwOb6qa5sG6rUSdLWfbDTo4DKU2SotAEnkvEA7JAJRaY9CUb5PDFVc9+TUaHC0A==
+"@butr/[email protected].129":
+  version "1.0.129"
+  resolved "https://registry.yarnpkg.com/@butr/vortexextensionnative/-/vortexextensionnative-1.0.129.tgz#ca450f98e3f2ec1c4282e1342775471595d71860"
+  integrity sha512-5dYN/59/DXYDcY2Hrl1h2j2Lz4MMLQ0c8LY3iFzK/vKj0O8i6t5VK8jZNL9JIu3xHzS/8h3A0ekHKclSWeYfkg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"