From af6e6a1aa9f47500407a812362740477264d7af6 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 23 Jul 2013 02:04:42 +1200 Subject: [PATCH] Added villager sounds and witch sounds (Which don't work) --- src/me/libraryaddict/disguise/DisguiseAPI.java | 2 -- .../libraryaddict/disguise/DisguiseTypes/DisguiseSound.java | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/me/libraryaddict/disguise/DisguiseAPI.java b/src/me/libraryaddict/disguise/DisguiseAPI.java index 189bbc20..b5f04daa 100644 --- a/src/me/libraryaddict/disguise/DisguiseAPI.java +++ b/src/me/libraryaddict/disguise/DisguiseAPI.java @@ -16,8 +16,6 @@ import net.minecraft.server.v1_6_R2.World; import net.minecraft.server.v1_6_R2.WorldServer; import org.bukkit.Location; -import org.bukkit.Sound; -import org.bukkit.craftbukkit.v1_6_R2.CraftSound; import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity; import org.bukkit.entity.Entity; diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java b/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java index 0c079fb6..66ad4170 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java @@ -5,7 +5,6 @@ import java.util.HashSet; import org.bukkit.Sound; import org.bukkit.craftbukkit.v1_6_R2.CraftSound; -import org.bukkit.entity.EntityType; public enum DisguiseSound { @@ -69,9 +68,10 @@ public enum DisguiseSound { UNDEAD_HORSE("mob.horse.zombie.hit", Sound.STEP_GRASS, "mob.horse.zombie.death", "mob.horse.zombie.idle"), - VILLAGER(null, null, null, null), + VILLAGER("mob.villager.hit", null, "mob.villager.death", "mob.villager.idle", "mob.villager.haggle", "mob.villager.yes", + "mob.villager.no"), - WITCH(null, null, null, null), + WITCH("mob.witch.hurt", null, "mob.witch.death", "mob.witch.idle"), WITHER(Sound.WITHER_HURT, null, Sound.WITHER_DEATH, Sound.WITHER_IDLE, Sound.WITHER_SHOOT, Sound.WITHER_SPAWN),