From 2f0b30cede7e75bf3761b408c502359514891cff Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 24 Jan 2026 18:54:53 +0000 Subject: [PATCH] music! --- config/defaultoptions/options.txt | 4 +- .../occlusion.properties | 2 +- kubejs/assets/minecraft/sounds.json | 210 ++++++++++++++++++ kubejs/assets/tfg/sounds.json | 181 +++++++++++++++ .../data/ad_astra/worldgen/biome/orbit.json | 36 +++ .../biome/glacio/placeholder_biome.json | 8 +- .../tfg/worldgen/biome/mars/amber_edge.json | 2 +- .../tfg/worldgen/biome/mars/amber_hills.json | 2 +- .../tfg/worldgen/biome/mars/amber_plains.json | 2 +- .../biome/mars/martian_deep_desert.json | 2 +- .../biome/mars/martian_dune_edge.json | 2 +- .../worldgen/biome/mars/martian_dunes.json | 2 +- .../biome/mars/martian_mountains.json | 2 +- .../worldgen/biome/mars/martian_river.json | 2 +- .../worldgen/biome/mars/rusticus_edge.json | 2 +- .../worldgen/biome/mars/rusticus_hills.json | 2 +- .../worldgen/biome/mars/rusticus_plains.json | 2 +- .../tfg/worldgen/biome/mars/sangnum_edge.json | 2 +- .../worldgen/biome/mars/sangnum_hills.json | 2 +- .../worldgen/biome/mars/sangnum_plains.json | 2 +- .../biome/moon/lunar_asurine_dense.json | 8 +- .../biome/moon/lunar_asurine_sparse.json | 8 +- .../biome/moon/lunar_chorus_dense.json | 8 +- .../biome/moon/lunar_chorus_sparse.json | 8 +- .../biome/moon/lunar_corals_dense.json | 8 +- .../biome/moon/lunar_corals_sparse.json | 8 +- .../biome/moon/lunar_lights_dense.json | 8 +- .../biome/moon/lunar_lights_sparse.json | 8 +- .../tfg/worldgen/biome/moon/lunar_plains.json | 8 +- .../tfg/worldgen/biome/moon/lunar_sands.json | 8 +- .../tfg/worldgen/biome/nether/ash_forest.json | 2 +- .../worldgen/biome/nether/basalt_deltas.json | 2 +- .../biome/nether/decaying_caverns.json | 2 +- .../worldgen/biome/nether/diorite_caves.json | 2 +- .../worldgen/biome/nether/gabbro_caves.json | 2 +- .../worldgen/biome/nether/gneiss_caves.json | 2 +- .../worldgen/biome/nether/granite_caves.json | 2 +- .../tfg/worldgen/biome/nether/lava_floes.json | 2 +- .../worldgen/biome/nether/lush_hollow.json | 2 +- .../worldgen/biome/nether/schist_caves.json | 2 +- .../worldgen/biome/nether/webbed_lair.json | 2 +- .../tfg/worldgen/biome/venus/arachnoids.json | 6 + .../worldgen/biome/venus/fractured_pools.json | 6 + .../tfg/worldgen/biome/venus/fumaroles.json | 6 + .../tfg/worldgen/biome/venus/geysers.json | 6 + .../biome/venus/jagged_tablelands.json | 6 + .../tfg/worldgen/biome/venus/salt_flats.json | 6 + .../biome/venus/scorching_volcanoes.json | 6 + .../biome/venus/stromatolite_beach.json | 6 + .../worldgen/biome/venus/sulfuric_ravine.json | 6 + pakku-lock.json | 3 +- 51 files changed, 588 insertions(+), 40 deletions(-) create mode 100644 kubejs/assets/minecraft/sounds.json create mode 100644 kubejs/data/ad_astra/worldgen/biome/orbit.json diff --git a/config/defaultoptions/options.txt b/config/defaultoptions/options.txt index 67d33be82..d5b550ee3 100644 --- a/config/defaultoptions/options.txt +++ b/config/defaultoptions/options.txt @@ -3,12 +3,12 @@ resourcePacks:["vanilla","mod_resources","gtceu:dynamic_assets","Moonlight Mods incompatibleResourcePacks:["firmalife_data","file/Perfected Anvil Helper.zip"] narrator:0 soundCategory_master:1.0 -soundCategory_music:0.3 +soundCategory_music:0.4 soundCategory_record:1.0 soundCategory_weather:1.0 soundCategory_block:1.0 soundCategory_hostile:1.0 soundCategory_neutral:1.0 soundCategory_player:1.0 -soundCategory_ambient:0.3 +soundCategory_ambient:0.7 soundCategory_voice:1.0 \ No newline at end of file diff --git a/config/sound_physics_remastered/occlusion.properties b/config/sound_physics_remastered/occlusion.properties index 53adea71f..d9f11a406 100644 --- a/config/sound_physics_remastered/occlusion.properties +++ b/config/sound_physics_remastered/occlusion.properties @@ -216,4 +216,4 @@ minecraft\:jukebox=0.0 # Lava (Block) minecraft\:lava=0.75 # Water (Block) -minecraft\:water=0.25 +\#minecraft\:water=0.25 diff --git a/kubejs/assets/minecraft/sounds.json b/kubejs/assets/minecraft/sounds.json new file mode 100644 index 000000000..1580bf5cf --- /dev/null +++ b/kubejs/assets/minecraft/sounds.json @@ -0,0 +1,210 @@ +{ + "music.game": { + "replace": true, + "sounds": [ + { + "name": "tfc:music/m0-dreams_of_the_phae", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m1-firmavista", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m2-sycamore_heights", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m3-terrafirmacraft", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m4-through_the_willows", + "stream": true, + "weight": 4 + }, + { + "name": "minecraft:music/game/creative/creative2", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative3", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative4", + "stream": true + }, + { + "name": "minecraft:music/game/nether/nether2", + "stream": true + }, + { + "name": "minecraft:music/game/swamp/aerie", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/swamp/firebugs", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/swamp/labyrinthine", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/axolotl", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/dragon_fish", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/shuniji", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/a_familiar_room", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/an_ordinary_day", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/bromeliad", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/comforting_memories", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/crescent_dunes", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/echo_in_the_wind", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/floating_dream", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/hal1", + "stream": true + }, + { + "name": "minecraft:music/game/hal2", + "stream": true + }, + { + "name": "minecraft:music/game/hal3", + "stream": true + }, + { + "name": "minecraft:music/game/hal4", + "stream": true + }, + { + "name": "minecraft:music/game/infinite_amethyst", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/left_to_bloom", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/one_more_day", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/stand_tall", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/wending", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/menu/menu1", + "stream": true + }, + { + "name": "minecraft:music/menu/menu2", + "stream": true + }, + { + "name": "minecraft:music/menu/menu3", + "stream": true + }, + { + "name": "minecraft:music/menu/menu4", + "stream": true + }, + { + "name": "minecraft:records/blocks", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:records/mall", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:records/strad", + "stream": true, + "volume": 0.4 + } + ] + }, + "music.menu": { + "replace": true, + "sounds": [ + { + "name": "tfc:music/m0-dreams_of_the_phae", + "stream": true + }, + { + "name": "tfc:music/m1-firmavista", + "stream": true + }, + { + "name": "tfc:music/m2-sycamore_heights", + "stream": true + }, + { + "name": "tfc:music/m3-terrafirmacraft", + "stream": true + }, + { + "name": "tfc:music/m4-through_the_willows", + "stream": true + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/sounds.json b/kubejs/assets/tfg/sounds.json index 56ed1adba..45cc75407 100644 --- a/kubejs/assets/tfg/sounds.json +++ b/kubejs/assets/tfg/sounds.json @@ -311,6 +311,58 @@ "minecraft:ambient/nether/nether_wastes/mood5" ] }, + "music.nether": { + "sounds": [ + { + "name": "minecraft:music/game/nether/nether1", + "stream": true + }, + { + "name": "minecraft:music/game/nether/nether3", + "stream": true + }, + { + "name": "minecraft:music/game/nether/nether_wastes/rubedo", + "stream": true, + "volume": 0.5 + }, + { + "name": "minecraft:music/game/water/axolotl", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/nether/soulsand_valley/so_below", + "stream": true, + "volume": 0.5 + }, + { + "name": "minecraft:music/game/ancestry", + "stream": true, + "volume": 0.4 + } + ] + }, + "music.orbit": { + "sounds": [ + { + "name": "minecraft:music/game/piano3", + "stream": true + }, + { + "name": "minecraft:music/game/calm1", + "stream": true + }, + { + "name": "minecraft:music/game/calm2", + "stream": true + }, + { + "name": "minecraft:music/game/calm3", + "stream": true + } + ] + }, "ambient.moon.additions": { "sounds": [ { @@ -377,6 +429,31 @@ "minecraft:ambient/nether/warped_forest/mood8" ] }, + "music.moon": { + "sounds": [ + { + "name": "minecraft:music/game/end/end", + "stream": true + }, + { + "name": "minecraft:music/game/floating_dream", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/nuance1", + "stream": true + }, + { + "name": "minecraft:music/game/nuance2", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative6", + "stream": true + } + ] + }, "ambient.mars_desert.loop": { "sounds": [ { @@ -583,6 +660,49 @@ "minecraft:ambient/nether/warped_forest/creak5" ] }, + "music.mars": { + "sounds": [ + { + "name": "minecraft:music/game/creative/creative1", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative2", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative3", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative4", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative5", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative6", + "stream": true + }, + { + "name": "minecraft:music/game/crescent_dunes", + "stream": true, + "volume": 0.4, + "weight": 2 + }, + { + "name": "minecraft:records/far", + "stream": true + }, + { + "name": "minecraft:records/otherside", + "stream": true, + "volume": 0.3 + } + ] + }, "ambient.venus_surface.loop": { "sounds": [ { @@ -754,5 +874,66 @@ "minecraft:ambient/nether/crimson_forest/shine2", "minecraft:ambient/nether/crimson_forest/shine3" ] + }, + "music.venus": { + "sounds": [ + { + "name": "minecraft:music/game/nether/nether1", + "stream": true, + "weight": 2 + }, + { + "name": "minecraft:music/game/nether/nether3", + "stream": true, + "weight": 2 + }, + { + "name": "minecraft:music/game/nether/nether4", + "stream": true, + "weight": 2 + }, + { + "name": "minecraft:music/game/nether/crimson_forest/chrysopoeia", + "stream": true, + "volume": 0.5, + "weight": 3 + }, + { + "name": "minecraft:music/game/nether/nether_wastes/rubedo", + "stream": true, + "volume": 0.5, + "weight": 3 + }, + { + "name": "minecraft:music/game/nether/soulsand_valley/so_below", + "stream": true, + "volume": 0.5, + "weight": 3 + }, + { + "name": "minecraft:music/game/piano3", + "stream": true + } + ] + }, + + "music.europa": { + "sounds": [ + { + "name": "minecraft:music/game/water/axolotl", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/dragon_fish", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/shuniji", + "stream": true, + "volume": 0.4 + } + ] } } \ No newline at end of file diff --git a/kubejs/data/ad_astra/worldgen/biome/orbit.json b/kubejs/data/ad_astra/worldgen/biome/orbit.json new file mode 100644 index 000000000..6ca112af5 --- /dev/null +++ b/kubejs/data/ad_astra/worldgen/biome/orbit.json @@ -0,0 +1,36 @@ +{ + "carvers": {}, + "downfall": 0.0, + "effects": { + "fog_color": 0, + "mood_sound": { + "block_search_extent": 8, + "offset": 2.0, + "sound": "minecraft:ambient.cave", + "tick_delay": 6000 + }, + "sky_color": 0, + "water_color": 4159204, + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.orbit" + } + }, + "features": [], + "has_precipitation": false, + "spawn_costs": {}, + "spawners": { + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": 0.5 +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json b/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json index 3af86fa03..11a0ae5ca 100644 --- a/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json +++ b/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json @@ -13,7 +13,13 @@ }, "sky_color": 12638463, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.europa" + } }, "features": [ [ diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json index ff69d8291..d33b3d3a3 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 123397ed4..c8264b7a0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 449c418df..b364fb13d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, 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 55dc40cb3..e0b3ae626 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -22,7 +22,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, 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 bc287325a..27cee44c3 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -22,7 +22,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index 5a6be0ee6..c8643ae89 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -22,7 +22,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 36fc33433..fcddd858c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 526e0aac2..6d52544c7 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json index 426622e37..d6eda6457 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 51da6391a..972f04a2a 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index fc74372ce..baec9fb2f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json index 9ec2931ea..8c54913ea 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index ea1dd0460..9fb85c03b 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index c121e5c92..799884b3d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json index bdcadd76f..4cac815ef 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json index 01404bf9a..f02dcffe1 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json index e1b31499f..3ad07802a 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json index 78f29f76c..ca03953f6 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json index 71e451418..2ed2f3417 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json index 7fa136647..00f00a73d 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json index daaa5ff95..6543331b8 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json index 2318e94fa..c3b22c181 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index ce6e50d86..70de199b4 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json index 1413884ea..ac2bd7dd3 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json index 4e1407e4f..373ec8433 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json +++ b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.basalt_deltas" + "sound": "tfg:music.nether" }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json index 021ca0904..000b82cee 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json +++ b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.basalt_deltas" + "sound": "tfg:music.nether" }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json index 46ba6d62b..ecd04d04b 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json +++ b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.swamp" + "sound": "tfg:music.nether" }, "sky_color": 7369031, "water_color": 6388580, diff --git a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json index 2eda606b4..e6151c614 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": "tfg:music.nether" }, "sky_color": 9868701, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json index 924c75418..be32b9025 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": "tfg:music.nether" }, "sky_color": 5855333, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json index 318f7de01..8704fd4fc 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": "tfg:music.nether" }, "sky_color": 5799235, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json index 5ff94fd88..245b0efaa 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": "tfg:music.nether" }, "sky_color": 9533575, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json b/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json index 1772b420e..34acd86f3 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json +++ b/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.basalt_deltas" + "sound": "tfg:music.nether" }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json index d7992093e..37ad103be 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json +++ b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.lush_caves" + "sound": "tfg:music.nether" }, "sky_color": 5799235, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json index 77e64f7b3..62179da9d 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": "tfg:music.nether" }, "sky_color": 7175789, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json index 709636995..3649311ef 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json +++ b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json @@ -15,7 +15,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.dripstone_caves" + "sound": "tfg:music.nether" }, "additions_sound": { "sound": "tfg:ambient.upper_nether_cave.additions", diff --git a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json index b5131ddc6..d25e960e3 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json +++ b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json @@ -24,6 +24,12 @@ "type": "minecraft:ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json index cb3acbedb..42778b30b 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json @@ -24,6 +24,12 @@ "type": "minecraft:ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json index f5cddc92c..d804e9ef3 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json @@ -24,6 +24,12 @@ "type": "minecraft:white_ash" }, "probability": 0.03 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/geysers.json b/kubejs/data/tfg/worldgen/biome/venus/geysers.json index 63937fc35..2300b4e28 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/geysers.json +++ b/kubejs/data/tfg/worldgen/biome/venus/geysers.json @@ -24,6 +24,12 @@ "type": "minecraft:ash" }, "probability": 0.07 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json index 2a092a303..8ab9b85f4 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json +++ b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json @@ -24,6 +24,12 @@ "type": "minecraft:white_ash" }, "probability": 0.02 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json index 8415a8167..ab90d033f 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json +++ b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json @@ -24,6 +24,12 @@ "type": "minecraft:white_ash" }, "probability": 0.02 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json index 7bd62eebb..e17187968 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json +++ b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json @@ -24,6 +24,12 @@ "type": "minecraft:ash" }, "probability": 0.1 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json index 7ac1a7cf5..504b50089 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json +++ b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json @@ -24,6 +24,12 @@ "type": "minecraft:white_ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json index 2088c8478..841f118df 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json +++ b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json @@ -24,6 +24,12 @@ "type": "minecraft:ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/pakku-lock.json b/pakku-lock.json index b98f4acab..476d7096d 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -187,7 +187,8 @@ }, { "pakku_id": "tIIGT85PQd5pJGf0", - "type": "MOD", + "type": "RESOURCE_PACK", + "side": "CLIENT", "slug": { "github": "Frontiers-PackForge/AE2-Midnight-and-Daybreak" },