diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java index 5b99e02c47..b0999be251 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java @@ -62,8 +62,7 @@ public class ModFileInfo implements IModFileInfo, IConfigurable map(MavenVersionAdapter::createFromVersionSpec). orElseThrow(()->new InvalidModFileException("Missing ModLoader version in file", this)); this.showAsResourcePack = config.getConfigElement("showAsResourcePack").orElse(false); - this.properties = config.getConfigElement("properties"). - map(UnmodifiableConfig::valueMap).orElse(Collections.emptyMap()); + this.properties = config.>getConfigElement("properties").orElse(Collections.emptyMap()); this.modFile.setFileProperties(this.properties); this.issueURL = config.getConfigElement("issueTrackerURL").map(StringUtils::toURL).orElse(null); final List modConfigs = config.getConfigList("mods"); diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/NightConfigWrapper.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/NightConfigWrapper.java index edf1d4c4f8..7a78745956 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/NightConfigWrapper.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/NightConfigWrapper.java @@ -45,8 +45,14 @@ public class NightConfigWrapper implements IConfigurable { } @Override + @SuppressWarnings("unchecked") public Optional getConfigElement(final String... key) { - return this.config.getOptional(asList(key)); + return this.config.getOptional(asList(key)).map(value -> { + if (value instanceof UnmodifiableConfig) { + return (T) ((UnmodifiableConfig) value).valueMap(); + } + return (T) value; + }); } @Override