config refactoring, configurable IDs for hardcoded mods.

This commit is contained in:
FalsePattern committed 2022-07-23 19:53:05 +02:00
1 parent 2f88904515
commit 6c78eb217e
10 files changed
+138 -24

No files matched your search

@@ -1,6 +1,6 @@
package com.falsepattern.endlessids.mixin.plugin;
import com.falsepattern.endlessids.IEConfig;
import com.falsepattern.endlessids.config.GeneralConfig;
import com.falsepattern.lib.mixin.IMixin;
import com.falsepattern.lib.mixin.ITargetedMod;
import lombok.Getter;
@@ -37,7 +37,7 @@ public enum Mixin implements IMixin {
//endregion Minecraft->common->biome
//region Minecraft->common->misc
BlockFireMixin(Side.COMMON, always(), "vanilla.misc.BlockFireMixin"),
DataWatcherMixin(Side.COMMON, condition(() -> IEConfig.extendDataWatcher), "vanilla.misc.DataWatcherMixin"),
DataWatcherMixin(Side.COMMON, condition(() -> GeneralConfig.extendDataWatcher), "vanilla.misc.DataWatcherMixin"),
ItemInWorldManagerMixin(Side.COMMON, always(), "vanilla.misc.ItemInWorldManagerMixin"),
StatListMixin(Side.COMMON, always(), "vanilla.misc.StatListMixin"),
WorldMixin(Side.COMMON, always(), "vanilla.misc.WorldMixin"),
@@ -144,7 +144,7 @@ public enum Mixin implements IMixin {
//endregion LOTR->common
//region MFQM->common
MFQMMixin(Side.COMMON, require(TargetedMod.MFQM), "mfqm.MFQMMixin"),
MFQMDataWatcherMixin(Side.COMMON, require(TargetedMod.MFQM).and(condition(() -> IEConfig.extendDataWatcher)),
MFQMDataWatcherMixin(Side.COMMON, require(TargetedMod.MFQM).and(condition(() -> GeneralConfig.extendDataWatcher)),
"mfqm.MFQMDataWatcherMixin"),
//endregion MFQM->common
//region NaturesCompass->common
@@ -1,5 +1,9 @@
package com.falsepattern.endlessids.mixin.plugin;
import com.falsepattern.endlessids.config.DarkWorldIDConfig;
import com.falsepattern.endlessids.config.FuturepackIDConfig;
import com.falsepattern.lib.config.ConfigException;
import com.falsepattern.lib.config.ConfigurationManager;
import com.falsepattern.lib.mixin.ITargetedMod;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -19,12 +23,13 @@ public enum TargetedMod implements ITargetedMod {
BIOMETWEAKER("Biome Tweaker", true, startsWith("biometweaker-")),
BIOMEWAND("Biome Wand", true, startsWith("1.7.10-biome-wand-").or(startsWith("biome-wand"))),
COFHLIB("CoFH Lib", true, startsWith("cofhlib-")),
DARKWORLD("Dark World", true, startsWith("darkworld-")),
DARKWORLD("Dark World", true, startsWith("darkworld-").and(loadConfig(DarkWorldIDConfig.class))),
DRAGONAPI("DragonAPI", false, startsWith("dragonapi")),
EB("Enhanced Biomes", true, startsWith("Enhanced Biomes").or(startsWith("enhancedbiomes"))),
EREBUS("The Erebus", true, startsWith("theerebus")),
EXTRAUTILITIES("Extra Utilities", true, startsWith("extrautilities-")),
FUTUREPACK("Futurepack", true, startsWith("[1.7.10]futurepack").or(startsWith("futurepack-"))),
FUTUREPACK("Futurepack", true, startsWith("[1.7.10]futurepack").or(startsWith("futurepack-")).and(loadConfig(
FuturepackIDConfig.class))),
GALACTICRAFTCORE("GalactiCraftCore", false, startsWith("galacticraftcore")),
HIGHLANDS("Highlands", true, startsWith("highlands")),
ICG("Immersive Cavegen", true, startsWith("immersivecavegen")),
@@ -40,6 +45,17 @@ public enum TargetedMod implements ITargetedMod {
WORLDEDIT("WorldEdit", false, startsWith("worldedit-")),
;
private static Predicate<String> loadConfig(Class<?> configClass) {
return (str) -> {
try {
ConfigurationManager.registerConfig(configClass);
} catch (ConfigException e) {
e.printStackTrace();
}
return true;
};
}
@Getter
private final String modName;
@Getter