Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions polymod/Polymod.hx
Original file line number Diff line number Diff line change
Expand Up @@ -1704,8 +1704,16 @@ class ModMetadata
m.license = JsonHelp.str(json, 'license');
m.metadata = JsonHelp.mapStr(json, 'metadata');

m.dependencies = JsonHelp.mapVersionRule(json, 'dependencies');
m.optionalDependencies = JsonHelp.mapVersionRule(json, 'optionalDependencies');
try
{
m.dependencies = JsonHelp.mapVersionRule(json, 'dependencies');
m.optionalDependencies = JsonHelp.mapVersionRule(json, 'optionalDependencies');
}
catch (msg:Dynamic)
{
Polymod.error(MOD_METADATA_PARSE_FAILED, 'Error parsing mod dependencies from metadata: ${msg}', origin);
return null;
}

return m;
}
Expand Down
3 changes: 2 additions & 1 deletion polymod/format/JsonHelp.hx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ class JsonHelp
{
for (field in Reflect.fields(val))
{
var fieldVal = Reflect.field(val, field);
var fieldVal:Null<String> = Reflect.field(val, field);
if (fieldVal == null || StringTools.trim(fieldVal) == '') fieldVal = '*';
map.set(field, VersionRule.stringToVersionRule(fieldVal));
}
}
Expand Down
Loading