From 74a22fd9c9f1bb0e57e2f1b467145e736b0da801 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Dec 2025 01:43:49 +0000 Subject: [PATCH] add hydralux and some ambient sounds --- .../betterend/blockstates/hydralux.json | 14 ------ .../betterend/blockstates/hydralux_large.json | 13 +++++ .../blockstates/hydralux_sapling.json | 10 ++-- .../betterend/blockstates/hydralux_small.json | 9 ++++ kubejs/assets/betterend/lang/en_us.json | 3 +- kubejs/assets/betterend/lang/ja_jp.json | 3 +- kubejs/assets/betterend/lang/ru_ru.json | 3 +- kubejs/assets/betterend/lang/uk_ua.json | 3 +- kubejs/assets/betterend/lang/zh_cn.json | 3 +- .../models/block/hydralux_sapling_1.json | 2 +- .../models/block/hydralux_sapling_2.json | 2 +- .../models/block/hydralux_sapling_3.json | 2 +- .../models/block/hydralux_sapling_4.json | 2 +- .../betterend/models/block/hydralux_vine.json | 2 +- ...x_roots.json => hydralux_vine_bottom.json} | 0 .../betterend/models/item/hydralux_large.json | 6 +++ .../betterend/models/item/hydralux_small.json | 6 +++ .../biome/mars/martian_deep_desert.json | 6 +++ .../biome/mars/martian_dune_edge.json | 6 +++ .../worldgen/biome/mars/martian_dunes.json | 6 +++ .../tfg/worldgen/biome/venus/arachnoids.json | 7 ++- .../worldgen/biome/venus/fractured_pools.json | 7 ++- .../tfg/worldgen/biome/venus/fumaroles.json | 13 +++-- .../tfg/worldgen/biome/venus/geysers.json | 9 +++- .../biome/venus/jagged_tablelands.json | 7 ++- .../tfg/worldgen/biome/venus/salt_flats.json | 9 +++- .../biome/venus/stromatolite_beach.json | 8 +++- .../worldgen/biome/venus/sulfuric_ravine.json | 12 +++-- .../biome/venus/volcanic_mountains.json | 11 +++-- .../venus/surface/hydralux_large.json | 43 +++++++++++++++++ .../venus/surface/hydralux_sapling.json | 47 +++++++++++++++++++ .../venus/surface/hydralux_small.json | 43 +++++++++++++++++ .../venus/terrain/ignimbrite_columns.json | 2 +- .../venus/terrain/ignimbrite_vents.json | 4 +- .../venus/surface/hydralux.json | 37 +++++++++++++++ .../venus/surface/hydralux_rare.json | 37 +++++++++++++++ .../venus/terrain/sulfur_blob_rare.json | 31 ++++++++++++ .../tfg/venus/blocks.venus_deco.js | 24 ++++++++++ 38 files changed, 403 insertions(+), 49 deletions(-) delete mode 100644 kubejs/assets/betterend/blockstates/hydralux.json create mode 100644 kubejs/assets/betterend/blockstates/hydralux_large.json create mode 100644 kubejs/assets/betterend/blockstates/hydralux_small.json rename kubejs/assets/betterend/models/block/{hydralux_roots.json => hydralux_vine_bottom.json} (100%) create mode 100644 kubejs/assets/betterend/models/item/hydralux_large.json create mode 100644 kubejs/assets/betterend/models/item/hydralux_small.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_large.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_sapling.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_small.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/hydralux.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/hydralux_rare.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_blob_rare.json diff --git a/kubejs/assets/betterend/blockstates/hydralux.json b/kubejs/assets/betterend/blockstates/hydralux.json deleted file mode 100644 index b8a984fc7..000000000 --- a/kubejs/assets/betterend/blockstates/hydralux.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "variants": { - "shape=flower_big_bottom": [ - { "model": "betterend:block/hydralux_flower_big_1_bottom" }, - { "model": "betterend:block/hydralux_flower_big_2_bottom" }, - { "model": "betterend:block/hydralux_flower_big_3_bottom" } - ], - "shape=flower_big_top": { "model": "betterend:block/hydralux_flower_big_top" }, - "shape=flower_small_bottom": { "model": "betterend:block/hydralux_flower_small_bottom" }, - "shape=flower_small_top": { "model": "betterend:block/hydralux_flower_small_top" }, - "shape=vine": { "model": "betterend:block/hydralux_vine" }, - "shape=roots": { "model": "betterend:block/hydralux_roots" } - } -} diff --git a/kubejs/assets/betterend/blockstates/hydralux_large.json b/kubejs/assets/betterend/blockstates/hydralux_large.json new file mode 100644 index 000000000..98fc5ef12 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/hydralux_large.json @@ -0,0 +1,13 @@ +{ + "variants": { + "height=0": { "model": "betterend:block/hydralux_vine_bottom" }, + "height=1": { "model": "betterend:block/hydralux_vine" }, + "height=2": [ + { "model": "betterend:block/hydralux_flower_big_1_bottom" }, + { "model": "betterend:block/hydralux_flower_big_2_bottom" }, + { "model": "betterend:block/hydralux_flower_big_3_bottom" } + ], + "height=3": { "model": "betterend:block/hydralux_flower_big_top" }, + "height=4": { "model": "" } + } +} diff --git a/kubejs/assets/betterend/blockstates/hydralux_sapling.json b/kubejs/assets/betterend/blockstates/hydralux_sapling.json index f0841963e..0e079837e 100644 --- a/kubejs/assets/betterend/blockstates/hydralux_sapling.json +++ b/kubejs/assets/betterend/blockstates/hydralux_sapling.json @@ -1,8 +1,10 @@ { "variants": { - "age=0": { "model": "betterend:block/hydralux_sapling_1" }, - "age=1": { "model": "betterend:block/hydralux_sapling_2" }, - "age=2": { "model": "betterend:block/hydralux_sapling_3" }, - "age=3": { "model": "betterend:block/hydralux_sapling_4" } + "": [ + { "model": "betterend:block/hydralux_sapling_1" }, + { "model": "betterend:block/hydralux_sapling_2" }, + { "model": "betterend:block/hydralux_sapling_3" }, + { "model": "betterend:block/hydralux_sapling_4" } + ] } } diff --git a/kubejs/assets/betterend/blockstates/hydralux_small.json b/kubejs/assets/betterend/blockstates/hydralux_small.json new file mode 100644 index 000000000..ba7bbcf0e --- /dev/null +++ b/kubejs/assets/betterend/blockstates/hydralux_small.json @@ -0,0 +1,9 @@ +{ + "variants": { + "height=0": { "model": "betterend:block/hydralux_vine_bottom" }, + "height=1": { "model": "betterend:block/hydralux_vine" }, + "height=2": { "model": "betterend:block/hydralux_flower_small_bottom" }, + "height=3": { "model": "betterend:block/hydralux_flower_small_top" }, + "height=4": { "model": "" } + } +} diff --git a/kubejs/assets/betterend/lang/en_us.json b/kubejs/assets/betterend/lang/en_us.json index 41142b02d..fcb9d958b 100644 --- a/kubejs/assets/betterend/lang/en_us.json +++ b/kubejs/assets/betterend/lang/en_us.json @@ -55,7 +55,8 @@ "block.betterend.glacian_hymenophore": "Glacian Hymenophore", "block.betterend.globulagus": "Globulagus", "block.betterend.hydrothermal_vent": "Thermal Vent", - "block.betterend.hydralux": "Hydralux", + "block.betterend.hydralux_small": "Hydralux", + "block.betterend.hydralux_large": "Hydralux", "block.betterend.hydralux_sapling": "Hydralux Sprout", "block.betterend.inflexia": "Inflexia", "block.betterend.lacugrove": "Lacugrove Algae", diff --git a/kubejs/assets/betterend/lang/ja_jp.json b/kubejs/assets/betterend/lang/ja_jp.json index 37ae88053..e72e61194 100644 --- a/kubejs/assets/betterend/lang/ja_jp.json +++ b/kubejs/assets/betterend/lang/ja_jp.json @@ -48,7 +48,8 @@ "block.betterend.fracturn": "Fracturn", "block.betterend.glacian_hymenophore": "Glacian Hymenophore", "block.betterend.globulagus": "Globulagus", - "block.betterend.hydralux": "Hydralux", + "block.betterend.hydralux_small": "Hydralux", + "block.betterend.hydralux_large": "Hydralux", "block.betterend.hydralux_sapling": "Hydralux Sprout", "block.betterend.inflexia": "Inflexia", "block.betterend.lacugrove": "Lacugrove Algae", diff --git a/kubejs/assets/betterend/lang/ru_ru.json b/kubejs/assets/betterend/lang/ru_ru.json index ca2bf627b..144183629 100644 --- a/kubejs/assets/betterend/lang/ru_ru.json +++ b/kubejs/assets/betterend/lang/ru_ru.json @@ -48,7 +48,8 @@ "block.betterend.fracturn": "Фрактюрн", "block.betterend.glacian_hymenophore": "Гласиевый гименофор", "block.betterend.globulagus": "Глобулагус", - "block.betterend.hydralux": "Гидралюкс", + "block.betterend.hydralux_small": "Гидралюкс", + "block.betterend.hydralux_large": "Гидралюкс", "block.betterend.hydralux_sapling": "Отросток гидралюкса", "block.betterend.inflexia": "Инфлексия", "block.betterend.lacugrove": "Водоросли озёрного мангра", diff --git a/kubejs/assets/betterend/lang/uk_ua.json b/kubejs/assets/betterend/lang/uk_ua.json index d8d5bf67d..1d111511d 100644 --- a/kubejs/assets/betterend/lang/uk_ua.json +++ b/kubejs/assets/betterend/lang/uk_ua.json @@ -48,7 +48,8 @@ "block.betterend.fracturn": "Фрактурн", "block.betterend.glacian_hymenophore": "Гіменофор Ґлаціана", "block.betterend.globulagus": "Глобулагус", - "block.betterend.hydralux": "Гідралюкс", + "block.betterend.hydralux_large": "Гідралюкс", + "block.betterend.hydralux_small": "Гідралюкс", "block.betterend.hydralux_sapling": "Паросток Гідралюкса", "block.betterend.inflexia": "Інфлексія", "block.betterend.lacugrove": "Водорості Лакугроув", diff --git a/kubejs/assets/betterend/lang/zh_cn.json b/kubejs/assets/betterend/lang/zh_cn.json index bb9244343..156ab295a 100644 --- a/kubejs/assets/betterend/lang/zh_cn.json +++ b/kubejs/assets/betterend/lang/zh_cn.json @@ -55,7 +55,8 @@ "block.betterend.glacian_hymenophore": "霜原菌褶", "block.betterend.globulagus": "球囊藻", "block.betterend.hydrothermal_vent": "热泉喷口", - "block.betterend.hydralux": "水光莲", + "block.betterend.hydralux_small": "水光莲", + "block.betterend.hydralux_large": "水光莲", "block.betterend.hydralux_sapling": "水光莲苗", "block.betterend.inflexia": "曲枝草", "block.betterend.lacugrove": "泊林木海藻", diff --git a/kubejs/assets/betterend/models/block/hydralux_sapling_1.json b/kubejs/assets/betterend/models/block/hydralux_sapling_1.json index c433371b8..aea21f65c 100644 --- a/kubejs/assets/betterend/models/block/hydralux_sapling_1.json +++ b/kubejs/assets/betterend/models/block/hydralux_sapling_1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "texture": "betterend:block/hydralux_sapling_1" + "cross": "betterend:block/hydralux_sapling_1" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/hydralux_sapling_2.json b/kubejs/assets/betterend/models/block/hydralux_sapling_2.json index 8b3416b43..003f6f42a 100644 --- a/kubejs/assets/betterend/models/block/hydralux_sapling_2.json +++ b/kubejs/assets/betterend/models/block/hydralux_sapling_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "texture": "betterend:block/hydralux_sapling_2" + "cross": "betterend:block/hydralux_sapling_2" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/hydralux_sapling_3.json b/kubejs/assets/betterend/models/block/hydralux_sapling_3.json index b584afc83..7c7083a3a 100644 --- a/kubejs/assets/betterend/models/block/hydralux_sapling_3.json +++ b/kubejs/assets/betterend/models/block/hydralux_sapling_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "texture": "betterend:block/hydralux_sapling_3" + "cross": "betterend:block/hydralux_sapling_3" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/hydralux_sapling_4.json b/kubejs/assets/betterend/models/block/hydralux_sapling_4.json index 29d0571ea..8447696d4 100644 --- a/kubejs/assets/betterend/models/block/hydralux_sapling_4.json +++ b/kubejs/assets/betterend/models/block/hydralux_sapling_4.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "texture": "betterend:block/hydralux_sapling_4" + "cross": "betterend:block/hydralux_sapling_4" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/hydralux_vine.json b/kubejs/assets/betterend/models/block/hydralux_vine.json index ad34df156..4bf44c7ce 100644 --- a/kubejs/assets/betterend/models/block/hydralux_vine.json +++ b/kubejs/assets/betterend/models/block/hydralux_vine.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "texture": "betterend:block/hydralux_vine" + "cross": "betterend:block/hydralux_vine" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/hydralux_roots.json b/kubejs/assets/betterend/models/block/hydralux_vine_bottom.json similarity index 100% rename from kubejs/assets/betterend/models/block/hydralux_roots.json rename to kubejs/assets/betterend/models/block/hydralux_vine_bottom.json diff --git a/kubejs/assets/betterend/models/item/hydralux_large.json b/kubejs/assets/betterend/models/item/hydralux_large.json new file mode 100644 index 000000000..d3a1c3199 --- /dev/null +++ b/kubejs/assets/betterend/models/item/hydralux_large.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/hydralux_sapling_4" + } +} diff --git a/kubejs/assets/betterend/models/item/hydralux_small.json b/kubejs/assets/betterend/models/item/hydralux_small.json new file mode 100644 index 000000000..1dcb9cba5 --- /dev/null +++ b/kubejs/assets/betterend/models/item/hydralux_small.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/hydralux_sapling_2" + } +} diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json index 31f6e1288..95b93a589 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -13,6 +13,12 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "minecraft:music.overworld.desert" + }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index 0c2a223e7..d31e4baaa 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -13,6 +13,12 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "minecraft:music.overworld.desert" + }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index d51fb49f4..3cb0ddee6 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -13,6 +13,12 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "minecraft:music.overworld.desert" + }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json index b5bd95447..bde6fef13 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json +++ b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json @@ -4,16 +4,21 @@ }, "downfall": 0, "effects": { + "additions_sound": { + "sound": "minecraft:ambient.basalt_deltas.additions", + "tick_chance": 0.0111 + }, "sky_color": 10465603, "fog_color": 9938052, "water_color": 8241044, "water_fog_color": 10866612, "grass_color": 13758586, "foliage_color": 11653213, + "ambient_sound": "minecraft:ambient.basalt_deltas.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, - "sound": "minecraft:ambient.cave", + "sound": "minecraft:ambient.basalt_deltas.mood", "tick_delay": 6000 }, "particle": { diff --git a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json index c55ed1b32..259eb1839 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json @@ -4,11 +4,16 @@ }, "downfall": 0, "effects": { + "additions_sound": { + "sound": "minecraft:ambient.basalt_deltas.additions", + "tick_chance": 0.0111 + }, "fog_color": 9938052, + "ambient_sound": "minecraft:ambient.basalt_deltas.loop", "mood_sound": { "block_search_extent": 8, "offset": 2.0, - "sound": "minecraft:ambient.cave", + "sound": "minecraft:ambient.basalt_deltas.mood", "tick_delay": 6000 }, "sky_color": 10465603, diff --git a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json index 1919f5236..951b5f9c6 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json @@ -4,21 +4,26 @@ }, "downfall": 0, "effects": { + "additions_sound": { + "sound": "minecraft:ambient.basalt_deltas.additions", + "tick_chance": 0.0111 + }, "sky_color": 11644227, "fog_color": 10788996, "water_color": 8241044, "water_fog_color": 10866612, "grass_color": 13758586, "foliage_color": 11653213, + "ambient_sound": "minecraft:ambient.basalt_deltas.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, - "sound": "minecraft:ambient.cave", + "sound": "minecraft:ambient.basalt_deltas.mood", "tick_delay": 6000 }, "particle": { "options": { - "type": "minecraft:ash" + "type": "minecraft:white_ash" }, "probability": 0.03 } @@ -35,6 +40,7 @@ "#tfg:venus_veins", "#tfg:venus_underground_decoration", [ + "tfg:venus/terrain/sulfur_blob_rare", "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", @@ -42,7 +48,8 @@ "tfg:venus/terrain/thermal_vent_rare" ], [ - "tfg:venus/surface/sulfur_patch" + "tfg:venus/surface/sulfur_patch", + "tfg:venus/surface/hydralux_rare" ], "#tfg:venus_top_layer_modification" ], diff --git a/kubejs/data/tfg/worldgen/biome/venus/geysers.json b/kubejs/data/tfg/worldgen/biome/venus/geysers.json index 48cd0de43..1f003659d 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/geysers.json +++ b/kubejs/data/tfg/worldgen/biome/venus/geysers.json @@ -4,21 +4,26 @@ }, "downfall": 0, "effects": { + "additions_sound": { + "sound": "minecraft:ambient.basalt_deltas.additions", + "tick_chance": 0.0111 + }, "sky_color": 10465603, "fog_color": 9938052, "water_color": 8241044, "water_fog_color": 10866612, "grass_color": 13758586, "foliage_color": 11653213, + "ambient_sound": "minecraft:ambient.basalt_deltas.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, - "sound": "minecraft:ambient.cave", + "sound": "minecraft:ambient.basalt_deltas.mood", "tick_delay": 6000 }, "particle": { "options": { - "type": "minecraft:ash" + "type": "minecraft:white_ash" }, "probability": 0.1 } diff --git a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json index 0484aa1c5..3d0afe1af 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json +++ b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json @@ -4,16 +4,21 @@ }, "downfall": 0, "effects": { + "additions_sound": { + "sound": "minecraft:ambient.basalt_deltas.additions", + "tick_chance": 0.0111 + }, "sky_color": 10465603, "fog_color": 9938052, "water_color": 8241044, "water_fog_color": 10866612, "grass_color": 13758586, "foliage_color": 11653213, + "ambient_sound": "minecraft:ambient.basalt_deltas.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, - "sound": "minecraft:ambient.cave", + "sound": "minecraft:ambient.basalt_deltas.mood", "tick_delay": 6000 }, "particle": { diff --git a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json index 01722f1a0..c1a5b4273 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json +++ b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json @@ -4,21 +4,26 @@ }, "downfall": 0, "effects": { + "additions_sound": { + "sound": "minecraft:ambient.basalt_deltas.additions", + "tick_chance": 0.0111 + }, "sky_color": 10465603, "fog_color": 12237498, "water_color": 8241044, "water_fog_color": 10866612, "grass_color": 13758586, "foliage_color": 11653213, + "ambient_sound": "minecraft:ambient.basalt_deltas.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, - "sound": "minecraft:ambient.cave", + "sound": "minecraft:ambient.basalt_deltas.mood", "tick_delay": 6000 }, "particle": { "options": { - "type": "minecraft:ash" + "type": "minecraft:white_ash" }, "probability": 0.02 } diff --git a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json index 065dec95d..14ab6fc24 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json +++ b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json @@ -4,6 +4,10 @@ }, "downfall": 0, "effects": { + "additions_sound": { + "sound": "minecraft:ambient.basalt_deltas.additions", + "tick_chance": 0.0111 + }, "sky_color": 11644227, "fog_color": 10788996, "water_color": 8241044, @@ -13,12 +17,12 @@ "mood_sound": { "block_search_extent": 8, "offset": 2, - "sound": "minecraft:ambient.cave", + "sound": "minecraft:ambient.basalt_deltas.mood", "tick_delay": 6000 }, "particle": { "options": { - "type": "minecraft:ash" + "type": "minecraft:white_ash" }, "probability": 0.05 } diff --git a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json index 8be57e46a..d474c79c9 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json +++ b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json @@ -4,16 +4,21 @@ }, "downfall": 0, "effects": { + "additions_sound": { + "sound": "minecraft:ambient.basalt_deltas.additions", + "tick_chance": 0.0111 + }, "sky_color": 11644227, - "fog_color": 12232752, + "fog_color": 11575877, "water_color": 8241044, "water_fog_color": 10866612, "grass_color": 13758586, "foliage_color": 11653213, + "ambient_sound": "minecraft:ambient.basalt_deltas.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, - "sound": "minecraft:ambient.cave", + "sound": "minecraft:ambient.basalt_deltas.mood", "tick_delay": 6000 }, "particle": { @@ -41,7 +46,8 @@ "tfg:venus/terrain/thermal_vent" ], [ - "tfg:venus/surface/sulfur_patch" + "tfg:venus/surface/sulfur_patch", + "tfg:venus/surface/hydralux" ], "#tfg:venus_top_layer_modification" ], diff --git a/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json b/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json index 7a6b92b61..e6cf0d645 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json @@ -4,16 +4,21 @@ }, "downfall": 0, "effects": { - "sky_color": 10465603, - "fog_color": 9938052, + "additions_sound": { + "sound": "minecraft:ambient.basalt_deltas.additions", + "tick_chance": 0.0111 + }, + "sky_color": 5450003, + "fog_color": 5450003, "water_color": 8241044, "water_fog_color": 10866612, "grass_color": 13758586, "foliage_color": 11653213, + "ambient_sound": "minecraft:ambient.basalt_deltas.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, - "sound": "minecraft:ambient.cave", + "sound": "minecraft:ambient.basalt_deltas.mood", "tick_delay": 6000 }, "particle": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_large.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_large.json new file mode 100644 index 000000000..babc7cf32 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_large.json @@ -0,0 +1,43 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "tfg:tall_decorative_plant", + "config": { + "block": "betterend:hydralux_large", + "plantHeight": 4, + "minHeight": 5, + "maxHeight": 9, + "middle": 1 + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "tfg:fluid/sulfur_fumes" + }, + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:venus_stone_replaceables" + } + ] + } + } + ] + }, + "tries": 4, + "xz_spread": 10, + "y_spread": 0 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_sapling.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_sapling.json new file mode 100644 index 000000000..cdda2a5d4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_sapling.json @@ -0,0 +1,47 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:hydralux_sapling", + "Properties": { + "fluid": "sulfur_fumes" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "tfg:fluid/sulfur_fumes" + }, + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:venus_stone_replaceables" + } + ] + } + } + ] + }, + "tries": 18, + "xz_spread": 16, + "y_spread": 0 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_small.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_small.json new file mode 100644 index 000000000..04da10296 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/hydralux_small.json @@ -0,0 +1,43 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "tfg:tall_decorative_plant", + "config": { + "block": "betterend:hydralux_small", + "plantHeight": 4, + "minHeight": 3, + "maxHeight": 6, + "middle": 1 + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "tfg:fluid/sulfur_fumes" + }, + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:venus_stone_replaceables" + } + ] + } + } + ] + }, + "tries": 6, + "xz_spread": 10, + "y_spread": 0 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_columns.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_columns.json index bf53f5020..5715015fa 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_columns.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_columns.json @@ -22,7 +22,7 @@ "type": "minecraft:uniform", "value": { "min_inclusive": 1, - "max_inclusive": 3 + "max_inclusive": 4 } }, "provider": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json index dcbb0a413..2d620ef82 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json @@ -16,7 +16,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR_WG" + "heightmap": "OCEAN_FLOOR" }, { "type": "minecraft:block_predicate_filter", @@ -41,7 +41,7 @@ ] }, "tries": 32, - "xz_spread": 2, + "xz_spread": 3, "y_spread": 0 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/hydralux.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/hydralux.json new file mode 100644 index 000000000..587031522 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/hydralux.json @@ -0,0 +1,37 @@ +{ + "feature": { + "type": "tfc:multiple", + "config": { + "features": [ + { + "feature": "tfg:venus/surface/hydralux_large", + "placement": [] + }, + { + "feature": "tfg:venus/surface/hydralux_small", + "placement": [] + }, + { + "feature": "tfg:venus/surface/hydralux_sapling", + "placement": [] + } + ] + } + }, + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/hydralux_rare.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/hydralux_rare.json new file mode 100644 index 000000000..acd708f5c --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/hydralux_rare.json @@ -0,0 +1,37 @@ +{ + "feature": { + "type": "tfc:multiple", + "config": { + "features": [ + { + "feature": "tfg:venus/surface/hydralux_large", + "placement": [] + }, + { + "feature": "tfg:venus/surface/hydralux_small", + "placement": [] + }, + { + "feature": "tfg:venus/surface/hydralux_sapling", + "placement": [] + } + ] + } + }, + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_blob_rare.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_blob_rare.json new file mode 100644 index 000000000..1872700a2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_blob_rare.json @@ -0,0 +1,31 @@ +{ + "feature": { + "type": "tfc:if_then", + "config": { + "if": { + "feature": "tfg:venus/terrain/sulfur_blob", + "placement": [] + }, + "then": { + "feature": "tfg:venus/surface/sulfur_crystals", + "placement": [] + } + } + }, + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + } + ] +} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js index a30788490..35f5341fa 100644 --- a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js +++ b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js @@ -261,4 +261,28 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .mapColor('terracotta_light_gray') .requiresTool(true) .tagBlock('minecraft:mineable/pickaxe') + + // Plants + + event.create('betterend:hydralux_sapling', 'tfg:decorative_plant') + .soundType('nether_wart') + .mapColor('green_terracotta') + .box(2, 0, 2, 14, 13, 14) + .tagBlock('tfg:do_not_destroy_in_space') + + event.create('betterend:hydralux_small', 'tfg:tall_decorative_plant') + .height(4) + .soundType('nether_wart') + .mapColor('green_terracotta') + .box(3, 0, 3, 13, 16, 13) + .tagItem('tfg:venus_plants') + .tagBlock('tfg:do_not_destroy_in_space') + + event.create('betterend:hydralux_large', 'tfg:tall_decorative_plant') + .height(4) + .soundType('nether_wart') + .mapColor('green_terracotta') + .box(3, 0, 3, 13, 16, 13) + .tagItem('tfg:venus_plants') + .tagBlock('tfg:do_not_destroy_in_space') } \ No newline at end of file