summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Fritsche <github@attrib.org>2012-11-05 22:10:09 +0100
committerTravis Watkins <amaranth@ubuntu.com>2012-11-17 11:07:49 -0600
commit321aea41564edf3bdcc312ab9d93b74a114a46a3 (patch)
treeb25bdb20f5959da480383548b402f0fac3a8f6ef /src
parentbc5e54d9041e9f3a279424f8b2fa39880cf4cb99 (diff)
downloadbukkit-321aea41564edf3bdcc312ab9d93b74a114a46a3.tar
bukkit-321aea41564edf3bdcc312ab9d93b74a114a46a3.tar.gz
bukkit-321aea41564edf3bdcc312ab9d93b74a114a46a3.tar.lz
bukkit-321aea41564edf3bdcc312ab9d93b74a114a46a3.tar.xz
bukkit-321aea41564edf3bdcc312ab9d93b74a114a46a3.zip
Update sounds for Minecraft 1.4.2 changes. Fixes BUKKIT-2849
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/Sound.java51
1 files changed, 46 insertions, 5 deletions
diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
index f5cef986..6d263809 100644
--- a/src/main/java/org/bukkit/Sound.java
+++ b/src/main/java/org/bukkit/Sound.java
@@ -10,8 +10,10 @@ public enum Sound {
AMBIENCE_CAVE,
AMBIENCE_RAIN,
AMBIENCE_THUNDER,
+ ANVIL_BREAK,
+ ANVIL_LAND,
+ ANVIL_USE,
ARROW_HIT,
- ARROW_SHAKE,
BREATH,
BURP,
CHEST_CLOSE,
@@ -22,13 +24,13 @@ public enum Sound {
DRINK,
EAT,
EXPLODE,
- EXPLODE_OLD,
FALL_BIG,
FALL_SMALL,
FIRE,
FIRE_IGNITE,
FIZZ,
FUSE,
+ GLASS,
HURT,
HURT_FLESH,
ITEM_BREAK,
@@ -36,12 +38,14 @@ public enum Sound {
LAVA,
LAVA_POP,
LEVEL_UP,
+ MINECART_BASE,
+ MINECART_INSIDE,
+ NOTE_BASS,
NOTE_PIANO,
NOTE_BASS_DRUM,
NOTE_STICKS,
NOTE_BASS_GUITAR,
NOTE_SNARE_DRUM,
- // NOTE_BASS("note.bass"),
NOTE_PLING,
ORB_PICKUP,
PISTON_EXTEND,
@@ -52,15 +56,23 @@ public enum Sound {
SHOOT_ARROW,
SPLASH,
SPLASH2,
+ STEP_GRASS,
STEP_GRAVEL,
+ STEP_LADDER,
STEP_SAND,
STEP_SNOW,
STEP_STONE,
STEP_WOOD,
STEP_WOOL,
+ SWIM,
WATER,
WOOD_CLICK,
// Mob sounds
+ BAT_DEATH,
+ BAT_HURT,
+ BAT_IDLE,
+ BAT_LOOP,
+ BAT_TAKEOFF,
BLAZE_BREATH,
BLAZE_DEATH,
BLAZE_HIT,
@@ -72,10 +84,16 @@ public enum Sound {
CHICKEN_IDLE,
CHICKEN_HURT,
CHICKEN_EGG_POP,
+ CHICKEN_WALK,
COW_IDLE,
COW_HURT,
+ COW_WALK,
CREEPER_HISS,
CREEPER_DEATH,
+ ENDERDRAGON_DEATH,
+ ENDERDRAGON_GROWL,
+ ENDERDRAGON_HIT,
+ ENDERDRAGON_WINGS,
ENDERMAN_DEATH,
ENDERMAN_HIT,
ENDERMAN_IDLE,
@@ -97,7 +115,10 @@ public enum Sound {
MAGMACUBE_JUMP,
PIG_IDLE,
PIG_DEATH,
+ PIG_WALK,
SHEEP_IDLE,
+ SHEEP_SHEAR,
+ SHEEP_WALK,
SILVERFISH_HIT,
SILVERFISH_KILL,
SILVERFISH_IDLE,
@@ -105,10 +126,18 @@ public enum Sound {
SKELETON_IDLE,
SKELETON_DEATH,
SKELETON_HURT,
- SLIME_IDLE,
+ SKELETON_WALK,
SLIME_ATTACK,
+ SLIME_WALK,
+ SLIME_WALK2,
SPIDER_IDLE,
SPIDER_DEATH,
+ SPIDER_WALK,
+ WITHER_DEATH,
+ WITHER_HURT,
+ WITHER_IDLE,
+ WITHER_SHOOT,
+ WITHER_SPAWN,
WOLF_BARK,
WOLF_DEATH,
WOLF_GROWL,
@@ -116,6 +145,7 @@ public enum Sound {
WOLF_HURT,
WOLF_PANT,
WOLF_SHAKE,
+ WOLF_WALK,
WOLF_WHINE,
ZOMBIE_METAL,
ZOMBIE_WOOD,
@@ -123,8 +153,19 @@ public enum Sound {
ZOMBIE_IDLE,
ZOMBIE_DEATH,
ZOMBIE_HURT,
+ ZOMBIE_INFECT,
+ ZOMBIE_UNFECT,
+ ZOMBIE_REMEDY,
ZOMBIE_PIG_IDLE,
ZOMBIE_PIG_ANGRY,
ZOMBIE_PIG_DEATH,
- ZOMBIE_PIG_HURT;
+ ZOMBIE_PIG_HURT,
+ // Dig Sounds
+ DIG_WOOL,
+ DIG_GRASS,
+ DIG_GRAVEL,
+ DIG_SAND,
+ DIG_SNOW,
+ DIG_STONE,
+ DIG_WOOD
}