Add echo to lush cave foliage rustling

Ladysnake · Sep 24, 2024 · 8e1220a · 8e1220a
1 parent 81a5442
commit 8e1220a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/client/java/org/ladysnake/effective/ambience/EffectiveAmbience.java b/src/client/java/org/ladysnake/effective/ambience/EffectiveAmbience.java
@@ -56,9 +56,13 @@ public void onInitializeClient() {
 		AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.ANIMAL_OWLS, AmbientCondition.Type.ANIMAL,
 			(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.FOREST)) && Effective.isNightTime(world)));
 
+		// rustling reverbed foliage in lush caves
+		AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.FOLIAGE_CAVE_LEAVES, AmbientCondition.Type.FOLIAGE,
+			(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && world.getBiome(pos).matchesKey(BiomeKeys.LUSH_CAVES)));
+
 		// rustling foliage in forests, floral biomes, swamps, jungles, wooded badlands and lush caves
 		AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.FOLIAGE_LEAVES, AmbientCondition.Type.FOLIAGE,
-			(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && (!EffectiveUtils.isInCave(world, pos) || world.getBiome(pos).matchesKey(BiomeKeys.LUSH_CAVES)) && (world.getBiome(pos).isIn(ConventionalBiomeTags.FOREST) || world.getBiome(pos).isIn(ConventionalBiomeTags.FLORAL) || world.getBiome(pos).isIn(ConventionalBiomeTags.SWAMP) || world.getBiome(pos).isIn(ConventionalBiomeTags.JUNGLE) || world.getBiome(pos).matchesKey(BiomeKeys.WOODED_BADLANDS) || world.getBiome(pos).matchesKey(BiomeKeys.LUSH_CAVES))));
+			(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.FOREST) || world.getBiome(pos).isIn(ConventionalBiomeTags.FLORAL) || world.getBiome(pos).isIn(ConventionalBiomeTags.SWAMP) || world.getBiome(pos).isIn(ConventionalBiomeTags.JUNGLE) || world.getBiome(pos).matchesKey(BiomeKeys.WOODED_BADLANDS))));
 
 		// water dripping in dripstone caves
 		AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WATER_DRIPSTONE_CAVES, AmbientCondition.Type.WATER,

diff --git a/src/client/java/org/ladysnake/effective/ambience/EffectiveAmbienceSounds.java b/src/client/java/org/ladysnake/effective/ambience/EffectiveAmbienceSounds.java
@@ -21,6 +21,7 @@ public class EffectiveAmbienceSounds {
 	public static final SoundEvent ANIMAL_JUNGLE_NIGHT = create("ambient.animal.jungle_night");
 	public static final SoundEvent ANIMAL_MANGROVE_BIRDS = create("ambient.animal.mangrove_birds");
 	public static final SoundEvent ANIMAL_OWLS = create("ambient.animal.owls");
+	public static final SoundEvent FOLIAGE_CAVE_LEAVES = create("ambient.foliage.cave_leaves");
 	public static final SoundEvent FOLIAGE_LEAVES = create("ambient.foliage.leaves");
 	public static final SoundEvent WATER_DRIPSTONE_CAVES = create("ambient.water.dripstone_caves");
 	public static final SoundEvent WATER_LUSH_CAVES = create("ambient.water.lush_caves");

diff --git a/src/client/resources/assets/effective/sounds.json b/src/client/resources/assets/effective/sounds.json
@@ -57,6 +57,11 @@
       "effective:ambient/animal_owls"
     ]
   },
+  "ambient.foliage.cave_leaves": {
+    "sounds": [
+      "effective:ambient/foliage_cave_leaves"
+    ]
+  },
   "ambient.foliage.leaves": {
     "sounds": [
       "effective:ambient/foliage_leaves"

diff --git a/src/client/resources/assets/effective/sounds/ambient/foliage_cave_leaves.ogg b/src/client/resources/assets/effective/sounds/ambient/foliage_cave_leaves.ogg