From 4406eef411bb6fb965ed667f6cbb3b574b820c6f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 25 Dec 2025 13:36:21 +0000 Subject: [PATCH] add trooper? and tweak beneath sounds --- kubejs/assets/tfg/sounds.json | 31 ++++++++++++++++++- .../tfg/worldgen/biome/nether/ash_forest.json | 8 ++--- .../biome/nether/decaying_caverns.json | 10 +++--- .../worldgen/biome/nether/diorite_caves.json | 6 ++-- .../worldgen/biome/nether/gabbro_caves.json | 6 ++-- .../worldgen/biome/nether/gneiss_caves.json | 6 ++-- .../worldgen/biome/nether/granite_caves.json | 6 ++-- .../worldgen/biome/nether/lush_hollow.json | 10 +++--- .../worldgen/biome/nether/schist_caves.json | 6 ++-- .../worldgen/biome/nether/webbed_lair.json | 12 +++---- kubejs/server_scripts/species/recipes.js | 29 ++++++----------- kubejs/startup_scripts/tfg/sounds.js | 3 +- 12 files changed, 76 insertions(+), 57 deletions(-) diff --git a/kubejs/assets/tfg/sounds.json b/kubejs/assets/tfg/sounds.json index 4358b496a..1a9e7be7c 100644 --- a/kubejs/assets/tfg/sounds.json +++ b/kubejs/assets/tfg/sounds.json @@ -1,5 +1,5 @@ { - "ambient.upper_nether.loop": { + "ambient.upper_nether_lush.loop": { "sounds": [ { "name": "ambientsounds:cave/cave_lush", @@ -38,6 +38,35 @@ } ] }, + "ambient.upper_nether_cave.loop": { + "sounds": [ + { + "name": "ambientsounds:cave/cave-water1", + "stream": true, + "volume": 1 + }, + { + "name": "ambientsounds:cave/cave-water2", + "stream": true, + "volume": 1 + }, + { + "name": "ambientsounds:cave/cave-water3", + "stream": true, + "volume": 1 + }, + { + "name": "ambientsounds:cave/cave-water4", + "stream": true, + "volume": 1 + }, + { + "name": "ambientsounds:cave/cave-water5", + "stream": true, + "volume": 1 + } + ] + }, "ambient.upper_nether.additions": { "sounds": [ { diff --git a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json index 08c81cc64..9102d14d7 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json +++ b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json @@ -102,10 +102,10 @@ ], "creature": [ { - "type": "minecraft:frog", - "maxCount": 2, - "minCount": 1, - "weight": 10 + "type": "species:trooper", + "maxCount": 3, + "minCount": 2, + "weight": 50 }, { "type": "beneath:red_elk", diff --git a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json index 2dbf55b97..239e984c5 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json +++ b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json @@ -8,7 +8,7 @@ "sound": "tfg:ambient.upper_nether.additions", "tick_chance": 0.0111 }, - "ambient_sound": "tfg:ambient.upper_nether.loop", + "ambient_sound": "tfg:ambient.upper_nether_lush.loop", "fog_color": 7369031, "mood_sound": { "block_search_extent": 8, @@ -107,16 +107,16 @@ "axolotls": [], "creature": [ { - "type": "minecraft:frog", - "maxCount": 5, + "type": "species:trooper", + "maxCount": 3, "minCount": 2, - "weight": 100 + "weight": 50 }, { "type": "beneath:red_elk", "maxCount": 3, "minCount": 2, - "weight": 50 + "weight": 100 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json index ee9cb81f5..a2c16252c 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json @@ -9,7 +9,7 @@ "sound": "tfg:ambient.upper_nether.additions", "tick_chance": 0.0111 }, - "ambient_sound": "tfg:ambient.upper_nether.loop", + "ambient_sound": "tfg:ambient.upper_nether_cave.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, @@ -100,8 +100,8 @@ ], "creature": [ { - "type": "minecraft:frog", - "maxCount": 4, + "type": "species:trooper", + "maxCount": 3, "minCount": 2, "weight": 50 }, diff --git a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json index 3fd6f8cb8..0f4244b9f 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json @@ -9,7 +9,7 @@ "sound": "tfg:ambient.upper_nether.additions", "tick_chance": 0.0111 }, - "ambient_sound": "tfg:ambient.upper_nether.loop", + "ambient_sound": "tfg:ambient.upper_nether_cave.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, @@ -100,8 +100,8 @@ ], "creature": [ { - "type": "minecraft:frog", - "maxCount": 4, + "type": "species:trooper", + "maxCount": 3, "minCount": 2, "weight": 50 }, diff --git a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json index ec01feca4..e5c647f8d 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json @@ -9,7 +9,7 @@ "sound": "tfg:ambient.upper_nether.additions", "tick_chance": 0.0111 }, - "ambient_sound": "tfg:ambient.upper_nether.loop", + "ambient_sound": "tfg:ambient.upper_nether_cave.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, @@ -101,8 +101,8 @@ ], "creature": [ { - "type": "minecraft:frog", - "maxCount": 4, + "type": "species:trooper", + "maxCount": 3, "minCount": 2, "weight": 50 }, diff --git a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json index 5bbe7ae9a..86695fd2d 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json @@ -9,7 +9,7 @@ "sound": "tfg:ambient.upper_nether.additions", "tick_chance": 0.0111 }, - "ambient_sound": "tfg:ambient.upper_nether.loop", + "ambient_sound": "tfg:ambient.upper_nether_cave.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, @@ -101,8 +101,8 @@ ], "creature": [ { - "type": "minecraft:frog", - "maxCount": 4, + "type": "species:trooper", + "maxCount": 3, "minCount": 2, "weight": 50 }, diff --git a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json index 6c407718b..98221703a 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json +++ b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json @@ -15,7 +15,7 @@ "sound": "tfg:ambient.upper_nether.additions", "tick_chance": 0.0111 }, - "ambient_sound": "tfg:ambient.upper_nether.loop", + "ambient_sound": "tfg:ambient.upper_nether_lush.loop", "music": { "max_delay": 24000, "min_delay": 12000, @@ -107,16 +107,16 @@ ], "creature": [ { - "type": "minecraft:frog", - "maxCount": 4, + "type": "species:trooper", + "maxCount": 3, "minCount": 2, - "weight": 100 + "weight": 50 }, { "type": "beneath:red_elk", "maxCount": 3, "minCount": 2, - "weight": 50 + "weight": 100 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json index 411aade9c..9e8e676a6 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json @@ -9,7 +9,7 @@ "sound": "tfg:ambient.upper_nether.additions", "tick_chance": 0.0111 }, - "ambient_sound": "tfg:ambient.upper_nether.loop", + "ambient_sound": "tfg:ambient.upper_nether_cave.loop", "mood_sound": { "block_search_extent": 8, "offset": 2, @@ -100,8 +100,8 @@ ], "creature": [ { - "type": "minecraft:frog", - "maxCount": 4, + "type": "species:trooper", + "maxCount": 3, "minCount": 2, "weight": 50 }, diff --git a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json index 6a164a71a..f72ec776c 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json +++ b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json @@ -18,10 +18,10 @@ "sound": "minecraft:music.overworld.dripstone_caves" }, "additions_sound": { - "sound": "tfg:ambient.upper_nether.additions", + "sound": "tfg:ambient.upper_nether_cave.additions", "tick_chance": 0.0111 }, - "ambient_sound": "tfg:ambient.upper_nether.loop", + "ambient_sound": "tfg:ambient.upper_nether_cave.loop", "sky_color": 5799235, "water_color": 7255466, "water_fog_color": 3169873, @@ -103,16 +103,16 @@ ], "creature": [ { - "type": "minecraft:frog", - "maxCount": 4, + "type": "species:trooper", + "maxCount": 3, "minCount": 2, - "weight": 100 + "weight": 50 }, { "type": "beneath:red_elk", "maxCount": 3, "minCount": 2, - "weight": 50 + "weight": 100 } ], "misc": [], diff --git a/kubejs/server_scripts/species/recipes.js b/kubejs/server_scripts/species/recipes.js index ef88347cb..9dd84f942 100644 --- a/kubejs/server_scripts/species/recipes.js +++ b/kubejs/server_scripts/species/recipes.js @@ -105,11 +105,11 @@ function registerSpeciesRecipes(event) { event.recipes.tfc.sewing('species:wicked_mask', [ - 1, 0, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 0, 1, - 0, 0, 0, 1, 0, 0, 1, - 0, 0, 0, 1, 0, 0, 1 + 1, 0, 0, 0, 1, 0, 0, 0, 1, + 1, 0, 0, 0, 1, 0, 0, 0, 1, + 1, 0, 0, 0, 1, 0, 0, 0, 1, + 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0 ], [ 1, 1, 1, 1, 0, 0, 0, 0, @@ -135,7 +135,7 @@ function registerSpeciesRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) .duration(200) - event.shaped('species:smoke_bomb', [ + event.shaped('2x species:smoke_bomb', [ ' A ', 'BCB', 'EDE' @@ -144,10 +144,10 @@ function registerSpeciesRecipes(event) { B: 'minecraft:paper', C: '#tfg:invisibility_ingredients', D: 'gtceu:sticky_resin', - E: '#tfc:powders' + E: 'minecraft:gunpowder' }).id('tfg:shaped/smoke_bomb_paper') - event.shaped('species:smoke_bomb', [ + event.shaped('2x species:smoke_bomb', [ ' A ', 'BC ', 'EDE' @@ -156,17 +156,6 @@ function registerSpeciesRecipes(event) { B: '#tfc:fired_vessels', C: '#tfg:invisibility_ingredients', D: 'gtceu:sticky_resin', - E: '#tfc:powders' + E: 'minecraft:gunpowder' }).id('tfg:shaped/smoke_bomb_vessel') - - event.shaped('2x species:smoke_bomb', [ - ' B ', - 'BCB', - ' D ' - ], { - A: '#forge:string', - B: 'minecraft:paper', - C: '#tfg:invisibility_ingredients', - D: 'tfg:dry_ice', - }).id('tfg:shaped/smoke_bomb_dry_ice') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/sounds.js b/kubejs/startup_scripts/tfg/sounds.js index 2b383fcc6..b169ac3d1 100644 --- a/kubejs/startup_scripts/tfg/sounds.js +++ b/kubejs/startup_scripts/tfg/sounds.js @@ -3,7 +3,8 @@ function registerTFGSounds(event) { - event.create('tfg:ambient.upper_nether.loop') + event.create('tfg:ambient.upper_nether_lush.loop') + event.create('tfg:ambient.upper_nether_cave.loop') event.create('tfg:ambient.upper_nether.additions') event.create('tfg:ambient.upper_nether.mood')