diff --git a/src/testmod/java/draylar/omegatest/config/StructureConfigEntry.java b/src/testmod/java/draylar/omegatest/config/StructureConfigEntry.java new file mode 100644 index 0000000..a96356c --- /dev/null +++ b/src/testmod/java/draylar/omegatest/config/StructureConfigEntry.java @@ -0,0 +1,42 @@ +package draylar.omegatest.config; + +import java.util.Map; + +public class StructureConfigEntry { + + public final boolean activated; + public final int separation; + public final int spacing; + public final int salt; + + private StructureConfigEntry(int separation, int spacing, int salt) { + this.activated = true; + this.spacing = spacing; + this.separation = separation; + this.salt = salt; + } + + public static StructureConfigEntry of(int separation, int spacing, int salt) { + return new StructureConfigEntry(separation, spacing, salt); + } + + + public static void computeConfigMap(Map map) { + map.computeIfAbsent("abandoned_church", (id) -> of(14, 38, 66996840)); + map.computeIfAbsent("barn_house", (id) -> of(8, 38, 165757306)); + map.computeIfAbsent("big_pyramid", (id) -> of(5, 25, 239284294)); + map.computeIfAbsent("jungle_pyramid", (id) -> of(5, 25, 312178642)); + map.computeIfAbsent("the_castle_in_the_sky", (id) -> of(8, 30, 423494938)); + map.computeIfAbsent("killer_bunny_castle", (id) -> of(25, 45, 48123900)); + map.computeIfAbsent("villager_tower", (id) -> of(16, 34, 550292492)); + map.computeIfAbsent("villager_market", (id) -> of(16, 36, 784939542)); + map.computeIfAbsent("pillager_factory", (id) -> of(16, 36, 839204924)); + map.computeIfAbsent("ice_tower", (id) -> of(8, 28, 964058305)); + map.computeIfAbsent("tavern", (id) -> of(12, 32, 19296726)); + map.computeIfAbsent("pirate_ship", (id) -> of(16, 40, 583957395)); + map.computeIfAbsent("lighthouse", (id) -> of(16, 32, 29502322)); + map.computeIfAbsent("volcanic_vent", (id) -> of(4, 8, 84981094)); + map.computeIfAbsent("moai", (id) -> of(4, 8, 12994829)); + map.computeIfAbsent("air_balloon", (id) -> of(1, 6, 29483148)); + } +} diff --git a/src/testmod/java/draylar/omegatest/config/StructuresConfigTest.java b/src/testmod/java/draylar/omegatest/config/StructuresConfigTest.java index d4238fa..aadac90 100644 --- a/src/testmod/java/draylar/omegatest/config/StructuresConfigTest.java +++ b/src/testmod/java/draylar/omegatest/config/StructuresConfigTest.java @@ -2,19 +2,30 @@ package draylar.omegatest.config; import draylar.omegaconfig.api.Comment; import draylar.omegaconfig.api.Config; +import net.minecraft.util.Identifier; +import java.util.HashMap; +import java.util.Map; + + +//taken straight out of Mo' Structures public class StructuresConfigTest implements Config { - @Comment("Mo' Structures feature toggles.") - public Features features = new Features(); - @Comment("Chances are once per the number of chunks. A Chance 500 makes a feature spawn every 500 chunks. Affected by biomes it spawns in and the chunk, so not all are proportional.") - public FeatureChances feature_chances = new FeatureChances(); - - @Comment("Structure toggles. These do not have chances, but in the future they may. ") - public Structures structures = new Structures(); - - @Comment("Structure chances. Seperation is the least amount of chunks that a structure will spawn from itself. Spacing is the maximum amount of chunks, and both are used to randomly spawn structures and can be tweaked.") - public StructureChances structureChances = new StructureChances(); + @Comment(""" + Welcome to Mo'Structures Config! + // + // Here, you can turn off structures, change their chance, and also change their salt. + // + // To turn off a structure, simply go to the corresponding entry and set `activated` to false. + // + // Mo' Structures uses the vanilla structure spawning system. That is- + // - Seperation is the minimum chunks between structures + // - Spacing is the average chunks between structures + // + // Salt is a special field that gives structures unique spawning positions. DO NOT TOUCH IT, ONLY ADVANCED TROUBLESHOOTING! + + """) + public final Map structureConfigEntries = new HashMap<>(17); @Override public String getName() { @@ -26,106 +37,22 @@ public class StructuresConfigTest implements Config { return "json5"; } - public static class Features { - @Comment("Airplanes & Air Balloons") - public boolean air_features = true; - @Comment("Fallen Trees") - public boolean fallen_trees = true; - @Comment("Desert Features") - public boolean desert_features = true; - @Comment("Ruins") - public boolean ruins = true; - @Comment("Lamppost") - public boolean lamppost = true; - @Comment("Boulder") - public boolean boulder = true; - @Comment("Volcanic Vent") - public boolean volcanic_vent = true; - @Comment("Beach Features") - public boolean beach_features = true; - @Comment("Boats") - public boolean boats = true; + public StructureConfigEntry get(Identifier id) { + + + for (Map.Entry entry : structureConfigEntries.entrySet()) { + if (entry.getKey().equals(id.getPath())) { + return entry.getValue(); + } + } + + throw new NullPointerException("Tried StructureConfigEntry with id: " + id + ", but it was null!"); } - public static class FeatureChances { - @Comment("Airplanes & Air Balloons") - public int air_feature_chance = 4600; - @Comment("Fallen Trees") - public int fallen_trees_chance = 17; - @Comment("Desert Features") - public int desert_features_chance = 555; - @Comment("Ruins") - public int ruins_chance = 3500; - @Comment("Lamppost") - public int lamppost_chance = 100; - @Comment("Boulder") - public int boulder_chance = 4000; - @Comment("Volcanic Vent") - public int volcanic_vent_chance = 85; - @Comment("Beach Features") - public int beach_features_chance = 75; - @Comment("Boats") - public int boats_chance = 4000; - } - public static class Structures { - @Comment("Barnhouse") - public boolean barn_house = true; - @Comment("Jungle Pyramid") - public boolean jungle_pyramid = true; - @Comment("Big Pyramid") - public boolean big_pyramid = true; - @Comment("The Castle In The Sky") - public boolean the_castle_in_the_sky = true; - @Comment("Villager Tower") - public boolean villager_tower = true; - @Comment("Abandoned Churches") - public boolean abandoned_churches = true; - @Comment("Villager Market") - public boolean villager_market = true; - @Comment("Pillager Factory") - public boolean pillager_factory = true; - @Comment("Ice Tower") - public boolean ice_tower = true; - @Comment("Boar Hat Tavern") - public boolean tavern = true; - @Comment("Killer Bunny Castle") - public boolean killer_bunny_castle = true; - } - - public static class StructureChances { - @Comment("Barn House") - public int barn_house_seperation = 16; - public int barn_house_spacing = 40; - @Comment("Big Pyramid") - public int big_pyramid_seperation = 5; - public int big_pyramid_spacing = 25; - @Comment("Jungle Pyramid") - public int jungle_pyramid_seperation = 5; - public int jungle_pyramid_spacing = 25; - @Comment("The Castle In The Sky") - public int the_castle_in_the_sky_seperation = 8; - public int the_castle_in_the_sky_spacing = 32; - @Comment("Villager Tower") - public int villager_tower_seperation = 16; - public int villager_tower_spacing = 40; - @Comment("Abandoned Church") - public int abandoned_church_seperation = 16; - public int abandoned_church_spacing = 40; - @Comment("Villager Market") - public int villager_market_seperation = 27; - public int villager_market_spacing = 50; - @Comment("Pillager Factory") - public int pillager_factory_seperation = 27; - public int pillager_factory_spacing = 50; - @Comment("Ice Tower") - public int ice_tower_seperation = 8; - public int ice_tower_spacing = 32; - @Comment("Boar Hat Tavern") - public int tavern_seperation = 16; - public int tavern_spacing = 46; - @Comment("Killer Bunny Castle") - public int killer_bunny_castle_seperation = 25; - public int killer_bunny_castle_spacing = 50; + @Override + public void save() { + StructureConfigEntry.computeConfigMap(structureConfigEntries); + Config.super.save(); } } \ No newline at end of file