From f99e53bed28d89e2eafc05a80769dbcc8315c6a7 Mon Sep 17 00:00:00 2001 From: Daniel Scalzi Date: Wed, 19 Feb 2020 01:16:44 -0500 Subject: [PATCH] Default to 0.0.0 if 1.7-1.12 mod contains version wildcard. This data likely lives only in the class file, which we cannot access. --- .eslintrc.json | 3 ++- src/model/struct/model/module/forgemod/forgemod17.struct.ts | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.eslintrc.json b/.eslintrc.json index 1b9a35b..88f1075 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -37,6 +37,7 @@ "requireLast": false } } - ] + ], + "@typescript-eslint/no-non-null-assertion": "off" } } diff --git a/src/model/struct/model/module/forgemod/forgemod17.struct.ts b/src/model/struct/model/module/forgemod/forgemod17.struct.ts index 72367e1..a18328b 100644 --- a/src/model/struct/model/module/forgemod/forgemod17.struct.ts +++ b/src/model/struct/model/module/forgemod/forgemod17.struct.ts @@ -84,6 +84,11 @@ export class ForgeModStructure17 extends BaseForgeModStructure { } else { this.forgeModMetadata[name] = (resolved as McModInfo[])[0] } + // No way to resolve this AFAIK + if(this.forgeModMetadata[name]!.version.indexOf('@') > -1 || this.forgeModMetadata[name]!.version.indexOf('$') > -1) { + // Ex. @VERSION@, ${version} + this.forgeModMetadata[name]!.version = '0.0.0' + } } catch (err) { console.error(`ForgeMod ${name} contains an invalid mcmod.info file.`) createDefault = true