From abef642e6626f32a70b4be9702f6e644ee701b0d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 3 Feb 2026 15:51:45 +0000 Subject: [PATCH] bunch o venus stuff --- kubejs/assets/gtceu/lang/en_us.json | 6 + kubejs/assets/tfg/lang/en_us.json | 5 +- kubejs/data/ad_astra/dimension/venus.json | 182 ++++---- .../tfg/worldgen/biome/venus/fumaroles.json | 4 +- .../biome/venus/scorching_volcanoes.json | 11 +- .../worldgen/biome/venus/sulfuric_ravine.json | 10 +- .../nether/terrain/spring_lava.json | 2 +- .../venus/surface/loose_crackrack.json | 2 +- .../venus/surface/loose_scorchia.json | 2 +- .../venus/surface/loose_scoria.json | 2 +- .../venus/surface/pile_black_sand.json | 2 +- .../venus/surface/pile_volcanic_ash.json | 2 +- .../venus/surface/shadow_plant_patch.json | 6 +- .../venus/terrain/lava_spring.json | 4 +- .../venus/terrain/sulfur_fumes_fill.json | 11 + .../venus/terrain/sulfur_fumes_spring.json | 87 ++++ .../venus/terrain/thermal_tube_worms.json | 8 +- .../density_function/venus/offset.json | 403 +++++++++++++++++- .../worldgen/noise_settings/venus_noise.json | 6 +- .../venus/terrain/adakite_column.json | 6 +- .../venus/terrain/sulfur_fumes_fill.json | 16 + .../venus/terrain/sulfur_fumes_spring.json | 12 + 22 files changed, 676 insertions(+), 113 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_fill.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_spring.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_fill.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_spring.json diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 7e6050d1c..dc9a569b8 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -39,6 +39,12 @@ "block.tfg.single_itemstack_bus": "Limiting Input Bus", "block.tfg.hydroponics_facility": "Hydroponics Facility", "block.tfg.pisciculture_fishery": "Pisciculture Fishery", + "block.gtceu.ev_1024a_laser_source_hatch": "§5EV§r 1,024§eA§r Laser Source Hatch", + "block.gtceu.ev_1024a_laser_target_hatch": "§5EV§r 1,024§eA§r Laser Target Hatch", + "block.gtceu.ev_256a_laser_source_hatch": "§5EV§r 256§eA§r Laser Source Hatch", + "block.gtceu.ev_256a_laser_target_hatch": "§5EV§r 256§eA§r Laser Target Hatch", + "block.gtceu.ev_4096a_laser_source_hatch": "§5EV§r 4,096§eA§r Laser Source Hatch", + "block.gtceu.ev_4096a_laser_target_hatch": "§5EV§r 4,096§eA§r Laser Target Hatch", "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp", "item.gtceu.small_wood_dust": "Small Pile of Softwood Pulp", "item.gtceu.wood_dust": "Softwood Pulp", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index bf468e88d..f59ce46fb 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -224,6 +224,7 @@ "block.tfg.spike.dripstone_spike": "Travertine Spike", "block.tfg.loose.dripstone": "Loose Travertine Rock", "block.tfg.rock.aqueduct_dripstone": "Travertine Aqueduct", + "block.tfg.rock.hardened_crackrack": "Hardened Keratophyre", "block.tfg.rock.crackrack_stairs": "Raw Keratophyre Stairs", "block.tfg.rock.crackrack_slab": "Raw Keratophyre Slab", "block.tfg.rock.crackrack_wall": "Raw Keratophyre Wall", @@ -1915,6 +1916,7 @@ "tfc.recipe.barrel.tfg.barrel.birch_syrup_to_sugar": "Making sugar", "tfc.recipe.barrel.tfg.barrel.develop_black_and_white_film": "Developing film", "tfc.recipe.barrel.tfg.barrel.develop_color_film": "Developing film", + "tfc.recipe.barrel.tfg.barrel.clay_ball": "Hydrating Clay", "tfc.recipe.barrel.tfg.barrel.light_concrete": "Solidifying Concrete", "tfc.recipe.barrel.tfg.barrel.reinforced_light_concrete_support": "Solidifying Concrete", "tfc.recipe.barrel.tfg.barrel.dark_concrete": "Dyeing", @@ -2607,6 +2609,7 @@ "quests.gregtech_energy.transformer.title": "The Super Transformer", "quests.gregtech_energy.transformer.subtitle": "Better than Optimus Prime", "quests.gregtech_energy.transformer.desc": "For every problem, GregTech has a multiblock solution. Enter the &dActive Transformer&r.\n\nThis beast is your ultimate transformer. It can transform energy between any tiers — from &aLV&r to &cUHV&r — without caring about amps or a mess of single block transformers.\n\nBut that's not even the best part: it can transmit energy using Laser Pipes.\n&7•&r Lasers send absurd amounts of Amps.\n&7•&r No loss. No cables. Just pure energy.\n&7•&r Only one catch: it &chas to be in a perfectly straight line&r.\n\nWhen cables feel weak, &luse lasers.", + "quests.gregtech_energy.transformer.task": "Any Laser Hatch from EV to IV", "quests.gregtech_energy.moving_wire.title": "Moving with wires", "quests.gregtech_energy.moving_wire.subtitle": "Funky to place", "quests.gregtech_energy.moving_wire.desc": "Moving energy around in GregTech can be tricky — &bmost cables are lossy&r. For every block, for every amp, you might lose energy as it travels through your wires. But don’t worry, there are solutions:\n\n&7•&r Cover your wires with rubber. By doing so, you'll significantly reduce energy loss over distance. Just check the quest items for a reference.\n\n&7•&r Use higher-tier cables. Platinum cables, for example, only lose 1 EU per block — practically nothing when compared to the 8192 EU it can carry.\n\n&7•&r &bSuperconductors&r. These beauties are a bit pricier, but they have &9zero loss&r. They don’t need rubber covers, and won't zap you either. Just be aware that they're usually only craftable near the end of their tier.\n\nOptimize your energy flow — &breduce losses&r and make your systems more efficient.", @@ -3030,7 +3033,7 @@ "quests.low_voltage.lv_polariser.desc": "One of the cheapest - if not the cheapest - &7LV&r machine. Use this to make &6Redstone-free Magnetic Rods&r for your Motors. Whenever you start to batch your Motors, this machine will save you stacks and stacks of Redstone.", "quests.low_voltage.link_chapter.title": "Explain energy to me", "quests.low_voltage.link_chapter.subtitle": "There is a whole chapter about energy", - "quests.low_voltage.link_chapter.desc": "It might look like a lot of reading, but it's important to understand if you want to avoid accidents and get the most out of your power generation.\n\nGregTech's energy system (EU, Energy Units) works differently to FE (Forge Energy), the system used by almost every other mod.\n\nThere's four ways to generate power in LV, and all are viable options. If you're new to GregTech, Steam is the easiest but falls off fast as you progress to further tiers. Gas fuel is more complicated to produce, but has the cheapest generators. Combustion is somewhere in between.\n\nHere's a link to the energy chapter", + "quests.low_voltage.link_chapter.desc": "GregTech's energy system (EU, Energy Units) works differently to FE (Forge Energy), the system used by almost every other mod, so we've dedicated a chapter of the questbook to talk about it.\n\nIt might look like a lot of reading, but it's important to understand if you want to avoid accidents and get the most out of your power generation.\n\nThere's four ways to generate power in LV, and all are viable options. If you're new to GregTech, Steam is the easiest but falls off fast as you progress to further tiers. Gas fuel is more complicated to produce, but has the cheapest generators. Combustion is somewhere in between.\n\nHere's a link to the energy chapter", "quests.low_voltage.link_chapter.task": "I read it", "quests.low_voltage.lv_combuston_gen.title": "The Combustion Generator", "quests.low_voltage.lv_combuston_gen.subtitle": "It does boom and make energy", diff --git a/kubejs/data/ad_astra/dimension/venus.json b/kubejs/data/ad_astra/dimension/venus.json index bdbd37c82..61d748a5f 100644 --- a/kubejs/data/ad_astra/dimension/venus.json +++ b/kubejs/data/ad_astra/dimension/venus.json @@ -10,7 +10,7 @@ "spawn_center_z": 0, "temperature_scale": 10000, "rainfall_scale": 10000, - "continentalness": 0, + "continentalness": 0.1, "rock_layer_settings": { "rocks": { "venus": { @@ -84,6 +84,36 @@ "spike": "tfg:spike/sandy_jadestone_spike", "loose": "tfg:loose/sandy_jadestone" }, + "crackrack": { + "raw": "beneath:crackrack", + "hardened": "tfg:rock/hardened_crackrack", + "gravel": "tfg:rock/gravel_crackrack", + "cobble": "tfg:rock/cobble_crackrack", + "sand": "tfc:sand/pink", + "sandstone": "tfc:raw_sandstone/pink", + "spike": "tfg:spike/crackrack_spike", + "loose": "tfg:loose/crackrack" + }, + "scoria": { + "raw": "create:scoria", + "hardened": "tfg:rock/hardened_scoria", + "gravel": "tfg:rock/gravel_scoria", + "cobble": "tfg:rock/cobble_scoria", + "sand": "tfc:sand/brown", + "sandstone": "tfc:raw_sandstone/brown", + "spike": "tfg:spike/scoria_spike", + "loose": "tfg:loose/scoria" + }, + "scorchia": { + "raw": "create:scorchia", + "hardened": "tfg:rock/hardened_scorchia", + "gravel": "tfg:rock/gravel_scorchia", + "cobble": "tfg:rock/cobble_scorchia", + "sand": "tfc:sand/black", + "sandstone": "tfc:raw_sandstone/black", + "spike": "tfg:spike/scorchia_spike", + "loose": "tfg:loose/scorchia" + }, "granite": "tfc:granite", "diorite": "tfc:diorite", "gabbro": "tfc:gabbro", @@ -176,7 +206,7 @@ "temperature": 0, "humidity": 0, "continentalness": -1, - "erosion": 0.05, + "erosion": -0.05, "weirdness": -0.2, "depth": 0, "offset": 0 @@ -188,7 +218,7 @@ "temperature": 0, "humidity": 0, "continentalness": -1, - "erosion": 0.05, + "erosion": -0.05, "weirdness": 0, "depth": 0, "offset": 0 @@ -200,7 +230,7 @@ "temperature": 0, "humidity": 0, "continentalness": -1, - "erosion": 0.05, + "erosion": -0.05, "weirdness": 0.2, "depth": 0, "offset": 0 @@ -249,8 +279,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, - "erosion": 0.05, + "continentalness": -0.57, + "erosion": -0.05, "weirdness": -0.2, "depth": 0, "offset": 0 @@ -261,8 +291,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, - "erosion": 0.05, + "continentalness": -0.57, + "erosion": -0.05, "weirdness": 0, "depth": 0, "offset": 0 @@ -273,8 +303,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, - "erosion": 0.05, + "continentalness": -0.57, + "erosion": -0.05, "weirdness": 0.2, "depth": 0, "offset": 0 @@ -285,7 +315,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, + "continentalness": -0.57, "erosion": 0.05, "weirdness": -0.2, "depth": 0, @@ -297,7 +327,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, + "continentalness": -0.57, "erosion": 0.05, "weirdness": 0, "depth": 0, @@ -309,7 +339,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, + "continentalness": -0.57, "erosion": 0.05, "weirdness": 0.2, "depth": 0, @@ -323,8 +353,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, - "erosion": 0.05, + "continentalness": -0.54, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0 @@ -335,8 +365,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, - "erosion": 0.05, + "continentalness": -0.54, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0 @@ -347,8 +377,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, - "erosion": 0.05, + "continentalness": -0.54, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0 @@ -360,7 +390,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, + "continentalness": -0.54, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -372,7 +402,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, + "continentalness": -0.54, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -384,7 +414,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, + "continentalness": -0.54, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -398,8 +428,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, - "erosion": 0.05, + "continentalness": -0.415, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0 @@ -410,8 +440,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, - "erosion": 0.05, + "continentalness": -0.415, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0 @@ -422,8 +452,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, - "erosion": 0.05, + "continentalness": -0.415, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0 @@ -435,7 +465,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, + "continentalness": -0.415, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -447,7 +477,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, + "continentalness": -0.415, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -459,7 +489,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, + "continentalness": -0.415, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -474,7 +504,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, + "continentalness": -0.39, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -486,7 +516,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, + "continentalness": -0.39, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -498,7 +528,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, + "continentalness": -0.39, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -511,7 +541,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, + "continentalness": 0.1, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -523,7 +553,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, + "continentalness": 0.1, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -535,7 +565,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, + "continentalness": 0.1, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -550,8 +580,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, - "erosion": 0.05, + "continentalness": -0.39, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -562,8 +592,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, - "erosion": 0.05, + "continentalness": -0.39, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -574,8 +604,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, - "erosion": 0.05, + "continentalness": -0.39, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -587,8 +617,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, - "erosion": 0.05, + "continentalness": 0.1, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -599,8 +629,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, - "erosion": 0.05, + "continentalness": 0.1, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -611,8 +641,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, - "erosion": 0.05, + "continentalness": 0.1, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -625,7 +655,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, + "continentalness": 0.15, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -637,7 +667,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, + "continentalness": 0.15, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -649,7 +679,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, + "continentalness": 0.15, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -662,7 +692,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, + "continentalness": 0.59, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -674,7 +704,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, + "continentalness": 0.59, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -686,7 +716,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, + "continentalness": 0.59, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -701,8 +731,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, - "erosion": 0.05, + "continentalness": 0.15, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -713,8 +743,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, - "erosion": 0.05, + "continentalness": 0.15, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -725,8 +755,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, - "erosion": 0.05, + "continentalness": 0.15, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -739,8 +769,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, - "erosion": 0.05, + "continentalness": 0.59, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -751,8 +781,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, - "erosion": 0.05, + "continentalness": 0.59, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -763,8 +793,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, - "erosion": 0.05, + "continentalness": 0.59, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -779,7 +809,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, + "continentalness": 0.61, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -791,7 +821,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, + "continentalness": 0.61, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -803,7 +833,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, + "continentalness": 0.61, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -817,8 +847,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, - "erosion": 0.05, + "continentalness": 0.61, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -829,8 +859,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, - "erosion": 0.05, + "continentalness": 0.61, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -841,8 +871,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, - "erosion": 0.05, + "continentalness": 0.61, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 diff --git a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json index dbd00bd06..57fa5d58f 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json @@ -35,6 +35,9 @@ } }, "features": [ + [ + "tfg:venus/terrain/sulfur_fumes_spring" + ], [ "tfc:erosion" ], @@ -42,7 +45,6 @@ [], [], [], - [], "#tfg:venus_veins", "#tfg:venus_underground_decoration", [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json index 46cb11773..4c757911f 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json +++ b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json @@ -35,20 +35,19 @@ } }, "features": [ - [ - "tfc:erosion" - ], [ "tfg:venus/terrain/lava_spring", "tfg:venus/terrain/lava_delta", "tfg:venus/terrain/lava_lake", "tfg:venus/terrain/lava_fissure", "tfg:venus/terrain/lava_rivulet", - "tfg:venus/terrain/magma_rivulet" - ], - [ + "tfg:venus/terrain/magma_rivulet", "tfg:venus/terrain/basalt_pillar" ], + [ + "tfc:erosion" + ], + [], [], [ "tfg:venus/terrain/basalt_columns_small", diff --git a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json index 79b328a81..e65dbd1cc 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json +++ b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json @@ -35,6 +35,10 @@ } }, "features": [ + [ + "tfg:venus/terrain/sulfur_fumes_fill", + "tfg:venus/terrain/sulfur_fumes_spring" + ], [ "tfc:erosion" ], @@ -42,7 +46,6 @@ [], [], [], - [], "#tfg:venus_veins", "#tfg:venus_underground_decoration", [ @@ -50,13 +53,12 @@ "tfg:venus/vein_manual/sulfur", "tfc:raw_boulder_small_patch", "tfc:cobble_boulder_small_patch", - "tfg:venus/terrain/thermal_vent" - ], - [ + "tfg:venus/terrain/thermal_vent", "tfg:venus/surface/sulfur_patch", "tfg:venus/surface/hydralux", "tfg:venus/surface/loose_scoria" ], + [], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/spring_lava.json b/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/spring_lava.json index cfbbc5b0b..05ea8c047 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/spring_lava.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/spring_lava.json @@ -10,6 +10,6 @@ "falling": "true" } }, - "valid_blocks": "#base_stone_nether" + "valid_blocks": "#minecraft:base_stone_nether" } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json index b42fe220e..e75620e1d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json @@ -27,7 +27,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json index 040d64b68..4192d4339 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json @@ -27,7 +27,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json index 406c92329..5377f30b2 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json @@ -27,7 +27,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_black_sand.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_black_sand.json index b9bc3ca6a..2e211ab1f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_black_sand.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_black_sand.json @@ -27,7 +27,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_volcanic_ash.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_volcanic_ash.json index e0e523bb8..f919ce0b8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_volcanic_ash.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_volcanic_ash.json @@ -27,7 +27,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json index abaeb145b..d8262a4f6 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json @@ -16,7 +16,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR_WG" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", @@ -24,9 +24,9 @@ "type": "minecraft:all_of", "predicates": [ { - "type": "minecraft:matching_block_tag", + "type": "minecraft:has_sturdy_face", "offset": [ 0, -1, 0 ], - "tag": "ad_astra:venus_stone_replaceables" + "direction": "down" }, { "type": "minecraft:matching_blocks", diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_spring.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_spring.json index 8968b9e43..c749a23d8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_spring.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_spring.json @@ -80,8 +80,8 @@ ] } ], - "radius": 8, - "count": 32, + "radius": 12, + "count": 48, "rarity": 1 } } diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_fill.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_fill.json new file mode 100644 index 000000000..df39b7c16 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_fill.json @@ -0,0 +1,11 @@ +{ + "type": "tfc:flood_fill_lake", + "config": { + "overfill": true, + "replace_fluids": [ + "minecraft:lava", + "tfg:geyser_slurry" + ], + "state": "tfg:fluid/sulfur_fumes" + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_spring.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_spring.json new file mode 100644 index 000000000..ba96454ad --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_spring.json @@ -0,0 +1,87 @@ +{ + "type": "tfc:hot_spring", + "config": { + "fluid_state": "tfg:fluid/sulfur_fumes", + "radius": 8, + "decoration": { + "blocks": [ + { + "replace": [ + "tfc:rock/raw/rhyolite" + ], + "with": [ + { + "block": "tfc:rock/magma/rhyolite" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/basalt", + "ad_astra:moon_deepslate" + ], + "with": [ + { + "block": "tfc:rock/magma/basalt" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/andesite" + ], + "with": [ + { + "block": "tfc:rock/magma/andesite" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dacite" + ], + "with": [ + { + "block": "tfc:rock/magma/dacite" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/granite", + "gtceu:red_granite" + ], + "with": [ + { + "block": "tfc:rock/magma/granite" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/diorite" + ], + "with": [ + { + "block": "tfc:rock/magma/diorite" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/gabbro", + "minecraft:deepslate" + ], + "with": [ + { + "block": "tfc:rock/magma/gabbro" + } + ] + } + ], + "radius": 8, + "count": 24, + "rarity": 1 + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json index d8b77e7ed..5295d9cbe 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json @@ -12,7 +12,7 @@ "type": "tfg:attached_decorative_plant", "config": { "block": "betterend:tube_worm", - "heightRange": 5 + "heightRange": 1 } }, "placement": [] @@ -33,7 +33,7 @@ "fluid": "sulfur_fumes" } }, - "heightRange": 5 + "heightRange": 1 } }, "placement": [] @@ -48,8 +48,8 @@ }, "placement": [] }, - "tries": 36, + "tries": 48, "xz_spread": 4, - "y_spread": 0 + "y_spread": 5 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/venus/offset.json b/kubejs/data/tfg/worldgen/density_function/venus/offset.json index 31910ca48..1846adcd6 100644 --- a/kubejs/data/tfg/worldgen/density_function/venus/offset.json +++ b/kubejs/data/tfg/worldgen/density_function/venus/offset.json @@ -41,12 +41,12 @@ }, { "derivative": 0.0, - "location": -0.51, + "location": -0.61, "value": -0.09 }, { "derivative": 0.0, - "location": -0.42, + "location": -0.52, "value": { "coordinate": "tfg:venus/ridges_folded", "points": [ @@ -85,7 +85,7 @@ }, { "derivative": 0.0, - "location": -0.35, + "location": -0.45, "value": { "coordinate": "tfg:venus/erosion", "points": [ @@ -655,7 +655,7 @@ }, { "derivative": 0.0, - "location": 0.0, + "location": 0.1, "value": { "coordinate": "tfg:venus/erosion", "points": [ @@ -1046,7 +1046,7 @@ }, { "derivative": 0.0, - "location": 0.30, + "location": 0.375, "value": { "coordinate": "tfg:venus/erosion", "points": [ @@ -1437,7 +1437,398 @@ }, { "derivative": 0.0, - "location": 0.45, + "location": 0.6, + "value": { + "coordinate": "tfg:venus/erosion", + "points": [ + { + "derivative": 0.0, + "location": -0.85, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.40235021 + }, + { + "derivative": 0.5138249, + "location": 0.0, + "value": 0.55 + }, + { + "derivative": 0.5138249, + "location": 1.0, + "value": 0.7 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.7, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.3 + }, + { + "derivative": 0.43317974, + "location": 0.0, + "value": 0.45 + }, + { + "derivative": 0.43317974, + "location": 1.0, + "value": 0.6 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.35 + }, + { + "derivative": 0.3917051, + "location": 0.0, + "value": 0.4 + }, + { + "derivative": 0.3917051, + "location": 1.0, + "value": 0.45 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.35, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": 0.2 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.3 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.35 + }, + { + "derivative": 0.0, + "location": 0.4, + "value": 0.4 + }, + { + "derivative": 0.049000014, + "location": 1.0, + "value": 0.45 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.1, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.07, + "location": -0.4, + "value": 0.0069999998 + }, + { + "derivative": 0.07, + "location": 0.0, + "value": 0.021 + }, + { + "derivative": 0.658, + "location": 0.4, + "value": 0.35 + }, + { + "derivative": 0.049000014, + "location": 1.0, + "value": 0.42000002 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.2, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.4, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": 0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.05 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.3 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.45, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.17 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.55, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.17 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.58, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.7, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.02 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": -0.03 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": -0.03 + }, + { + "derivative": 0.12, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.65, "value": { "coordinate": "tfg:venus/erosion", "points": [ diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index 36a967625..cb1fa3e2c 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -382,7 +382,7 @@ "if_true": { "type": "minecraft:y_above", "anchor": { - "absolute": 65 + "absolute": 70 }, "surface_depth_multiplier": 0, "add_stone_depth": false @@ -402,10 +402,10 @@ "type": "minecraft:vertical_gradient", "random_name": "salt_flats", "true_at_and_below": { - "absolute": 60 + "absolute": 63 }, "false_at_and_above": { - "absolute": 64 + "absolute": 67 } } }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/adakite_column.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/adakite_column.json index 7a7c2c0f0..cffa3ebfd 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/adakite_column.json +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/adakite_column.json @@ -1,4 +1,8 @@ { "feature": "tfg:venus/terrain/adakite_column", - "placement": [] + "placement": [ + { + "type": "minecraft:biome" + } + ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_fill.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_fill.json new file mode 100644 index 000000000..1a4620961 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_fill.json @@ -0,0 +1,16 @@ +{ + "feature": "tfg:venus/terrain/sulfur_fumes_fill", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_spring.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_spring.json new file mode 100644 index 000000000..f55982796 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_spring.json @@ -0,0 +1,12 @@ +{ + "feature": "tfg:venus/terrain/sulfur_fumes_spring", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 30 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file