From 28d746653eac22c9cf74516cfd148780d3a92c6c Mon Sep 17 00:00:00 2001 From: Marcel Konrad Date: Mon, 26 Jul 2021 00:02:19 +0200 Subject: [PATCH] Simplify config loading --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../worldhandler/config/Config.java | 22 ++----------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 549d844..05679dc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/exopandora/worldhandler/config/Config.java b/src/main/java/exopandora/worldhandler/config/Config.java index 7057213..cb8d34b 100644 --- a/src/main/java/exopandora/worldhandler/config/Config.java +++ b/src/main/java/exopandora/worldhandler/config/Config.java @@ -7,14 +7,11 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import com.electronwill.nightconfig.core.file.CommentedFileConfig; - import exopandora.worldhandler.event.KeyHandler; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.config.ModConfig.Reloading; import net.minecraftforge.fml.config.ModConfig.Type; @@ -23,9 +20,6 @@ public class Config public static final ForgeConfigSpec CLIENT_SPEC; public static final ClientConfig CLIENT; - private static ModConfig MOD_CONFIG; - private static CommentedFileConfig CONFIG_DATA; - static { Pair pair = new ForgeConfigSpec.Builder().configure(ClientConfig::new); @@ -94,27 +88,15 @@ public class Config { if(configValue != null && value != null && (!value.equals(configValue.get()) || configValue.get() instanceof List)) { - Config.CONFIG_DATA.set(configValue.getPath(), value); - configValue.clearCache(); - } - } - - @SubscribeEvent - public static void configLoad(ModConfig.Loading event) - { - if(event.getConfig().getType().equals(Type.CLIENT)) - { - Config.MOD_CONFIG = event.getConfig(); - Config.CONFIG_DATA = (CommentedFileConfig) Config.MOD_CONFIG.getConfigData(); + configValue.set(value); } } @SubscribeEvent public static void configReload(Reloading event) { - if(event.getConfig().getType().equals(Type.CLIENT) && Config.CONFIG_DATA != null) + if(event.getConfig().getType().equals(Type.CLIENT)) { - Config.CONFIG_DATA.load(); KeyHandler.updatePosKeys(); } }