Small tweaks

-Completely remove MoC donkey sounds
-Use vanilla angry horse sounds
-Slightly reduce reptile whip durability

src/main/java/drzhark/mocreatures/entity/passive/MoCEntityHorse.java

@@ -503,7 +503,7 @@ protected SoundEvent getDeathSound() {
         if (this.isUndead()) return MoCSoundEvents.ENTITY_HORSE_DEATH_UNDEAD;
         if (this.getIsGhost()) return MoCSoundEvents.ENTITY_HORSE_DEATH_GHOST;
         if (this.getType() == 60 || this.getType() == 61) return MoCSoundEvents.ENTITY_HORSE_HURT_ZEBRA;
-        if (this.getType() > 64 && this.getType() < 68) return MoCSoundEvents.ENTITY_HORSE_DEATH_DONKEY;
+        if (this.getType() > 64 && this.getType() < 68) return SoundEvents.ENTITY_DONKEY_DEATH;
         return MoCSoundEvents.ENTITY_HORSE_DEATH;
     }
 
@@ -590,7 +590,7 @@ protected SoundEvent getHurtSound(DamageSource source) {
         if (this.isUndead()) return MoCSoundEvents.ENTITY_HORSE_HURT_UNDEAD;
         if (this.getIsGhost()) return MoCSoundEvents.ENTITY_HORSE_HURT_GHOST;
         if (this.getType() == 60 || this.getType() == 61) return MoCSoundEvents.ENTITY_HORSE_HURT_ZEBRA;
-        if (this.getType() > 64 && this.getType() < 68) return MoCSoundEvents.ENTITY_HORSE_HURT_DONKEY;
+        if (this.getType() > 64 && this.getType() < 68) return SoundEvents.ENTITY_DONKEY_HURT;
 
         return MoCSoundEvents.ENTITY_HORSE_HURT;
     }
@@ -603,7 +603,7 @@ protected SoundEvent getAmbientSound() {
         if (this.isUndead()) return MoCSoundEvents.ENTITY_HORSE_AMBIENT_UNDEAD;
         if (this.getIsGhost()) return MoCSoundEvents.ENTITY_HORSE_AMBIENT_GHOST;
         if (this.getType() == 60 || this.getType() == 61) return MoCSoundEvents.ENTITY_HORSE_AMBIENT_ZEBRA;
-        if (this.getType() > 64 && this.getType() < 68) return MoCSoundEvents.ENTITY_HORSE_HURT_DONKEY;
+        if (this.getType() > 64 && this.getType() < 68) return SoundEvents.ENTITY_DONKEY_AMBIENT;
 
         return MoCSoundEvents.ENTITY_HORSE_AMBIENT;
     }
@@ -618,8 +618,8 @@ protected SoundEvent getAngrySound() {
         if (this.isUndead()) return MoCSoundEvents.ENTITY_HORSE_ANGRY_UNDEAD;
         if (this.getIsGhost()) return MoCSoundEvents.ENTITY_HORSE_ANGRY_GHOST;
         if (this.getType() == 60 || this.getType() == 61) return MoCSoundEvents.ENTITY_HORSE_HURT_ZEBRA;
-        if (this.getType() > 64 && this.getType() < 68) return MoCSoundEvents.ENTITY_HORSE_HURT_DONKEY;
-        return MoCSoundEvents.ENTITY_HORSE_MAD;
+        if (this.getType() > 64 && this.getType() < 68) return SoundEvents.ENTITY_DONKEY_ANGRY;
+        return SoundEvents.ENTITY_HORSE_ANGRY;
     }
 
     public float calculateMaxHealth() {
@@ -1907,7 +1907,7 @@ public void onLivingUpdate() {
              */
             if ((this.sprintCounter > 0 && this.sprintCounter < 150) && isUnicorned() && this.isBeingRidden()) {
                 MoCTools.buckleMobs(this, 2D, this.world);
-                MoCTools.playCustomSound(this, MoCSoundEvents.ENTITY_HORSE_MAD);
+                MoCTools.playCustomSound(this, SoundEvents.ENTITY_HORSE_ANGRY);
             }
 
             if (isFlyer() && !getIsTamed() && this.rand.nextInt(100) == 0 && !isMovementCeased() && !getIsSitting())

src/main/java/drzhark/mocreatures/init/MoCItems.java

@@ -110,7 +110,7 @@ public class MoCItems {
     // Weapons
     static ToolMaterial WHIP = EnumHelper.addToolMaterial("WHIP", 0, 184, 2.0F, 3.0F, 15).setRepairItem(new ItemStack(Items.LEATHER));
     public static final MoCItemWhip whip = new MoCItemWhip("whip", WHIP, 1.9F);
-    static ToolMaterial REPTILEWHIP = EnumHelper.addToolMaterial("REPTILEWHIP", 0, 234, 3.0F, 4.0F, 17).setRepairItem(new ItemStack(hideCroc));
+    static ToolMaterial REPTILEWHIP = EnumHelper.addToolMaterial("REPTILEWHIP", 0, 224, 3.0F, 4.0F, 17).setRepairItem(new ItemStack(hideCroc));
     public static final MoCItemWhip reptileWhip = new MoCItemWhip("reptile_whip", REPTILEWHIP, 1.9F);
     static ToolMaterial NINJA = EnumHelper.addToolMaterial("NINJA", 3, 501, 10.0F, 3.5F, 20).setRepairItem(new ItemStack(ancientSilverIngot));
     public static final MoCItemSword nunchaku = new MoCItemSword("nunchaku", NINJA);

src/main/java/drzhark/mocreatures/init/MoCSoundEvents.java

@@ -172,20 +172,17 @@ public class MoCSoundEvents {
     public static final SoundEvent ENTITY_DUCK_AMBIENT;
     public static final SoundEvent ENTITY_DUCK_HURT;
     //
-    public static final SoundEvent ENTITY_HORSE_MAD;
+    public static final SoundEvent ENTITY_HORSE_ANGRY;
     public static final SoundEvent ENTITY_HORSE_AMBIENT;
-    public static final SoundEvent ENTITY_HORSE_AMBIENT_DONKEY;
     public static final SoundEvent ENTITY_HORSE_AMBIENT_GHOST;
     public static final SoundEvent ENTITY_HORSE_AMBIENT_UNDEAD;
     public static final SoundEvent ENTITY_HORSE_AMBIENT_ZEBRA;
     public static final SoundEvent ENTITY_HORSE_ANGRY_GHOST;
     public static final SoundEvent ENTITY_HORSE_ANGRY_UNDEAD;
     public static final SoundEvent ENTITY_HORSE_DEATH;
-    public static final SoundEvent ENTITY_HORSE_DEATH_DONKEY;
     public static final SoundEvent ENTITY_HORSE_DEATH_GHOST;
     public static final SoundEvent ENTITY_HORSE_DEATH_UNDEAD;
     public static final SoundEvent ENTITY_HORSE_HURT;
-    public static final SoundEvent ENTITY_HORSE_HURT_DONKEY;
     public static final SoundEvent ENTITY_HORSE_HURT_GHOST;
     public static final SoundEvent ENTITY_HORSE_HURT_UNDEAD;
     public static final SoundEvent ENTITY_HORSE_HURT_ZEBRA;
@@ -404,20 +401,17 @@ public class MoCSoundEvents {
             ENTITY_DUCK_AMBIENT = createSoundEvent("entity.duck.ambient");
             ENTITY_DUCK_HURT = createSoundEvent("entity.duck.hurt");
             //
-            ENTITY_HORSE_MAD = createSoundEvent("entity.horse.angry");
+            ENTITY_HORSE_ANGRY = createSoundEvent("entity.horse.angry");
             ENTITY_HORSE_AMBIENT = createSoundEvent("entity.horse.ambient");
-            ENTITY_HORSE_AMBIENT_DONKEY = createSoundEvent("entity.donkey.ambient");
             ENTITY_HORSE_AMBIENT_GHOST = createSoundEvent("entity.horse.ambient_ghost");
             ENTITY_HORSE_AMBIENT_UNDEAD = createSoundEvent("entity.horse.ambient_undead");
             ENTITY_HORSE_AMBIENT_ZEBRA = createSoundEvent("entity.zebra.ambient");
             ENTITY_HORSE_ANGRY_GHOST = createSoundEvent("entity.horse.angry_ghost");
             ENTITY_HORSE_ANGRY_UNDEAD = createSoundEvent("entity.horse.angry_undead");
             ENTITY_HORSE_DEATH = createSoundEvent("entity.horse.death");
-            ENTITY_HORSE_DEATH_DONKEY = createSoundEvent("entity.donkey.death");
             ENTITY_HORSE_DEATH_GHOST = createSoundEvent("entity.horse.death_ghost");
             ENTITY_HORSE_DEATH_UNDEAD = createSoundEvent("entity.horse.death_undead");
             ENTITY_HORSE_HURT = createSoundEvent("entity.horse.hurt");
-            ENTITY_HORSE_HURT_DONKEY = createSoundEvent("entity.donkey.hurt");
             ENTITY_HORSE_HURT_GHOST = createSoundEvent("entity.horse.hurt_ghost");
             ENTITY_HORSE_HURT_UNDEAD = createSoundEvent("entity.horse.hurt_undead");
             ENTITY_HORSE_HURT_ZEBRA = createSoundEvent("entity.zebra.hurt");
@@ -650,20 +644,17 @@ public static void registerSoundEvents(final RegistryEvent.Register<SoundEvent>
                     ENTITY_DUCK_AMBIENT,
                     ENTITY_DUCK_HURT,
                     //
-                    ENTITY_HORSE_MAD,
+                    ENTITY_HORSE_ANGRY,
                     ENTITY_HORSE_AMBIENT,
-                    ENTITY_HORSE_AMBIENT_DONKEY,
                     ENTITY_HORSE_AMBIENT_GHOST,
                     ENTITY_HORSE_AMBIENT_UNDEAD,
                     ENTITY_HORSE_AMBIENT_ZEBRA,
                     ENTITY_HORSE_ANGRY_GHOST,
                     ENTITY_HORSE_ANGRY_UNDEAD,
                     ENTITY_HORSE_DEATH,
-                    ENTITY_HORSE_DEATH_DONKEY,
                     ENTITY_HORSE_DEATH_GHOST,
                     ENTITY_HORSE_DEATH_UNDEAD,
                     ENTITY_HORSE_HURT,
-                    ENTITY_HORSE_HURT_DONKEY,
                     ENTITY_HORSE_HURT_GHOST,
                     ENTITY_HORSE_HURT_UNDEAD,
                     ENTITY_HORSE_HURT_ZEBRA,

src/main/resources/assets/mocreatures/sounds.json

@@ -311,25 +311,6 @@
       "mocreatures:entity/dolphin/angry"
     ]
   },
-  "entity.donkey.death": {
-    "category": "neutral",
-    "sounds": [
-      "mocreatures:entity/donkey/death"
-    ]
-  },
-  "entity.donkey.ambient": {
-    "category": "neutral",
-    "sounds": [
-      "mocreatures:entity/donkey/idle1",
-      "mocreatures:entity/donkey/idle2"
-    ]
-  },
-  "entity.donkey.hurt": {
-    "category": "neutral",
-    "sounds": [
-      "mocreatures:entity/donkey/hurt"
-    ]
-  },
   "entity.dragonfly.ambient": {
     "category": "neutral",
     "sounds": [