Fix Configs not generating correctly on first load Closes #6069

This commit is contained in:
LexManos committed 2019-08-19 19:45:32 -07:00
1 parent 8c04651301
commit dc0eacb80f
3 files changed
+22 -11

No files matched your search

@@ -21,7 +21,6 @@ package net.minecraftforge.fml.config;
import com.electronwill.nightconfig.core.ConfigFormat;
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
import com.electronwill.nightconfig.core.file.FileNotFoundAction;
import com.electronwill.nightconfig.core.file.FileWatcher;
import com.electronwill.nightconfig.core.io.WritingMode;
import net.minecraftforge.fml.loading.FMLConfig;
@@ -90,9 +89,11 @@ public class ConfigFileTypeHandler {
public void run() {
// Force the regular classloader onto the special thread
Thread.currentThread().setContextClassLoader(realClassLoader);
this.commentedFileConfig.load();
LOGGER.debug(CONFIG, "Config file {} changed, sending notifies", this.modConfig.getFileName());
this.modConfig.fireEvent(new ModConfig.ConfigReloading(this.modConfig));
if (!this.modConfig.getSpec().isCorrecting()) {
this.commentedFileConfig.load();
LOGGER.debug(CONFIG, "Config file {} changed, sending notifies", this.modConfig.getFileName());
this.modConfig.fireEvent(new ModConfig.ConfigReloading(this.modConfig));
}
}
}
}
@@ -28,9 +28,6 @@ import net.minecraftforge.fml.loading.StringUtils;
import java.nio.file.Path;
import java.util.concurrent.Callable;
import java.util.function.Consumer;
import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.uncheck;
public class ModConfig
{