diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index c655b848f..2aa6312fc 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -8,5 +8,45 @@ "gtceu.alternator": "Alternator", "material.treated_wood": "Creosote-Treated Wood", - "block.gtceu.treated_wood_planks": "Creosote-Treated Wood Planks" -} \ No newline at end of file + "block.gtceu.treated_wood_planks": "Creosote-Treated Wood Planks", + + "block.gtceu.lv_kinetic_mixer": "Basic Kinetic Mixer", + "block.gtceu.mv_kinetic_mixer": "Advanced Kinetic Mixer", + "block.gtceu.hv_kinetic_mixer": "Advanced Kinetic Mixer II", + "block.gtceu.ev_kinetic_mixer": "Advanced Kinetic Mixer III", + + "block.gtceu.lv_electric_gear_box_2a": "Low Voltage 2x Gear Box", + "block.gtceu.mv_electric_gear_box_2a": "Medium Voltage 2x Gear Box", + "block.gtceu.hv_electric_gear_box_2a": "High Voltage 2x Gear Box", + "block.gtceu.ev_electric_gear_box_2a": "Extreme Voltage 2x Gear Box", + "block.gtceu.lv_electric_gear_box_8a": "Low Voltage 8x Gear Box", + "block.gtceu.mv_electric_gear_box_8a": "Medium Voltage 8x Gear Box", + "block.gtceu.hv_electric_gear_box_8a": "High Voltage 8x Gear Box", + "block.gtceu.ev_electric_gear_box_8a": "Extreme Voltage 8x Gear Box", + "block.gtceu.lv_electric_gear_box_16a": "Low Voltage 16x Gear Box", + "block.gtceu.mv_electric_gear_box_16a": "Medium Voltage 16x Gear Box", + "block.gtceu.hv_electric_gear_box_16a": "High Voltage 16x Gear Box", + "block.gtceu.ev_electric_gear_box_16a": "Extreme Voltage 16x Gear Box", + "block.gtceu.lv_electric_gear_box_32a": "Low Voltage 32x Gear Box", + "block.gtceu.mv_electric_gear_box_32a": "Medium Voltage 32x Gear Box", + "block.gtceu.hv_electric_gear_box_32a": "High Voltage 32x Gear Box", + "block.gtceu.ev_electric_gear_box_32a": "Extreme Voltage 32x Gear Box", + + "block.gtceu.lv_kinetic_input_box": "Low Voltage Kinetic Input Box", + "block.gtceu.mv_kinetic_input_box": "Medium Voltage Kinetic Input Box", + "block.gtceu.hv_kinetic_input_box": "High Voltage Kinetic Input Box", + "block.gtceu.ev_kinetic_input_box": "Extreme Voltage Kinetic Input Box", + "block.gtceu.iv_kinetic_input_box": "Insane Voltage Kinetic Input Box", + "block.gtceu.luv_kinetic_input_box": "Ludicrous Voltage Kinetic Input Box", + "block.gtceu.zpm_kinetic_input_box": "ZPM Voltage Kinetic Input Box", + "block.gtceu.uv_kinetic_input_box": "Ultimate Voltage Kinetic Input Box", + + "block.gtceu.lv_kinetic_output_box": "Low Voltage Kinetic Output Box", + "block.gtceu.mv_kinetic_output_box": "Medium Voltage Kinetic Output Box", + "block.gtceu.hv_kinetic_output_box": "High Voltage Kinetic Output Box", + "block.gtceu.ev_kinetic_output_box": "Extreme Voltage Kinetic Output Box", + "block.gtceu.iv_kinetic_output_box": "Insane Voltage Kinetic Output Box", + "block.gtceu.luv_kinetic_output_box": "Ludicrous Voltage Kinetic Output Box", + "block.gtceu.zpm_kinetic_output_box": "ZPM Voltage Kinetic Output Box", + "block.gtceu.uv_kinetic_output_box": "Ultimate Voltage Kinetic Output Box" +} diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index dfc5db90d..3a3f5f2ec 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1,4 +1,8 @@ { + "material.tfg.latex": "Latex", + "material.tfg.fluix": "Fluix", + "item.tfg.spade_head_extruder_mold": "Extruder Mold (Spade Head)", + "quests.naming-1": "t - Title", "quests.naming-2": "st - Subtitle", "quests.naming-3": "d* - Description, where * description number, for example: d1, d2, d3, d4...", 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 5c182435e..6a171d364 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 @@ -308,6 +308,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 20, + "depth": 35, + "underground_rarity": 80, + "underground_count": 1000, + "blocks": [ + { + "block": "minecraft:small_amethyst_bud", + "weight": 50 + }, + { + "block": "minecraft:medium_amethyst_bud", + "weight": 30 + }, + { + "block": "minecraft:large_amethyst_bud", + "weight": 20 + } + ] + } } } \ No newline at end of file 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 4d44ad915..86b7cf4b4 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 @@ -170,6 +170,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 20, + "depth": 35, + "underground_rarity": 80, + "underground_count": 1000, + "blocks": [ + { + "block": "minecraft:small_amethyst_bud", + "weight": 50 + }, + { + "block": "minecraft:medium_amethyst_bud", + "weight": 30 + }, + { + "block": "minecraft:large_amethyst_bud", + "weight": 20 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_gold.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_gold.json index ddab0f5d8..af3955006 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_gold.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_gold.json @@ -169,6 +169,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 1000, + "blocks": [ + { + "block": "tfc:ore/small_limonite", + "weight": 25 + }, + { + "block": "tfc:ore/small_hematite", + "weight": 25 + }, + { + "block": "tfc:ore/small_native_gold", + "weight": 50 + } + ] + } } } \ No newline at end of file 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 c354a8d12..0f8d67d38 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_hematite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_hematite.json @@ -116,6 +116,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 1000, + "blocks": [ + { + "block": "tfc:ore/small_hematite", + "weight": 40 + }, + { + "block": "tfc:ore/small_limonite", + "weight": 40 + }, + { + "block": "tfc:ore/small_native_gold", + "weight": 20 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_limonite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_limonite.json index 186db84af..e957c9495 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_limonite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_limonite.json @@ -54,6 +54,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 1000, + "blocks": [ + { + "block": "tfc:ore/small_hematite", + "weight": 30 + }, + { + "block": "tfc:ore/small_limonite", + "weight": 30 + }, + { + "block": "tfc:ore/small_malachite", + "weight": 40 + } + ] + } } } \ No newline at end of file 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 a9f375c72..b5bf65ada 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_magnetite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_magnetite.json @@ -197,6 +197,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 1000, + "blocks": [ + { + "block": "tfc:ore/small_magnetite", + "weight": 20 + }, + { + "block": "tfc:ore/small_native_gold", + "weight": 10 + }, + { + "block": "gtceu:chromite_indicator", + "weight": 60 + }, + { + "block": "gtceu:sapphire_indicator", + "weight": 10 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_molybdenum.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_molybdenum.json index 5c616d03e..a7cf92c2f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_molybdenum.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_molybdenum.json @@ -169,6 +169,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 500, + "blocks": [ + { + "block": "gtceu:wulfenite_indicator", + "weight": 40 + }, + { + "block": "gtceu:molybdenite_indicator", + "weight": 30 + }, + { + "block": "gtceu:molybdenum_indicator", + "weight": 15 + }, + { + "block": "gtceu:powellite_indicator", + "weight": 15 + } + ] + } } } \ No newline at end of file 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 ae246bac5..09f8bcbba 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_naquadah.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_naquadah.json @@ -2,10 +2,10 @@ "type": "tfc:cluster_vein", "config": { "rarity": 310, - "density": 0.25, + "density": 0.30, "min_y": -64, "max_y": -20, - "size": 22, + "size": 32, "random_name": "deep_naquadah", "blocks": [ { @@ -98,6 +98,22 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 500, + "blocks": [ + { + "block": "gtceu:naquadah_indicator", + "weight": 75 + }, + { + "block": "gtceu:plutonium_indicator", + "weight": 25 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_pitchblende.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_pitchblende.json index 2ce0d37b3..ff9b8987b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_pitchblende.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_pitchblende.json @@ -143,6 +143,22 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 500, + "blocks": [ + { + "block": "gtceu:pitchblende_indicator", + "weight": 50 + }, + { + "block": "gtceu:uraninite_indicator", + "weight": 50 + } + ] + } } } \ No newline at end of file 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 4f38d2fc0..d9341c048 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_sapphire.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_sapphire.json @@ -101,6 +101,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 500, + "blocks": [ + { + "block": "gtceu:almandine_indicator", + "weight": 35 + }, + { + "block": "gtceu:pyrope_indicator", + "weight": 25 + }, + { + "block": "gtceu:sapphire_indicator", + "weight": 15 + }, + { + "block": "gtceu:green_sapphire_indicator", + "weight": 15 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_scheelite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_scheelite.json index 60dad99ed..680c5f37c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_scheelite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_scheelite.json @@ -65,6 +65,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 500, + "blocks": [ + { + "block": "gtceu:scheelite_indicator", + "weight": 45 + }, + { + "block": "gtceu:tungstate_indicator", + "weight": 35 + }, + { + "block": "gtceu:lithium_indicator", + "weight": 20 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_sheldonite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_sheldonite.json index 6a61d6e5b..8eb70c26c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_sheldonite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_sheldonite.json @@ -146,6 +146,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 500, + "blocks": [ + { + "block": "gtceu:bornite_indicator", + "weight": 35 + }, + { + "block": "gtceu:cooperite_indicator", + "weight": 25 + }, + { + "block": "gtceu:platinum_indicator", + "weight": 25 + }, + { + "block": "gtceu:palladium_indicator", + "weight": 15 + } + ] + } } } \ No newline at end of file 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 bbbefa97b..ec85c9e4d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_topaz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_topaz.json @@ -147,6 +147,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "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 + } + ] + } } } \ No newline at end of file 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 e55526af6..f5f467fd7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_apatite_.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_apatite_.json @@ -179,6 +179,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "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 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_basaltic_sands.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_basaltic_sands.json index 630d2171c..1fc555e9a 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_basaltic_sands.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_basaltic_sands.json @@ -55,6 +55,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:basaltic_mineral_sand_indicator", + "weight": 35 + }, + { + "block": "gtceu:granitic_mineral_sand_indicator", + "weight": 25 + }, + { + "block": "gtceu:fullers_earth_indicator", + "weight": 25 + }, + { + "block": "gtceu:gypsum_indicator", + "weight": 15 + } + ] + } } } \ No newline at end of file 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 4c96d330b..735da885b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_bauxite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_bauxite.json @@ -141,6 +141,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:bauxite_indicator", + "weight": 45 + }, + { + "block": "gtceu:ilmenite_indicator", + "weight": 30 + }, + { + "block": "gtceu:aluminium_indicator", + "weight": 25 + } + ] + } } } \ No newline at end of file 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 0ff3e26c5..a83ecb372 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_beryllium.json @@ -90,6 +90,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:beryllium_indicator", + "weight": 35 + }, + { + "block": "gtceu:emerald_indicator", + "weight": 50 + }, + { + "block": "gtceu:thorium_indicator", + "weight": 15 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_bismuthinite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_bismuthinite.json index b8c2b9826..55da0b95c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_bismuthinite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_bismuthinite.json @@ -201,9 +201,9 @@ ], "indicator": { "rarity": 12, - "depth": 60, - "underground_rarity": 1, - "underground_count": 0, + "depth": 40, + "underground_rarity": 40, + "underground_count": 200, "blocks": [ { "block": "tfc:ore/small_bismuthinite", diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_cassiterite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_cassiterite.json index c0571a68e..f043908f7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_cassiterite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_cassiterite.json @@ -57,8 +57,8 @@ "indicator": { "rarity": 12, "depth": 60, - "underground_rarity": 1, - "underground_count": 0, + "underground_rarity": 40, + "underground_count": 200, "blocks": [ { "block": "tfc:ore/small_cassiterite", 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 974fd99e3..a7acce5cd 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 @@ -100,6 +100,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 5, + "depth": 40, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "ae2:small_quartz_bud", + "weight": 50 + }, + { + "block": "ae2:medium_quartz_bud", + "weight": 30 + }, + { + "block": "ae2:large_quartz_bud", + "weight": 20 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_coal.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_coal.json index 93c69ee0d..47126bde7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_coal.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_coal.json @@ -85,6 +85,18 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:coal_indicator", + "weight": 100 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_copper.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_copper.json index 9ac3958d5..dbb2bee3c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_copper.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_copper.json @@ -104,8 +104,8 @@ "indicator": { "rarity": 12, "depth": 85, - "underground_rarity": 1, - "underground_count": 0, + "underground_rarity": 40, + "underground_count": 200, "blocks": [ { "block": "tfc:ore/small_native_copper", diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnet_tin.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnet_tin.json index cd8a87579..da7a37ba4 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnet_tin.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnet_tin.json @@ -468,6 +468,18 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 60, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "tfc:ore/small_cassiterite", + "weight": 100 + } + ] + } } } \ No newline at end of file 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 3002932eb..606504638 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnierite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnierite.json @@ -39,8 +39,8 @@ "indicator": { "rarity": 12, "depth": 60, - "underground_rarity": 1, - "underground_count": 0, + "underground_rarity": 40, + "underground_count": 200, "blocks": [ { "block": "tfc:ore/small_garnierite", diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_gold.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_gold.json index c3baaa13e..b01f28c66 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_gold.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_gold.json @@ -174,12 +174,20 @@ "indicator": { "rarity": 12, "depth": 60, - "underground_rarity": 1, - "underground_count": 0, + "underground_rarity": 40, + "underground_count": 200, "blocks": [ { + "block": "tfc:ore/small_limonite", + "weight": 25 + }, + { + "block": "tfc:ore/small_hematite", + "weight": 25 + }, + { "block": "tfc:ore/small_native_gold", - "weight": 100 + "weight": 50 } ] } 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 c31c1d0fe..cdb44e2d7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_graphite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_graphite.json @@ -33,6 +33,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 50, + "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 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_hematite.json index cf40974c8..afd20c678 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_hematite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_hematite.json @@ -103,13 +103,21 @@ ], "indicator": { "rarity": 12, - "depth": 35, - "underground_rarity": 1, - "underground_count": 0, + "depth": 50, + "underground_rarity": 40, + "underground_count": 200, "blocks": [ { "block": "tfc:ore/small_hematite", - "weight": 100 + "weight": 70 + }, + { + "block": "tfc:ore/small_limonite", + "weight": 20 + }, + { + "block": "tfc:ore/small_native_gold", + "weight": 10 } ] } 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 5d287c649..5f38d8342 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lapis.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lapis.json @@ -146,6 +146,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "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 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_limonite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_limonite.json index b0e3a01e3..092a5e629 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_limonite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_limonite.json @@ -57,13 +57,21 @@ ], "indicator": { "rarity": 12, - "depth": 35, - "underground_rarity": 1, - "underground_count": 0, + "depth": 50, + "underground_rarity": 40, + "underground_count": 200, "blocks": [ { "block": "tfc:ore/small_limonite", - "weight": 100 + "weight": 65 + }, + { + "block": "tfc:ore/small_hematite", + "weight": 20 + }, + { + "block": "tfc:ore/small_malachite", + "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 5248cc9bf..55ff7f177 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lubricant.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lubricant.json @@ -89,6 +89,34 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:soapstone_indicator", + "weight": 30 + }, + { + "block": "gtceu:talc_indicator", + "weight": 20 + }, + { + "block": "gtceu:glauconite_sand_indicator", + "weight": 25 + }, + { + "block": "gtceu:pentlandite_indicator", + "weight": 15 + }, + { + "block": "gtceu:trona_indicator", + "weight": 10 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_magnetite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_magnetite.json index 74b7fc550..3f05df86a 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_magnetite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_magnetite.json @@ -145,12 +145,16 @@ "indicator": { "rarity": 12, "depth": 35, - "underground_rarity": 1, - "underground_count": 0, + "underground_rarity": 40, + "underground_count": 200, "blocks": [ { "block": "tfc:ore/small_magnetite", - "weight": 100 + "weight": 80 + }, + { + "block": "tfc:ore/small_native_gold", + "weight": 20 } ] } 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 7f3d2ceb6..cbd26e90e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_manganese.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_manganese.json @@ -261,6 +261,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 40, + "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 + }, + { + "block": "gtceu:tantalite_indicator", + "weight": 10 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_mica.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_mica.json index bd96dcf05..3fe2cf55e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_mica.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_mica.json @@ -215,6 +215,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:kyanite_indicator", + "weight": 35 + }, + { + "block": "gtceu:mica_indicator", + "weight": 25 + }, + { + "block": "gtceu:bauxite_indicator", + "weight": 25 + }, + { + "block": "gtceu:pollucite_indicator", + "weight": 15 + } + ] + } } } \ No newline at end of file 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 0086b72f3..1a5ab5a36 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_monazite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_monazite.json @@ -65,6 +65,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:bastnasite_indicator", + "weight": 50 + }, + { + "block": "gtceu:monazite_indicator", + "weight": 25 + }, + { + "block": "gtceu:neodymium_indicator", + "weight": 25 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_oilsands.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_oilsands.json index b90e0ee33..5196b1cba 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_oilsands.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_oilsands.json @@ -1,8 +1,8 @@ { "type": "tfc:cluster_vein", "config": { - "rarity": 155, - "density": 0.25, + "rarity": 185, + "density": 0.20, "min_y": 0, "max_y": 70, "size": 55, @@ -85,6 +85,18 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:oilsands_indicator", + "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 11114ea15..27a83d025 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_olivine.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_olivine.json @@ -169,6 +169,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:bentonite_indicator", + "weight": 35 + }, + { + "block": "gtceu:magnesite_indicator", + "weight": 25 + }, + { + "block": "gtceu:olivine_indicator", + "weight": 25 + }, + { + "block": "gtceu:glauconite_sand_indicator", + "weight": 15 + } + ] + } } } \ No newline at end of file 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 ebe0c1a5f..c340cc0ac 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_redstone.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_redstone.json @@ -27,6 +27,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 60, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "minecraft:redstone_wire", + "weight": 70 + }, + { + "block": "gtceu:ruby_indicator", + "weight": 20 + }, + { + "block": "gtceu:cinnabar_indicator", + "weight": 10 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_salt.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_salt.json index 6fc2e582e..ad0cf303b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_salt.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_salt.json @@ -78,6 +78,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 40, + "depth": 35, + "underground_rarity": 80, + "underground_count": 1000, + "blocks": [ + { + "block": "gtceu:rock_salt_indicator", + "weight": 4 + }, + { + "block": "tfc:groundcover/salt_lick", + "weight": 90 + }, + { + "block": "gtceu:lepidolite_indicator", + "weight": 3 + }, + { + "block": "gtceu:borax_indicator", + "weight": 3 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_saltpeter.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_saltpeter.json index 7228aafc5..acae02ec1 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_saltpeter.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_saltpeter.json @@ -215,6 +215,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 100, + "blocks": [ + { + "block": "gtceu:saltpeter_indicator", + "weight": 35 + }, + { + "block": "gtceu:diatomite_indicator", + "weight": 25 + }, + { + "block": "gtceu:electrotine_indicator", + "weight": 25 + }, + { + "block": "gtceu:alunite_indicator", + "weight": 15 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_silver.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_silver.json index 5a6a4031c..ec6e9d918 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_silver.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_silver.json @@ -50,8 +50,8 @@ "indicator": { "rarity": 12, "depth": 60, - "underground_rarity": 1, - "underground_count": 0, + "underground_rarity": 40, + "underground_count": 200, "blocks": [ { "block": "tfc:ore/small_native_silver", diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_sphalerite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_sphalerite.json index c283fe420..571091f22 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_sphalerite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_sphalerite.json @@ -202,8 +202,8 @@ "indicator": { "rarity": 12, "depth": 60, - "underground_rarity": 1, - "underground_count": 0, + "underground_rarity": 40, + "underground_count": 200, "blocks": [ { "block": "tfc:ore/small_sphalerite", diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_spodumene.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_spodumene.json index 71d98f782..0e35819a4 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_spodumene.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_spodumene.json @@ -216,6 +216,30 @@ } ] } - ] + ], + "indicator": { + "rarity": 40, + "depth": 35, + "underground_rarity": 80, + "underground_count": 1000, + "blocks": [ + { + "block": "gtceu:rock_salt_indicator", + "weight": 4 + }, + { + "block": "tfc:groundcover/salt_lick", + "weight": 90 + }, + { + "block": "gtceu:lepidolite_indicator", + "weight": 4 + }, + { + "block": "gtceu:spodumene_indicator", + "weight": 6 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_sulfur.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_sulfur.json index 464d1f9cd..e08bf9bb4 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_sulfur.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_sulfur.json @@ -84,6 +84,26 @@ } ] } - ] + ], + "indicator": { + "rarity": 12, + "depth": 35, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:sulfur_indicator", + "weight": 50 + }, + { + "block": "gtceu:pyrite_indicator", + "weight": 35 + }, + { + "block": "gtceu:sphalerite_indicator", + "weight": 15 + } + ] + } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_tetrahedrite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_tetrahedrite.json index a740d6ff4..0646c98b1 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_tetrahedrite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_tetrahedrite.json @@ -15,15 +15,15 @@ "with": [ { "block": "gtceu:quartzite_tetrahedrite_ore", - "weight": 35 + "weight": 50 }, { "block": "gtceu:quartzite_copper_ore", - "weight": 40 + "weight": 30 }, { "block": "gtceu:quartzite_stibnite_ore", - "weight": 25 + "weight": 20 } ] }, @@ -34,15 +34,15 @@ "with": [ { "block": "gtceu:slate_tetrahedrite_ore", - "weight": 35 + "weight": 50 }, { "block": "gtceu:slate_copper_ore", - "weight": 40 + "weight": 30 }, { "block": "gtceu:slate_stibnite_ore", - "weight": 25 + "weight": 20 } ] }, @@ -53,15 +53,15 @@ "with": [ { "block": "gtceu:phyllite_tetrahedrite_ore", - "weight": 35 + "weight": 50 }, { "block": "gtceu:phyllite_copper_ore", - "weight": 40 + "weight": 30 }, { "block": "gtceu:phyllite_stibnite_ore", - "weight": 25 + "weight": 20 } ] }, @@ -72,15 +72,15 @@ "with": [ { "block": "gtceu:schist_tetrahedrite_ore", - "weight": 35 + "weight": 50 }, { "block": "gtceu:schist_copper_ore", - "weight": 40 + "weight": 30 }, { "block": "gtceu:schist_stibnite_ore", - "weight": 25 + "weight": 20 } ] }, @@ -91,15 +91,15 @@ "with": [ { "block": "gtceu:gneiss_tetrahedrite_ore", - "weight": 35 + "weight": 50 }, { "block": "gtceu:gneiss_copper_ore", - "weight": 40 + "weight": 30 }, { "block": "gtceu:gneiss_stibnite_ore", - "weight": 25 + "weight": 20 } ] }, @@ -110,15 +110,15 @@ "with": [ { "block": "gtceu:marble_tetrahedrite_ore", - "weight": 35 + "weight": 50 }, { "block": "gtceu:marble_copper_ore", - "weight": 40 + "weight": 30 }, { "block": "gtceu:marble_stibnite_ore", - "weight": 25 + "weight": 20 } ] } @@ -126,12 +126,16 @@ "indicator": { "rarity": 12, "depth": 60, - "underground_rarity": 1, - "underground_count": 0, + "underground_rarity": 40, + "underground_count": 200, "blocks": [ { "block": "tfc:ore/small_tetrahedrite", - "weight": 100 + "weight": 70 + }, + { + "block": "tfc:ore/small_native_copper", + "weight": 30 } ] } 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 8e6f8ace9..dbc83b258 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/surface_copper.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/surface_copper.json @@ -3,7 +3,7 @@ "config": { "rarity": 140, "density": 0.25, - "min_y": 60, + "min_y": 30, "max_y": 210, "size": 50, "random_name": "surface_copper", @@ -109,7 +109,15 @@ "blocks": [ { "block": "tfc:ore/small_native_copper", - "weight": 100 + "weight": 40 + }, + { + "block": "tfc:ore/small_cassiterite", + "weight": 40 + }, + { + "block": "gtceu:realgar_indicator", + "weight": 20 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/surface_tetrahedrite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/surface_tetrahedrite.json index 78e7e3b16..39ba69b1a 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/surface_tetrahedrite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/vein/surface_tetrahedrite.json @@ -19,11 +19,11 @@ }, { "block": "gtceu:quartzite_copper_ore", - "weight": 10 + "weight": 20 }, { "block": "gtceu:quartzite_stibnite_ore", - "weight": 30 + "weight": 20 } ] }, @@ -38,11 +38,11 @@ }, { "block": "gtceu:slate_copper_ore", - "weight": 10 + "weight": 20 }, { "block": "gtceu:slate_stibnite_ore", - "weight": 30 + "weight": 20 } ] }, @@ -57,11 +57,11 @@ }, { "block": "gtceu:phyllite_copper_ore", - "weight": 10 + "weight": 20 }, { "block": "gtceu:phyllite_stibnite_ore", - "weight": 30 + "weight": 20 } ] }, @@ -76,11 +76,11 @@ }, { "block": "gtceu:schist_copper_ore", - "weight": 10 + "weight": 20 }, { "block": "gtceu:schist_stibnite_ore", - "weight": 30 + "weight": 20 } ] }, @@ -95,11 +95,11 @@ }, { "block": "gtceu:gneiss_copper_ore", - "weight": 10 + "weight": 20 }, { "block": "gtceu:gneiss_stibnite_ore", - "weight": 30 + "weight": 20 } ] }, @@ -114,11 +114,11 @@ }, { "block": "gtceu:marble_copper_ore", - "weight": 10 + "weight": 20 }, { "block": "gtceu:marble_stibnite_ore", - "weight": 30 + "weight": 20 } ] } @@ -131,7 +131,11 @@ "blocks": [ { "block": "tfc:ore/small_tetrahedrite", - "weight": 100 + "weight": 80 + }, + { + "block": "tfc:ore/small_native_copper", + "weight": 20 } ] } diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 2f026964f..a746d2c62 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -439,7 +439,7 @@ const registerTFCPlacedFeatures = (event) => { 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_oilsands') 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')