Re-add fish ambient sound support for resource packs. (#286)

TeamMetallurgy · Dec 5, 2021 · 9d43cf0 · 9d43cf0
1 parent a40fbed
commit 9d43cf0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishEntity.java b/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishEntity.java
@@ -67,7 +67,12 @@ protected SoundEvent getFlopSound() {
         }
         return AquaSounds.FISH_FLOP;
     }
-
+
+    @Override
+    protected SoundEvent getAmbientSound() {
+        return AquaSounds.FISH_AMBIENT;
+    }
+
     @Override
     protected SoundEvent getDeathSound() {
         return AquaSounds.FISH_DEATH;
@@ -115,4 +120,4 @@ private static boolean isSourceBlock(LevelAccessor world, BlockPos pos) {
         BlockState state = world.getBlockState(pos);
         return state.getBlock() instanceof LiquidBlock && world.getBlockState(pos).is(Blocks.WATER) && state.getValue(LiquidBlock.LEVEL) == 0;
     }
-}
+}
diff --git a/src/main/java/com/teammetallurgy/aquaculture/init/AquaSounds.java b/src/main/java/com/teammetallurgy/aquaculture/init/AquaSounds.java
@@ -22,6 +22,7 @@ public final class AquaSounds {
     public static final SoundEvent BOBBER_LAND_IN_LAVA = registerSound("bobber_land_lava");
     public static final SoundEvent JELLYFISH_FLOP = registerSound("jellyfish_flop");
     public static final SoundEvent FISH_FLOP = registerSound("fish_flop");
+    public static final SoundEvent FISH_AMBIENT = registerSound("fish_ambient");
     public static final SoundEvent FISH_DEATH = registerSound("fish_death");
     public static final SoundEvent FISH_HURT = registerSound("fish_hurt");
     public static final SoundEvent JELLYFISH_COLLIDE = registerSound("jellyfish_collide");
@@ -47,6 +48,7 @@ public static void registerSounds(Register<SoundEvent> event) {
         registry.register(BOBBER_LAND_IN_LAVA);
         registry.register(JELLYFISH_FLOP);
         registry.register(FISH_FLOP);
+        registry.register(FISH_AMBIENT);
         registry.register(FISH_DEATH);
         registry.register(FISH_HURT);
         registry.register(JELLYFISH_COLLIDE);

diff --git a/src/main/resources/assets/aquaculture/sounds.json b/src/main/resources/assets/aquaculture/sounds.json
@@ -107,6 +107,15 @@
 		],
 		"subtitle": "aquaculture.subtitles.fish_flop"
 	},
+	"fish_ambient": {
+		"sounds": [
+			{
+				"type": "event",
+				"name": "aquaculture:silence"
+			}
+		],
+		"subtitle": "aquaculture.subtitles.fish_ambient"
+	},
 	"fish_death": {
 		"sounds": [
 			{

diff --git a/src/main/resources/assets/aquaculture/sounds/silence.ogg b/src/main/resources/assets/aquaculture/sounds/silence.ogg