diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_garnet_amethyst.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_garnet_amethyst.json index 6a171d364..f8a3267d8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_garnet_amethyst.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_garnet_amethyst.json @@ -317,15 +317,51 @@ "blocks": [ { "block": "minecraft:small_amethyst_bud", - "weight": 50 - }, - { - "block": "minecraft:medium_amethyst_bud", "weight": 30 }, { - "block": "minecraft:large_amethyst_bud", + "block": "minecraft:medium_amethyst_bud", "weight": 20 + }, + { + "block": "minecraft:large_amethyst_bud", + "weight": 15 + }, + { + "block": "tfg:buds/small_red_garnet_bud", + "weight": 3 + }, + { + "block": "tfg:buds/medium_red_garnet_bud", + "weight": 2 + }, + { + "block": "tfg:buds/large_red_garnet_bud", + "weight": 1 + }, + { + "block": "tfg:buds/small_yellow_garnet_bud", + "weight": 7 + }, + { + "block": "tfg:buds/medium_yellow_garnet_bud", + "weight": 5 + }, + { + "block": "tfg:buds/large_yellow_garnet_bud", + "weight": 3 + }, + { + "block": "tfg:buds/small_opal_bud", + "weight": 7 + }, + { + "block": "tfg:buds/medium_opal_bud", + "weight": 5 + }, + { + "block": "tfg:buds/large_opal_bud", + "weight": 3 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_garnet_opal.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_garnet_opal.json index 86b7cf4b4..5752b0a7b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_garnet_opal.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_garnet_opal.json @@ -179,15 +179,51 @@ "blocks": [ { "block": "minecraft:small_amethyst_bud", - "weight": 50 + "weight": 15 }, { "block": "minecraft:medium_amethyst_bud", - "weight": 30 + "weight": 10 }, { "block": "minecraft:large_amethyst_bud", - "weight": 20 + "weight": 5 + }, + { + "block": "tfg:buds/small_red_garnet_bud", + "weight": 3 + }, + { + "block": "tfg:buds/medium_red_garnet_bud", + "weight": 2 + }, + { + "block": "tfg:buds/large_red_garnet_bud", + "weight": 1 + }, + { + "block": "tfg:buds/small_yellow_garnet_bud", + "weight": 7 + }, + { + "block": "tfg:buds/medium_yellow_garnet_bud", + "weight": 5 + }, + { + "block": "tfg:buds/large_yellow_garnet_bud", + "weight": 3 + }, + { + "block": "tfg:buds/small_opal_bud", + "weight": 30 + }, + { + "block": "tfg:buds/medium_opal_bud", + "weight": 12 + }, + { + "block": "tfg:buds/large_opal_bud", + "weight": 8 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_hematite.json index 0f8d67d38..b81c574be 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_hematite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_hematite.json @@ -134,6 +134,18 @@ { "block": "tfc:ore/small_native_gold", "weight": 20 + }, + { + "block": "tfg:buds/small_ruby_bud", + "weight": 7 + }, + { + "block": "tfg:buds/medium_ruby_bud", + "weight": 5 + }, + { + "block": "tfg:buds/large_ruby_bud", + "weight": 3 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_magnetite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_magnetite.json index b5bf65ada..b10355562 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_magnetite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_magnetite.json @@ -217,8 +217,16 @@ "weight": 60 }, { - "block": "gtceu:sapphire_indicator", - "weight": 10 + "block": "tfg:buds/small_sapphire_bud", + "weight": 3 + }, + { + "block": "tfg:buds/medium_sapphire_bud", + "weight": 2 + }, + { + "block": "tfg:buds/large_sapphire_bud", + "weight": 1 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_sapphire.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_sapphire.json index d9341c048..60c9b494d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_sapphire.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_sapphire.json @@ -1,7 +1,7 @@ { "type": "tfc:disc_vein", "config": { - "rarity": 280, + "rarity": 180, "density": 0.35, "min_y": -64, "max_y": 26, @@ -109,20 +109,52 @@ "underground_count": 500, "blocks": [ { - "block": "gtceu:almandine_indicator", - "weight": 35 + "block": "tfg:buds/small_almandine_bud", + "weight": 20 }, { - "block": "gtceu:pyrope_indicator", - "weight": 25 + "block": "tfg:buds/medium_almandine_bud", + "weight": 12 }, { - "block": "gtceu:sapphire_indicator", - "weight": 15 + "block": "tfg:buds/large_almandine_bud", + "weight": 8 }, { - "block": "gtceu:green_sapphire_indicator", - "weight": 15 + "block": "tfg:buds/small_pyrope_bud", + "weight": 10 + }, + { + "block": "tfg:buds/medium_pyrope_bud", + "weight": 6 + }, + { + "block": "tfg:buds/large_pyrope_bud", + "weight": 4 + }, + { + "block": "tfg:buds/small_sapphire_bud", + "weight": 7 + }, + { + "block": "tfg:buds/medium_sapphire_bud", + "weight": 5 + }, + { + "block": "tfg:buds/large_sapphire_bud", + "weight": 3 + }, + { + "block": "tfg:buds/small_green_sapphire_bud", + "weight": 7 + }, + { + "block": "tfg:buds/medium_green_sapphire_bud", + "weight": 5 + }, + { + "block": "tfg:buds/large_green_sapphire_bud", + "weight": 3 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_topaz.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_topaz.json index ec85c9e4d..bc9d5d224 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_topaz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_topaz.json @@ -155,20 +155,36 @@ "underground_count": 500, "blocks": [ { - "block": "gtceu:blue_topaz_indicator", - "weight": 35 - }, - { - "block": "gtceu:topaz_indicator", - "weight": 25 - }, - { "block": "gtceu:chalcocite_indicator", "weight": 25 }, { "block": "gtceu:bornite_indicator", "weight": 15 + }, + { + "block": "tfg:buds/small_blue_topaz_bud", + "weight": 20 + }, + { + "block": "tfg:buds/medium_blue_topaz_bud", + "weight": 10 + }, + { + "block": "tfg:buds/large_blue_topaz_bud", + "weight": 10 + }, + { + "block": "tfg:buds/small_topaz_bud", + "weight": 15 + }, + { + "block": "tfg:buds/medium_topaz_bud", + "weight": 10 + }, + { + "block": "tfg:buds/large_topaz_bud", + "weight": 5 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_apatite_.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_apatite_.json index f5f467fd7..b94c36a08 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_apatite_.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_apatite_.json @@ -181,22 +181,30 @@ } ], "indicator": { - "rarity": 12, + "rarity": 4, "depth": 35, "underground_rarity": 40, "underground_count": 200, "blocks": [ { - "block": "gtceu:apatite_indicator", - "weight": 50 - }, - { "block": "gtceu:tricalcium_phosphate_indicator", "weight": 35 }, { "block": "gtceu:pyrochlore_indicator", "weight": 15 + }, + { + "block": "tfg:buds/small_apatite_bud", + "weight": 30 + }, + { + "block": "tfg:buds/medium_apatite_bud", + "weight": 20 + }, + { + "block": "tfg:buds/large_apatite_bud", + "weight": 10 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_bauxite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_bauxite.json index 735da885b..cb91fbb5e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_bauxite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_bauxite.json @@ -143,7 +143,7 @@ } ], "indicator": { - "rarity": 12, + "rarity": 10, "depth": 35, "underground_rarity": 40, "underground_count": 200, @@ -159,6 +159,18 @@ { "block": "gtceu:aluminium_indicator", "weight": 25 + }, + { + "block": "tfg:buds/small_rutile_bud", + "weight": 10 + }, + { + "block": "tfg:buds/medium_rutile_bud", + "weight": 7 + }, + { + "block": "tfg:buds/large_rutile_bud", + "weight": 4 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_beryllium.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_beryllium.json index a83ecb372..f8e5b2b11 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_beryllium.json @@ -102,11 +102,19 @@ "weight": 35 }, { - "block": "gtceu:emerald_indicator", - "weight": 50 + "block": "gtceu:thorium_indicator", + "weight": 15 }, { - "block": "gtceu:thorium_indicator", + "block": "tfg:buds/small_emerald_bud", + "weight": 35 + }, + { + "block": "tfg:buds/medium_emerald_bud", + "weight": 25 + }, + { + "block": "tfg:buds/large_emerald_bud", "weight": 15 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_certus_quartz.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_certus_quartz.json index a7acce5cd..331a1c1cf 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_certus_quartz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_certus_quartz.json @@ -102,22 +102,50 @@ } ], "indicator": { - "rarity": 5, + "rarity": 3, "depth": 40, "underground_rarity": 40, "underground_count": 200, "blocks": [ + { + "block": "gtceu:barite_indicator", + "weight": 20 + }, { "block": "ae2:small_quartz_bud", - "weight": 50 + "weight": 20 }, { "block": "ae2:medium_quartz_bud", - "weight": 30 + "weight": 10 }, { "block": "ae2:large_quartz_bud", - "weight": 20 + "weight": 5 + }, + { + "block": "tfg:buds/small_quartzite_bud", + "weight": 30 + }, + { + "block": "tfg:buds/medium_quartzite_bud", + "weight": 15 + }, + { + "block": "tfg:buds/large_quartzite_bud", + "weight": 10 + }, + { + "block": "tfg:buds/small_nether_quartz_bud", + "weight": 10 + }, + { + "block": "tfg:buds/medium_nether_quartz_bud", + "weight": 6 + }, + { + "block": "tfg:buds/large_nether_quartz_bud", + "weight": 4 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_graphite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_graphite.json index cdb44e2d7..0aca3e254 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_graphite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_graphite.json @@ -35,22 +35,30 @@ } ], "indicator": { - "rarity": 12, - "depth": 50, + "rarity": 15, + "depth": 60, "underground_rarity": 40, "underground_count": 200, "blocks": [ { - "block": "gtceu:diamond_indicator", - "weight": 25 - }, - { "block": "gtceu:graphite_indicator", "weight": 45 }, { "block": "gtceu:coal_indicator", "weight": 39 + }, + { + "block": "tfg:buds/small_diamond_bud", + "weight": 12 + }, + { + "block": "tfg:buds/medium_diamond_bud", + "weight": 8 + }, + { + "block": "tfg:buds/large_diamond_bud", + "weight": 6 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lapis.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lapis.json index 5f38d8342..74d38f65f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lapis.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lapis.json @@ -148,26 +148,50 @@ } ], "indicator": { - "rarity": 12, + "rarity": 4, "depth": 35, "underground_rarity": 40, "underground_count": 200, "blocks": [ { - "block": "gtceu:lazurite_indicator", - "weight": 35 - }, - { - "block": "gtceu:sodalite_indicator", - "weight": 25 - }, - { - "block": "gtceu:lapis_indicator", - "weight": 25 - }, - { "block": "gtceu:calcite_indicator", "weight": 15 + }, + { + "block": "tfg:buds/small_lazurite_bud", + "weight": 30 + }, + { + "block": "tfg:buds/medium_lazurite_bud", + "weight": 20 + }, + { + "block": "tfg:buds/large_lazurite_bud", + "weight": 10 + }, + { + "block": "tfg:buds/small_sodalite_bud", + "weight": 20 + }, + { + "block": "tfg:buds/medium_sodalite_bud", + "weight": 12 + }, + { + "block": "tfg:buds/large_sodalite_bud", + "weight": 8 + }, + { + "block": "tfg:buds/small_lapis_bud", + "weight": 20 + }, + { + "block": "tfg:buds/medium_lapis_bud", + "weight": 12 + }, + { + "block": "tfg:buds/large_lapis_bud", + "weight": 8 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_manganese.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_manganese.json index cbd26e90e..80dce41ee 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_manganese.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_manganese.json @@ -268,14 +268,6 @@ "underground_rarity": 40, "underground_count": 200, "blocks": [ - { - "block": "gtceu:grossular_indicator", - "weight": 30 - }, - { - "block": "gtceu:spessartine_indicator", - "weight": 20 - }, { "block": "gtceu:pyrolusite_indicator", "weight": 20 @@ -283,6 +275,30 @@ { "block": "gtceu:tantalite_indicator", "weight": 10 + }, + { + "block": "tfg:buds/small_grossular_bud", + "weight": 16 + }, + { + "block": "tfg:buds/medium_grossular_bud", + "weight": 9 + }, + { + "block": "tfg:buds/large_grossular_bud", + "weight": 5 + }, + { + "block": "tfg:buds/small_spessartine_bud", + "weight": 10 + }, + { + "block": "tfg:buds/medium_spessartine_bud", + "weight": 7 + }, + { + "block": "tfg:buds/large_spessartine_bud", + "weight": 3 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_monazite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_monazite.json index 1a5ab5a36..ceae21cd4 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_monazite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_monazite.json @@ -77,12 +77,20 @@ "weight": 50 }, { - "block": "gtceu:monazite_indicator", + "block": "gtceu:neodymium_indicator", "weight": 25 }, { - "block": "gtceu:neodymium_indicator", - "weight": 25 + "block": "tfg:buds/small_monazite_bud", + "weight": 14 + }, + { + "block": "tfg:buds/medium_monazite_bud", + "weight": 8 + }, + { + "block": "tfg:buds/large_monazite_bud", + "weight": 5 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_olivine.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_olivine.json index 27a83d025..6cae8009d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_olivine.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_olivine.json @@ -183,14 +183,22 @@ { "block": "gtceu:magnesite_indicator", "weight": 25 - }, - { - "block": "gtceu:olivine_indicator", - "weight": 25 }, { "block": "gtceu:glauconite_sand_indicator", "weight": 15 + }, + { + "block": "tfg:buds/small_olivine_bud", + "weight": 15 + }, + { + "block": "tfg:buds/medium_olivine_bud", + "weight": 10 + }, + { + "block": "tfg:buds/large_olivine_bud", + "weight": 5 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_redstone.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_redstone.json index c340cc0ac..e4709403c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_redstone.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_redstone.json @@ -29,22 +29,38 @@ } ], "indicator": { - "rarity": 12, + "rarity": 15, "depth": 60, "underground_rarity": 40, "underground_count": 200, "blocks": [ { "block": "minecraft:redstone_wire", - "weight": 70 + "weight": 45 }, - { - "block": "gtceu:ruby_indicator", + { + "block": "tfg:buds/small_ruby_bud", "weight": 20 }, - { - "block": "gtceu:cinnabar_indicator", + { + "block": "tfg:buds/medium_ruby_bud", + "weight": 12 + }, + { + "block": "tfg:buds/large_ruby_bud", + "weight": 8 + }, + { + "block": "tfg:buds/small_cinnabar_bud", "weight": 10 + }, + { + "block": "tfg:buds/medium_cinnabar_bud", + "weight": 6 + }, + { + "block": "tfg:buds/large_cinnabar_bud", + "weight": 4 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/surface_copper.json b/kubejs/data/tfg/worldgen/configured_feature/vein/surface_copper.json index dbc83b258..a52b24538 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/surface_copper.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/surface_copper.json @@ -116,8 +116,16 @@ "weight": 40 }, { - "block": "gtceu:realgar_indicator", - "weight": 20 + "block": "tfg:buds/small_realgar_bud", + "weight": 10 + }, + { + "block": "tfg:buds/medium_realgar_bud", + "weight": 6 + }, + { + "block": "tfg:buds/large_realgar_bud", + "weight": 4 } ] }