Make fish not use generic hurt sound. Closes #111

TeamMetallurgy · Apr 27, 2020 · ac6d88e · ac6d88e
1 parent 2811279
commit ac6d88e
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishEntity.java b/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishEntity.java
@@ -62,12 +62,27 @@ protected ItemStack getFishBucket() {
     @Override
     @Nonnull
     protected SoundEvent getFlopSound() {
-        if (Objects.equals(this.getType().getRegistryName(), AquaItems.JELLYFISH.getRegistryName())) {
+        if (AquaFishEntity.TYPES.get(this.getType()) == FishType.JELLYFISH) {
             return SoundEvents.BLOCK_SLIME_BLOCK_STEP;
         }
         return SoundEvents.ENTITY_COD_FLOP;
     }
 
+    @Override
+    protected SoundEvent getAmbientSound() {
+        return SoundEvents.ENTITY_COD_AMBIENT;
+    }
+
+    @Override
+    protected SoundEvent getDeathSound() {
+        return SoundEvents.ENTITY_COD_DEATH;
+    }
+
+    @Override
+    protected SoundEvent getHurtSound(@Nonnull DamageSource damageSource) {
+        return SoundEvents.ENTITY_COD_HURT;
+    }
+
     @Override
     @Nonnull
     public EntitySize getSize(@Nonnull Pose pose) {