Skip to content

Commit ef4d140

Browse files
authored
Merge pull request #714 from zyxkad/config-type-patch
config type patch
2 parents d4b8b97 + d4aeaf9 commit ef4d140

File tree

5 files changed

+4
-42
lines changed

5 files changed

+4
-42
lines changed
Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
package de.srendi.advancedperipherals.common.configuration;
22

3-
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
43
import net.minecraftforge.fml.ModContainer;
54
import net.minecraftforge.fml.ModLoadingContext;
6-
import net.minecraftforge.fml.config.ConfigFileTypeHandler;
75
import net.minecraftforge.fml.config.ModConfig;
8-
import net.minecraftforge.fml.loading.FMLPaths;
9-
10-
import java.nio.file.Path;
11-
import java.util.function.Function;
126

137
public class APConfig extends ModConfig {
148

15-
public static final ConfigFileHandler CONFIG_FILE_HANDLER = new ConfigFileHandler();
16-
179
public static final GeneralConfig GENERAL_CONFIG = new GeneralConfig();
1810
public static final PeripheralsConfig PERIPHERALS_CONFIG = new PeripheralsConfig();
1911
public static final MetaphysicsConfig METAPHYSICS_CONFIG = new MetaphysicsConfig();
@@ -24,37 +16,10 @@ public APConfig(IAPConfig config, ModContainer container) {
2416
}
2517

2618
public static void register(ModLoadingContext context) {
27-
//Creates the config folder
28-
FMLPaths.getOrCreateGameRelativePath(FMLPaths.CONFIGDIR.get().resolve("Advancedperipherals"), "Advancedperipherals");
29-
3019
ModContainer modContainer = context.getActiveContainer();
3120
modContainer.addConfig(new APConfig(GENERAL_CONFIG, modContainer));
3221
modContainer.addConfig(new APConfig(PERIPHERALS_CONFIG, modContainer));
3322
modContainer.addConfig(new APConfig(METAPHYSICS_CONFIG, modContainer));
3423
modContainer.addConfig(new APConfig(WORLD_CONFIG, modContainer));
3524
}
36-
37-
@Override
38-
public ConfigFileTypeHandler getHandler() {
39-
return CONFIG_FILE_HANDLER;
40-
}
41-
42-
public static class ConfigFileHandler extends ConfigFileTypeHandler {
43-
44-
public static Path getPath(Path path) {
45-
if (path.endsWith("serverconfig")) return FMLPaths.CONFIGDIR.get();
46-
47-
return path;
48-
}
49-
50-
@Override
51-
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
52-
return super.reader(getPath(configBasePath));
53-
}
54-
55-
@Override
56-
public void unload(Path configBasePath, ModConfig config) {
57-
super.unload(getPath(configBasePath), config);
58-
}
59-
}
6025
}

src/main/java/de/srendi/advancedperipherals/common/configuration/GeneralConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ public String getFileName() {
4545

4646
@Override
4747
public ModConfig.Type getType() {
48-
return ModConfig.Type.COMMON;
48+
return ModConfig.Type.SERVER;
4949
}
5050
}

src/main/java/de/srendi/advancedperipherals/common/configuration/MetaphysicsConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ public String getFileName() {
4747

4848
@Override
4949
public ModConfig.Type getType() {
50-
return ModConfig.Type.COMMON;
50+
return ModConfig.Type.SERVER;
5151
}
5252
}

src/main/java/de/srendi/advancedperipherals/common/configuration/PeripheralsConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public String getFileName() {
268268

269269
@Override
270270
public ModConfig.Type getType() {
271-
return ModConfig.Type.COMMON;
271+
return ModConfig.Type.SERVER;
272272
}
273273

274274
private List<Predicate<String>> parseChatBoxCommandFilters() {

src/main/java/de/srendi/advancedperipherals/common/configuration/WorldConfig.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ public String getFileName() {
4141

4242
@Override
4343
public ModConfig.Type getType() {
44-
return ModConfig.Type.COMMON;
44+
return ModConfig.Type.SERVER;
4545
}
46-
/*
47-
[
48-
*/
4946
}

0 commit comments

Comments
 (0)