Fixed step sound for Player only registering one sound
This commit is contained in:
		| @@ -1,345 +1,345 @@ | |||||||
| package me.libraryaddict.disguise.utilities; | package me.libraryaddict.disguise.utilities; | ||||||
|  |  | ||||||
| import java.util.HashMap; | import java.util.HashMap; | ||||||
| import java.util.Map.Entry; | import java.util.Map.Entry; | ||||||
| import java.util.Objects; | import java.util.Objects; | ||||||
|  |  | ||||||
| import org.bukkit.Sound; | import org.bukkit.Sound; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Only living disguises go in here! |  * Only living disguises go in here! | ||||||
|  */ |  */ | ||||||
| public enum DisguiseSound { | public enum DisguiseSound { | ||||||
|  |  | ||||||
|     ARROW(null, null, null, null, Sound.ENTITY_ARROW_HIT, Sound.ENTITY_ARROW_SHOOT), |     ARROW(null, null, null, null, Sound.ENTITY_ARROW_HIT, Sound.ENTITY_ARROW_SHOOT), | ||||||
|  |  | ||||||
|     BAT(Sound.ENTITY_BAT_HURT, null, Sound.ENTITY_BAT_DEATH, Sound.ENTITY_BAT_AMBIENT, Sound.ENTITY_PLAYER_SMALL_FALL, |     BAT(Sound.ENTITY_BAT_HURT, null, Sound.ENTITY_BAT_DEATH, Sound.ENTITY_BAT_AMBIENT, Sound.ENTITY_PLAYER_SMALL_FALL, | ||||||
|             Sound.ENTITY_BAT_LOOP, Sound.ENTITY_PLAYER_BIG_FALL, Sound.ENTITY_BAT_TAKEOFF), |             Sound.ENTITY_BAT_LOOP, Sound.ENTITY_PLAYER_BIG_FALL, Sound.ENTITY_BAT_TAKEOFF), | ||||||
|  |  | ||||||
|     BLAZE(Sound.ENTITY_BLAZE_HURT, null, Sound.ENTITY_BLAZE_DEATH, Sound.ENTITY_BLAZE_AMBIENT, Sound.ENTITY_PLAYER_SMALL_FALL, |     BLAZE(Sound.ENTITY_BLAZE_HURT, null, Sound.ENTITY_BLAZE_DEATH, Sound.ENTITY_BLAZE_AMBIENT, Sound.ENTITY_PLAYER_SMALL_FALL, | ||||||
|             Sound.ENTITY_PLAYER_BIG_FALL), |             Sound.ENTITY_PLAYER_BIG_FALL), | ||||||
|  |  | ||||||
|     CAVE_SPIDER(Sound.ENTITY_SPIDER_AMBIENT, Sound.ENTITY_SPIDER_STEP, Sound.ENTITY_SPIDER_DEATH, Sound.ENTITY_SPIDER_AMBIENT), |     CAVE_SPIDER(Sound.ENTITY_SPIDER_AMBIENT, Sound.ENTITY_SPIDER_STEP, Sound.ENTITY_SPIDER_DEATH, Sound.ENTITY_SPIDER_AMBIENT), | ||||||
|  |  | ||||||
|     CHICKEN(Sound.ENTITY_CHICKEN_HURT, Sound.ENTITY_CHICKEN_STEP, Sound.ENTITY_CHICKEN_HURT, Sound.ENTITY_CHICKEN_AMBIENT, |     CHICKEN(Sound.ENTITY_CHICKEN_HURT, Sound.ENTITY_CHICKEN_STEP, Sound.ENTITY_CHICKEN_HURT, Sound.ENTITY_CHICKEN_AMBIENT, | ||||||
|             Sound.ENTITY_PLAYER_SMALL_FALL, Sound.ENTITY_CHICKEN_EGG, Sound.ENTITY_PLAYER_BIG_FALL), |             Sound.ENTITY_PLAYER_SMALL_FALL, Sound.ENTITY_CHICKEN_EGG, Sound.ENTITY_PLAYER_BIG_FALL), | ||||||
|  |  | ||||||
|     COW(Sound.ENTITY_COW_HURT, Sound.ENTITY_COW_STEP, Sound.ENTITY_COW_DEATH, Sound.ENTITY_COW_AMBIENT), |     COW(Sound.ENTITY_COW_HURT, Sound.ENTITY_COW_STEP, Sound.ENTITY_COW_DEATH, Sound.ENTITY_COW_AMBIENT), | ||||||
|  |  | ||||||
|     CREEPER(Sound.ENTITY_CREEPER_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_CREEPER_DEATH, null), |     CREEPER(Sound.ENTITY_CREEPER_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_CREEPER_DEATH, null), | ||||||
|  |  | ||||||
|     DONKEY(Sound.ENTITY_DONKEY_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_DONKEY_DEATH, Sound.ENTITY_DONKEY_AMBIENT, |     DONKEY(Sound.ENTITY_DONKEY_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_DONKEY_DEATH, Sound.ENTITY_DONKEY_AMBIENT, | ||||||
|             Sound.ENTITY_HORSE_GALLOP, Sound.ENTITY_HORSE_SADDLE, Sound.ENTITY_DONKEY_ANGRY, Sound.ENTITY_HORSE_STEP_WOOD, |             Sound.ENTITY_HORSE_GALLOP, Sound.ENTITY_HORSE_SADDLE, Sound.ENTITY_DONKEY_ANGRY, Sound.ENTITY_HORSE_STEP_WOOD, | ||||||
|             Sound.ENTITY_HORSE_ARMOR, Sound.ENTITY_HORSE_LAND, Sound.ENTITY_HORSE_JUMP, Sound.ENTITY_HORSE_ANGRY), |             Sound.ENTITY_HORSE_ARMOR, Sound.ENTITY_HORSE_LAND, Sound.ENTITY_HORSE_JUMP, Sound.ENTITY_HORSE_ANGRY), | ||||||
|  |  | ||||||
|     ELDER_GUARDIAN(Sound.ENTITY_ELDER_GUARDIAN_HURT, null, Sound.ENTITY_ELDER_GUARDIAN_DEATH, |     ELDER_GUARDIAN(Sound.ENTITY_ELDER_GUARDIAN_HURT, null, Sound.ENTITY_ELDER_GUARDIAN_DEATH, | ||||||
|             Sound.ENTITY_ELDER_GUARDIAN_AMBIENT), |             Sound.ENTITY_ELDER_GUARDIAN_AMBIENT), | ||||||
|  |  | ||||||
|     ENDER_DRAGON(Sound.ENTITY_ENDERDRAGON_HURT, null, Sound.ENTITY_ENDERDRAGON_DEATH, Sound.ENTITY_ENDERDRAGON_AMBIENT, |     ENDER_DRAGON(Sound.ENTITY_ENDERDRAGON_HURT, null, Sound.ENTITY_ENDERDRAGON_DEATH, Sound.ENTITY_ENDERDRAGON_AMBIENT, | ||||||
|             Sound.ENTITY_PLAYER_SMALL_FALL, Sound.ENTITY_ENDERDRAGON_FLAP, Sound.ENTITY_PLAYER_BIG_FALL), |             Sound.ENTITY_PLAYER_SMALL_FALL, Sound.ENTITY_ENDERDRAGON_FLAP, Sound.ENTITY_PLAYER_BIG_FALL), | ||||||
|  |  | ||||||
|     ENDERMAN(Sound.ENTITY_ENDERMEN_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_ENDERMEN_DEATH, Sound.ENTITY_ENDERMEN_AMBIENT, |     ENDERMAN(Sound.ENTITY_ENDERMEN_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_ENDERMEN_DEATH, Sound.ENTITY_ENDERMEN_AMBIENT, | ||||||
|             Sound.ENTITY_ENDERMEN_SCREAM, Sound.ENTITY_ENDERMEN_TELEPORT, Sound.ENTITY_ENDERMEN_STARE), |             Sound.ENTITY_ENDERMEN_SCREAM, Sound.ENTITY_ENDERMEN_TELEPORT, Sound.ENTITY_ENDERMEN_STARE), | ||||||
|  |  | ||||||
|     ENDERMITE(Sound.ENTITY_SILVERFISH_HURT, Sound.ENTITY_ENDERMITE_STEP, Sound.ENTITY_ENDERMITE_DEATH, |     ENDERMITE(Sound.ENTITY_SILVERFISH_HURT, Sound.ENTITY_ENDERMITE_STEP, Sound.ENTITY_ENDERMITE_DEATH, | ||||||
|             Sound.ENTITY_ENDERMITE_AMBIENT), |             Sound.ENTITY_ENDERMITE_AMBIENT), | ||||||
|  |  | ||||||
|     EVOKER(Sound.ENTITY_EVOCATION_ILLAGER_HURT, null, Sound.ENTITY_EVOCATION_ILLAGER_DEATH, |     EVOKER(Sound.ENTITY_EVOCATION_ILLAGER_HURT, null, Sound.ENTITY_EVOCATION_ILLAGER_DEATH, | ||||||
|             Sound.ENTITY_EVOCATION_ILLAGER_AMBIENT, Sound.ENTITY_EVOCATION_ILLAGER_CAST_SPELL, |             Sound.ENTITY_EVOCATION_ILLAGER_AMBIENT, Sound.ENTITY_EVOCATION_ILLAGER_CAST_SPELL, | ||||||
|             Sound.ENTITY_EVOCATION_ILLAGER_PREPARE_ATTACK, Sound.ENTITY_EVOCATION_ILLAGER_PREPARE_SUMMON, |             Sound.ENTITY_EVOCATION_ILLAGER_PREPARE_ATTACK, Sound.ENTITY_EVOCATION_ILLAGER_PREPARE_SUMMON, | ||||||
|             Sound.ENTITY_EVOCATION_ILLAGER_PREPARE_WOLOLO), |             Sound.ENTITY_EVOCATION_ILLAGER_PREPARE_WOLOLO), | ||||||
|  |  | ||||||
|     EVOKER_FANGS(null, null, null, null, Sound.ENTITY_EVOCATION_FANGS_ATTACK), |     EVOKER_FANGS(null, null, null, null, Sound.ENTITY_EVOCATION_FANGS_ATTACK), | ||||||
|  |  | ||||||
|     GHAST(Sound.ENTITY_GHAST_HURT, null, Sound.ENTITY_GHAST_DEATH, Sound.ENTITY_GHAST_AMBIENT, Sound.ENTITY_PLAYER_SMALL_FALL, |     GHAST(Sound.ENTITY_GHAST_HURT, null, Sound.ENTITY_GHAST_DEATH, Sound.ENTITY_GHAST_AMBIENT, Sound.ENTITY_PLAYER_SMALL_FALL, | ||||||
|             Sound.ENTITY_GHAST_SHOOT, Sound.ENTITY_PLAYER_BIG_FALL, Sound.ENTITY_GHAST_SCREAM, Sound.ENTITY_GHAST_WARN), |             Sound.ENTITY_GHAST_SHOOT, Sound.ENTITY_PLAYER_BIG_FALL, Sound.ENTITY_GHAST_SCREAM, Sound.ENTITY_GHAST_WARN), | ||||||
|  |  | ||||||
|     GIANT(Sound.ENTITY_PLAYER_HURT, Sound.BLOCK_GRASS_STEP, null, null), |     GIANT(Sound.ENTITY_PLAYER_HURT, Sound.BLOCK_GRASS_STEP, null, null), | ||||||
|  |  | ||||||
|     GUARDIAN(Sound.ENTITY_GUARDIAN_HURT, null, Sound.ENTITY_GUARDIAN_DEATH, Sound.ENTITY_ELDER_GUARDIAN_AMBIENT), |     GUARDIAN(Sound.ENTITY_GUARDIAN_HURT, null, Sound.ENTITY_GUARDIAN_DEATH, Sound.ENTITY_ELDER_GUARDIAN_AMBIENT), | ||||||
|  |  | ||||||
|     HORSE(Sound.ENTITY_HORSE_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_HORSE_DEATH, Sound.ENTITY_HORSE_AMBIENT, |     HORSE(Sound.ENTITY_HORSE_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_HORSE_DEATH, Sound.ENTITY_HORSE_AMBIENT, | ||||||
|             Sound.ENTITY_HORSE_GALLOP, Sound.ENTITY_HORSE_SADDLE, Sound.ENTITY_DONKEY_ANGRY, Sound.ENTITY_HORSE_STEP_WOOD, |             Sound.ENTITY_HORSE_GALLOP, Sound.ENTITY_HORSE_SADDLE, Sound.ENTITY_DONKEY_ANGRY, Sound.ENTITY_HORSE_STEP_WOOD, | ||||||
|             Sound.ENTITY_HORSE_ARMOR, Sound.ENTITY_HORSE_LAND, Sound.ENTITY_HORSE_JUMP, Sound.ENTITY_HORSE_ANGRY), |             Sound.ENTITY_HORSE_ARMOR, Sound.ENTITY_HORSE_LAND, Sound.ENTITY_HORSE_JUMP, Sound.ENTITY_HORSE_ANGRY), | ||||||
|  |  | ||||||
|     IRON_GOLEM(Sound.ENTITY_IRONGOLEM_HURT, Sound.ENTITY_IRONGOLEM_STEP, Sound.ENTITY_IRONGOLEM_DEATH, |     IRON_GOLEM(Sound.ENTITY_IRONGOLEM_HURT, Sound.ENTITY_IRONGOLEM_STEP, Sound.ENTITY_IRONGOLEM_DEATH, | ||||||
|             Sound.ENTITY_IRONGOLEM_ATTACK), |             Sound.ENTITY_IRONGOLEM_ATTACK), | ||||||
|  |  | ||||||
|     LLAMA(Sound.ENTITY_LLAMA_HURT, Sound.ENTITY_LLAMA_STEP, Sound.ENTITY_LLAMA_DEATH, Sound.ENTITY_LLAMA_AMBIENT, |     LLAMA(Sound.ENTITY_LLAMA_HURT, Sound.ENTITY_LLAMA_STEP, Sound.ENTITY_LLAMA_DEATH, Sound.ENTITY_LLAMA_AMBIENT, | ||||||
|             Sound.ENTITY_LLAMA_ANGRY, Sound.ENTITY_LLAMA_CHEST, Sound.ENTITY_LLAMA_EAT, Sound.ENTITY_LLAMA_SWAG), |             Sound.ENTITY_LLAMA_ANGRY, Sound.ENTITY_LLAMA_CHEST, Sound.ENTITY_LLAMA_EAT, Sound.ENTITY_LLAMA_SWAG), | ||||||
|  |  | ||||||
|     MAGMA_CUBE(Sound.ENTITY_MAGMACUBE_HURT, Sound.ENTITY_MAGMACUBE_JUMP, null, null), |     MAGMA_CUBE(Sound.ENTITY_MAGMACUBE_HURT, Sound.ENTITY_MAGMACUBE_JUMP, null, null), | ||||||
|  |  | ||||||
|     MULE(Sound.ENTITY_MULE_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_MULE_DEATH, Sound.ENTITY_MULE_AMBIENT), |     MULE(Sound.ENTITY_MULE_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_MULE_DEATH, Sound.ENTITY_MULE_AMBIENT), | ||||||
|  |  | ||||||
|     MUSHROOM_COW(Sound.ENTITY_COW_HURT, Sound.ENTITY_COW_STEP, Sound.ENTITY_COW_HURT, Sound.ENTITY_COW_AMBIENT), |     MUSHROOM_COW(Sound.ENTITY_COW_HURT, Sound.ENTITY_COW_STEP, Sound.ENTITY_COW_HURT, Sound.ENTITY_COW_AMBIENT), | ||||||
|  |  | ||||||
|     OCELOT(Sound.ENTITY_CAT_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_CAT_HURT, Sound.ENTITY_CAT_AMBIENT, Sound.ENTITY_CAT_PURR, |     OCELOT(Sound.ENTITY_CAT_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_CAT_HURT, Sound.ENTITY_CAT_AMBIENT, Sound.ENTITY_CAT_PURR, | ||||||
|             Sound.ENTITY_CAT_PURREOW), |             Sound.ENTITY_CAT_PURREOW), | ||||||
|  |  | ||||||
|     PIG(Sound.ENTITY_PIG_HURT, Sound.ENTITY_PIG_STEP, Sound.ENTITY_PIG_DEATH, Sound.ENTITY_PIG_AMBIENT), |     PIG(Sound.ENTITY_PIG_HURT, Sound.ENTITY_PIG_STEP, Sound.ENTITY_PIG_DEATH, Sound.ENTITY_PIG_AMBIENT), | ||||||
|  |  | ||||||
|     PIG_ZOMBIE(Sound.ENTITY_ZOMBIE_PIG_HURT, null, Sound.ENTITY_ZOMBIE_PIG_DEATH, Sound.ENTITY_ZOMBIE_PIG_AMBIENT, |     PIG_ZOMBIE(Sound.ENTITY_ZOMBIE_PIG_HURT, null, Sound.ENTITY_ZOMBIE_PIG_DEATH, Sound.ENTITY_ZOMBIE_PIG_AMBIENT, | ||||||
|             Sound.ENTITY_ZOMBIE_PIG_ANGRY), |             Sound.ENTITY_ZOMBIE_PIG_ANGRY), | ||||||
|  |  | ||||||
|     PLAYER(Sound.ENTITY_PLAYER_HURT, new Sound[] { |     PLAYER(Sound.ENTITY_PLAYER_HURT, new Sound[] { | ||||||
|             Sound.BLOCK_ANVIL_STEP, Sound.BLOCK_CLOTH_STEP, Sound.BLOCK_GLASS_STEP, Sound.BLOCK_GRASS_STEP, |             Sound.BLOCK_STONE_STEP, Sound.BLOCK_GRASS_STEP, Sound.BLOCK_ANVIL_STEP, Sound.BLOCK_CLOTH_STEP, | ||||||
|             Sound.BLOCK_GRAVEL_STEP, Sound.BLOCK_LADDER_STEP, Sound.BLOCK_METAL_STEP, Sound.BLOCK_SAND_STEP, |             Sound.BLOCK_GLASS_STEP, Sound.BLOCK_GRAVEL_STEP, Sound.BLOCK_LADDER_STEP, Sound.BLOCK_METAL_STEP, | ||||||
|             Sound.BLOCK_SLIME_STEP, Sound.BLOCK_SNOW_STEP, Sound.BLOCK_STONE_STEP, Sound.BLOCK_WOOD_STEP |             Sound.BLOCK_SAND_STEP, Sound.BLOCK_SLIME_STEP, Sound.BLOCK_SNOW_STEP, Sound.BLOCK_WOOD_STEP | ||||||
|     }, Sound.ENTITY_PLAYER_DEATH, null), |     }, Sound.ENTITY_PLAYER_DEATH, null), | ||||||
|  |  | ||||||
|     RABBIT(Sound.ENTITY_RABBIT_HURT, Sound.ENTITY_RABBIT_JUMP, Sound.ENTITY_RABBIT_DEATH, Sound.ENTITY_RABBIT_AMBIENT), |     RABBIT(Sound.ENTITY_RABBIT_HURT, Sound.ENTITY_RABBIT_JUMP, Sound.ENTITY_RABBIT_DEATH, Sound.ENTITY_RABBIT_AMBIENT), | ||||||
|  |  | ||||||
|     SHEEP(Sound.ENTITY_SHEEP_HURT, Sound.ENTITY_SHEEP_STEP, null, Sound.ENTITY_SHEEP_AMBIENT, Sound.ENTITY_SHEEP_SHEAR), |     SHEEP(Sound.ENTITY_SHEEP_HURT, Sound.ENTITY_SHEEP_STEP, null, Sound.ENTITY_SHEEP_AMBIENT, Sound.ENTITY_SHEEP_SHEAR), | ||||||
|  |  | ||||||
|     SHULKER(Sound.ENTITY_SHULKER_HURT, null, Sound.ENTITY_SHULKER_DEATH, Sound.ENTITY_SHULKER_AMBIENT, Sound.ENTITY_SHULKER_OPEN, |     SHULKER(Sound.ENTITY_SHULKER_HURT, null, Sound.ENTITY_SHULKER_DEATH, Sound.ENTITY_SHULKER_AMBIENT, Sound.ENTITY_SHULKER_OPEN, | ||||||
|             Sound.ENTITY_SHULKER_CLOSE, Sound.ENTITY_SHULKER_HURT_CLOSED, Sound.ENTITY_SHULKER_TELEPORT), |             Sound.ENTITY_SHULKER_CLOSE, Sound.ENTITY_SHULKER_HURT_CLOSED, Sound.ENTITY_SHULKER_TELEPORT), | ||||||
|  |  | ||||||
|     SILVERFISH(Sound.ENTITY_SILVERFISH_HURT, Sound.ENTITY_SILVERFISH_STEP, Sound.ENTITY_SILVERFISH_DEATH, |     SILVERFISH(Sound.ENTITY_SILVERFISH_HURT, Sound.ENTITY_SILVERFISH_STEP, Sound.ENTITY_SILVERFISH_DEATH, | ||||||
|             Sound.ENTITY_SILVERFISH_AMBIENT), |             Sound.ENTITY_SILVERFISH_AMBIENT), | ||||||
|  |  | ||||||
|     SKELETON(Sound.ENTITY_SKELETON_HURT, Sound.ENTITY_SKELETON_STEP, Sound.ENTITY_SKELETON_DEATH, Sound.ENTITY_SKELETON_AMBIENT), |     SKELETON(Sound.ENTITY_SKELETON_HURT, Sound.ENTITY_SKELETON_STEP, Sound.ENTITY_SKELETON_DEATH, Sound.ENTITY_SKELETON_AMBIENT), | ||||||
|  |  | ||||||
|     SKELETON_HORSE(Sound.ENTITY_SKELETON_HORSE_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_SKELETON_HORSE_DEATH, |     SKELETON_HORSE(Sound.ENTITY_SKELETON_HORSE_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_SKELETON_HORSE_DEATH, | ||||||
|             Sound.ENTITY_SKELETON_HORSE_AMBIENT, Sound.ENTITY_HORSE_GALLOP, Sound.ENTITY_HORSE_SADDLE, Sound.ENTITY_DONKEY_ANGRY, |             Sound.ENTITY_SKELETON_HORSE_AMBIENT, Sound.ENTITY_HORSE_GALLOP, Sound.ENTITY_HORSE_SADDLE, Sound.ENTITY_DONKEY_ANGRY, | ||||||
|             Sound.ENTITY_HORSE_STEP_WOOD, Sound.ENTITY_HORSE_ARMOR, Sound.ENTITY_HORSE_LAND, Sound.ENTITY_HORSE_JUMP, |             Sound.ENTITY_HORSE_STEP_WOOD, Sound.ENTITY_HORSE_ARMOR, Sound.ENTITY_HORSE_LAND, Sound.ENTITY_HORSE_JUMP, | ||||||
|             Sound.ENTITY_HORSE_ANGRY), |             Sound.ENTITY_HORSE_ANGRY), | ||||||
|  |  | ||||||
|     SLIME(Sound.ENTITY_SLIME_HURT, Sound.ENTITY_SLIME_JUMP, Sound.ENTITY_SLIME_DEATH, null), |     SLIME(Sound.ENTITY_SLIME_HURT, Sound.ENTITY_SLIME_JUMP, Sound.ENTITY_SLIME_DEATH, null), | ||||||
|  |  | ||||||
|     SNOWMAN(Sound.ENTITY_SNOWMAN_HURT, null, Sound.ENTITY_SNOWMAN_DEATH, Sound.ENTITY_SNOWMAN_AMBIENT, |     SNOWMAN(Sound.ENTITY_SNOWMAN_HURT, null, Sound.ENTITY_SNOWMAN_DEATH, Sound.ENTITY_SNOWMAN_AMBIENT, | ||||||
|             Sound.ENTITY_SNOWMAN_SHOOT), |             Sound.ENTITY_SNOWMAN_SHOOT), | ||||||
|  |  | ||||||
|     SPIDER(Sound.ENTITY_SPIDER_AMBIENT, Sound.ENTITY_SPIDER_STEP, Sound.ENTITY_SPIDER_DEATH, Sound.ENTITY_SPIDER_AMBIENT), |     SPIDER(Sound.ENTITY_SPIDER_AMBIENT, Sound.ENTITY_SPIDER_STEP, Sound.ENTITY_SPIDER_DEATH, Sound.ENTITY_SPIDER_AMBIENT), | ||||||
|  |  | ||||||
|     SQUID(Sound.ENTITY_SQUID_HURT, null, Sound.ENTITY_SQUID_DEATH, Sound.ENTITY_SQUID_AMBIENT), |     SQUID(Sound.ENTITY_SQUID_HURT, null, Sound.ENTITY_SQUID_DEATH, Sound.ENTITY_SQUID_AMBIENT), | ||||||
|  |  | ||||||
|     UNDEAD_HORSE(Sound.ENTITY_ZOMBIE_HORSE_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_ZOMBIE_HORSE_DEATH, |     UNDEAD_HORSE(Sound.ENTITY_ZOMBIE_HORSE_HURT, Sound.BLOCK_GRASS_STEP, Sound.ENTITY_ZOMBIE_HORSE_DEATH, | ||||||
|             Sound.ENTITY_ZOMBIE_HORSE_AMBIENT, Sound.ENTITY_HORSE_GALLOP, Sound.ENTITY_HORSE_SADDLE, Sound.ENTITY_DONKEY_ANGRY, |             Sound.ENTITY_ZOMBIE_HORSE_AMBIENT, Sound.ENTITY_HORSE_GALLOP, Sound.ENTITY_HORSE_SADDLE, Sound.ENTITY_DONKEY_ANGRY, | ||||||
|             Sound.ENTITY_HORSE_STEP_WOOD, Sound.ENTITY_HORSE_ARMOR, Sound.ENTITY_HORSE_LAND, Sound.ENTITY_HORSE_JUMP, |             Sound.ENTITY_HORSE_STEP_WOOD, Sound.ENTITY_HORSE_ARMOR, Sound.ENTITY_HORSE_LAND, Sound.ENTITY_HORSE_JUMP, | ||||||
|             Sound.ENTITY_HORSE_ANGRY), |             Sound.ENTITY_HORSE_ANGRY), | ||||||
|  |  | ||||||
|     VEX(Sound.ENTITY_VEX_HURT, null, Sound.ENTITY_VEX_DEATH, Sound.ENTITY_VEX_AMBIENT, Sound.ENTITY_VEX_CHARGE), |     VEX(Sound.ENTITY_VEX_HURT, null, Sound.ENTITY_VEX_DEATH, Sound.ENTITY_VEX_AMBIENT, Sound.ENTITY_VEX_CHARGE), | ||||||
|  |  | ||||||
|     VILLAGER(Sound.ENTITY_VILLAGER_HURT, null, Sound.ENTITY_VILLAGER_DEATH, Sound.ENTITY_VILLAGER_AMBIENT, |     VILLAGER(Sound.ENTITY_VILLAGER_HURT, null, Sound.ENTITY_VILLAGER_DEATH, Sound.ENTITY_VILLAGER_AMBIENT, | ||||||
|             Sound.ENTITY_VILLAGER_TRADING, Sound.ENTITY_VILLAGER_NO, Sound.ENTITY_VILLAGER_YES), |             Sound.ENTITY_VILLAGER_TRADING, Sound.ENTITY_VILLAGER_NO, Sound.ENTITY_VILLAGER_YES), | ||||||
|  |  | ||||||
|     VINDICATOR(Sound.ENTITY_VINDICATION_ILLAGER_HURT, null, Sound.ENTITY_VINDICATION_ILLAGER_DEATH, |     VINDICATOR(Sound.ENTITY_VINDICATION_ILLAGER_HURT, null, Sound.ENTITY_VINDICATION_ILLAGER_DEATH, | ||||||
|             Sound.ENTITY_VINDICATION_ILLAGER_AMBIENT), |             Sound.ENTITY_VINDICATION_ILLAGER_AMBIENT), | ||||||
|  |  | ||||||
|     WITCH(Sound.ENTITY_WITCH_HURT, null, Sound.ENTITY_WITCH_DEATH, Sound.ENTITY_WITCH_AMBIENT), |     WITCH(Sound.ENTITY_WITCH_HURT, null, Sound.ENTITY_WITCH_DEATH, Sound.ENTITY_WITCH_AMBIENT), | ||||||
|  |  | ||||||
|     WITHER(Sound.ENTITY_WITHER_HURT, null, Sound.ENTITY_WITHER_DEATH, Sound.ENTITY_WITHER_AMBIENT, Sound.ENTITY_PLAYER_SMALL_FALL, |     WITHER(Sound.ENTITY_WITHER_HURT, null, Sound.ENTITY_WITHER_DEATH, Sound.ENTITY_WITHER_AMBIENT, Sound.ENTITY_PLAYER_SMALL_FALL, | ||||||
|             Sound.ENTITY_WITHER_SPAWN, Sound.ENTITY_PLAYER_BIG_FALL, Sound.ENTITY_WITHER_SHOOT), |             Sound.ENTITY_WITHER_SPAWN, Sound.ENTITY_PLAYER_BIG_FALL, Sound.ENTITY_WITHER_SHOOT), | ||||||
|  |  | ||||||
|     WITHER_SKELETON(Sound.ENTITY_SKELETON_HURT, Sound.ENTITY_SKELETON_STEP, Sound.ENTITY_SKELETON_DEATH, |     WITHER_SKELETON(Sound.ENTITY_SKELETON_HURT, Sound.ENTITY_SKELETON_STEP, Sound.ENTITY_SKELETON_DEATH, | ||||||
|             Sound.ENTITY_SKELETON_AMBIENT), |             Sound.ENTITY_SKELETON_AMBIENT), | ||||||
|  |  | ||||||
|     WOLF(Sound.ENTITY_WOLF_HURT, Sound.ENTITY_WOLF_STEP, Sound.ENTITY_WOLF_DEATH, Sound.ENTITY_WOLF_AMBIENT, |     WOLF(Sound.ENTITY_WOLF_HURT, Sound.ENTITY_WOLF_STEP, Sound.ENTITY_WOLF_DEATH, Sound.ENTITY_WOLF_AMBIENT, | ||||||
|             Sound.ENTITY_WOLF_GROWL, Sound.ENTITY_WOLF_PANT, Sound.ENTITY_WOLF_HOWL, Sound.ENTITY_WOLF_SHAKE, |             Sound.ENTITY_WOLF_GROWL, Sound.ENTITY_WOLF_PANT, Sound.ENTITY_WOLF_HOWL, Sound.ENTITY_WOLF_SHAKE, | ||||||
|             Sound.ENTITY_WOLF_WHINE), |             Sound.ENTITY_WOLF_WHINE), | ||||||
|  |  | ||||||
|     ZOMBIE(Sound.ENTITY_ZOMBIE_HURT, Sound.ENTITY_ZOMBIE_STEP, Sound.ENTITY_ZOMBIE_DEATH, Sound.ENTITY_ZOMBIE_AMBIENT, |     ZOMBIE(Sound.ENTITY_ZOMBIE_HURT, Sound.ENTITY_ZOMBIE_STEP, Sound.ENTITY_ZOMBIE_DEATH, Sound.ENTITY_ZOMBIE_AMBIENT, | ||||||
|             Sound.ENTITY_ZOMBIE_INFECT, Sound.ENTITY_ZOMBIE_BREAK_DOOR_WOOD, Sound.ENTITY_ZOMBIE_ATTACK_DOOR_WOOD, |             Sound.ENTITY_ZOMBIE_INFECT, Sound.ENTITY_ZOMBIE_BREAK_DOOR_WOOD, Sound.ENTITY_ZOMBIE_ATTACK_DOOR_WOOD, | ||||||
|             Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR), ZOMBIE_VILLAGER(Sound.ENTITY_ZOMBIE_VILLAGER_HURT, |             Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR), ZOMBIE_VILLAGER(Sound.ENTITY_ZOMBIE_VILLAGER_HURT, | ||||||
|                     Sound.ENTITY_ZOMBIE_VILLAGER_STEP, Sound.ENTITY_ZOMBIE_VILLAGER_DEATH, Sound.ENTITY_ZOMBIE_VILLAGER_AMBIENT, |                     Sound.ENTITY_ZOMBIE_VILLAGER_STEP, Sound.ENTITY_ZOMBIE_VILLAGER_DEATH, Sound.ENTITY_ZOMBIE_VILLAGER_AMBIENT, | ||||||
|                     Sound.ENTITY_ZOMBIE_INFECT, Sound.ENTITY_ZOMBIE_BREAK_DOOR_WOOD, Sound.ENTITY_ZOMBIE_ATTACK_DOOR_WOOD, |                     Sound.ENTITY_ZOMBIE_INFECT, Sound.ENTITY_ZOMBIE_BREAK_DOOR_WOOD, Sound.ENTITY_ZOMBIE_ATTACK_DOOR_WOOD, | ||||||
|                     Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR); |                     Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR); | ||||||
|  |  | ||||||
|     public enum SoundType { |     public enum SoundType { | ||||||
|         CANCEL, DEATH, HURT, IDLE, STEP |         CANCEL, DEATH, HURT, IDLE, STEP | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     public static DisguiseSound getType(String name) { |     public static DisguiseSound getType(String name) { | ||||||
|         try { |         try { | ||||||
|             return valueOf(name); |             return valueOf(name); | ||||||
|         } |         } | ||||||
|         catch (Exception ex) { |         catch (Exception ex) { | ||||||
|             return null; |             return null; | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private float damageSoundVolume = 1F; |     private float damageSoundVolume = 1F; | ||||||
|     private HashMap<Object, Object> disguiseSounds = new HashMap<>(); |     private HashMap<Object, Object> disguiseSounds = new HashMap<>(); | ||||||
|  |  | ||||||
|     DisguiseSound(Object hurt, Object step, Object death, Object idle, Object... sounds) { |     DisguiseSound(Object hurt, Object step, Object death, Object idle, Object... sounds) { | ||||||
|         addSound(hurt, SoundType.HURT); |         addSound(hurt, SoundType.HURT); | ||||||
|         addSound(step, SoundType.STEP); |         addSound(step, SoundType.STEP); | ||||||
|         addSound(death, SoundType.DEATH); |         addSound(death, SoundType.DEATH); | ||||||
|         addSound(idle, SoundType.IDLE); |         addSound(idle, SoundType.IDLE); | ||||||
|  |  | ||||||
|         for (Object obj : sounds) { |         for (Object obj : sounds) { | ||||||
|             addSound(obj, SoundType.CANCEL); |             addSound(obj, SoundType.CANCEL); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     DisguiseSound(Object hurt, Object[] step, Object death, Object idle, Object... sounds) { |     DisguiseSound(Object hurt, Object[] step, Object death, Object idle, Object... sounds) { | ||||||
|         addSound(hurt, SoundType.HURT); |         addSound(hurt, SoundType.HURT); | ||||||
|  |  | ||||||
|         if (step != null) { |         if (step != null) { | ||||||
|             for (Object obj : step) { |             for (Object obj : step) { | ||||||
|                 addSound(obj, SoundType.STEP); |                 addSound(obj, SoundType.STEP); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         addSound(death, SoundType.DEATH); |         addSound(death, SoundType.DEATH); | ||||||
|         addSound(idle, SoundType.IDLE); |         addSound(idle, SoundType.IDLE); | ||||||
|  |  | ||||||
|         for (Object obj : sounds) { |         for (Object obj : sounds) { | ||||||
|             addSound(obj, SoundType.CANCEL); |             addSound(obj, SoundType.CANCEL); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private void addSound(Object sound, SoundType type) { |     private void addSound(Object sound, SoundType type) { | ||||||
|         String s; |         String s; | ||||||
|  |  | ||||||
|         if (sound == null) { |         if (sound == null) { | ||||||
|             return; |             return; | ||||||
|         } |         } | ||||||
|         else if (sound instanceof String) { |         else if (sound instanceof String) { | ||||||
|             s = (String) sound; |             s = (String) sound; | ||||||
|         } |         } | ||||||
|         else if (sound instanceof Sound) { |         else if (sound instanceof Sound) { | ||||||
|             s = ReflectionManager.getCraftSound((Sound) sound); |             s = ReflectionManager.getCraftSound((Sound) sound); | ||||||
|         } |         } | ||||||
|         else { |         else { | ||||||
|             throw new RuntimeException("Was given a unknown object " + sound); |             throw new RuntimeException("Was given a unknown object " + sound); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         switch (type) { |         switch (type) { | ||||||
|         case HURT: |         case HURT: | ||||||
|             disguiseSounds.put(SoundType.HURT, s); |             disguiseSounds.put(SoundType.HURT, s); | ||||||
|             break; |             break; | ||||||
|         case STEP: |         case STEP: | ||||||
|             disguiseSounds.put(SoundType.STEP, s); |             disguiseSounds.put(s, SoundType.STEP); | ||||||
|             break; |             break; | ||||||
|         case DEATH: |         case DEATH: | ||||||
|             disguiseSounds.put(SoundType.DEATH, s); |             disguiseSounds.put(SoundType.DEATH, s); | ||||||
|             break; |             break; | ||||||
|         case IDLE: |         case IDLE: | ||||||
|             disguiseSounds.put(SoundType.IDLE, s); |             disguiseSounds.put(SoundType.IDLE, s); | ||||||
|             break; |             break; | ||||||
|         case CANCEL: |         case CANCEL: | ||||||
|             disguiseSounds.put(s, SoundType.CANCEL); |             disguiseSounds.put(s, SoundType.CANCEL); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     public float getDamageAndIdleSoundVolume() { |     public float getDamageAndIdleSoundVolume() { | ||||||
|         return damageSoundVolume; |         return damageSoundVolume; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     public String getSound(SoundType type) { |     public String getSound(SoundType type) { | ||||||
|         if (type == null) { |         if (type == null) { | ||||||
|             return null; |             return null; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         if (disguiseSounds.containsKey(type)) { |         if (disguiseSounds.containsKey(type)) { | ||||||
|             return (String) disguiseSounds.get(type); |             return (String) disguiseSounds.get(type); | ||||||
|         } |         } | ||||||
|         else if (disguiseSounds.containsValue(type)) { |         else if (disguiseSounds.containsValue(type)) { | ||||||
|             for (Entry<Object, Object> entry : disguiseSounds.entrySet()) { |             for (Entry<Object, Object> entry : disguiseSounds.entrySet()) { | ||||||
|                 if (entry.getValue() != type) |                 if (entry.getValue() != type) | ||||||
|                     continue; |                     continue; | ||||||
|  |  | ||||||
|                 return (String) entry.getKey(); |                 return (String) entry.getKey(); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         return null; |         return null; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     public SoundType getSound(String sound) { |     public SoundType getSound(String sound) { | ||||||
|         if (sound == null) { |         if (sound == null) { | ||||||
|             return null; |             return null; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         if (disguiseSounds.containsKey(sound)) { |         if (disguiseSounds.containsKey(sound)) { | ||||||
|             return (SoundType) disguiseSounds.get(sound); |             return (SoundType) disguiseSounds.get(sound); | ||||||
|         } |         } | ||||||
|         else if (disguiseSounds.containsValue(sound)) { |         else if (disguiseSounds.containsValue(sound)) { | ||||||
|             for (Entry<Object, Object> entry : disguiseSounds.entrySet()) { |             for (Entry<Object, Object> entry : disguiseSounds.entrySet()) { | ||||||
|                 if (!Objects.equals(sound, entry.getValue())) |                 if (!Objects.equals(sound, entry.getValue())) | ||||||
|                     continue; |                     continue; | ||||||
|  |  | ||||||
|                 return (SoundType) entry.getKey(); |                 return (SoundType) entry.getKey(); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         return null; |         return null; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Used to check if this sound name is owned by this disguise sound. |      * Used to check if this sound name is owned by this disguise sound. | ||||||
|      */ |      */ | ||||||
|     public SoundType getType(String sound, boolean ignoreDamage) { |     public SoundType getType(String sound, boolean ignoreDamage) { | ||||||
|         if (sound == null) |         if (sound == null) | ||||||
|             return SoundType.CANCEL; |             return SoundType.CANCEL; | ||||||
|  |  | ||||||
|         if (isCancelSound(sound)) { |         if (isCancelSound(sound)) { | ||||||
|             return SoundType.CANCEL; |             return SoundType.CANCEL; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /*if (disguiseSounds.containsKey(SoundType.STEP) && disguiseSounds.get(SoundType.STEP).startsWith("step.") |         /*if (disguiseSounds.containsKey(SoundType.STEP) && disguiseSounds.get(SoundType.STEP).startsWith("step.") | ||||||
|                 && sound.startsWith("step.")) { |                 && sound.startsWith("step.")) { | ||||||
|             return SoundType.STEP; |             return SoundType.STEP; | ||||||
|         }*/ |         }*/ | ||||||
|  |  | ||||||
|         for (SoundType type : SoundType.values()) { |         for (SoundType type : SoundType.values()) { | ||||||
|             if (!disguiseSounds.containsKey(type) || type == SoundType.DEATH || (ignoreDamage && type == SoundType.HURT)) { |             if (!disguiseSounds.containsKey(type) || type == SoundType.DEATH || (ignoreDamage && type == SoundType.HURT)) { | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             Object s = disguiseSounds.get(type); |             Object s = disguiseSounds.get(type); | ||||||
|  |  | ||||||
|             if (s != null) { |             if (s != null) { | ||||||
|                 if (Objects.equals(s, sound)) { |                 if (Objects.equals(s, sound)) { | ||||||
|                     return type; |                     return type; | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|             else { |             else { | ||||||
|                 for (Entry<Object, Object> entry : disguiseSounds.entrySet()) { |                 for (Entry<Object, Object> entry : disguiseSounds.entrySet()) { | ||||||
|                     if (!Objects.equals(sound, entry.getKey())) |                     if (!Objects.equals(sound, entry.getKey())) | ||||||
|                         continue; |                         continue; | ||||||
|  |  | ||||||
|                     return (SoundType) entry.getValue(); |                     return (SoundType) entry.getValue(); | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         return null; |         return null; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     public boolean isCancelSound(String sound) { |     public boolean isCancelSound(String sound) { | ||||||
|         return getSound(sound) == SoundType.CANCEL; |         return getSound(sound) == SoundType.CANCEL; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /*  public void removeSound(SoundType type, Sound sound) { |     /*  public void removeSound(SoundType type, Sound sound) { | ||||||
|         removeSound(type, ReflectionManager.getCraftSound(sound)); |         removeSound(type, ReflectionManager.getCraftSound(sound)); | ||||||
|     } |     } | ||||||
|      |      | ||||||
|     public void removeSound(SoundType type, String sound) { |     public void removeSound(SoundType type, String sound) { | ||||||
|         if (type == SoundType.CANCEL) { |         if (type == SoundType.CANCEL) { | ||||||
|             cancelSounds.remove(sound); |             cancelSounds.remove(sound); | ||||||
|         } |         } | ||||||
|         else { |         else { | ||||||
|             disguiseSounds.remove(type); |             disguiseSounds.remove(type); | ||||||
|         } |         } | ||||||
|     }*/ |     }*/ | ||||||
|  |  | ||||||
|     public void setDamageAndIdleSoundVolume(float strength) { |     public void setDamageAndIdleSoundVolume(float strength) { | ||||||
|         this.damageSoundVolume = strength; |         this.damageSoundVolume = strength; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /* public void setSound(SoundType type, Sound sound) { |     /* public void setSound(SoundType type, Sound sound) { | ||||||
|         setSound(type, ReflectionManager.getCraftSound(sound)); |         setSound(type, ReflectionManager.getCraftSound(sound)); | ||||||
|     } |     } | ||||||
|      |      | ||||||
|     public void setSound(SoundType type, String sound) { |     public void setSound(SoundType type, String sound) { | ||||||
|         if (type == SoundType.CANCEL) { |         if (type == SoundType.CANCEL) { | ||||||
|             cancelSounds.add(sound); |             cancelSounds.add(sound); | ||||||
|         } |         } | ||||||
|         else { |         else { | ||||||
|             disguiseSounds.put(type, sound); |             disguiseSounds.put(type, sound); | ||||||
|         } |         } | ||||||
|     }*/ |     }*/ | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user