From 5bc6fb0fe5c63d5f2c822ed1823e8460bbeb1104 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 9 Jan 2024 17:36:27 +0700 Subject: [PATCH] ore fixes --- .../vein/deep_magnetite.json | 2 +- .../vein/deep_naquadah.json | 2 +- .../vein/normal_beryllium.json | 24 +- .../vein/normal_garnierite.json | 8 +- .../vein/normal_lubricant.json | 24 +- .../vein/normal_oilsands.json | 90 +++++++ .../vein/normal_olivine.json | 14 +- .../vein/normal_spodumene.json | 221 ++++++++++++++++++ .../vein/surface_copper.json | 24 +- .../placed_feature/vein/normal_oilsands.json | 4 + .../placed_feature/vein/normal_spodumene.json | 4 + kubejs/server_scripts/tfc/tags.js | 2 + 12 files changed, 394 insertions(+), 25 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/vein/normal_oilsands.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/vein/normal_spodumene.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/vein/normal_oilsands.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/vein/normal_spodumene.json 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 57f0a09e0..a9f375c72 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_magnetite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_magnetite.json @@ -1,7 +1,7 @@ { "type": "tfc:cluster_vein", "config": { - "rarity": 235, + "rarity": 205, "density": 0.3, "min_y": -64, "max_y": 30, diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_naquadah.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_naquadah.json index efd95bb1f..ae246bac5 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_naquadah.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_naquadah.json @@ -1,7 +1,7 @@ { "type": "tfc:cluster_vein", "config": { - "rarity": 380, + "rarity": 310, "density": 0.25, "min_y": -64, "max_y": -20, 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 8b8c77c94..0ff3e26c5 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_beryllium.json @@ -25,7 +25,11 @@ }, { "block": "gtceu:rhyolite_emerald_ore", - "weight": 65 + "weight": 50 + }, + { + "block": "gtceu:rhyolite_thorium_ore", + "weight": 15 } ] }, @@ -40,7 +44,11 @@ }, { "block": "gtceu:basalt_emerald_ore", - "weight": 65 + "weight": 50 + }, + { + "block": "gtceu:basalt_thorium_ore", + "weight": 15 } ] }, @@ -55,7 +63,11 @@ }, { "block": "gtceu:andesite_emerald_ore", - "weight": 65 + "weight": 50 + }, + { + "block": "gtceu:andesite_thorium_ore", + "weight": 15 } ] }, @@ -70,7 +82,11 @@ }, { "block": "gtceu:dacite_emerald_ore", - "weight": 65 + "weight": 50 + }, + { + "block": "gtceu:dacite_thorium_ore", + "weight": 15 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnierite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnierite.json index a00fc8cd6..b213d644c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnierite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnierite.json @@ -15,7 +15,7 @@ "with": [ { "block": "gtceu:gabbro_garnierite_ore", - "weight": 40 + "weight": 30 }, { "block": "gtceu:gabbro_nickel_ore", @@ -27,7 +27,11 @@ }, { "block": "gtceu:gabbro_pentlandite_ore", - "weight": 30 + "weight": 25 + }, + { + "block": "gtceu:gabbro_cobalt_ore", + "weight": 15 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lubricant.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lubricant.json index 32877b425..5248cc9bf 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lubricant.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lubricant.json @@ -15,11 +15,11 @@ "with": [ { "block": "gtceu:granite_soapstone_ore", - "weight": 35 + "weight": 30 }, { "block": "gtceu:granite_talc_ore", - "weight": 25 + "weight": 20 }, { "block": "gtceu:granite_glauconite_sand_ore", @@ -28,6 +28,10 @@ { "block": "gtceu:granite_pentlandite_ore", "weight": 15 + }, + { + "block": "gtceu:granite_trona_ore", + "weight": 10 } ] }, @@ -38,11 +42,11 @@ "with": [ { "block": "gtceu:diorite_soapstone_ore", - "weight": 35 + "weight": 30 }, { "block": "gtceu:diorite_talc_ore", - "weight": 25 + "weight": 20 }, { "block": "gtceu:diorite_glauconite_sand_ore", @@ -51,6 +55,10 @@ { "block": "gtceu:diorite_pentlandite_ore", "weight": 15 + }, + { + "block": "gtceu:diorite_trona_ore", + "weight": 10 } ] }, @@ -61,11 +69,11 @@ "with": [ { "block": "gtceu:gabbro_soapstone_ore", - "weight": 35 + "weight": 30 }, { "block": "gtceu:gabbro_talc_ore", - "weight": 25 + "weight": 20 }, { "block": "gtceu:gabbro_glauconite_sand_ore", @@ -74,6 +82,10 @@ { "block": "gtceu:gabbro_pentlandite_ore", "weight": 15 + }, + { + "block": "gtceu:gabbro_trona_ore", + "weight": 10 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_oilsands.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_oilsands.json new file mode 100644 index 000000000..c8ac7aca6 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_oilsands.json @@ -0,0 +1,90 @@ +{ + "type": "tfc:cluster_vein", + "config": { + "rarity": 170, + "density": 0.3, + "min_y": 20, + "max_y": 70, + "size": 55, + "random_name": "normal_oilsands", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/shale" + ], + "with": [ + { + "block": "gtceu:shale_oilsands_ore", + "weight": 100 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/claystone" + ], + "with": [ + { + "block": "gtceu:claystone_oilsands_ore", + "weight": 100 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/limestone" + ], + "with": [ + { + "block": "gtceu:limestone_oilsands_ore", + "weight": 100 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/conglomerate" + ], + "with": [ + { + "block": "gtceu:conglomerate_oilsands_ore", + "weight": 100 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dolomite" + ], + "with": [ + { + "block": "gtceu:dolomite_oilsands_ore", + "weight": 100 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chert" + ], + "with": [ + { + "block": "gtceu:chert_oilsands_ore", + "weight": 100 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chalk" + ], + "with": [ + { + "block": "gtceu:chalk_oilsands_ore", + "weight": 100 + } + ] + } + ] + } +} \ No newline at end of file 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 ad4ef4618..11114ea15 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_olivine.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_olivine.json @@ -18,7 +18,7 @@ "weight": 35 }, { - "block": "gtceu:rhyolite_magnetite_ore", + "block": "gtceu:rhyolite_magnesite_ore", "weight": 25 }, { @@ -41,7 +41,7 @@ "weight": 35 }, { - "block": "gtceu:basalt_magnetite_ore", + "block": "gtceu:basalt_magnesite_ore", "weight": 25 }, { @@ -64,7 +64,7 @@ "weight": 35 }, { - "block": "gtceu:andesite_magnetite_ore", + "block": "gtceu:andesite_magnesite_ore", "weight": 25 }, { @@ -87,7 +87,7 @@ "weight": 35 }, { - "block": "gtceu:dacite_magnetite_ore", + "block": "gtceu:dacite_magnesite_ore", "weight": 25 }, { @@ -110,7 +110,7 @@ "weight": 35 }, { - "block": "gtceu:granite_magnetite_ore", + "block": "gtceu:granite_magnesite_ore", "weight": 25 }, { @@ -133,7 +133,7 @@ "weight": 35 }, { - "block": "gtceu:diorite_magnetite_ore", + "block": "gtceu:diorite_magnesite_ore", "weight": 25 }, { @@ -156,7 +156,7 @@ "weight": 35 }, { - "block": "gtceu:gabbro_magnetite_ore", + "block": "gtceu:gabbro_magnesite_ore", "weight": 25 }, { diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_spodumene.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_spodumene.json new file mode 100644 index 000000000..2075f8fce --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_spodumene.json @@ -0,0 +1,221 @@ +{ + "type": "tfc:disc_vein", + "config": { + "rarity": 180, + "density": 0.375, + "min_y": 20, + "max_y": 60, + "size": 35, + "height": 6, + "random_name": "normal_spodumene", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/granite" + ], + "with": [ + { + "block": "gtceu:granite_rock_salt_ore", + "weight": 20 + }, + { + "block": "gtceu:granite_salt_ore", + "weight": 30 + }, + { + "block": "gtceu:granite_lepidolite_ore", + "weight": 15 + }, + { + "block": "gtceu:granite_spodumene_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/diorite" + ], + "with": [ + { + "block": "gtceu:diorite_rock_salt_ore", + "weight": 20 + }, + { + "block": "gtceu:diorite_salt_ore", + "weight": 30 + }, + { + "block": "gtceu:diorite_lepidolite_ore", + "weight": 15 + }, + { + "block": "gtceu:diorite_spodumene_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/gabbro" + ], + "with": [ + { + "block": "gtceu:gabbro_rock_salt_ore", + "weight": 20 + }, + { + "block": "gtceu:gabbro_salt_ore", + "weight": 30 + }, + { + "block": "gtceu:gabbro_lepidolite_ore", + "weight": 15 + }, + { + "block": "gtceu:gabbro_spodumene_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_rock_salt_ore", + "weight": 20 + }, + { + "block": "gtceu:quartzite_salt_ore", + "weight": 30 + }, + { + "block": "gtceu:quartzite_lepidolite_ore", + "weight": 15 + }, + { + "block": "gtceu:quartzite_spodumene_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/slate" + ], + "with": [ + { + "block": "gtceu:slate_rock_salt_ore", + "weight": 20 + }, + { + "block": "gtceu:slate_salt_ore", + "weight": 30 + }, + { + "block": "gtceu:slate_lepidolite_ore", + "weight": 15 + }, + { + "block": "gtceu:slate_spodumene_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/phyllite" + ], + "with": [ + { + "block": "gtceu:phyllite_rock_salt_ore", + "weight": 20 + }, + { + "block": "gtceu:phyllite_salt_ore", + "weight": 30 + }, + { + "block": "gtceu:phyllite_lepidolite_ore", + "weight": 15 + }, + { + "block": "gtceu:phyllite_spodumene_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/schist" + ], + "with": [ + { + "block": "gtceu:schist_rock_salt_ore", + "weight": 20 + }, + { + "block": "gtceu:schist_salt_ore", + "weight": 30 + }, + { + "block": "gtceu:schist_lepidolite_ore", + "weight": 15 + }, + { + "block": "gtceu:schist_spodumene_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/gneiss" + ], + "with": [ + { + "block": "gtceu:gneiss_rock_salt_ore", + "weight": 20 + }, + { + "block": "gtceu:gneiss_salt_ore", + "weight": 30 + }, + { + "block": "gtceu:gneiss_lepidolite_ore", + "weight": 15 + }, + { + "block": "gtceu:gneiss_spodumene_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/marble" + ], + "with": [ + { + "block": "gtceu:marble_rock_salt_ore", + "weight": 20 + }, + { + "block": "gtceu:marble_salt_ore", + "weight": 30 + }, + { + "block": "gtceu:marble_lepidolite_ore", + "weight": 15 + }, + { + "block": "gtceu:marble_spodumene_ore", + "weight": 35 + } + ] + } + ] + } +} \ No newline at end of file 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 c2c34cc8d..06ef4a2c4 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/surface_copper.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/surface_copper.json @@ -15,7 +15,7 @@ "with": [ { "block": "gtceu:rhyolite_chalcopyrite_ore", - "weight": 70 + "weight": 55 }, { "block": "gtceu:rhyolite_zeolite_ore", @@ -24,6 +24,10 @@ { "block": "gtceu:rhyolite_cassiterite_ore", "weight": 5 + }, + { + "block": "gtceu:rhyolite_realgar_ore", + "weight": 15 } ] }, @@ -34,7 +38,7 @@ "with": [ { "block": "gtceu:basalt_chalcopyrite_ore", - "weight": 70 + "weight": 55 }, { "block": "gtceu:basalt_zeolite_ore", @@ -43,6 +47,10 @@ { "block": "gtceu:basalt_cassiterite_ore", "weight": 5 + }, + { + "block": "gtceu:basalt_realgar_ore", + "weight": 15 } ] }, @@ -53,7 +61,7 @@ "with": [ { "block": "gtceu:andesite_chalcopyrite_ore", - "weight": 70 + "weight": 55 }, { "block": "gtceu:andesite_zeolite_ore", @@ -62,6 +70,10 @@ { "block": "gtceu:andesite_cassiterite_ore", "weight": 5 + }, + { + "block": "gtceu:andesite_realgar_ore", + "weight": 15 } ] }, @@ -72,7 +84,7 @@ "with": [ { "block": "gtceu:dacite_chalcopyrite_ore", - "weight": 70 + "weight": 55 }, { "block": "gtceu:dacite_zeolite_ore", @@ -81,6 +93,10 @@ { "block": "gtceu:dacite_cassiterite_ore", "weight": 5 + }, + { + "block": "gtceu:dacite_realgar_ore", + "weight": 15 } ] } diff --git a/kubejs/data/tfg/worldgen/placed_feature/vein/normal_oilsands.json b/kubejs/data/tfg/worldgen/placed_feature/vein/normal_oilsands.json new file mode 100644 index 000000000..b93414bf7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/vein/normal_oilsands.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:vein/normal_oilsands", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/vein/normal_spodumene.json b/kubejs/data/tfg/worldgen/placed_feature/vein/normal_spodumene.json new file mode 100644 index 000000000..090e0f59b --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/vein/normal_spodumene.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:vein/normal_spodumene", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 4aced4a3d..822866b45 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -317,6 +317,8 @@ const registerTFCPlacedFeatures = (event) => { event.add('tfc:in_biome/veins', 'tfg:vein/normal_gold') event.add('tfc:in_biome/veins', 'tfg:vein/normal_graphite') event.add('tfc:in_biome/veins', 'tfg:vein/normal_hematite') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_spodumene') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_oil_sands') event.add('tfc:in_biome/veins', 'tfg:vein/normal_lapis') event.add('tfc:in_biome/veins', 'tfg:vein/normal_limonite') event.add('tfc:in_biome/veins', 'tfg:vein/normal_lubricant')