From 2d8c8e25711cdf64c4760a69f41876b5d113050d Mon Sep 17 00:00:00 2001 From: zyxkad Date: Tue, 21 Jan 2025 16:08:23 -0700 Subject: [PATCH] change config type from common to server to allow each save has its own config values close #693 --- .../common/configuration/APConfig.java | 30 ------------------- .../common/configuration/GeneralConfig.java | 2 +- .../configuration/MetaphysicsConfig.java | 2 +- .../configuration/PeripheralsConfig.java | 2 +- .../common/configuration/WorldConfig.java | 5 +--- 5 files changed, 4 insertions(+), 37 deletions(-) diff --git a/src/main/java/de/srendi/advancedperipherals/common/configuration/APConfig.java b/src/main/java/de/srendi/advancedperipherals/common/configuration/APConfig.java index f19dbc4c2..9f4b892bd 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/configuration/APConfig.java +++ b/src/main/java/de/srendi/advancedperipherals/common/configuration/APConfig.java @@ -3,7 +3,6 @@ import com.electronwill.nightconfig.core.file.CommentedFileConfig; import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.config.ConfigFileTypeHandler; import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.loading.FMLPaths; @@ -12,8 +11,6 @@ public class APConfig extends ModConfig { - public static final ConfigFileHandler CONFIG_FILE_HANDLER = new ConfigFileHandler(); - public static final GeneralConfig GENERAL_CONFIG = new GeneralConfig(); public static final PeripheralsConfig PERIPHERALS_CONFIG = new PeripheralsConfig(); public static final MetaphysicsConfig METAPHYSICS_CONFIG = new MetaphysicsConfig(); @@ -24,37 +21,10 @@ public APConfig(IAPConfig config, ModContainer container) { } public static void register(ModLoadingContext context) { - //Creates the config folder - FMLPaths.getOrCreateGameRelativePath(FMLPaths.CONFIGDIR.get().resolve("Advancedperipherals"), "Advancedperipherals"); - ModContainer modContainer = context.getActiveContainer(); modContainer.addConfig(new APConfig(GENERAL_CONFIG, modContainer)); modContainer.addConfig(new APConfig(PERIPHERALS_CONFIG, modContainer)); modContainer.addConfig(new APConfig(METAPHYSICS_CONFIG, modContainer)); modContainer.addConfig(new APConfig(WORLD_CONFIG, modContainer)); } - - @Override - public ConfigFileTypeHandler getHandler() { - return CONFIG_FILE_HANDLER; - } - - public static class ConfigFileHandler extends ConfigFileTypeHandler { - - public static Path getPath(Path path) { - if (path.endsWith("serverconfig")) return FMLPaths.CONFIGDIR.get(); - - return path; - } - - @Override - public Function reader(Path configBasePath) { - return super.reader(getPath(configBasePath)); - } - - @Override - public void unload(Path configBasePath, ModConfig config) { - super.unload(getPath(configBasePath), config); - } - } } diff --git a/src/main/java/de/srendi/advancedperipherals/common/configuration/GeneralConfig.java b/src/main/java/de/srendi/advancedperipherals/common/configuration/GeneralConfig.java index 3c4aa971b..8f07728e7 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/configuration/GeneralConfig.java +++ b/src/main/java/de/srendi/advancedperipherals/common/configuration/GeneralConfig.java @@ -45,6 +45,6 @@ public String getFileName() { @Override public ModConfig.Type getType() { - return ModConfig.Type.COMMON; + return ModConfig.Type.SERVER; } } diff --git a/src/main/java/de/srendi/advancedperipherals/common/configuration/MetaphysicsConfig.java b/src/main/java/de/srendi/advancedperipherals/common/configuration/MetaphysicsConfig.java index e45fdcbde..7a29fe96c 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/configuration/MetaphysicsConfig.java +++ b/src/main/java/de/srendi/advancedperipherals/common/configuration/MetaphysicsConfig.java @@ -47,6 +47,6 @@ public String getFileName() { @Override public ModConfig.Type getType() { - return ModConfig.Type.COMMON; + return ModConfig.Type.SERVER; } } diff --git a/src/main/java/de/srendi/advancedperipherals/common/configuration/PeripheralsConfig.java b/src/main/java/de/srendi/advancedperipherals/common/configuration/PeripheralsConfig.java index 5c4a8de36..066ededac 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/configuration/PeripheralsConfig.java +++ b/src/main/java/de/srendi/advancedperipherals/common/configuration/PeripheralsConfig.java @@ -268,7 +268,7 @@ public String getFileName() { @Override public ModConfig.Type getType() { - return ModConfig.Type.COMMON; + return ModConfig.Type.SERVER; } private List> parseChatBoxCommandFilters() { diff --git a/src/main/java/de/srendi/advancedperipherals/common/configuration/WorldConfig.java b/src/main/java/de/srendi/advancedperipherals/common/configuration/WorldConfig.java index 31178683b..9bc456e48 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/configuration/WorldConfig.java +++ b/src/main/java/de/srendi/advancedperipherals/common/configuration/WorldConfig.java @@ -41,9 +41,6 @@ public String getFileName() { @Override public ModConfig.Type getType() { - return ModConfig.Type.COMMON; + return ModConfig.Type.SERVER; } - /* - [ - */ }