Skip to content

Commit

Permalink
Change cave ambience detection to use solid stone-like blocks above t…
Browse files Browse the repository at this point in the history 
…he player instead of light level
  • Loading branch information
@doctor4t
doctor4t committed Sep 24, 2024
1 parent e33a30b commit 801c6f3
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 30 deletions.
53 changes: 24 additions & 29 deletions src/client/java/org/ladysnake/effective/ambience/EffectiveAmbience.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags;
import net.minecraft.registry.tag.BiomeTags;
import net.minecraft.block.BlockState;
import net.minecraft.registry.tag.BlockTags;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockRenderView;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeKeys;
import org.ladysnake.effective.ambience.sound.AmbientCondition;
import org.ladysnake.effective.core.Effective;
import org.ladysnake.effective.core.utils.EffectiveUtils;

import java.util.HashSet;
import java.util.Set;
Expand All @@ -19,94 +22,86 @@ public class EffectiveAmbience implements ClientModInitializer {
public void onInitializeClient() {
// bees in floral biomes during the day
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.ANIMAL_BEES, AmbientCondition.Type.ANIMAL,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.FLORAL) && !Effective.isNightTime(world)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.FLORAL) && !Effective.isNightTime(world)));

// birds in forests during the day
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.ANIMAL_BIRDS, AmbientCondition.Type.ANIMAL,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.FOREST) && !Effective.isNightTime(world)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.FOREST) && !Effective.isNightTime(world)));

// cicadas in savannas during day
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.ANIMAL_CICADAS, AmbientCondition.Type.ANIMAL,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.SAVANNA) && !Effective.isNightTime(world)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.SAVANNA) && !Effective.isNightTime(world)));

// crickets in temperate (excluding swamps to use their dedicated cricket and frog ambience instead) and floral biomes at night
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.ANIMAL_CRICKETS, AmbientCondition.Type.ANIMAL,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && ((world.getBiome(pos).isIn(ConventionalBiomeTags.CLIMATE_TEMPERATE) && !world.getBiome(pos).isIn(ConventionalBiomeTags.SWAMP)) || world.getBiome(pos).isIn(ConventionalBiomeTags.FLORAL)) && Effective.isNightTime(world)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && ((world.getBiome(pos).isIn(ConventionalBiomeTags.CLIMATE_TEMPERATE) && !world.getBiome(pos).isIn(ConventionalBiomeTags.SWAMP)) || world.getBiome(pos).isIn(ConventionalBiomeTags.FLORAL)) && Effective.isNightTime(world)));

// frogs and crickets in swamps at night
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.ANIMAL_FROGS_AND_CRICKETS, AmbientCondition.Type.ANIMAL,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.SWAMP)) && Effective.isNightTime(world)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.SWAMP)) && Effective.isNightTime(world)));

// day jungle animals in jungles during the day
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.ANIMAL_JUNGLE_DAY, AmbientCondition.Type.ANIMAL,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.JUNGLE)) && !Effective.isNightTime(world)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.JUNGLE)) && !Effective.isNightTime(world)));

// night jungle animals in jungles at night
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.ANIMAL_JUNGLE_NIGHT, AmbientCondition.Type.ANIMAL,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.JUNGLE)) && Effective.isNightTime(world)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.JUNGLE)) && Effective.isNightTime(world)));

// mangrove birds in mangroves during the day
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.ANIMAL_MANGROVE_BIRDS, AmbientCondition.Type.ANIMAL,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && world.getBiome(pos).matchesKey(BiomeKeys.MANGROVE_SWAMP) && !Effective.isNightTime(world)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && world.getBiome(pos).matchesKey(BiomeKeys.MANGROVE_SWAMP) && !Effective.isNightTime(world)));

// owls in forests at night
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.ANIMAL_OWLS, AmbientCondition.Type.ANIMAL,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.FOREST)) && Effective.isNightTime(world)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.FOREST)) && Effective.isNightTime(world)));

// 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) -> isInOverworld(world, pos) && (!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).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))));

// water dripping in dripstone caves
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WATER_DRIPSTONE_CAVES, AmbientCondition.Type.WATER,
(world, pos, player) -> isInOverworld(world, pos) && world.getBiome(pos).matchesKey(BiomeKeys.DRIPSTONE_CAVES)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && world.getBiome(pos).matchesKey(BiomeKeys.DRIPSTONE_CAVES)));

// water streams in lush caves
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WATER_LUSH_CAVES, AmbientCondition.Type.WATER,
(world, pos, player) -> isInOverworld(world, pos) && world.getBiome(pos).matchesKey(BiomeKeys.LUSH_CAVES)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && world.getBiome(pos).matchesKey(BiomeKeys.LUSH_CAVES)));

// water flowing in rivers
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WATER_RIVER, AmbientCondition.Type.WATER,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.RIVER)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.RIVER)));

// water waves in beaches and oceans
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WATER_WAVES, AmbientCondition.Type.WATER,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.BEACH) || world.getBiome(pos).isIn(ConventionalBiomeTags.OCEAN)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.BEACH) || world.getBiome(pos).isIn(ConventionalBiomeTags.OCEAN)));

// arid wind in deserts and mesas
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WIND_ARID, AmbientCondition.Type.WIND,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.DESERT) || world.getBiome(pos).isIn(ConventionalBiomeTags.MESA))));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.DESERT) || world.getBiome(pos).isIn(ConventionalBiomeTags.MESA))));

// cave wind in caves (excluding the deep dark to use its dedicated ambience instead)
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WIND_CAVE, AmbientCondition.Type.WIND,
(world, pos, player) -> isInOverworld(world, pos) && isInCave(world, pos) && !world.getBiome(pos).matchesKey(BiomeKeys.DEEP_DARK)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && EffectiveUtils.isInCave(world, pos) && !world.getBiome(pos).matchesKey(BiomeKeys.DEEP_DARK)));

// cold wind in cold biomes (excluding peaks to use their dedicated wind instead) and mountain slopes
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WIND_COLD, AmbientCondition.Type.WIND,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.CLIMATE_COLD) || world.getBiome(pos).isIn(ConventionalBiomeTags.MOUNTAIN_SLOPE)) && !world.getBiome(pos).isIn(ConventionalBiomeTags.MOUNTAIN_PEAK)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.CLIMATE_COLD) || world.getBiome(pos).isIn(ConventionalBiomeTags.MOUNTAIN_SLOPE)) && !world.getBiome(pos).isIn(ConventionalBiomeTags.MOUNTAIN_PEAK)));

// deep dark ambience (classified as wind)
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WIND_DEEP_DARK, AmbientCondition.Type.WIND,
(world, pos, player) -> isInOverworld(world, pos) && world.getBiome(pos).matchesKey(BiomeKeys.DEEP_DARK)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && world.getBiome(pos).matchesKey(BiomeKeys.DEEP_DARK)));

// end ambience (classified as wind)
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WIND_END, AmbientCondition.Type.WIND,
(world, pos, player) -> world.getBiome(pos).isIn(ConventionalBiomeTags.IN_THE_END)));

// mountain wind in peaks
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WIND_MOUNTAINS, AmbientCondition.Type.WIND,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.MOUNTAIN_PEAK)));
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && world.getBiome(pos).isIn(ConventionalBiomeTags.MOUNTAIN_PEAK)));

// soft wind in temperate, floral, savanna, jungle, swamp and mushroom field biomes
AMBIENT_CONDITIONS.add(new AmbientCondition(EffectiveAmbienceSounds.WIND_TEMPERATE, AmbientCondition.Type.WIND,
(world, pos, player) -> isInOverworld(world, pos) && !isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.CLIMATE_TEMPERATE) || world.getBiome(pos).isIn(ConventionalBiomeTags.FLORAL) || world.getBiome(pos).isIn(ConventionalBiomeTags.SAVANNA) || world.getBiome(pos).isIn(ConventionalBiomeTags.JUNGLE) || world.getBiome(pos).isIn(ConventionalBiomeTags.SWAMP) || world.getBiome(pos).isIn(ConventionalBiomeTags.MUSHROOM))));
}

public static final boolean isInCave(World world, BlockPos pos) {
return pos.getY() < world.getSeaLevel() && !world.isSkyVisibleAllowingSea(pos);
}

public static final boolean isInOverworld(World world, BlockPos pos) {
return world.getBiome(pos).isIn(ConventionalBiomeTags.IN_OVERWORLD);
(world, pos, player) -> EffectiveUtils.isInOverworld(world, pos) && !EffectiveUtils.isInCave(world, pos) && (world.getBiome(pos).isIn(ConventionalBiomeTags.CLIMATE_TEMPERATE) || world.getBiome(pos).isIn(ConventionalBiomeTags.FLORAL) || world.getBiome(pos).isIn(ConventionalBiomeTags.SAVANNA) || world.getBiome(pos).isIn(ConventionalBiomeTags.JUNGLE) || world.getBiome(pos).isIn(ConventionalBiomeTags.SWAMP) || world.getBiome(pos).isIn(ConventionalBiomeTags.MUSHROOM))));
}
}
24 changes: 24 additions & 0 deletions src/client/java/org/ladysnake/effective/core/utils/EffectiveUtils.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package org.ladysnake.effective.core.utils;

import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags;
import net.minecraft.entity.passive.AllayEntity;
import net.minecraft.particle.DefaultParticleType;
import net.minecraft.registry.tag.BlockTags;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.LightType;
Expand Down Expand Up @@ -56,4 +58,26 @@ public enum WaterEffectType {
DROPLET,
RIPPLE,
}

public static final boolean isInCave(World world, BlockPos pos) {
return pos.getY() < world.getSeaLevel() && EffectiveUtils.hasStoneAbove(world, pos);
}

public static final boolean isInOverworld(World world, BlockPos pos) {
return world.getBiome(pos).isIn(ConventionalBiomeTags.IN_OVERWORLD);
}

// method to check if the player has a stone material type block above them, more reliable to detect caves compared to isSkyVisible
// (okay nvm they removed materials we're using pickaxe mineable instead lmao oh god this is gonna be so unreliable)
public static boolean hasStoneAbove(World world, BlockPos pos) {
BlockPos.Mutable mutable = pos.mutableCopy();
int startY = mutable.getY();
for (int y = startY; y <= startY + 100; y++) {
mutable.setY(mutable.getY()+1);
if (world.getBlockState(mutable).isSolidBlock(world, pos) && world.getBlockState(mutable).isIn(BlockTags.PICKAXE_MINEABLE)) {
return true;
}
}
return false;
}
}
2 changes: 1 addition & 1 deletion src/client/java/org/ladysnake/effective/core/world/WaterfallCloudGenerators.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public static void tick() {
if (waterfall.isSilent() || distance > EffectiveConfig.cascadeSoundDistanceBlocks || EffectiveConfig.cascadeSoundsVolume == 0 || EffectiveConfig.cascadeSoundDistanceBlocks == 0) {
return;
}
if ((world.isSkyVisibleAllowingSea(waterfall.blockPos()) && world.getSeaLevel() > waterfall.blockPos().getY()) == (world.isSkyVisibleAllowingSea(client.player.getBlockPos()) && world.getSeaLevel() > client.player.getBlockPos().getY())
if (EffectiveUtils.isInCave(world, waterfall.blockPos()) == EffectiveUtils.isInCave(world, client.player.getBlockPos())
&& world.random.nextInt(200) == 0) { // make it so cascades underground can only be heard by players underground, and surface cascades can only be heard by players on the surface
client.getSoundManager().play(WaterfallSoundInstance.ambient(Effective.AMBIENCE_WATERFALL, 1.2f + world.random.nextFloat() / 10f, waterfall.blockPos(), EffectiveConfig.cascadeSoundDistanceBlocks), (int) (distance / 2));
}
Expand Down

0 comments on commit 801c6f3

Please sign in to comment.