diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/grass.json b/kubejs/assets/ambientsounds/basic/blockgroups/grass.json index cfea52f20..31c09150e 100644 --- a/kubejs/assets/ambientsounds/basic/blockgroups/grass.json +++ b/kubejs/assets/ambientsounds/basic/blockgroups/grass.json @@ -1,6 +1,3 @@ [ - "tfc:grass/loam", - "tfc:grass/silty_loam", - "tfc:grass/sandy_loam", - "tfc:grass/silt" + "#tfc:plants" ] diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/ice.json b/kubejs/assets/ambientsounds/basic/blockgroups/ice.json index 9e24b58f1..df328151d 100644 --- a/kubejs/assets/ambientsounds/basic/blockgroups/ice.json +++ b/kubejs/assets/ambientsounds/basic/blockgroups/ice.json @@ -3,6 +3,9 @@ "minecraft:packed_ice", "minecraft:frosted_ice", "minecraft:blue_ice", + "tfg:dry_ice", + "tfg:mars_ice", + "ad_astra:permafrost", "tfc:sea_ice", "tfc:ice_pile" ] diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/rock.json b/kubejs/assets/ambientsounds/basic/blockgroups/rock.json new file mode 100644 index 000000000..6995313c7 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/blockgroups/rock.json @@ -0,0 +1,3 @@ +[ + "#forge:stone" +] diff --git a/kubejs/assets/ambientsounds/basic/regions/forest.cold.json b/kubejs/assets/ambientsounds/basic/regions/forest.cold.json index 9c8a520f9..d606e30c4 100644 --- a/kubejs/assets/ambientsounds/basic/regions/forest.cold.json +++ b/kubejs/assets/ambientsounds/basic/regions/forest.cold.json @@ -66,8 +66,8 @@ "ambientsounds:animals.wolf" ], "pause": { - "min": 100, - "max": 600 + "min": 12000, + "max": 72000 }, "day": 0 }, @@ -78,7 +78,7 @@ "ambientsounds:animals.long-wolf" ], "pause": { - "min": 12000, + "min": 56000, "max": 72000 }, "day": 0 diff --git a/kubejs/assets/ambientsounds/basic/regions/savanna.json b/kubejs/assets/ambientsounds/basic/regions/savanna.json index b876efba6..65ed279d9 100644 --- a/kubejs/assets/ambientsounds/basic/regions/savanna.json +++ b/kubejs/assets/ambientsounds/basic/regions/savanna.json @@ -91,8 +91,8 @@ "ambientsounds:animals.wolf" ], "pause": { - "min": 100, - "max": 600 + "min": 12000, + "max": 72000 }, "day": 0 }, @@ -103,7 +103,7 @@ "ambientsounds:animals.long-wolf" ], "pause": { - "min": 12000, + "min": 56000, "max": 72000 }, "day": 0 diff --git a/kubejs/assets/ambientsounds/basic/regions/taiga.json b/kubejs/assets/ambientsounds/basic/regions/taiga.json index d697d9f8d..0eea8ca75 100644 --- a/kubejs/assets/ambientsounds/basic/regions/taiga.json +++ b/kubejs/assets/ambientsounds/basic/regions/taiga.json @@ -52,8 +52,8 @@ "ambientsounds:animals.wolf" ], "pause": { - "min": 100, - "max": 600 + "min": 12000, + "max": 72000 }, "day": 0 }, @@ -64,7 +64,7 @@ "ambientsounds:animals.long-wolf" ], "pause": { - "min": 12000, + "min": 56000, "max": 72000 }, "day": 0 diff --git a/kubejs/server_scripts/tfg/mars/tags.mars.js b/kubejs/server_scripts/tfg/mars/tags.mars.js index 7d5e34e30..33eafa125 100644 --- a/kubejs/server_scripts/tfg/mars/tags.mars.js +++ b/kubejs/server_scripts/tfg/mars/tags.mars.js @@ -2,8 +2,6 @@ function registerTFGMarsItemTags(event) { - event.add('c:hidden_from_recipe_viewers', 'tfg:mars_ice') - event.add('tfc:compost_greens', 'ad_astra:aeronos_cap') event.add('tfc:compost_greens', 'ad_astra:strophar_cap') diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index b6d93a48f..539c5cb42 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -131,10 +131,10 @@ const registerTFGBlockTags = (event) => { event.add('forge:mineable/wrench', 'tfg:machine_casing_power_casing') event.add('minecraft:mineable/pickaxe', 'tfg:mars_ice') - event.add('minecraft:mineable/pickaxe', 'tfg:dry_ice') event.add('tfcambiental:cold_stuff', 'tfg:mars_ice') - event.add('tfcambiental:cold_stuff', 'tfg:dry_ice') event.add('minecraft:ice', 'tfg:mars_ice') + event.add('minecraft:mineable/pickaxe', 'tfg:dry_ice') + event.add('tfcambiental:cold_stuff', 'tfg:dry_ice') event.add('minecraft:ice', 'tfg:dry_ice') } //#endregion