diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLConfig.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLConfig.java index bfc9cb0fb5..b541fb60f0 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLConfig.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLConfig.java @@ -21,6 +21,7 @@ package net.minecraftforge.fml.loading; import com.electronwill.nightconfig.core.ConfigSpec; import com.electronwill.nightconfig.core.file.CommentedFileConfig; +import com.electronwill.nightconfig.core.io.ParsingException; import com.electronwill.nightconfig.core.io.WritingMode; import net.minecraftforge.api.distmarker.Dist; import org.apache.logging.log4j.LogManager; @@ -54,7 +55,14 @@ public class FMLConfig autosave().autoreload(). writingMode(WritingMode.REPLACE). build(); - configData.load(); + try + { + configData.load(); + } + catch (ParsingException e) + { + throw new RuntimeException("Failed to load FML config from " + configFile.toString(), e); + } if (!configSpec.isCorrect(configData)) { LOGGER.warn(CORE, "Configuration file {} is not correct. Correcting", configFile); configSpec.correct(configData, (action, path, incorrectValue, correctedValue) -> diff --git a/src/main/java/net/minecraftforge/fml/config/ConfigFileTypeHandler.java b/src/main/java/net/minecraftforge/fml/config/ConfigFileTypeHandler.java index cc47908414..904b1285bf 100644 --- a/src/main/java/net/minecraftforge/fml/config/ConfigFileTypeHandler.java +++ b/src/main/java/net/minecraftforge/fml/config/ConfigFileTypeHandler.java @@ -22,6 +22,7 @@ package net.minecraftforge.fml.config; import com.electronwill.nightconfig.core.ConfigFormat; import com.electronwill.nightconfig.core.file.CommentedFileConfig; import com.electronwill.nightconfig.core.file.FileWatcher; +import com.electronwill.nightconfig.core.io.ParsingException; import com.electronwill.nightconfig.core.io.WritingMode; import net.minecraftforge.fml.loading.FMLConfig; import net.minecraftforge.fml.loading.FMLPaths; @@ -50,7 +51,14 @@ public class ConfigFileTypeHandler { writingMode(WritingMode.REPLACE). build(); LOGGER.debug(CONFIG, "Built TOML config for {}", configPath.toString()); - configData.load(); + try + { + configData.load(); + } + catch (ParsingException ex) + { + throw new ConfigLoadingException(c, ex); + } LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath.toString()); try { FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader())); @@ -99,10 +107,25 @@ public class ConfigFileTypeHandler { // Force the regular classloader onto the special thread Thread.currentThread().setContextClassLoader(realClassLoader); if (!this.modConfig.getSpec().isCorrecting()) { - this.commentedFileConfig.load(); + try + { + this.commentedFileConfig.load(); + } + catch (ParsingException ex) + { + throw new ConfigLoadingException(modConfig, ex); + } LOGGER.debug(CONFIG, "Config file {} changed, sending notifies", this.modConfig.getFileName()); this.modConfig.fireEvent(new ModConfig.Reloading(this.modConfig)); } } } + + private static class ConfigLoadingException extends RuntimeException + { + public ConfigLoadingException(ModConfig config, Exception cause) + { + super("Failed loading config file " + config.getFullPath().toString() + " with type " + config.getType() + " for modid " + config.getModId(), cause); + } + } }