diff --git a/CHANGELOG.md b/CHANGELOG.md index 644baa7d6..6e88846c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +### Base Metals 4.0.2.121012 + +- Give Overworld tin, lead, zinc, silver and mercury more selective rock and geological-province preferences. +- Favour mafic rocks for nickel and platinum, with optional Mineralogy hosts and natural vanilla-stone fallbacks. +- Use the public OreSpawn 4.1.1 release used for the combined geology checks. +- Keep vein sizes, Nether/End rules, custom-dimension fallbacks and saved profiles unchanged. + ### Base Metals 4.0.1.121012 (in development) - Extend vanilla copper like the other vanilla materials instead of re-adding its ingot, block, ore, door and trapdoor. Old Base Metals copper IDs map to the vanilla ones. Like iron and gold, copper no longer has villager trades, copper shields leave the anvil plate-upgrade chain, and copper blocks are no longer a beacon base. diff --git a/build.gradle b/build.gradle index 2b33819fd..45e9ad2ad 100644 --- a/build.gradle +++ b/build.gradle @@ -135,7 +135,7 @@ configurations { dependencies { //TODO Move version strings to gradle.properties implementation "net.neoforged:neoforge:${neo_version}" - implementation 'zone.moddev.mc.orespawn:OreSpawn:4.0.16.121012' + implementation 'zone.moddev.mc.orespawn:OreSpawn:4.1.1.121012' implementation "zone.moddev.mc.lib:mmdlib:${mmdlib_version}" // API only: Mekanism remains optional at runtime. Its public slurry // registry is required to provide the eight historical processing chains. diff --git a/gradle.properties b/gradle.properties index 3fd4876cc..6790cd2d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -mod_version = 4.0.1.121012 +mod_version = 4.0.2.121012 mod_name = MMD Base Metals mod_id=basemetals mod_archive_name = basemetals diff --git a/src/main/resources/data/basemetals/orespawn/provider.json b/src/main/resources/data/basemetals/orespawn/provider.json index 5fbd6ffca..830291796 100644 --- a/src/main/resources/data/basemetals/orespawn/provider.json +++ b/src/main/resources/data/basemetals/orespawn/provider.json @@ -1,7 +1,7 @@ { "schema_version": 3, "provider_modid": "basemetals", - "provider_revision": 2, + "provider_revision": 3, "ores": { "basemetals:ore/coldiron": { "block": "basemetals:coldiron_ore", @@ -10,112 +10,571 @@ "retrogen": false, "dimensions": { "minecraft:the_nether": { - "enabled": true, "min_y": 0, "max_y": 127, "frequency": 5, - "min_quantity": 4, "max_quantity": 11, "pattern": "vein", - "height_distribution": "uniform", "discard_chance_on_air_exposure": 0, - "spread": 8, "vertical_spread": 4, "node_size": 4, "length": 16, - "host_blocks": ["minecraft:netherrack"], - "host_tags": ["forge:netherrack"] + "enabled": true, + "min_y": 0, + "max_y": 127, + "frequency": 5, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "uniform", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_blocks": [ + "minecraft:netherrack" + ], + "host_tags": [ + "forge:netherrack" + ] } } }, "basemetals:ore/adamantine": { "block": "basemetals:adamantine_ore", - "enabled": true, "source_mod": "basemetals", "retrogen": false, + "enabled": true, + "source_mod": "basemetals", + "retrogen": false, "dimensions": { "minecraft:the_nether": { - "enabled": true, "min_y": 0, "max_y": 127, "frequency": 2, - "min_quantity": 4, "max_quantity": 11, "pattern": "vein", - "height_distribution": "uniform", "discard_chance_on_air_exposure": 0, - "spread": 8, "vertical_spread": 4, "node_size": 4, "length": 16, - "host_blocks": ["minecraft:netherrack"], - "host_tags": ["forge:netherrack"] + "enabled": true, + "min_y": 0, + "max_y": 127, + "frequency": 2, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "uniform", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_blocks": [ + "minecraft:netherrack" + ], + "host_tags": [ + "forge:netherrack" + ] } } }, "basemetals:ore/starsteel": { "block": "basemetals:starsteel_ore", - "enabled": true, "source_mod": "basemetals", "retrogen": false, + "enabled": true, + "source_mod": "basemetals", + "retrogen": false, "dimensions": { "minecraft:the_end": { - "enabled": true, "min_y": 0, "max_y": 254, "frequency": 5, - "min_quantity": 4, "max_quantity": 11, "pattern": "vein", - "height_distribution": "uniform", "discard_chance_on_air_exposure": 0, - "spread": 8, "vertical_spread": 4, "node_size": 4, "length": 16, - "host_blocks": ["minecraft:end_stone"], - "host_tags": ["forge:end_stones"] + "enabled": true, + "min_y": 0, + "max_y": 254, + "frequency": 5, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "uniform", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_blocks": [ + "minecraft:end_stone" + ], + "host_tags": [ + "forge:end_stones" + ] } } }, "basemetals:ore/tin": { - "block": "basemetals:tin_ore", "enabled": true, "source_mod": "basemetals", "retrogen": false, - "dimension_selectors": {"orespawn:all_except_nether_end": { - "enabled": true, "min_y": -64, "max_y": 128, "frequency": 10, - "min_quantity": 4, "max_quantity": 11, "pattern": "vein", "height_distribution": "triangle", - "discard_chance_on_air_exposure": 0, "spread": 8, "vertical_spread": 4, "node_size": 4, "length": 16, - "host_families": ["sedimentary", "metamorphic", "igneous_intrusive", "igneous_volcanic"], - "host_tags": ["minecraft:stone_ore_replaceables", "minecraft:deepslate_ore_replaceables"] - }} + "block": "basemetals:tin_ore", + "enabled": true, + "source_mod": "basemetals", + "retrogen": false, + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": -64, + "max_y": 128, + "frequency": 10, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" + ] + } + }, + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": -64, + "max_y": 128, + "frequency": 10, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "igneous_intrusive", + "metamorphic" + ], + "host_tags": [], + "host_blocks": [ + "minecraft:stone", + "minecraft:deepslate" + ], + "geomes": { + "stable_craton": 1.4, + "mountain_belt": 1.2, + "volcanic_arc": 0.55, + "sedimentary_basin": 0.35, + "coastal_shelf": 0.25, + "arid_basin": 0.6, + "wetland_basin": 0.25, + "glacial_highland": 0.8 + } + } + } }, "basemetals:ore/lead": { - "block": "basemetals:lead_ore", "enabled": true, "source_mod": "basemetals", "retrogen": false, - "dimension_selectors": {"orespawn:all_except_nether_end": { - "enabled": true, "min_y": -64, "max_y": 64, "frequency": 5, - "min_quantity": 4, "max_quantity": 11, "pattern": "vein", "height_distribution": "triangle", - "discard_chance_on_air_exposure": 0, "spread": 8, "vertical_spread": 4, "node_size": 4, "length": 16, - "host_families": ["sedimentary", "metamorphic", "igneous_intrusive", "igneous_volcanic"], - "host_tags": ["minecraft:stone_ore_replaceables", "minecraft:deepslate_ore_replaceables"] - }} + "block": "basemetals:lead_ore", + "enabled": true, + "source_mod": "basemetals", + "retrogen": false, + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": -64, + "max_y": 64, + "frequency": 5, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" + ] + } + }, + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": -64, + "max_y": 64, + "frequency": 5, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "sedimentary", + "igneous_intrusive", + "metamorphic" + ], + "host_tags": [], + "host_blocks": [ + "minecraft:stone", + "minecraft:deepslate" + ], + "geomes": { + "stable_craton": 0.8, + "mountain_belt": 1, + "volcanic_arc": 0.65, + "sedimentary_basin": 1.3, + "coastal_shelf": 1, + "arid_basin": 0.8, + "wetland_basin": 0.6, + "glacial_highland": 0.8 + } + } + } }, "basemetals:ore/zinc": { - "block": "basemetals:zinc_ore", "enabled": true, "source_mod": "basemetals", "retrogen": false, - "dimension_selectors": {"orespawn:all_except_nether_end": { - "enabled": true, "min_y": -64, "max_y": 96, "frequency": 5, - "min_quantity": 4, "max_quantity": 11, "pattern": "vein", "height_distribution": "triangle", - "discard_chance_on_air_exposure": 0, "spread": 8, "vertical_spread": 4, "node_size": 4, "length": 16, - "host_families": ["sedimentary", "metamorphic", "igneous_intrusive", "igneous_volcanic"], - "host_tags": ["minecraft:stone_ore_replaceables", "minecraft:deepslate_ore_replaceables"] - }} + "block": "basemetals:zinc_ore", + "enabled": true, + "source_mod": "basemetals", + "retrogen": false, + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": -64, + "max_y": 96, + "frequency": 5, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" + ] + } + }, + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": -64, + "max_y": 96, + "frequency": 5, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "sedimentary", + "igneous_intrusive", + "metamorphic" + ], + "host_tags": [], + "host_blocks": [ + "minecraft:stone", + "minecraft:deepslate" + ], + "geomes": { + "stable_craton": 0.8, + "mountain_belt": 1, + "volcanic_arc": 0.65, + "sedimentary_basin": 1.3, + "coastal_shelf": 1, + "arid_basin": 0.8, + "wetland_basin": 0.6, + "glacial_highland": 0.8 + } + } + } }, "basemetals:ore/silver": { - "block": "basemetals:silver_ore", "enabled": true, "source_mod": "basemetals", "retrogen": false, - "dimension_selectors": {"orespawn:all_except_nether_end": { - "enabled": true, "min_y": -64, "max_y": 32, "frequency": 4, - "min_quantity": 4, "max_quantity": 11, "pattern": "vein", "height_distribution": "bottom_triangle", - "discard_chance_on_air_exposure": 0, "spread": 8, "vertical_spread": 4, "node_size": 4, "length": 16, - "host_families": ["sedimentary", "metamorphic", "igneous_intrusive", "igneous_volcanic"], - "host_tags": ["minecraft:stone_ore_replaceables", "minecraft:deepslate_ore_replaceables"] - }} + "block": "basemetals:silver_ore", + "enabled": true, + "source_mod": "basemetals", + "retrogen": false, + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": -64, + "max_y": 32, + "frequency": 4, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "bottom_triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" + ] + } + }, + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": -64, + "max_y": 32, + "frequency": 4, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "bottom_triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "sedimentary", + "igneous_intrusive", + "metamorphic" + ], + "host_tags": [], + "host_blocks": [ + "minecraft:stone", + "minecraft:deepslate" + ], + "geomes": { + "stable_craton": 0.8, + "mountain_belt": 1.3, + "volcanic_arc": 1, + "sedimentary_basin": 0.9, + "coastal_shelf": 0.75, + "arid_basin": 0.8, + "wetland_basin": 0.6, + "glacial_highland": 0.9 + } + } + } }, "basemetals:ore/mercury": { - "block": "basemetals:mercury_ore", "enabled": true, "source_mod": "basemetals", "retrogen": false, - "dimension_selectors": {"orespawn:all_except_nether_end": { - "enabled": true, "min_y": -64, "max_y": 32, "frequency": 3, - "min_quantity": 4, "max_quantity": 11, "pattern": "vein", "height_distribution": "bottom_triangle", - "discard_chance_on_air_exposure": 0, "spread": 8, "vertical_spread": 4, "node_size": 4, "length": 16, - "host_families": ["sedimentary", "metamorphic", "igneous_intrusive", "igneous_volcanic"], - "host_tags": ["minecraft:stone_ore_replaceables", "minecraft:deepslate_ore_replaceables"] - }} + "block": "basemetals:mercury_ore", + "enabled": true, + "source_mod": "basemetals", + "retrogen": false, + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": -64, + "max_y": 32, + "frequency": 3, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "bottom_triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" + ] + } + }, + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": -64, + "max_y": 32, + "frequency": 3, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "bottom_triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "sedimentary", + "igneous_volcanic" + ], + "host_tags": [], + "host_blocks": [ + "minecraft:stone", + "minecraft:deepslate" + ], + "geomes": { + "stable_craton": 0.3, + "mountain_belt": 0.6, + "volcanic_arc": 2, + "sedimentary_basin": 0.7, + "coastal_shelf": 0.4, + "arid_basin": 0.9, + "wetland_basin": 0.2, + "glacial_highland": 0.3 + } + } + } }, "basemetals:ore/nickel": { - "block": "basemetals:nickel_ore", "enabled": true, "source_mod": "basemetals", "retrogen": false, - "dimension_selectors": {"orespawn:all_except_nether_end": { - "enabled": true, "min_y": -32, "max_y": 96, "frequency": 1, - "min_quantity": 4, "max_quantity": 11, "pattern": "vein", "height_distribution": "triangle", - "discard_chance_on_air_exposure": 0, "spread": 8, "vertical_spread": 4, "node_size": 4, "length": 16, - "host_families": ["sedimentary", "metamorphic", "igneous_intrusive", "igneous_volcanic"], - "host_tags": ["minecraft:stone_ore_replaceables", "minecraft:deepslate_ore_replaceables"] - }} + "block": "basemetals:nickel_ore", + "enabled": true, + "source_mod": "basemetals", + "retrogen": false, + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": -32, + "max_y": 96, + "frequency": 1, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" + ] + } + }, + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": -32, + "max_y": 96, + "frequency": 4, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [], + "host_tags": [ + "basemetals:ore_hosts/mafic" + ], + "host_blocks": [ + "minecraft:basalt", + "minecraft:stone", + "minecraft:deepslate" + ], + "geomes": { + "stable_craton": 1, + "mountain_belt": 1.5, + "volcanic_arc": 1.8, + "sedimentary_basin": 0.15, + "coastal_shelf": 0.1, + "arid_basin": 0.4, + "wetland_basin": 0.1, + "glacial_highland": 0.6 + } + } + } }, "basemetals:ore/platinum": { - "block": "basemetals:platinum_ore", "enabled": true, "source_mod": "basemetals", "retrogen": false, - "dimension_selectors": {"orespawn:all_except_nether_end": { - "enabled": true, "min_y": -64, "max_y": 16, "frequency": 0.125, - "min_quantity": 4, "max_quantity": 11, "pattern": "vein", "height_distribution": "bottom_triangle", - "discard_chance_on_air_exposure": 0, "spread": 8, "vertical_spread": 4, "node_size": 4, "length": 16, - "host_families": ["sedimentary", "metamorphic", "igneous_intrusive", "igneous_volcanic"], - "host_tags": ["minecraft:stone_ore_replaceables", "minecraft:deepslate_ore_replaceables"] - }} + "block": "basemetals:platinum_ore", + "enabled": true, + "source_mod": "basemetals", + "retrogen": false, + "dimension_selectors": { + "orespawn:all_except_nether_end": { + "enabled": true, + "min_y": -64, + "max_y": 16, + "frequency": 0.125, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "bottom_triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" + ] + } + }, + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": -64, + "max_y": 16, + "frequency": 0.75, + "min_quantity": 4, + "max_quantity": 11, + "pattern": "vein", + "height_distribution": "bottom_triangle", + "discard_chance_on_air_exposure": 0, + "spread": 8, + "vertical_spread": 4, + "node_size": 4, + "length": 16, + "host_families": [], + "host_tags": [ + "basemetals:ore_hosts/mafic" + ], + "host_blocks": [ + "minecraft:basalt", + "minecraft:stone", + "minecraft:deepslate" + ], + "geomes": { + "stable_craton": 1, + "mountain_belt": 1.5, + "volcanic_arc": 1.8, + "sedimentary_basin": 0.15, + "coastal_shelf": 0.1, + "arid_basin": 0.4, + "wetland_basin": 0.1, + "glacial_highland": 0.6 + } + } + } } }, "rocks": {}, diff --git a/src/main/resources/data/basemetals/tags/block/ore_hosts/mafic.json b/src/main/resources/data/basemetals/tags/block/ore_hosts/mafic.json new file mode 100644 index 000000000..8ec1f8ef7 --- /dev/null +++ b/src/main/resources/data/basemetals/tags/block/ore_hosts/mafic.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id": "mineralogy:gabbro", "required": false}, + {"id": "mineralogy:peridotite", "required": false} + ] +} diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml index 168855e30..40bc739b7 100644 --- a/src/main/templates/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -14,7 +14,7 @@ description='''${mod_description}''' [[dependencies.${mod_id}]] modId="orespawn" type="required" -versionRange="[4.0.16.121012,5.0.0)" +versionRange="[4.1.1.121012,5.0.0)" ordering="AFTER" side="BOTH" diff --git a/src/verificationTest/java/zone/moddev/mc/basemetals/data/GeologyDefaultsTest.java b/src/verificationTest/java/zone/moddev/mc/basemetals/data/GeologyDefaultsTest.java new file mode 100644 index 000000000..da29695c8 --- /dev/null +++ b/src/verificationTest/java/zone/moddev/mc/basemetals/data/GeologyDefaultsTest.java @@ -0,0 +1,30 @@ +package zone.moddev.mc.basemetals.data; + +import static org.junit.jupiter.api.Assertions.*; +import com.google.gson.*; +import java.nio.file.*; +import org.junit.jupiter.api.Test; + +class GeologyDefaultsTest { + private static final Path ROOT = NeoForgeResourcesTest.projectRoot(); + @Test void overworldTuningDoesNotReplaceFallbacksOrAddCopper() throws Exception { + JsonObject p=JsonParser.parseString(Files.readString(ROOT.resolve("src/main/resources/data/basemetals/orespawn/provider.json"))).getAsJsonObject(); + JsonObject ores=p.getAsJsonObject("ores"); + assertEquals(10,ores.size());assertFalse(ores.has("basemetals:ore/copper")); + for(String name:new String[]{"tin","lead","zinc","silver","mercury","nickel","platinum"}) { + JsonObject ore=ores.getAsJsonObject("basemetals:ore/"+name); + assertFalse(ore.get("retrogen").getAsBoolean()); + assertEquals(8,ore.getAsJsonObject("dimensions").getAsJsonObject("minecraft:overworld").getAsJsonObject("geomes").size()); + assertEquals(4,ore.getAsJsonObject("dimension_selectors").getAsJsonObject("orespawn:all_except_nether_end").getAsJsonArray("host_families").size()); + } + assertFalse(ores.getAsJsonObject("basemetals:ore/coldiron").getAsJsonObject("dimensions").has("minecraft:overworld")); + } + @Test void mineralogyIsOptionalAndOnlyRawRocksJoinTheMaficTag() throws Exception { + JsonObject tag=JsonParser.parseString(Files.readString(ROOT.resolve("src/main/resources/data/basemetals/tags/block/ore_hosts/mafic.json"))).getAsJsonObject(); + assertEquals(2,tag.getAsJsonArray("values").size()); + for(var value:tag.getAsJsonArray("values")) { + assertFalse(value.getAsJsonObject().get("required").getAsBoolean()); + assertTrue(value.getAsJsonObject().get("id").getAsString().matches("mineralogy:(gabbro|peridotite)")); + } + } +}