From ba4e6e5d2fcf5ea671f051ffb5995da904a070f3 Mon Sep 17 00:00:00 2001 From: HugoDaBosss Date: Tue, 1 Mar 2016 14:24:58 +0100 Subject: [PATCH 1/3] Fixed ItemFrame crash --- .../myles/ViaVersion/metadata/MetaIndex.java | 402 +++++++++--------- 1 file changed, 201 insertions(+), 201 deletions(-) diff --git a/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java b/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java index fbc1763aa..50df771af 100644 --- a/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java +++ b/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java @@ -1,201 +1,201 @@ -package us.myles.ViaVersion.metadata; - -import org.bukkit.entity.*; - -public enum MetaIndex { - - // entity - ENTITY_STATUS(org.bukkit.entity.Entity.class, 0, Type.Byte, NewType.Byte), - ENTITY_AIR(org.bukkit.entity.Entity.class, 1, Type.Short, NewType.VarInt), - ENTITY_SILENT(org.bukkit.entity.Entity.class, 4, Type.Byte, NewType.Boolean), - // living entity - LIVINGENTITY_NAMETAG(LivingEntity.class, 2, Type.String, NewType.String), - LIVINGENTITY_ALWAYS_SHOW_NAMETAG(LivingEntity.class, 3, Type.Byte, NewType.Boolean), - LIVINGENTITY_HEALTH(LivingEntity.class, 6, Type.Float, NewType.Float), - LIVINGENTITY_POTION_EFFECT_COLOR(LivingEntity.class, 7, Type.Int, NewType.VarInt), - LIVINGENTITY_IS_POTION_AMBIENT(LivingEntity.class, 8, Type.Byte, NewType.Boolean), - LIVINGENTITY_NUMBER_OF_ARROWS_IN(LivingEntity.class, 9, Type.Byte, NewType.VarInt), - LIVINGENTITY_NO_AI(LivingEntity.class, 15, Type.Byte, 10, NewType.Byte), // in 1.9 this is combined with Left handed, oh. - // ageable - AGEABLE_AGE(Ageable.class, 12, Type.Byte, 11, NewType.Boolean), - // armour stand - STAND_INFO(ArmorStand.class, 10, Type.Byte, NewType.Byte), - STAND_HEAD_POS(ArmorStand.class, 11, Type.Rotation, NewType.Vector3F), - STAND_BODY_POS(ArmorStand.class, 12, Type.Rotation, NewType.Vector3F), - STAND_LA_POS(ArmorStand.class, 13, Type.Rotation, NewType.Vector3F), - STAND_RA_POS(ArmorStand.class, 14, Type.Rotation, NewType.Vector3F), - STAND_LL_POS(ArmorStand.class, 15, Type.Rotation, NewType.Vector3F), - STAND_RL_POS(ArmorStand.class, 16, Type.Rotation, NewType.Vector3F), - // human, discountined? - PLAYER_SKIN_FLAGS(HumanEntity.class, 10, Type.Byte, NewType.Discontinued), // unsigned on 1.8 - PLAYER_HUMAN_BYTE(HumanEntity.class, 16, Type.Byte, NewType.Discontinued), // unused on 1.8 - PLAYER_ADDITIONAL_HEARTS(HumanEntity.class, 17, Type.Float, NewType.Discontinued), - PLAYER_SCORE(HumanEntity.class, 18, Type.Int, NewType.Discontinued), - // horse - HORSE_INFO(Horse.class, 16, Type.Int, 12, NewType.Byte), - HORSE_TYPE(Horse.class, 19, Type.Byte, 13, NewType.VarInt), - HORSE_SUBTYPE(Horse.class, 20, Type.Int, 14, NewType.VarInt), - HORSE_OWNER(Horse.class, 21, Type.String, 15, NewType.OptUUID), - HORSE_ARMOR(Horse.class, 22, Type.Int, 16, NewType.VarInt), - // bat - BAT_ISHANGING(Bat.class, 16, Type.Byte, 11, NewType.Byte), - // tameable - TAMING_INFO(Tameable.class, 16, Type.Byte, 12, NewType.Byte), - TAMING_OWNER(Tameable.class, 17, Type.String, 13, NewType.OptUUID), - // ocelot - OCELOT_TYPE(Ocelot.class, 18, Type.Byte, 14, NewType.VarInt), - // wolf - WOLF_HEALTH(Wolf.class, 18, Type.Float, 14, NewType.Float), - WOLF_BEGGING(Wolf.class, 19, Type.Byte, 15, NewType.Boolean), - WOLF_COLLAR(Wolf.class, 20, Type.Byte, 16, NewType.VarInt), - // pig - PIG_SADDLE(Pig.class, 16, Type.Byte, 12, NewType.Boolean), - // rabbit - RABBIT_TYPE(Rabbit.class, 18, Type.Byte, 12, NewType.VarInt), - // sheep - SHEEP_COLOR(Sheep.class, 16, Type.Byte, 12, NewType.Byte), - // villager - VILLAGER_PROFESSION(Villager.class, 16, Type.Int, 12, NewType.VarInt), // TODO write this to wiki.vg - // enderman - ENDERMAN_BLOCK(Enderman.class, 16, Type.Short, 11, NewType.BlockID), // special case - ENDERMAN_BLOCKDATA(Enderman.class, 17, Type.Byte, 11, NewType.BlockID), // special case - ENDERMAN_ISSCREAMING(Enderman.class, 18, Type.Byte, 12, NewType.Boolean), - // zombie - ZOMBIE_ISCHILD(Zombie.class, 12, Type.Byte, 11, NewType.Boolean), - ZOMBIE_ISVILLAGER(Zombie.class, 13, Type.Byte, 12, NewType.VarInt), - ZOMBIE_ISCONVERTING(Zombie.class, 14, Type.Byte, 13, NewType.Boolean), - // ZOMBIE_RISINGHANDS added in 1.9 - // blaze - BLAZE_ONFIRE(Blaze.class, 16, Type.Byte, 11, NewType.Byte), - // spider - SPIDER_CIMBING(Spider.class, 16, Type.Byte, 11, NewType.Byte), - // creeper - CREEPER_FUSE(Creeper.class, 16, Type.Byte, 11, NewType.VarInt), // -1 idle, 1 is fuse - CREEPER_ISPOWERED(Creeper.class, 17, Type.Byte, 12, NewType.Boolean), - CREEPER_ISIGNITED(Creeper.class, 18, Type.Byte, 13, NewType.Boolean), // TODO: Write on wiki.vg for current prot - // ghast - GHAST_ISATTACKING(Ghast.class, 16, Type.Byte, 11, NewType.Boolean), - // slime - SLIME_SIZE(Slime.class, 16, Type.Byte, 11, NewType.VarInt), - // skeleton - SKELETON_TYPE(Skeleton.class, 13, Type.Byte, 11, NewType.VarInt), - // witch - WITCH_AGGRO(Witch.class, 21, Type.Byte, 11, NewType.Boolean), - // iron golem - IRON_PLAYERMADE(IronGolem.class, 16, Type.Byte, 11, NewType.Byte), - // wither - WITHER_TARGET1(Wither.class, 17, Type.Int, 11, NewType.VarInt), - WITHER_TARGET2(Wither.class, 18, Type.Int, 12, NewType.VarInt), - WITHER_TARGET3(Wither.class, 19, Type.Int, 13, NewType.VarInt), - WITHER_INVULN_TIME(Wither.class, 20, Type.Int, 14, NewType.VarInt), - // guardian - GUARDIAN_INFO(Guardian.class, 16, Type.Byte, 11, NewType.Byte), - GUARDIAN_TARGET(Guardian.class, 17, Type.Int, 12, NewType.VarInt), - // boat - BOAT_SINCEHIT(Boat.class, 17, Type.Int, 5, NewType.VarInt), - BOAT_FORWARDDIR(Boat.class, 18, Type.Int, 6, NewType.VarInt), - BOAT_DMGTAKEN(Boat.class, 19, Type.Float, 7, NewType.Float), - // BOAT_TYPE in 1.9 - // minecart - MINECART_SHAKINGPOWER(Minecart.class, 17, Type.Int, 5, NewType.VarInt), - MINECART_SHAKINGDIRECTION(Minecart.class, 18, Type.Int, 6, NewType.VarInt), - MINECART_DAMAGETAKEN(Minecart.class, 19, Type.Float, 7, NewType.Float), // also shaking modifier :P - MINECART_BLOCK(Minecart.class, 20, Type.Int, 8, NewType.VarInt), - MINECART_BLOCK_Y(Minecart.class, 21, Type.Int, 9, NewType.VarInt), - MINECART_SHOWBLOCK(Minecart.class, 22, Type.Byte, 10, NewType.Boolean), - // furnace cart - FURNACECART_ISPOWERED(org.bukkit.entity.minecart.PoweredMinecart.class, 16, Type.Byte, 11, NewType.Boolean), - // item drop - ITEM_ITEM(Item.class, 10, Type.Slot, 5, NewType.Slot), - // arrow - ARROW_ISCRIT(Arrow.class, 16, Type.Byte, 5, NewType.Byte), - // firework - FIREWORK_INFO(Firework.class, 8, Type.Slot, 5, NewType.Slot), - // item frame - ITEMFRAME_ITEM(ItemFrame.class, 8, Type.Slot, 5, NewType.Slot), - ITEMFRAME_ROTATION(ItemFrame.class, 9, Type.Byte, 5, NewType.VarInt), - // ender crystal - ENDERCRYSTAL_HEALTH(EnderCrystal.class, 8, Type.Int, NewType.Discontinued),; - - private Class clazz; - private int newIndex; - private NewType newType; - private Type oldType; - private int index; - - MetaIndex(Class type, int index, Type oldType, NewType newType) { - this.clazz = type; - this.index = index; - this.newIndex = index; - this.oldType = oldType; - this.newType = newType; - } - - MetaIndex(Class type, int index, Type oldType, int newIndex, NewType newType) { - this.clazz = type; - this.index = index; - this.oldType = oldType; - this.newIndex = newIndex; - this.newType = newType; - } - - public int getNewIndex() { - return newIndex; - } - - public NewType getNewType() { - return newType; - } - - public Type getOldType() { - return oldType; - } - - public int getIndex() { - return index; - } - - public Class getApplicableClass() { - return this.clazz; - } - - public static MetaIndex getIndex(Entity entity, int index) { - EntityType type; - if (entity instanceof Player) { - type = EntityType.PLAYER; - } else { - type = entity.getType(); - } - return getIndex(type, index); - } - - public static MetaIndex getIndex(EntityType type, int index) { - Class entityClass = type.getEntityClass(); - if(entityClass == null){ - System.out.println("Could not get entity class for " + type); - return null; - } - for (MetaIndex mi : MetaIndex.values()) { - if (mi.getIndex() == index) { - // To fix issue with armour stands colliding with new values - if(mi.getApplicableClass().equals(LivingEntity.class)) continue; - - if ((mi.getApplicableClass().isAssignableFrom(entityClass) || - mi.getApplicableClass().equals(entityClass))) { - return mi; - } - } - } - // fall back to living entity - for (MetaIndex mi : MetaIndex.values()) { - if (mi.getIndex() == index) { - if (mi.getApplicableClass().isAssignableFrom(LivingEntity.class) || - mi.getApplicableClass().equals(LivingEntity.class)) { - return mi; - } - } - } - return null; - } -} - +package us.myles.ViaVersion.metadata; + +import org.bukkit.entity.*; + +public enum MetaIndex { + + // entity + ENTITY_STATUS(org.bukkit.entity.Entity.class, 0, Type.Byte, NewType.Byte), + ENTITY_AIR(org.bukkit.entity.Entity.class, 1, Type.Short, NewType.VarInt), + ENTITY_SILENT(org.bukkit.entity.Entity.class, 4, Type.Byte, NewType.Boolean), + // living entity + LIVINGENTITY_NAMETAG(LivingEntity.class, 2, Type.String, NewType.String), + LIVINGENTITY_ALWAYS_SHOW_NAMETAG(LivingEntity.class, 3, Type.Byte, NewType.Boolean), + LIVINGENTITY_HEALTH(LivingEntity.class, 6, Type.Float, NewType.Float), + LIVINGENTITY_POTION_EFFECT_COLOR(LivingEntity.class, 7, Type.Int, NewType.VarInt), + LIVINGENTITY_IS_POTION_AMBIENT(LivingEntity.class, 8, Type.Byte, NewType.Boolean), + LIVINGENTITY_NUMBER_OF_ARROWS_IN(LivingEntity.class, 9, Type.Byte, NewType.VarInt), + LIVINGENTITY_NO_AI(LivingEntity.class, 15, Type.Byte, 10, NewType.Byte), // in 1.9 this is combined with Left handed, oh. + // ageable + AGEABLE_AGE(Ageable.class, 12, Type.Byte, 11, NewType.Boolean), + // armour stand + STAND_INFO(ArmorStand.class, 10, Type.Byte, NewType.Byte), + STAND_HEAD_POS(ArmorStand.class, 11, Type.Rotation, NewType.Vector3F), + STAND_BODY_POS(ArmorStand.class, 12, Type.Rotation, NewType.Vector3F), + STAND_LA_POS(ArmorStand.class, 13, Type.Rotation, NewType.Vector3F), + STAND_RA_POS(ArmorStand.class, 14, Type.Rotation, NewType.Vector3F), + STAND_LL_POS(ArmorStand.class, 15, Type.Rotation, NewType.Vector3F), + STAND_RL_POS(ArmorStand.class, 16, Type.Rotation, NewType.Vector3F), + // human, discountined? + PLAYER_SKIN_FLAGS(HumanEntity.class, 10, Type.Byte, NewType.Discontinued), // unsigned on 1.8 + PLAYER_HUMAN_BYTE(HumanEntity.class, 16, Type.Byte, NewType.Discontinued), // unused on 1.8 + PLAYER_ADDITIONAL_HEARTS(HumanEntity.class, 17, Type.Float, NewType.Discontinued), + PLAYER_SCORE(HumanEntity.class, 18, Type.Int, NewType.Discontinued), + // horse + HORSE_INFO(Horse.class, 16, Type.Int, 12, NewType.Byte), + HORSE_TYPE(Horse.class, 19, Type.Byte, 13, NewType.VarInt), + HORSE_SUBTYPE(Horse.class, 20, Type.Int, 14, NewType.VarInt), + HORSE_OWNER(Horse.class, 21, Type.String, 15, NewType.OptUUID), + HORSE_ARMOR(Horse.class, 22, Type.Int, 16, NewType.VarInt), + // bat + BAT_ISHANGING(Bat.class, 16, Type.Byte, 11, NewType.Byte), + // tameable + TAMING_INFO(Tameable.class, 16, Type.Byte, 12, NewType.Byte), + TAMING_OWNER(Tameable.class, 17, Type.String, 13, NewType.OptUUID), + // ocelot + OCELOT_TYPE(Ocelot.class, 18, Type.Byte, 14, NewType.VarInt), + // wolf + WOLF_HEALTH(Wolf.class, 18, Type.Float, 14, NewType.Float), + WOLF_BEGGING(Wolf.class, 19, Type.Byte, 15, NewType.Boolean), + WOLF_COLLAR(Wolf.class, 20, Type.Byte, 16, NewType.VarInt), + // pig + PIG_SADDLE(Pig.class, 16, Type.Byte, 12, NewType.Boolean), + // rabbit + RABBIT_TYPE(Rabbit.class, 18, Type.Byte, 12, NewType.VarInt), + // sheep + SHEEP_COLOR(Sheep.class, 16, Type.Byte, 12, NewType.Byte), + // villager + VILLAGER_PROFESSION(Villager.class, 16, Type.Int, 12, NewType.VarInt), // TODO write this to wiki.vg + // enderman + ENDERMAN_BLOCK(Enderman.class, 16, Type.Short, 11, NewType.BlockID), // special case + ENDERMAN_BLOCKDATA(Enderman.class, 17, Type.Byte, 11, NewType.BlockID), // special case + ENDERMAN_ISSCREAMING(Enderman.class, 18, Type.Byte, 12, NewType.Boolean), + // zombie + ZOMBIE_ISCHILD(Zombie.class, 12, Type.Byte, 11, NewType.Boolean), + ZOMBIE_ISVILLAGER(Zombie.class, 13, Type.Byte, 12, NewType.VarInt), + ZOMBIE_ISCONVERTING(Zombie.class, 14, Type.Byte, 13, NewType.Boolean), + // ZOMBIE_RISINGHANDS added in 1.9 + // blaze + BLAZE_ONFIRE(Blaze.class, 16, Type.Byte, 11, NewType.Byte), + // spider + SPIDER_CIMBING(Spider.class, 16, Type.Byte, 11, NewType.Byte), + // creeper + CREEPER_FUSE(Creeper.class, 16, Type.Byte, 11, NewType.VarInt), // -1 idle, 1 is fuse + CREEPER_ISPOWERED(Creeper.class, 17, Type.Byte, 12, NewType.Boolean), + CREEPER_ISIGNITED(Creeper.class, 18, Type.Byte, 13, NewType.Boolean), // TODO: Write on wiki.vg for current prot + // ghast + GHAST_ISATTACKING(Ghast.class, 16, Type.Byte, 11, NewType.Boolean), + // slime + SLIME_SIZE(Slime.class, 16, Type.Byte, 11, NewType.VarInt), + // skeleton + SKELETON_TYPE(Skeleton.class, 13, Type.Byte, 11, NewType.VarInt), + // witch + WITCH_AGGRO(Witch.class, 21, Type.Byte, 11, NewType.Boolean), + // iron golem + IRON_PLAYERMADE(IronGolem.class, 16, Type.Byte, 11, NewType.Byte), + // wither + WITHER_TARGET1(Wither.class, 17, Type.Int, 11, NewType.VarInt), + WITHER_TARGET2(Wither.class, 18, Type.Int, 12, NewType.VarInt), + WITHER_TARGET3(Wither.class, 19, Type.Int, 13, NewType.VarInt), + WITHER_INVULN_TIME(Wither.class, 20, Type.Int, 14, NewType.VarInt), + // guardian + GUARDIAN_INFO(Guardian.class, 16, Type.Byte, 11, NewType.Byte), + GUARDIAN_TARGET(Guardian.class, 17, Type.Int, 12, NewType.VarInt), + // boat + BOAT_SINCEHIT(Boat.class, 17, Type.Int, 5, NewType.VarInt), + BOAT_FORWARDDIR(Boat.class, 18, Type.Int, 6, NewType.VarInt), + BOAT_DMGTAKEN(Boat.class, 19, Type.Float, 7, NewType.Float), + // BOAT_TYPE in 1.9 + // minecart + MINECART_SHAKINGPOWER(Minecart.class, 17, Type.Int, 5, NewType.VarInt), + MINECART_SHAKINGDIRECTION(Minecart.class, 18, Type.Int, 6, NewType.VarInt), + MINECART_DAMAGETAKEN(Minecart.class, 19, Type.Float, 7, NewType.Float), // also shaking modifier :P + MINECART_BLOCK(Minecart.class, 20, Type.Int, 8, NewType.VarInt), + MINECART_BLOCK_Y(Minecart.class, 21, Type.Int, 9, NewType.VarInt), + MINECART_SHOWBLOCK(Minecart.class, 22, Type.Byte, 10, NewType.Boolean), + // furnace cart + FURNACECART_ISPOWERED(org.bukkit.entity.minecart.PoweredMinecart.class, 16, Type.Byte, 11, NewType.Boolean), + // item drop + ITEM_ITEM(Item.class, 10, Type.Slot, 5, NewType.Slot), + // arrow + ARROW_ISCRIT(Arrow.class, 16, Type.Byte, 5, NewType.Byte), + // firework + FIREWORK_INFO(Firework.class, 8, Type.Slot, 5, NewType.Slot), + // item frame + ITEMFRAME_ITEM(ItemFrame.class, 8, Type.Slot, 5, NewType.Slot), + ITEMFRAME_ROTATION(ItemFrame.class, 9, Type.Byte, 6, NewType.VarInt), + // ender crystal + ENDERCRYSTAL_HEALTH(EnderCrystal.class, 8, Type.Int, NewType.Discontinued),; + + private Class clazz; + private int newIndex; + private NewType newType; + private Type oldType; + private int index; + + MetaIndex(Class type, int index, Type oldType, NewType newType) { + this.clazz = type; + this.index = index; + this.newIndex = index; + this.oldType = oldType; + this.newType = newType; + } + + MetaIndex(Class type, int index, Type oldType, int newIndex, NewType newType) { + this.clazz = type; + this.index = index; + this.oldType = oldType; + this.newIndex = newIndex; + this.newType = newType; + } + + public int getNewIndex() { + return newIndex; + } + + public NewType getNewType() { + return newType; + } + + public Type getOldType() { + return oldType; + } + + public int getIndex() { + return index; + } + + public Class getApplicableClass() { + return this.clazz; + } + + public static MetaIndex getIndex(Entity entity, int index) { + EntityType type; + if (entity instanceof Player) { + type = EntityType.PLAYER; + } else { + type = entity.getType(); + } + return getIndex(type, index); + } + + public static MetaIndex getIndex(EntityType type, int index) { + Class entityClass = type.getEntityClass(); + if(entityClass == null){ + System.out.println("Could not get entity class for " + type); + return null; + } + for (MetaIndex mi : MetaIndex.values()) { + if (mi.getIndex() == index) { + // To fix issue with armour stands colliding with new values + if(mi.getApplicableClass().equals(LivingEntity.class)) continue; + + if ((mi.getApplicableClass().isAssignableFrom(entityClass) || + mi.getApplicableClass().equals(entityClass))) { + return mi; + } + } + } + // fall back to living entity + for (MetaIndex mi : MetaIndex.values()) { + if (mi.getIndex() == index) { + if (mi.getApplicableClass().isAssignableFrom(LivingEntity.class) || + mi.getApplicableClass().equals(LivingEntity.class)) { + return mi; + } + } + } + return null; + } +} + From 45dfe7261bf3a9b8507818650c987c96366a4574 Mon Sep 17 00:00:00 2001 From: HugoDaBosss Date: Tue, 1 Mar 2016 14:48:00 +0100 Subject: [PATCH 2/3] Added remaining missing sounds --- .../myles/ViaVersion/sounds/SoundEffect.java | 570 +++++++++--------- 1 file changed, 283 insertions(+), 287 deletions(-) diff --git a/src/main/java/us/myles/ViaVersion/sounds/SoundEffect.java b/src/main/java/us/myles/ViaVersion/sounds/SoundEffect.java index 9e27fe64e..a78b2e8a8 100644 --- a/src/main/java/us/myles/ViaVersion/sounds/SoundEffect.java +++ b/src/main/java/us/myles/ViaVersion/sounds/SoundEffect.java @@ -1,287 +1,283 @@ -package us.myles.ViaVersion.sounds; - -public enum SoundEffect { - - MOB_HORSE_ZOMBIE_IDLE("mob.horse.zombie.idle", "entity.zombie_horse.ambient", SoundCategory.NEUTRAL), - NOTE_SNARE("note.snare", "block.note.snare", SoundCategory.RECORD), - RANDOM_WOOD_CLICK("random.wood_click", "block.wood_button.click_on", SoundCategory.BLOCK), - DIG_GRAVEL("dig.gravel", "block.gravel.place", SoundCategory.BLOCK), - RANDOM_BOWHIT("random.bowhit", "block.tripwire.detach", SoundCategory.NEUTRAL), - DIG_GLASS("dig.glass", "block.glass.break", SoundCategory.BLOCK), - MOB_ZOMBIE_SAY("mob.zombie.say", "entity.zombie_villager.ambient", SoundCategory.HOSTILE), - MOB_PIG_DEATH("mob.pig.death", "entity.pig.death", SoundCategory.NEUTRAL), - MOB_HORSE_DONKEY_HIT("mob.horse.donkey.hit", "entity.donkey.hurt", SoundCategory.NEUTRAL), - GAME_NEUTRAL_SWIM("game.neutral.swim", "entity.player.swim", SoundCategory.NEUTRAL), - GAME_PLAYER_SWIM("game.player.swim", "entity.player.swim", SoundCategory.PLAYER), - MOB_ENDERMEN_IDLE("mob.endermen.idle", "entity.endermen.ambient", SoundCategory.HOSTILE), - PORTAL_PORTAL("portal.portal", "block.portal.ambient", SoundCategory.BLOCK), - RANDOM_FIZZ("random.fizz", "entity.generic.extinguish_fire", SoundCategory.BLOCK), - NOTE_HARP("note.harp", "block.note.harp", SoundCategory.RECORD), - STEP_SNOW("step.snow", "block.snow.step", SoundCategory.NEUTRAL), - RANDOM_SUCCESSFUL_HIT("random.successful_hit", "entity.arrow.hit_player", SoundCategory.PLAYER), - MOB_ZOMBIEPIG_ZPIGHURT("mob.zombiepig.zpighurt", "entity.zombie_pig.hurt", SoundCategory.HOSTILE), - MOB_WOLF_HOWL("mob.wolf.howl", "entity.wolf.howl", SoundCategory.NEUTRAL), - FIREWORKS_LAUNCH("fireworks.launch", "entity.firework.launch", SoundCategory.AMBIENT), - MOB_COW_HURT("mob.cow.hurt", "entity.cow.death", SoundCategory.NEUTRAL), - FIREWORKS_LARGEBLAST("fireworks.largeBlast", "entity.firework.large_blast", SoundCategory.AMBIENT), - MOB_BLAZE_HIT("mob.blaze.hit", "entity.blaze.hurt", SoundCategory.HOSTILE), - MOB_VILLAGER_DEATH("mob.villager.death", "entity.villager.death", SoundCategory.NEUTRAL), - MOB_BLAZE_DEATH("mob.blaze.death", "entity.blaze.death", SoundCategory.HOSTILE), - MOB_HORSE_ZOMBIE_DEATH("mob.horse.zombie.death", "entity.zombie_horse.death", SoundCategory.NEUTRAL), - MOB_SILVERFISH_KILL("mob.silverfish.kill", "entity.endermite.death", SoundCategory.HOSTILE), - MOB_WOLF_PANTING("mob.wolf.panting", "entity.wolf.pant", SoundCategory.NEUTRAL), - NOTE_BASS("note.bass", "null", SoundCategory.RECORD), - DIG_STONE("dig.stone", "block.glass.place", SoundCategory.BLOCK), - MOB_ENDERMEN_STARE("mob.endermen.stare", "entity.endermen.stare", SoundCategory.HOSTILE), - GAME_PLAYER_SWIM_SPLASH("game.player.swim.splash", "entity.generic.splash", SoundCategory.BLOCK), - MOB_SLIME_SMALL("mob.slime.small", "block.slime.hit", SoundCategory.HOSTILE), - MOB_GHAST_DEATH("mob.ghast.death", "entity.ghast.death", SoundCategory.HOSTILE), - MOB_GUARDIAN_ATTACK("mob.guardian.attack", "entity.guardian.attack", SoundCategory.HOSTILE), - RANDOM_CLICK("random.click", "block.wood_pressureplate.click_on", SoundCategory.BLOCK), - MOB_ZOMBIEPIG_ZPIG("mob.zombiepig.zpig", "entity.zombie_pig.ambient", SoundCategory.HOSTILE), - GAME_PLAYER_DIE("game.player.die", "entity.player.death", SoundCategory.PLAYER), - FIREWORKS_TWINKLE_FAR("fireworks.twinkle_far", "entity.firework.twinkle_far", SoundCategory.AMBIENT), - MOB_GUARDIAN_LAND_IDLE("mob.guardian.land.idle", "entity.guardian.ambient_land", SoundCategory.HOSTILE), - DIG_GRASS("dig.grass", "block.grass.place", SoundCategory.BLOCK), - MOB_SKELETON_STEP("mob.skeleton.step", "entity.skeleton.step", SoundCategory.HOSTILE), - MOB_WITHER_DEATH("mob.wither.death", "entity.wither.death", SoundCategory.HOSTILE), - MOB_WOLF_HURT("mob.wolf.hurt", "entity.wolf.hurt", SoundCategory.NEUTRAL), - MOB_HORSE_LEATHER("mob.horse.leather", "entity.horse.saddle", SoundCategory.NEUTRAL), - MOB_BAT_LOOP("mob.bat.loop", "entity.bat.loop", SoundCategory.NEUTRAL), - MOB_GHAST_SCREAM("mob.ghast.scream", "entity.ghast.hurt", SoundCategory.HOSTILE), - GAME_PLAYER_HURT("game.player.hurt", "entity.player.death", SoundCategory.PLAYER), - GAME_NEUTRAL_DIE("game.neutral.die", "entity.player.death", SoundCategory.NEUTRAL), - MOB_CREEPER_DEATH("mob.creeper.death", "entity.creeper.death", SoundCategory.HOSTILE), - MOB_HORSE_GALLOP("mob.horse.gallop", "entity.horse.gallop", SoundCategory.NEUTRAL), - MOB_WITHER_SPAWN("mob.wither.spawn", "entity.wither.spawn", SoundCategory.HOSTILE), - MOB_ENDERMEN_HIT("mob.endermen.hit", "entity.endermen.hurt", SoundCategory.HOSTILE), - MOB_CREEPER_SAY("mob.creeper.say", "entity.creeper.hurt", SoundCategory.HOSTILE), - MOB_HORSE_WOOD("mob.horse.wood", "entity.horse.step_wood", SoundCategory.NEUTRAL), - MOB_ZOMBIE_UNFECT("mob.zombie.unfect", "entity.zombie_villager.converted", SoundCategory.HOSTILE), - RANDOM_ANVIL_USE("random.anvil_use", "block.anvil.use", SoundCategory.BLOCK), - RANDOM_CHESTCLOSED("random.chestclosed", "block.enderchest.close", SoundCategory.BLOCK), - MOB_SHEEP_SHEAR("mob.sheep.shear", "entity.sheep.shear", SoundCategory.NEUTRAL), - RANDOM_POP("random.pop", "entity.item.pickup", SoundCategory.PLAYER), - MOB_BAT_DEATH("mob.bat.death", "entity.bat.death", SoundCategory.NEUTRAL), - DIG_WOOD("dig.wood", "block.ladder.break", SoundCategory.BLOCK), - MOB_HORSE_DONKEY_DEATH("mob.horse.donkey.death", "entity.donkey.death", SoundCategory.NEUTRAL), - FIREWORKS_BLAST("fireworks.blast", "entity.firework.blast", SoundCategory.AMBIENT), - MOB_ZOMBIEPIG_ZPIGANGRY("mob.zombiepig.zpigangry", "entity.zombie_pig.angry", SoundCategory.HOSTILE), - GAME_HOSTILE_SWIM("game.hostile.swim", "entity.player.swim", SoundCategory.HOSTILE), - MOB_GUARDIAN_FLOP("mob.guardian.flop", "entity.guardian.flop", SoundCategory.HOSTILE), - MOB_VILLAGER_YES("mob.villager.yes", "entity.villager.yes", SoundCategory.NEUTRAL), - MOB_GHAST_CHARGE("mob.ghast.charge", "entity.ghast.warn", SoundCategory.HOSTILE), - CREEPER_PRIMED("creeper.primed", "entity.creeper.primed", SoundCategory.HOSTILE), - DIG_SAND("dig.sand", "block.sand.break", SoundCategory.BLOCK), - MOB_CHICKEN_SAY("mob.chicken.say", "entity.chicken.ambient", SoundCategory.NEUTRAL), - RANDOM_DOOR_CLOSE("random.door_close", "null", SoundCategory.BLOCK), - MOB_GUARDIAN_ELDER_DEATH("mob.guardian.elder.death", "entity.elder_guardian.death", SoundCategory.HOSTILE), - FIREWORKS_TWINKLE("fireworks.twinkle", "entity.firework.twinkle", SoundCategory.AMBIENT), - MOB_HORSE_SKELETON_DEATH("mob.horse.skeleton.death", "entity.skeleton_horse.death", SoundCategory.NEUTRAL), - AMBIENT_WEATHER_RAIN("ambient.weather.rain", "weather.rain.above", SoundCategory.WEATHER), - PORTAL_TRIGGER("portal.trigger", "block.portal.trigger", SoundCategory.BLOCK), - RANDOM_CHESTOPEN("random.chestopen", "block.enderchest.open", SoundCategory.BLOCK), - MOB_HORSE_LAND("mob.horse.land", "entity.horse.land", SoundCategory.NEUTRAL), - MOB_SILVERFISH_STEP("mob.silverfish.step", "entity.silverfish.step", SoundCategory.HOSTILE), - MOB_BAT_TAKEOFF("mob.bat.takeoff", "entity.bat.takeoff", SoundCategory.NEUTRAL), - MOB_VILLAGER_NO("mob.villager.no", "entity.villager.no", SoundCategory.NEUTRAL), - GAME_HOSTILE_HURT_FALL_BIG("game.hostile.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.HOSTILE), - MOB_IRONGOLEM_WALK("mob.irongolem.walk", "entity.irongolem.step", SoundCategory.NEUTRAL), - NOTE_HAT("note.hat", "block.note.hat", SoundCategory.RECORD), - MOB_ZOMBIE_METAL("mob.zombie.metal", "entity.zombie.attack_iron_door", SoundCategory.HOSTILE), - MOB_VILLAGER_HAGGLE("mob.villager.haggle", "entity.villager.trading", SoundCategory.NEUTRAL), - MOB_GHAST_FIREBALL("mob.ghast.fireball", "entity.blaze.shoot", SoundCategory.HOSTILE), - MOB_IRONGOLEM_DEATH("mob.irongolem.death", "entity.irongolem.death", SoundCategory.NEUTRAL), - RANDOM_BREAK("random.break", "item.shield.break", SoundCategory.PLAYER), - MOB_ZOMBIE_REMEDY("mob.zombie.remedy", "entity.zombie_villager.cure", SoundCategory.HOSTILE), - RANDOM_BOW("random.bow", "entity.splash_potion.throw", SoundCategory.NEUTRAL), - MOB_VILLAGER_IDLE("mob.villager.idle", "entity.villager.ambient", SoundCategory.NEUTRAL), - STEP_CLOTH("step.cloth", "block.cloth.fall", SoundCategory.NEUTRAL), - MOB_SILVERFISH_HIT("mob.silverfish.hit", "entity.endermite.hurt", SoundCategory.HOSTILE), - LIQUID_LAVA("liquid.lava", "block.lava.ambient", SoundCategory.BLOCK), - GAME_NEUTRAL_HURT_FALL_BIG("game.neutral.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.NEUTRAL), - FIRE_FIRE("fire.fire", "block.fire.ambient", SoundCategory.BLOCK), - MOB_ZOMBIE_WOOD("mob.zombie.wood", "entity.zombie.attack_door_wood", SoundCategory.HOSTILE), - MOB_CHICKEN_STEP("mob.chicken.step", "entity.chicken.step", SoundCategory.NEUTRAL), - MOB_GUARDIAN_LAND_HIT("mob.guardian.land.hit", "entity.guardian.hurt_land", SoundCategory.HOSTILE), - MOB_CHICKEN_PLOP("mob.chicken.plop", "entity.donkey.chest", SoundCategory.NEUTRAL), - MOB_ENDERDRAGON_WINGS("mob.enderdragon.wings", "entity.enderdragon.flap", SoundCategory.HOSTILE), - STEP_GRASS("step.grass", "block.grass.hit", SoundCategory.NEUTRAL), - MOB_HORSE_BREATHE("mob.horse.breathe", "entity.horse.breathe", SoundCategory.NEUTRAL), - GAME_PLAYER_HURT_FALL_BIG("game.player.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.PLAYER), - MOB_HORSE_DONKEY_IDLE("mob.horse.donkey.idle", "entity.donkey.ambient", SoundCategory.NEUTRAL), - MOB_SPIDER_STEP("mob.spider.step", "entity.spider.step", SoundCategory.HOSTILE), - GAME_NEUTRAL_HURT("game.neutral.hurt", "entity.player.death", SoundCategory.NEUTRAL), - MOB_COW_SAY("mob.cow.say", "entity.cow.ambient", SoundCategory.NEUTRAL), - MOB_HORSE_JUMP("mob.horse.jump", "entity.horse.jump", SoundCategory.NEUTRAL), - MOB_HORSE_SOFT("mob.horse.soft", "entity.horse.step", SoundCategory.NEUTRAL), - GAME_NEUTRAL_SWIM_SPLASH("game.neutral.swim.splash", "entity.generic.splash", SoundCategory.NEUTRAL), - MOB_GUARDIAN_HIT("mob.guardian.hit", "entity.guardian.hurt", SoundCategory.HOSTILE), - MOB_ENDERDRAGON_END("mob.enderdragon.end", "entity.enderdragon.death", SoundCategory.HOSTILE), - MOB_ZOMBIE_STEP("mob.zombie.step", "entity.zombie.step", SoundCategory.HOSTILE), - MOB_ENDERDRAGON_GROWL("mob.enderdragon.growl", "entity.enderdragon.growl", SoundCategory.HOSTILE), - MOB_WOLF_SHAKE("mob.wolf.shake", "entity.wolf.shake", SoundCategory.NEUTRAL), - MOB_ENDERMEN_DEATH("mob.endermen.death", "entity.endermen.death", SoundCategory.HOSTILE), - RANDOM_ANVIL_LAND("random.anvil_land", "block.anvil.land", SoundCategory.BLOCK), - GAME_HOSTILE_HURT("game.hostile.hurt", "entity.player.death", SoundCategory.HOSTILE), - MINECART_INSIDE("minecart.inside", "entity.minecart.inside", SoundCategory.PLAYER), - MOB_SLIME_BIG("mob.slime.big", "entity.slime.death", SoundCategory.HOSTILE), - LIQUID_WATER("liquid.water", "block.water.ambient", SoundCategory.BLOCK), - MOB_PIG_SAY("mob.pig.say", "entity.pig.ambient", SoundCategory.NEUTRAL), - MOB_WITHER_SHOOT("mob.wither.shoot", "entity.wither.shoot", SoundCategory.HOSTILE), - ITEM_FIRECHARGE_USE("item.fireCharge.use", "entity.blaze.shoot", SoundCategory.BLOCK), - STEP_SAND("step.sand", "block.sand.fall", SoundCategory.NEUTRAL), - MOB_IRONGOLEM_HIT("mob.irongolem.hit", "entity.irongolem.hurt", SoundCategory.NEUTRAL), - MOB_HORSE_DEATH("mob.horse.death", "entity.horse.death", SoundCategory.NEUTRAL), - MOB_BAT_HURT("mob.bat.hurt", "entity.bat.hurt", SoundCategory.NEUTRAL), - MOB_GHAST_AFFECTIONATE_SCREAM("mob.ghast.affectionate_scream", "entity.ghast.scream", SoundCategory.HOSTILE), - MOB_GUARDIAN_ELDER_IDLE("mob.guardian.elder.idle", "entity.elder_guardian.ambient", SoundCategory.HOSTILE), - MOB_ZOMBIEPIG_ZPIGDEATH("mob.zombiepig.zpigdeath", "entity.zombie_pig.death", SoundCategory.HOSTILE), - AMBIENT_WEATHER_THUNDER("ambient.weather.thunder", "entity.lightning.thunder", SoundCategory.WEATHER), - MINECART_BASE("minecart.base", "entity.minecart.riding", SoundCategory.NEUTRAL), - STEP_LADDER("step.ladder", "block.ladder.hit", SoundCategory.NEUTRAL), - MOB_HORSE_DONKEY_ANGRY("mob.horse.donkey.angry", "entity.donkey.angry", SoundCategory.NEUTRAL), - AMBIENT_CAVE_CAVE("ambient.cave.cave", "ambient.cave", SoundCategory.AMBIENT), - FIREWORKS_BLAST_FAR("fireworks.blast_far", "entity.firework.blast_far", SoundCategory.AMBIENT), - GAME_NEUTRAL_HURT_FALL_SMALL("game.neutral.hurt.fall.small", "entity.generic.small_fall", SoundCategory.NEUTRAL), - GAME_HOSTILE_SWIM_SPLASH("game.hostile.swim.splash", "entity.generic.splash", SoundCategory.HOSTILE), - RANDOM_DRINK("random.drink", "entity.generic.drink", SoundCategory.PLAYER), - GAME_HOSTILE_DIE("game.hostile.die", "entity.player.death", SoundCategory.HOSTILE), - MOB_CAT_HISS("mob.cat.hiss", "entity.cat.hiss", SoundCategory.NEUTRAL), - NOTE_BD("note.bd", "block.note.basedrum", SoundCategory.RECORD), - MOB_SPIDER_SAY("mob.spider.say", "entity.spider.hurt", SoundCategory.HOSTILE), - STEP_STONE("step.stone", "block.anvil.hit", SoundCategory.NEUTRAL), - RANDOM_LEVELUP("random.levelup", "entity.player.levelup", SoundCategory.PLAYER), - LIQUID_LAVAPOP("liquid.lavapop", "block.lava.pop", SoundCategory.BLOCK), - MOB_SHEEP_SAY("mob.sheep.say", "entity.sheep.ambient", SoundCategory.NEUTRAL), - MOB_SKELETON_SAY("mob.skeleton.say", "entity.skeleton.ambient", SoundCategory.HOSTILE), - MOB_BLAZE_BREATHE("mob.blaze.breathe", "entity.blaze.ambient", SoundCategory.HOSTILE), - MOB_BAT_IDLE("mob.bat.idle", "entity.bat.ambient", SoundCategory.NEUTRAL), - MOB_MAGMACUBE_BIG("mob.magmacube.big", "entity.magmacube.squish", SoundCategory.HOSTILE), - MOB_HORSE_IDLE("mob.horse.idle", "entity.horse.ambient", SoundCategory.NEUTRAL), - GAME_HOSTILE_HURT_FALL_SMALL("game.hostile.hurt.fall.small", "entity.generic.small_fall", SoundCategory.HOSTILE), - MOB_HORSE_ZOMBIE_HIT("mob.horse.zombie.hit", "entity.zombie_horse.hurt", SoundCategory.NEUTRAL), - MOB_IRONGOLEM_THROW("mob.irongolem.throw", "entity.irongolem.attack", SoundCategory.NEUTRAL), - DIG_CLOTH("dig.cloth", "block.cloth.place", SoundCategory.BLOCK), - STEP_GRAVEL("step.gravel", "block.gravel.hit", SoundCategory.NEUTRAL), - MOB_SILVERFISH_SAY("mob.silverfish.say", "entity.silverfish.ambient", SoundCategory.HOSTILE), - MOB_CAT_PURR("mob.cat.purr", "entity.cat.purr", SoundCategory.NEUTRAL), - MOB_ZOMBIE_INFECT("mob.zombie.infect", "entity.zombie.infect", SoundCategory.HOSTILE), - RANDOM_EAT("random.eat", "entity.generic.eat", SoundCategory.PLAYER), - MOB_WOLF_BARK("mob.wolf.bark", "entity.wolf.ambient", SoundCategory.NEUTRAL), - GAME_TNT_PRIMED("game.tnt.primed", "entity.creeper.primed", SoundCategory.BLOCK), - MOB_SHEEP_STEP("mob.sheep.step", "entity.sheep.step", SoundCategory.NEUTRAL), - MOB_ZOMBIE_DEATH("mob.zombie.death", "entity.zombie.death", SoundCategory.HOSTILE), - RANDOM_DOOR_OPEN("random.door_open", "null", SoundCategory.BLOCK), - MOB_ENDERMEN_PORTAL("mob.endermen.portal", "entity.endermen.teleport", SoundCategory.HOSTILE), - MOB_HORSE_ANGRY("mob.horse.angry", "entity.horse.angry", SoundCategory.NEUTRAL), - MOB_WOLF_GROWL("mob.wolf.growl", "entity.wolf.growl", SoundCategory.NEUTRAL), - DIG_SNOW("dig.snow", "block.snow.place", SoundCategory.BLOCK), - TILE_PISTON_OUT("tile.piston.out", "block.piston.extend", SoundCategory.BLOCK), - RANDOM_BURP("random.burp", "entity.player.burp", SoundCategory.PLAYER), - MOB_COW_STEP("mob.cow.step", "entity.cow.step", SoundCategory.NEUTRAL), - MOB_WITHER_HURT("mob.wither.hurt", "entity.wither.hurt", SoundCategory.HOSTILE), - MOB_GUARDIAN_LAND_DEATH("mob.guardian.land.death", "entity.elder_guardian.death_land", SoundCategory.HOSTILE), - MOB_CHICKEN_HURT("mob.chicken.hurt", "entity.chicken.death", SoundCategory.NEUTRAL), - MOB_WOLF_STEP("mob.wolf.step", "entity.wolf.step", SoundCategory.NEUTRAL), - MOB_WOLF_DEATH("mob.wolf.death", "entity.wolf.death", SoundCategory.NEUTRAL), - MOB_WOLF_WHINE("mob.wolf.whine", "entity.wolf.whine", SoundCategory.NEUTRAL), - NOTE_PLING("note.pling", "block.note.pling", SoundCategory.RECORD), - GAME_PLAYER_HURT_FALL_SMALL("game.player.hurt.fall.small", "entity.generic.small_fall", SoundCategory.PLAYER), - MOB_CAT_PURREOW("mob.cat.purreow", "entity.cat.purreow", SoundCategory.NEUTRAL), - FIREWORKS_LARGEBLAST_FAR("fireworks.largeBlast_far", "entity.firework.large_blast_far", SoundCategory.AMBIENT), - MOB_SKELETON_HURT("mob.skeleton.hurt", "entity.skeleton.hurt", SoundCategory.HOSTILE), - MOB_SPIDER_DEATH("mob.spider.death", "entity.spider.death", SoundCategory.HOSTILE), - RANDOM_ANVIL_BREAK("random.anvil_break", "block.anvil.destroy", SoundCategory.BLOCK), - MOB_WITHER_IDLE("mob.wither.idle", "entity.wither.ambient", SoundCategory.HOSTILE), - MOB_GUARDIAN_ELDER_HIT("mob.guardian.elder.hit", "entity.elder_guardian.hurt", SoundCategory.HOSTILE), - MOB_ENDERMEN_SCREAM("mob.endermen.scream", "entity.endermen.scream", SoundCategory.HOSTILE), - MOB_CAT_HITT("mob.cat.hitt", "entity.cat.hurt", SoundCategory.NEUTRAL), - MOB_MAGMACUBE_SMALL("mob.magmacube.small", "entity.small_magmacube.squish", SoundCategory.HOSTILE), - FIRE_IGNITE("fire.ignite", "item.flintandsteel.use", SoundCategory.BLOCK), - MOB_ENDERDRAGON_HIT("mob.enderdragon.hit", "entity.enderdragon.hurt", SoundCategory.HOSTILE), - MOB_ZOMBIE_HURT("mob.zombie.hurt", "entity.zombie_villager.hurt", SoundCategory.HOSTILE), - RANDOM_EXPLODE("random.explode", "block.end_gateway.spawn", SoundCategory.BLOCK), - MOB_SLIME_ATTACK("mob.slime.attack", "entity.slime.attack", SoundCategory.HOSTILE), - MOB_MAGMACUBE_JUMP("mob.magmacube.jump", "entity.magmacube.jump", SoundCategory.HOSTILE), - RANDOM_SPLASH("random.splash", "entity.bobber.splash", SoundCategory.PLAYER), - MOB_HORSE_SKELETON_HIT("mob.horse.skeleton.hit", "entity.skeleton_horse.hurt", SoundCategory.NEUTRAL), - MOB_GHAST_MOAN("mob.ghast.moan", "entity.ghast.ambient", SoundCategory.HOSTILE), - MOB_GUARDIAN_CURSE("mob.guardian.curse", "entity.elder_guardian.curse", SoundCategory.HOSTILE), - GAME_POTION_SMASH("game.potion.smash", "block.glass.break", SoundCategory.NEUTRAL), - NOTE_BASSATTACK("note.bassattack", "block.note.bass", SoundCategory.RECORD), - GUI_BUTTON_PRESS("gui.button.press", "block.wood_pressureplate.click_on", SoundCategory.MASTER), - RANDOM_ORB("random.orb", "entity.experience_orb.pickup", SoundCategory.PLAYER), - MOB_ZOMBIE_WOODBREAK("mob.zombie.woodbreak", "entity.zombie.break_door_wood", SoundCategory.HOSTILE), - MOB_HORSE_ARMOR("mob.horse.armor", "entity.horse.armor", SoundCategory.NEUTRAL), - TILE_PISTON_IN("tile.piston.in", "block.piston.contract", SoundCategory.BLOCK), - MOB_CAT_MEOW("mob.cat.meow", "entity.cat.ambient", SoundCategory.NEUTRAL), - MOB_PIG_STEP("mob.pig.step", "entity.pig.step", SoundCategory.NEUTRAL), - STEP_WOOD("step.wood", "block.wood.step", SoundCategory.NEUTRAL), - PORTAL_TRAVEL("portal.travel", "block.portal.travel", SoundCategory.PLAYER), - MOB_GUARDIAN_DEATH("mob.guardian.death", "entity.guardian.death", SoundCategory.HOSTILE), - MOB_SKELETON_DEATH("mob.skeleton.death", "entity.skeleton.death", SoundCategory.HOSTILE), - MOB_HORSE_HIT("mob.horse.hit", "entity.horse.hurt", SoundCategory.NEUTRAL), - MOB_VILLAGER_HIT("mob.villager.hit", "entity.villager.hurt", SoundCategory.NEUTRAL), - MOB_HORSE_SKELETON_IDLE("mob.horse.skeleton.idle", "entity.skeleton_horse.ambient", SoundCategory.NEUTRAL); - - //NOT ALL SOUNDS INCLUDED! - //Missing all new 1.9 sounds - //Missing (1.8 sound names): - //records.ward - //music.game.nether - //music.game.end.dragon - //mob.rabbit.death - //records.chirp - //records.13 - //records.11 - //music.game.end.credits - //records.mellohi - //music.game - //records.mall - //records.stal - //records.far - //records.blocks - //music.game.creative - //records.wait - //music.menu - //music.game.end - //mob.rabbit.hurt - //records.cat - //mob.guardian.idle - //mob.rabbit.hop - //mob.rabbit.idle - //records.strad - - private String name; - private String newname; - private SoundCategory cat; - - SoundEffect(String name, String newname, SoundCategory cat) { - this.cat = cat; - this.newname = newname; - this.name = name; - } - - public static SoundEffect getByName(String name) { - name = name.toLowerCase(); - for (SoundEffect e : SoundEffect.values()) { - if (e.getName().equals(name)) - return e; - } - return null; - } - - public String getNewName() { - return newname; - } - - public String getName() { - return name; - } - - public SoundCategory getCategory() { - return cat; - } - -} +package us.myles.ViaVersion.sounds; + +public enum SoundEffect { + + MOB_HORSE_ZOMBIE_IDLE("mob.horse.zombie.idle", "entity.zombie_horse.ambient", SoundCategory.NEUTRAL), + NOTE_SNARE("note.snare", "block.note.snare", SoundCategory.RECORD), + RANDOM_WOOD_CLICK("random.wood_click", "block.wood_button.click_on", SoundCategory.BLOCK), + DIG_GRAVEL("dig.gravel", "block.gravel.place", SoundCategory.BLOCK), + RANDOM_BOWHIT("random.bowhit", "block.tripwire.detach", SoundCategory.NEUTRAL), + DIG_GLASS("dig.glass", "block.glass.break", SoundCategory.BLOCK), + MOB_ZOMBIE_SAY("mob.zombie.say", "entity.zombie_villager.ambient", SoundCategory.HOSTILE), + MOB_PIG_DEATH("mob.pig.death", "entity.pig.death", SoundCategory.NEUTRAL), + MOB_HORSE_DONKEY_HIT("mob.horse.donkey.hit", "entity.donkey.hurt", SoundCategory.NEUTRAL), + GAME_NEUTRAL_SWIM("game.neutral.swim", "entity.player.swim", SoundCategory.NEUTRAL), + GAME_PLAYER_SWIM("game.player.swim", "entity.player.swim", SoundCategory.PLAYER), + MOB_ENDERMEN_IDLE("mob.endermen.idle", "entity.endermen.ambient", SoundCategory.HOSTILE), + PORTAL_PORTAL("portal.portal", "block.portal.ambient", SoundCategory.BLOCK), + RANDOM_FIZZ("random.fizz", "entity.generic.extinguish_fire", SoundCategory.BLOCK), + NOTE_HARP("note.harp", "block.note.harp", SoundCategory.RECORD), + STEP_SNOW("step.snow", "block.snow.step", SoundCategory.NEUTRAL), + RANDOM_SUCCESSFUL_HIT("random.successful_hit", "entity.arrow.hit_player", SoundCategory.PLAYER), + MOB_ZOMBIEPIG_ZPIGHURT("mob.zombiepig.zpighurt", "entity.zombie_pig.hurt", SoundCategory.HOSTILE), + MOB_WOLF_HOWL("mob.wolf.howl", "entity.wolf.howl", SoundCategory.NEUTRAL), + FIREWORKS_LAUNCH("fireworks.launch", "entity.firework.launch", SoundCategory.AMBIENT), + MOB_COW_HURT("mob.cow.hurt", "entity.cow.death", SoundCategory.NEUTRAL), + FIREWORKS_LARGEBLAST("fireworks.largeBlast", "entity.firework.large_blast", SoundCategory.AMBIENT), + MOB_BLAZE_HIT("mob.blaze.hit", "entity.blaze.hurt", SoundCategory.HOSTILE), + MOB_VILLAGER_DEATH("mob.villager.death", "entity.villager.death", SoundCategory.NEUTRAL), + MOB_BLAZE_DEATH("mob.blaze.death", "entity.blaze.death", SoundCategory.HOSTILE), + MOB_HORSE_ZOMBIE_DEATH("mob.horse.zombie.death", "entity.zombie_horse.death", SoundCategory.NEUTRAL), + MOB_SILVERFISH_KILL("mob.silverfish.kill", "entity.endermite.death", SoundCategory.HOSTILE), + MOB_WOLF_PANTING("mob.wolf.panting", "entity.wolf.pant", SoundCategory.NEUTRAL), + NOTE_BASS("note.bass", "null", SoundCategory.RECORD), + DIG_STONE("dig.stone", "block.glass.place", SoundCategory.BLOCK), + MOB_ENDERMEN_STARE("mob.endermen.stare", "entity.endermen.stare", SoundCategory.HOSTILE), + GAME_PLAYER_SWIM_SPLASH("game.player.swim.splash", "entity.generic.splash", SoundCategory.BLOCK), + MOB_SLIME_SMALL("mob.slime.small", "block.slime.hit", SoundCategory.HOSTILE), + MOB_GHAST_DEATH("mob.ghast.death", "entity.ghast.death", SoundCategory.HOSTILE), + MOB_GUARDIAN_ATTACK("mob.guardian.attack", "entity.guardian.attack", SoundCategory.HOSTILE), + RANDOM_CLICK("random.click", "block.wood_pressureplate.click_on", SoundCategory.BLOCK), + MOB_ZOMBIEPIG_ZPIG("mob.zombiepig.zpig", "entity.zombie_pig.ambient", SoundCategory.HOSTILE), + GAME_PLAYER_DIE("game.player.die", "entity.player.death", SoundCategory.PLAYER), + FIREWORKS_TWINKLE_FAR("fireworks.twinkle_far", "entity.firework.twinkle_far", SoundCategory.AMBIENT), + MOB_GUARDIAN_LAND_IDLE("mob.guardian.land.idle", "entity.guardian.ambient_land", SoundCategory.HOSTILE), + DIG_GRASS("dig.grass", "block.grass.place", SoundCategory.BLOCK), + MOB_SKELETON_STEP("mob.skeleton.step", "entity.skeleton.step", SoundCategory.HOSTILE), + MOB_WITHER_DEATH("mob.wither.death", "entity.wither.death", SoundCategory.HOSTILE), + MOB_WOLF_HURT("mob.wolf.hurt", "entity.wolf.hurt", SoundCategory.NEUTRAL), + MOB_HORSE_LEATHER("mob.horse.leather", "entity.horse.saddle", SoundCategory.NEUTRAL), + MOB_BAT_LOOP("mob.bat.loop", "entity.bat.loop", SoundCategory.NEUTRAL), + MOB_GHAST_SCREAM("mob.ghast.scream", "entity.ghast.hurt", SoundCategory.HOSTILE), + GAME_PLAYER_HURT("game.player.hurt", "entity.player.death", SoundCategory.PLAYER), + GAME_NEUTRAL_DIE("game.neutral.die", "entity.player.death", SoundCategory.NEUTRAL), + MOB_CREEPER_DEATH("mob.creeper.death", "entity.creeper.death", SoundCategory.HOSTILE), + MOB_HORSE_GALLOP("mob.horse.gallop", "entity.horse.gallop", SoundCategory.NEUTRAL), + MOB_WITHER_SPAWN("mob.wither.spawn", "entity.wither.spawn", SoundCategory.HOSTILE), + MOB_ENDERMEN_HIT("mob.endermen.hit", "entity.endermen.hurt", SoundCategory.HOSTILE), + MOB_CREEPER_SAY("mob.creeper.say", "entity.creeper.hurt", SoundCategory.HOSTILE), + MOB_HORSE_WOOD("mob.horse.wood", "entity.horse.step_wood", SoundCategory.NEUTRAL), + MOB_ZOMBIE_UNFECT("mob.zombie.unfect", "entity.zombie_villager.converted", SoundCategory.HOSTILE), + RANDOM_ANVIL_USE("random.anvil_use", "block.anvil.use", SoundCategory.BLOCK), + RANDOM_CHESTCLOSED("random.chestclosed", "block.enderchest.close", SoundCategory.BLOCK), + MOB_SHEEP_SHEAR("mob.sheep.shear", "entity.sheep.shear", SoundCategory.NEUTRAL), + RANDOM_POP("random.pop", "entity.item.pickup", SoundCategory.PLAYER), + MOB_BAT_DEATH("mob.bat.death", "entity.bat.death", SoundCategory.NEUTRAL), + DIG_WOOD("dig.wood", "block.ladder.break", SoundCategory.BLOCK), + MOB_HORSE_DONKEY_DEATH("mob.horse.donkey.death", "entity.donkey.death", SoundCategory.NEUTRAL), + FIREWORKS_BLAST("fireworks.blast", "entity.firework.blast", SoundCategory.AMBIENT), + MOB_ZOMBIEPIG_ZPIGANGRY("mob.zombiepig.zpigangry", "entity.zombie_pig.angry", SoundCategory.HOSTILE), + GAME_HOSTILE_SWIM("game.hostile.swim", "entity.player.swim", SoundCategory.HOSTILE), + MOB_GUARDIAN_FLOP("mob.guardian.flop", "entity.guardian.flop", SoundCategory.HOSTILE), + MOB_VILLAGER_YES("mob.villager.yes", "entity.villager.yes", SoundCategory.NEUTRAL), + MOB_GHAST_CHARGE("mob.ghast.charge", "entity.ghast.warn", SoundCategory.HOSTILE), + CREEPER_PRIMED("creeper.primed", "entity.creeper.primed", SoundCategory.HOSTILE), + DIG_SAND("dig.sand", "block.sand.break", SoundCategory.BLOCK), + MOB_CHICKEN_SAY("mob.chicken.say", "entity.chicken.ambient", SoundCategory.NEUTRAL), + RANDOM_DOOR_CLOSE("random.door_close", "null", SoundCategory.BLOCK), + MOB_GUARDIAN_ELDER_DEATH("mob.guardian.elder.death", "entity.elder_guardian.death", SoundCategory.HOSTILE), + FIREWORKS_TWINKLE("fireworks.twinkle", "entity.firework.twinkle", SoundCategory.AMBIENT), + MOB_HORSE_SKELETON_DEATH("mob.horse.skeleton.death", "entity.skeleton_horse.death", SoundCategory.NEUTRAL), + AMBIENT_WEATHER_RAIN("ambient.weather.rain", "weather.rain.above", SoundCategory.WEATHER), + PORTAL_TRIGGER("portal.trigger", "block.portal.trigger", SoundCategory.BLOCK), + RANDOM_CHESTOPEN("random.chestopen", "block.enderchest.open", SoundCategory.BLOCK), + MOB_HORSE_LAND("mob.horse.land", "entity.horse.land", SoundCategory.NEUTRAL), + MOB_SILVERFISH_STEP("mob.silverfish.step", "entity.silverfish.step", SoundCategory.HOSTILE), + MOB_BAT_TAKEOFF("mob.bat.takeoff", "entity.bat.takeoff", SoundCategory.NEUTRAL), + MOB_VILLAGER_NO("mob.villager.no", "entity.villager.no", SoundCategory.NEUTRAL), + GAME_HOSTILE_HURT_FALL_BIG("game.hostile.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.HOSTILE), + MOB_IRONGOLEM_WALK("mob.irongolem.walk", "entity.irongolem.step", SoundCategory.NEUTRAL), + NOTE_HAT("note.hat", "block.note.hat", SoundCategory.RECORD), + MOB_ZOMBIE_METAL("mob.zombie.metal", "entity.zombie.attack_iron_door", SoundCategory.HOSTILE), + MOB_VILLAGER_HAGGLE("mob.villager.haggle", "entity.villager.trading", SoundCategory.NEUTRAL), + MOB_GHAST_FIREBALL("mob.ghast.fireball", "entity.blaze.shoot", SoundCategory.HOSTILE), + MOB_IRONGOLEM_DEATH("mob.irongolem.death", "entity.irongolem.death", SoundCategory.NEUTRAL), + RANDOM_BREAK("random.break", "item.shield.break", SoundCategory.PLAYER), + MOB_ZOMBIE_REMEDY("mob.zombie.remedy", "entity.zombie_villager.cure", SoundCategory.HOSTILE), + RANDOM_BOW("random.bow", "entity.splash_potion.throw", SoundCategory.NEUTRAL), + MOB_VILLAGER_IDLE("mob.villager.idle", "entity.villager.ambient", SoundCategory.NEUTRAL), + STEP_CLOTH("step.cloth", "block.cloth.fall", SoundCategory.NEUTRAL), + MOB_SILVERFISH_HIT("mob.silverfish.hit", "entity.endermite.hurt", SoundCategory.HOSTILE), + LIQUID_LAVA("liquid.lava", "block.lava.ambient", SoundCategory.BLOCK), + GAME_NEUTRAL_HURT_FALL_BIG("game.neutral.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.NEUTRAL), + FIRE_FIRE("fire.fire", "block.fire.ambient", SoundCategory.BLOCK), + MOB_ZOMBIE_WOOD("mob.zombie.wood", "entity.zombie.attack_door_wood", SoundCategory.HOSTILE), + MOB_CHICKEN_STEP("mob.chicken.step", "entity.chicken.step", SoundCategory.NEUTRAL), + MOB_GUARDIAN_LAND_HIT("mob.guardian.land.hit", "entity.guardian.hurt_land", SoundCategory.HOSTILE), + MOB_CHICKEN_PLOP("mob.chicken.plop", "entity.donkey.chest", SoundCategory.NEUTRAL), + MOB_ENDERDRAGON_WINGS("mob.enderdragon.wings", "entity.enderdragon.flap", SoundCategory.HOSTILE), + STEP_GRASS("step.grass", "block.grass.hit", SoundCategory.NEUTRAL), + MOB_HORSE_BREATHE("mob.horse.breathe", "entity.horse.breathe", SoundCategory.NEUTRAL), + GAME_PLAYER_HURT_FALL_BIG("game.player.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.PLAYER), + MOB_HORSE_DONKEY_IDLE("mob.horse.donkey.idle", "entity.donkey.ambient", SoundCategory.NEUTRAL), + MOB_SPIDER_STEP("mob.spider.step", "entity.spider.step", SoundCategory.HOSTILE), + GAME_NEUTRAL_HURT("game.neutral.hurt", "entity.player.death", SoundCategory.NEUTRAL), + MOB_COW_SAY("mob.cow.say", "entity.cow.ambient", SoundCategory.NEUTRAL), + MOB_HORSE_JUMP("mob.horse.jump", "entity.horse.jump", SoundCategory.NEUTRAL), + MOB_HORSE_SOFT("mob.horse.soft", "entity.horse.step", SoundCategory.NEUTRAL), + GAME_NEUTRAL_SWIM_SPLASH("game.neutral.swim.splash", "entity.generic.splash", SoundCategory.NEUTRAL), + MOB_GUARDIAN_HIT("mob.guardian.hit", "entity.guardian.hurt", SoundCategory.HOSTILE), + MOB_ENDERDRAGON_END("mob.enderdragon.end", "entity.enderdragon.death", SoundCategory.HOSTILE), + MOB_ZOMBIE_STEP("mob.zombie.step", "entity.zombie.step", SoundCategory.HOSTILE), + MOB_ENDERDRAGON_GROWL("mob.enderdragon.growl", "entity.enderdragon.growl", SoundCategory.HOSTILE), + MOB_WOLF_SHAKE("mob.wolf.shake", "entity.wolf.shake", SoundCategory.NEUTRAL), + MOB_ENDERMEN_DEATH("mob.endermen.death", "entity.endermen.death", SoundCategory.HOSTILE), + RANDOM_ANVIL_LAND("random.anvil_land", "block.anvil.land", SoundCategory.BLOCK), + GAME_HOSTILE_HURT("game.hostile.hurt", "entity.player.death", SoundCategory.HOSTILE), + MINECART_INSIDE("minecart.inside", "entity.minecart.inside", SoundCategory.PLAYER), + MOB_SLIME_BIG("mob.slime.big", "entity.slime.death", SoundCategory.HOSTILE), + LIQUID_WATER("liquid.water", "block.water.ambient", SoundCategory.BLOCK), + MOB_PIG_SAY("mob.pig.say", "entity.pig.ambient", SoundCategory.NEUTRAL), + MOB_WITHER_SHOOT("mob.wither.shoot", "entity.wither.shoot", SoundCategory.HOSTILE), + ITEM_FIRECHARGE_USE("item.fireCharge.use", "entity.blaze.shoot", SoundCategory.BLOCK), + STEP_SAND("step.sand", "block.sand.fall", SoundCategory.NEUTRAL), + MOB_IRONGOLEM_HIT("mob.irongolem.hit", "entity.irongolem.hurt", SoundCategory.NEUTRAL), + MOB_HORSE_DEATH("mob.horse.death", "entity.horse.death", SoundCategory.NEUTRAL), + MOB_BAT_HURT("mob.bat.hurt", "entity.bat.hurt", SoundCategory.NEUTRAL), + MOB_GHAST_AFFECTIONATE_SCREAM("mob.ghast.affectionate_scream", "entity.ghast.scream", SoundCategory.HOSTILE), + MOB_GUARDIAN_ELDER_IDLE("mob.guardian.elder.idle", "entity.elder_guardian.ambient", SoundCategory.HOSTILE), + MOB_ZOMBIEPIG_ZPIGDEATH("mob.zombiepig.zpigdeath", "entity.zombie_pig.death", SoundCategory.HOSTILE), + AMBIENT_WEATHER_THUNDER("ambient.weather.thunder", "entity.lightning.thunder", SoundCategory.WEATHER), + MINECART_BASE("minecart.base", "entity.minecart.riding", SoundCategory.NEUTRAL), + STEP_LADDER("step.ladder", "block.ladder.hit", SoundCategory.NEUTRAL), + MOB_HORSE_DONKEY_ANGRY("mob.horse.donkey.angry", "entity.donkey.angry", SoundCategory.NEUTRAL), + AMBIENT_CAVE_CAVE("ambient.cave.cave", "ambient.cave", SoundCategory.AMBIENT), + FIREWORKS_BLAST_FAR("fireworks.blast_far", "entity.firework.blast_far", SoundCategory.AMBIENT), + GAME_NEUTRAL_HURT_FALL_SMALL("game.neutral.hurt.fall.small", "entity.generic.small_fall", SoundCategory.NEUTRAL), + GAME_HOSTILE_SWIM_SPLASH("game.hostile.swim.splash", "entity.generic.splash", SoundCategory.HOSTILE), + RANDOM_DRINK("random.drink", "entity.generic.drink", SoundCategory.PLAYER), + GAME_HOSTILE_DIE("game.hostile.die", "entity.player.death", SoundCategory.HOSTILE), + MOB_CAT_HISS("mob.cat.hiss", "entity.cat.hiss", SoundCategory.NEUTRAL), + NOTE_BD("note.bd", "block.note.basedrum", SoundCategory.RECORD), + MOB_SPIDER_SAY("mob.spider.say", "entity.spider.hurt", SoundCategory.HOSTILE), + STEP_STONE("step.stone", "block.anvil.hit", SoundCategory.NEUTRAL), + RANDOM_LEVELUP("random.levelup", "entity.player.levelup", SoundCategory.PLAYER), + LIQUID_LAVAPOP("liquid.lavapop", "block.lava.pop", SoundCategory.BLOCK), + MOB_SHEEP_SAY("mob.sheep.say", "entity.sheep.ambient", SoundCategory.NEUTRAL), + MOB_SKELETON_SAY("mob.skeleton.say", "entity.skeleton.ambient", SoundCategory.HOSTILE), + MOB_BLAZE_BREATHE("mob.blaze.breathe", "entity.blaze.ambient", SoundCategory.HOSTILE), + MOB_BAT_IDLE("mob.bat.idle", "entity.bat.ambient", SoundCategory.NEUTRAL), + MOB_MAGMACUBE_BIG("mob.magmacube.big", "entity.magmacube.squish", SoundCategory.HOSTILE), + MOB_HORSE_IDLE("mob.horse.idle", "entity.horse.ambient", SoundCategory.NEUTRAL), + GAME_HOSTILE_HURT_FALL_SMALL("game.hostile.hurt.fall.small", "entity.generic.small_fall", SoundCategory.HOSTILE), + MOB_HORSE_ZOMBIE_HIT("mob.horse.zombie.hit", "entity.zombie_horse.hurt", SoundCategory.NEUTRAL), + MOB_IRONGOLEM_THROW("mob.irongolem.throw", "entity.irongolem.attack", SoundCategory.NEUTRAL), + DIG_CLOTH("dig.cloth", "block.cloth.place", SoundCategory.BLOCK), + STEP_GRAVEL("step.gravel", "block.gravel.hit", SoundCategory.NEUTRAL), + MOB_SILVERFISH_SAY("mob.silverfish.say", "entity.silverfish.ambient", SoundCategory.HOSTILE), + MOB_CAT_PURR("mob.cat.purr", "entity.cat.purr", SoundCategory.NEUTRAL), + MOB_ZOMBIE_INFECT("mob.zombie.infect", "entity.zombie.infect", SoundCategory.HOSTILE), + RANDOM_EAT("random.eat", "entity.generic.eat", SoundCategory.PLAYER), + MOB_WOLF_BARK("mob.wolf.bark", "entity.wolf.ambient", SoundCategory.NEUTRAL), + GAME_TNT_PRIMED("game.tnt.primed", "entity.creeper.primed", SoundCategory.BLOCK), + MOB_SHEEP_STEP("mob.sheep.step", "entity.sheep.step", SoundCategory.NEUTRAL), + MOB_ZOMBIE_DEATH("mob.zombie.death", "entity.zombie.death", SoundCategory.HOSTILE), + RANDOM_DOOR_OPEN("random.door_open", "null", SoundCategory.BLOCK), + MOB_ENDERMEN_PORTAL("mob.endermen.portal", "entity.endermen.teleport", SoundCategory.HOSTILE), + MOB_HORSE_ANGRY("mob.horse.angry", "entity.horse.angry", SoundCategory.NEUTRAL), + MOB_WOLF_GROWL("mob.wolf.growl", "entity.wolf.growl", SoundCategory.NEUTRAL), + DIG_SNOW("dig.snow", "block.snow.place", SoundCategory.BLOCK), + TILE_PISTON_OUT("tile.piston.out", "block.piston.extend", SoundCategory.BLOCK), + RANDOM_BURP("random.burp", "entity.player.burp", SoundCategory.PLAYER), + MOB_COW_STEP("mob.cow.step", "entity.cow.step", SoundCategory.NEUTRAL), + MOB_WITHER_HURT("mob.wither.hurt", "entity.wither.hurt", SoundCategory.HOSTILE), + MOB_GUARDIAN_LAND_DEATH("mob.guardian.land.death", "entity.elder_guardian.death_land", SoundCategory.HOSTILE), + MOB_CHICKEN_HURT("mob.chicken.hurt", "entity.chicken.death", SoundCategory.NEUTRAL), + MOB_WOLF_STEP("mob.wolf.step", "entity.wolf.step", SoundCategory.NEUTRAL), + MOB_WOLF_DEATH("mob.wolf.death", "entity.wolf.death", SoundCategory.NEUTRAL), + MOB_WOLF_WHINE("mob.wolf.whine", "entity.wolf.whine", SoundCategory.NEUTRAL), + NOTE_PLING("note.pling", "block.note.pling", SoundCategory.RECORD), + GAME_PLAYER_HURT_FALL_SMALL("game.player.hurt.fall.small", "entity.generic.small_fall", SoundCategory.PLAYER), + MOB_CAT_PURREOW("mob.cat.purreow", "entity.cat.purreow", SoundCategory.NEUTRAL), + FIREWORKS_LARGEBLAST_FAR("fireworks.largeBlast_far", "entity.firework.large_blast_far", SoundCategory.AMBIENT), + MOB_SKELETON_HURT("mob.skeleton.hurt", "entity.skeleton.hurt", SoundCategory.HOSTILE), + MOB_SPIDER_DEATH("mob.spider.death", "entity.spider.death", SoundCategory.HOSTILE), + RANDOM_ANVIL_BREAK("random.anvil_break", "block.anvil.destroy", SoundCategory.BLOCK), + MOB_WITHER_IDLE("mob.wither.idle", "entity.wither.ambient", SoundCategory.HOSTILE), + MOB_GUARDIAN_ELDER_HIT("mob.guardian.elder.hit", "entity.elder_guardian.hurt", SoundCategory.HOSTILE), + MOB_ENDERMEN_SCREAM("mob.endermen.scream", "entity.endermen.scream", SoundCategory.HOSTILE), + MOB_CAT_HITT("mob.cat.hitt", "entity.cat.hurt", SoundCategory.NEUTRAL), + MOB_MAGMACUBE_SMALL("mob.magmacube.small", "entity.small_magmacube.squish", SoundCategory.HOSTILE), + FIRE_IGNITE("fire.ignite", "item.flintandsteel.use", SoundCategory.BLOCK), + MOB_ENDERDRAGON_HIT("mob.enderdragon.hit", "entity.enderdragon.hurt", SoundCategory.HOSTILE), + MOB_ZOMBIE_HURT("mob.zombie.hurt", "entity.zombie_villager.hurt", SoundCategory.HOSTILE), + RANDOM_EXPLODE("random.explode", "block.end_gateway.spawn", SoundCategory.BLOCK), + MOB_SLIME_ATTACK("mob.slime.attack", "entity.slime.attack", SoundCategory.HOSTILE), + MOB_MAGMACUBE_JUMP("mob.magmacube.jump", "entity.magmacube.jump", SoundCategory.HOSTILE), + RANDOM_SPLASH("random.splash", "entity.bobber.splash", SoundCategory.PLAYER), + MOB_HORSE_SKELETON_HIT("mob.horse.skeleton.hit", "entity.skeleton_horse.hurt", SoundCategory.NEUTRAL), + MOB_GHAST_MOAN("mob.ghast.moan", "entity.ghast.ambient", SoundCategory.HOSTILE), + MOB_GUARDIAN_CURSE("mob.guardian.curse", "entity.elder_guardian.curse", SoundCategory.HOSTILE), + GAME_POTION_SMASH("game.potion.smash", "block.glass.break", SoundCategory.NEUTRAL), + NOTE_BASSATTACK("note.bassattack", "block.note.bass", SoundCategory.RECORD), + GUI_BUTTON_PRESS("gui.button.press", "block.wood_pressureplate.click_on", SoundCategory.MASTER), + RANDOM_ORB("random.orb", "entity.experience_orb.pickup", SoundCategory.PLAYER), + MOB_ZOMBIE_WOODBREAK("mob.zombie.woodbreak", "entity.zombie.break_door_wood", SoundCategory.HOSTILE), + MOB_HORSE_ARMOR("mob.horse.armor", "entity.horse.armor", SoundCategory.NEUTRAL), + TILE_PISTON_IN("tile.piston.in", "block.piston.contract", SoundCategory.BLOCK), + MOB_CAT_MEOW("mob.cat.meow", "entity.cat.ambient", SoundCategory.NEUTRAL), + MOB_PIG_STEP("mob.pig.step", "entity.pig.step", SoundCategory.NEUTRAL), + STEP_WOOD("step.wood", "block.wood.step", SoundCategory.NEUTRAL), + PORTAL_TRAVEL("portal.travel", "block.portal.travel", SoundCategory.PLAYER), + MOB_GUARDIAN_DEATH("mob.guardian.death", "entity.guardian.death", SoundCategory.HOSTILE), + MOB_SKELETON_DEATH("mob.skeleton.death", "entity.skeleton.death", SoundCategory.HOSTILE), + MOB_HORSE_HIT("mob.horse.hit", "entity.horse.hurt", SoundCategory.NEUTRAL), + MOB_VILLAGER_HIT("mob.villager.hit", "entity.villager.hurt", SoundCategory.NEUTRAL), + MOB_HORSE_SKELETON_IDLE("mob.horse.skeleton.idle", "entity.skeleton_horse.ambient", SoundCategory.NEUTRAL), + RECORDS_CHIRP("records.chirp", "record.chirp", SoundCategory.RECORD), + MOB_RABBIT_HURT("mob.rabbit.hurt", "entity.rabbit.hurt", SoundCategory.NEUTRAL), + RECORDS_STAL("records.stal", "record.stal", SoundCategory.RECORD), + MUSIC_GAME_NETHER("music.game.nether", "music.nether", SoundCategory.MUSIC), + MUSIC_MENU("music.menu", "music.menu", SoundCategory.MUSIC), + RECORDS_MELLOHI("records.mellohi", "record.mellohi", SoundCategory.RECORD), + RECORDS_CAT("records.cat", "record.cat", SoundCategory.RECORD), + RECORDS_FAR("records.far", "record.far", SoundCategory.RECORD), + MUSIC_GAME_END_DRAGON("music.game.end.dragon", "music.dragon", SoundCategory.MUSIC), + MOB_RABBIT_DEATH("mob.rabbit.death", "entity.rabbit.death", SoundCategory.NEUTRAL), + MOB_RABBIT_IDLE("mob.rabbit.idle", "entity.rabbit.ambient", SoundCategory.NEUTRAL), + MUSIC_GAME_END("music.game.end", "music.end", SoundCategory.MUSIC), + MUSIC_GAME("music.game", "music.game", SoundCategory.MUSIC), + MOB_GUARDIAN_IDLE("mob.guardian.idle", "null", SoundCategory.HOSTILE), + RECORDS_WARD("records.ward", "record.ward", SoundCategory.RECORD), + RECORDS_13("records.13", "record.13", SoundCategory.RECORD), + MOB_RABBIT_HOP("mob.rabbit.hop", "entity.rabbit.jump", SoundCategory.NEUTRAL), + RECORDS_STRAD("records.strad", "record.strad", SoundCategory.RECORD), + RECORDS_11("records.11", "record.11", SoundCategory.RECORD), + RECORDS_MALL("records.mall", "record.mall", SoundCategory.RECORD), + RECORDS_BLOCKS("records.blocks", "record.blocks", SoundCategory.RECORD), + RECORDS_WAIT("records.wait", "record.wait", SoundCategory.RECORD), + MUSIC_GAME_END_CREDITS("music.game.end.credits", "music.credits", SoundCategory.MUSIC), + MUSIC_GAME_CREATIVE("music.game.creative", "music.creative", SoundCategory.MUSIC); + + private String name; + private String newname; + private SoundCategory cat; + + SoundEffect(String name, String newname, SoundCategory cat) { + this.cat = cat; + this.newname = newname; + this.name = name; + } + + public static SoundEffect getByName(String name) { + name = name.toLowerCase(); + for (SoundEffect e : SoundEffect.values()) { + if (e.getName().equals(name)) + return e; + } + return null; + } + + public String getNewName() { + return newname; + } + + public String getName() { + return name; + } + + public SoundCategory getCategory() { + return cat; + } + +} From 43aaa728b516de55eafa39fb5e98c729bc79b13c Mon Sep 17 00:00:00 2001 From: HugoDaBosss Date: Tue, 1 Mar 2016 15:09:21 +0100 Subject: [PATCH 3/3] Fix Horse Metadata Error --- .../us/myles/ViaVersion/transformers/OutgoingTransformer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java index 4a293ecc6..553b95be9 100644 --- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java +++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java @@ -478,7 +478,7 @@ public class OutgoingTransformer { } output.writeBoolean(toWrite != null); if (toWrite != null) - PacketUtil.writeUUID((UUID) value, output); + PacketUtil.writeUUID((UUID) toWrite, output); break; case BlockID: // if we have both sources :))