diff --git a/TODO.md b/TODO.md index d648c37..986ae3a 100644 --- a/TODO.md +++ b/TODO.md @@ -10,14 +10,6 @@ Start by creating a list of needed mods ## Datapack -* Worldgen - * Ores - * Overworld (gold/iron/etc) - * geophilic - * install - * disable rocks - * Amplified nether - * Amplified nether height * Recipes * Antique Atlas/alternative mod * Advancements diff --git a/modrinth.index.json b/modrinth.index.json index 21e449f..0a4648a 100644 --- a/modrinth.index.json +++ b/modrinth.index.json @@ -232,6 +232,21 @@ "sha512": "45403bbdbe35c27b9bd9beb720f0299d652144a99a841b205fdc123dc5475d707ec7a8c9e21352a7f1064fdfbcc16e0b838c854bd97cd48771623c8995c9a21e" }, "path": "mods/ikwid-1.0_1.21.jar" + }, + { + "downloads": [ + "https://cdn.modrinth.com/data/hl5OLM95/versions/Vk4cYx6F/Geophilic v3.4.6.mod.jar" + ], + "env": { + "client": "required", + "server": "required" + }, + "fileSize": 751598, + "hashes": { + "sha1": "cea812a101e7dd130d130ca43d7ee4d1a227cbd5", + "sha512": "5d0ac03046a6524f015c6c380e5fce59d8b763eec5fd5b6b301d67418d25a726088e94d96381ec577425d03f7d70c3b711cfd13eea29e7a48a02e95a5fb11065" + }, + "path": "mods/Geophilic v3.4.6.mod.jar" } ] } diff --git a/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/_legacy/plains_rock.json b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/_legacy/plains_rock.json new file mode 100644 index 0000000..29c2a2d --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/_legacy/plains_rock.json @@ -0,0 +1,6 @@ +{ + "type": "minecraft:replace_single_block", + "config": { + "targets": [] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/biome_specific/cherry_grove/stone_rock.json b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/biome_specific/cherry_grove/stone_rock.json new file mode 100644 index 0000000..29c2a2d --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/biome_specific/cherry_grove/stone_rock.json @@ -0,0 +1,6 @@ +{ + "type": "minecraft:replace_single_block", + "config": { + "targets": [] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/cobblestone.json b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/cobblestone.json new file mode 100644 index 0000000..29c2a2d --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/cobblestone.json @@ -0,0 +1,6 @@ +{ + "type": "minecraft:replace_single_block", + "config": { + "targets": [] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/mossy_cobblestone.json b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/mossy_cobblestone.json new file mode 100644 index 0000000..29c2a2d --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/mossy_cobblestone.json @@ -0,0 +1,6 @@ +{ + "type": "minecraft:replace_single_block", + "config": { + "targets": [] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/ore.json b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/ore.json new file mode 100644 index 0000000..29c2a2d --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/ore.json @@ -0,0 +1,6 @@ +{ + "type": "minecraft:replace_single_block", + "config": { + "targets": [] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/red_sandstone.json b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/red_sandstone.json new file mode 100644 index 0000000..29c2a2d --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/red_sandstone.json @@ -0,0 +1,6 @@ +{ + "type": "minecraft:replace_single_block", + "config": { + "targets": [] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/sandstone.json b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/sandstone.json new file mode 100644 index 0000000..29c2a2d --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/sandstone.json @@ -0,0 +1,6 @@ +{ + "type": "minecraft:replace_single_block", + "config": { + "targets": [] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/stone.json b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/stone.json new file mode 100644 index 0000000..29c2a2d --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/geophilic/worldgen/configured_feature/rock/stone.json @@ -0,0 +1,6 @@ +{ + "type": "minecraft:replace_single_block", + "config": { + "targets": [] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/worldgen/configured_feature/ore_iron_upper.json b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/worldgen/configured_feature/ore_iron_upper.json new file mode 100644 index 0000000..4ac5dcc --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/worldgen/configured_feature/ore_iron_upper.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 1.0, + "size": 9, + "targets": [ + { + "state": { + "Name": "minecraft:iron_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + }, + { + "state": { + "Name": "minecraft:deepslate_iron_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/worldgen/placed_feature/ore_coal_lowest.json b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/worldgen/placed_feature/ore_coal_lowest.json new file mode 100644 index 0000000..30f60b4 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/worldgen/placed_feature/ore_coal_lowest.json @@ -0,0 +1,16 @@ +{ + "feature": "minecraft:ore_coal", + "placement": [ + {"type": "minecraft:count", "count": 1}, + {"type": "minecraft:in_square"}, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": {"above_bottom": 0}, + "max_inclusive": {"above_bottom": 9} + } + }, + {"type": "minecraft:biome"} + ] +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/configured_feature/ore_gold.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/configured_feature/ore_gold.json new file mode 100644 index 0000000..7ae8d72 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/configured_feature/ore_gold.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.5, + "size": 3, + "targets": [ + { + "state": { + "Name": "minecraft:gold_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + }, + { + "state": { + "Name": "minecraft:deepslate_gold_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/configured_feature/ore_gold_buried.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/configured_feature/ore_gold_buried.json new file mode 100644 index 0000000..f3333a2 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/configured_feature/ore_gold_buried.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.7, + "size": 5, + "targets": [ + { + "state": { + "Name": "minecraft:gold_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + }, + { + "state": { + "Name": "minecraft:deepslate_gold_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/configured_feature/ore_iron.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/configured_feature/ore_iron.json new file mode 100644 index 0000000..557b323 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/configured_feature/ore_iron.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.2, + "size": 7, + "targets": [ + { + "state": { + "Name": "minecraft:iron_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + }, + { + "state": { + "Name": "minecraft:deepslate_iron_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/noise_settings/amplified.json.patch b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/noise_settings/amplified.json.patch new file mode 100644 index 0000000..be815a1 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/noise_settings/amplified.json.patch @@ -0,0 +1,5 @@ +{ + "op": "add", + "path": "/ore_veins_enabled", + "value": false +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/noise_settings/large_biomes.json.patch b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/noise_settings/large_biomes.json.patch new file mode 100644 index 0000000..be815a1 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/noise_settings/large_biomes.json.patch @@ -0,0 +1,5 @@ +{ + "op": "add", + "path": "/ore_veins_enabled", + "value": false +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/noise_settings/overworld.json.patch b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/noise_settings/overworld.json.patch new file mode 100644 index 0000000..be815a1 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/noise_settings/overworld.json.patch @@ -0,0 +1,5 @@ +{ + "op": "add", + "path": "/ore_veins_enabled", + "value": false +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_gold.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_gold.json new file mode 100644 index 0000000..819579c --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_gold.json @@ -0,0 +1,27 @@ +{ + "feature": "minecraft:ore_gold_buried", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 8 + }, + "min_inclusive": { + "above_bottom": 10 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_gold_extra.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_gold_extra.json new file mode 100644 index 0000000..5e7f701 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_gold_extra.json @@ -0,0 +1,27 @@ +{ + "feature": "minecraft:ore_gold", + "placement": [ + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 8 + }, + "min_inclusive": { + "above_bottom": 10 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_gold_lower.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_gold_lower.json new file mode 100644 index 0000000..bc11258 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_gold_lower.json @@ -0,0 +1,27 @@ +{ + "feature": "minecraft:ore_gold_buried", + "placement": [ + { + "type": "minecraft:count", + "count": 4 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": -16 + }, + "min_inclusive": { + "above_bottom": 10 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_iron_small.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_iron_small.json new file mode 100644 index 0000000..6b839c9 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_iron_small.json @@ -0,0 +1,27 @@ +{ + "feature": "minecraft:ore_iron_small", + "placement": [ + { + "type": "minecraft:count", + "count": 12 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 62 + }, + "min_inclusive": { + "above_bottom": 10 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_iron_upper.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_iron_upper.json new file mode 100644 index 0000000..2c72fe8 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_iron_upper.json @@ -0,0 +1,27 @@ +{ + "feature": "mc_rebalance:ore_iron_upper", + "placement": [ + { + "type": "minecraft:count", + "count": 90 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 384 + }, + "min_inclusive": { + "absolute": 80 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_redstone.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_redstone.json new file mode 100644 index 0000000..e6ec50a --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/worldgen/placed_feature/ore_redstone.json @@ -0,0 +1,16 @@ +{ + "feature": "minecraft:ore_redstone", + "placement": [ + {"type": "minecraft:count","count": 13}, + {"type": "minecraft:in_square"}, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": {"above_bottom": 0}, + "max_inclusive": {"above_bottom": 9} + } + }, + {"type": "minecraft:biome"} + ] +} diff --git a/overrides/global_packs/mc_rebalance_datapack/pack.mcmeta b/overrides/global_packs/mc_rebalance_datapack/pack.mcmeta index 22fc7c8..16cd5d1 100644 --- a/overrides/global_packs/mc_rebalance_datapack/pack.mcmeta +++ b/overrides/global_packs/mc_rebalance_datapack/pack.mcmeta @@ -9,7 +9,17 @@ "patch_targets": [ { "pack_type": "server_data", - "patch": "nether_ores", + "patch": "coal_ore_lowest", + "targets": [{ + "namespace": ["minecraft"], + "path": [ + {"pattern": "worldgen/biome/.*\\.json"} + ] + }] + }, + { + "pack_type": "server_data", + "patch": "nether_diamond_ore", "targets": [{ "namespace": ["minecraft"], "path": [ @@ -23,7 +33,7 @@ }, { "pack_type": "server_data", - "patch": "end_ores", + "patch": "end_netherite_ore", "targets": [{ "namespace": ["minecraft"], "path": [ diff --git a/overrides/global_packs/mc_rebalance_datapack/patches/coal_ore_lowest.json.patch b/overrides/global_packs/mc_rebalance_datapack/patches/coal_ore_lowest.json.patch new file mode 100644 index 0000000..bfe03d3 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/patches/coal_ore_lowest.json.patch @@ -0,0 +1,12 @@ +[ + { + "op": "test", + "path": "/features/6/10", + "value": "minecraft:ore_coal_lower" + }, + { + "op": "add", + "path": "/features/6/-", + "value": "mc_rebalance:ore_coal_lowest" + } +] diff --git a/overrides/global_packs/mc_rebalance_datapack/patches/end_ores.json.patch b/overrides/global_packs/mc_rebalance_datapack/patches/end_netherite_ore.json.patch similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/patches/end_ores.json.patch rename to overrides/global_packs/mc_rebalance_datapack/patches/end_netherite_ore.json.patch diff --git a/overrides/global_packs/mc_rebalance_datapack/patches/nether_ores.json.patch b/overrides/global_packs/mc_rebalance_datapack/patches/nether_diamond_ore.json.patch similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/patches/nether_ores.json.patch rename to overrides/global_packs/mc_rebalance_datapack/patches/nether_diamond_ore.json.patch