diff --git a/.gitignore b/.gitignore index ccc5792..412529c 100644 --- a/.gitignore +++ b/.gitignore @@ -145,9 +145,3 @@ gradle-app.setting # End of https://www.toptal.com/developers/gitignore/api/intellij+all,gradle,forgegradle,java !lib/*.jar - -!run -run/* -!run/config -run/config/* -!run/config/archaicfix.cfg \ No newline at end of file diff --git a/run/config/archaicfix.cfg b/run/config/archaicfix.cfg deleted file mode 100644 index 44e1ba2..0000000 --- a/run/config/archaicfix.cfg +++ /dev/null @@ -1,56 +0,0 @@ -# Configuration file - -general { - # Replace the regional difficulty calculation with a TMCW-style one that increases with playtime, not time per chunk. [default: true] - B:betterRegionalDifficulty=true - - # EXPERIMENTAL: Replace the Thaumcraft hashing implementation. This really hasn't been tested and probably breaks everything. [default: false] - B:betterThaumcraftHashing=false - - # EXPERIMENTAL: Cache matching crafting recipes to avoid needing to scan the whole list each time. [default: false] - B:cacheRecipes=false - - # Disable spawn chunks [default: true] - B:disableSpawnChunks=true - - # Prevents buttons from showing a yellow text color when hovered, as was done in 1.14+. [default: false] - B:enableNewButtonAppearance=false - - # Enables the 1.8-style occlusion culling originally developed by CoFHTweaks. Not compatible with OptiFine. [default: false] - B:enableOcclusionTweaks=false - - # Fix instances of cascading worldgen in Mekanism. [default: true] - B:fixMekanismCascadingWorldgen=true - - # Cap the integrated server render distance at a minimum of 8 chunks, and adjust despawn ranges so mobs will always despawn properly on low render distances. [default: true] - B:fixMobSpawnsAtLowRenderDist=true - - # [default: true] - B:hideDownloadingTerrainScreen=true - - # Improve the sorting of chunk updates, provides a slight improvement to how fast the world renders out to its border. Has no effect if enableOcclusionTweaks is on. [default: true] - B:improveRenderSortingOrder=true - - # Allow 65000 block updates to be performed per tick, rather than 1000. [default: true] - B:increaseBlockUpdateLimit=true - - # Increase the amount of armor mobs wear on average. From TMCW. [default: true] - B:increaseMobArmor=true - - # Reduce lag caused by item entities [default: true] - B:itemLagReduction=true - - # Log when cascading worldgen occurs. [default: true] - B:logCascadingWorldgen=false - - # Print a stacktrace when cascading worldgen occurs. Use only for development as this will add more lag in game. [default: false] - B:logCascadingWorldgenStacktrace=false - - # Increase the maximum render distance to 32 if OptiFine and FastCraft are not installed. [default: false] - B:raiseMaxRenderDistance=false - - # Have NEI take over creative searching. Much more performant, but requires the GTNH fork of NEI to be installed. [default: true] - B:useNeiForCreativeSearch=true -} - - diff --git a/src/main/java/com/falsepattern/endlessids/config/DarkWorldIDConfig.java b/src/main/java/com/falsepattern/endlessids/config/DarkWorldIDConfig.java index c816197..d2f71c8 100644 --- a/src/main/java/com/falsepattern/endlessids/config/DarkWorldIDConfig.java +++ b/src/main/java/com/falsepattern/endlessids/config/DarkWorldIDConfig.java @@ -3,9 +3,18 @@ package com.falsepattern.endlessids.config; import com.falsepattern.endlessids.Tags; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.lib.config.Config; +import com.falsepattern.lib.config.ConfigException; +import com.falsepattern.lib.config.ConfigurationManager; -@Config(modid = Tags.MODID, category = "DarkWorld") +@Config(modid = Tags.MODID, category = "darkworld") public class DarkWorldIDConfig { + static { + try { + ConfigurationManager.registerConfig(DarkWorldIDConfig.class); + } catch (ConfigException e) { + throw new RuntimeException(e); + } + } @Config.Comment("Original: 100") @Config.RangeInt(min = 40, max = ExtendedConstants.biomeIDCount - 1) @Config.DefaultInt(10100) diff --git a/src/main/java/com/falsepattern/endlessids/config/FuturepackIDConfig.java b/src/main/java/com/falsepattern/endlessids/config/FuturepackIDConfig.java index f294e0d..9a2d542 100644 --- a/src/main/java/com/falsepattern/endlessids/config/FuturepackIDConfig.java +++ b/src/main/java/com/falsepattern/endlessids/config/FuturepackIDConfig.java @@ -3,9 +3,18 @@ package com.falsepattern.endlessids.config; import com.falsepattern.endlessids.Tags; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.lib.config.Config; +import com.falsepattern.lib.config.ConfigException; +import com.falsepattern.lib.config.ConfigurationManager; @Config(modid = Tags.MODID, category = "futurepack") public class FuturepackIDConfig { + static { + try { + ConfigurationManager.registerConfig(FuturepackIDConfig.class); + } catch (ConfigException e) { + throw new RuntimeException(e); + } + } @Config.Comment("Original: 97") @Config.RangeInt(min = 40, max = ExtendedConstants.biomeIDCount - 1) @Config.DefaultInt(11097) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java index c7b5f1b..112a3aa 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java @@ -23,14 +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-").and(loadConfig(DarkWorldIDConfig.class))), + DARKWORLD("Dark World", true, startsWith("darkworld-")), DRAGONAPI("DragonAPI", false, startsWith("dragonapi")), EB("Enhanced Biomes", true, startsWith("Enhanced Biomes").or(startsWith("enhancedbiomes"))), EREBUS("The Erebus", true, startsWith("theerebus")), EXTRAPLANETS("Extra Planets", false, startsWith("extraplanets-")), EXTRAUTILITIES("Extra Utilities", true, startsWith("extrautilities-")), - FUTUREPACK("Futurepack", true, startsWith("[1.7.10]futurepack").or(startsWith("futurepack-")).and(loadConfig( - FuturepackIDConfig.class))), + FUTUREPACK("Futurepack", true, startsWith("[1.7.10]futurepack").or(startsWith("futurepack-"))), GALACTICRAFTCORE("GalactiCraftCore", false, startsWith("galacticraftcore")), HIGHLANDS("Highlands", true, startsWith("highlands")), ICG("Immersive Cavegen", true, startsWith("immersivecavegen")), @@ -46,17 +45,6 @@ public enum TargetedMod implements ITargetedMod { WORLDEDIT("WorldEdit", false, startsWith("worldedit-")), ; - private static Predicate loadConfig(Class configClass) { - return (str) -> { - try { - ConfigurationManager.registerConfig(configClass); - } catch (ConfigException e) { - e.printStackTrace(); - } - return true; - }; - } - @Getter private final String modName; @Getter