diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
index 5be87969df..a2535542d3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
@@ -9,167 +9,211 @@ public class CraftSound {
     private static final String[] sounds = new String[Sound.values().length];
 
     static {
-        sounds[AMBIENCE_CAVE.ordinal()] = "ambient.cave.cave";
-        sounds[AMBIENCE_RAIN.ordinal()] = "ambient.weather.rain";
-        sounds[AMBIENCE_THUNDER.ordinal()] = "ambient.weather.thunder";
-        sounds[ANVIL_BREAK.ordinal()] = "random.anvil_break";
-        sounds[ANVIL_LAND.ordinal()] = "random.anvil_land";
-        sounds[ANVIL_USE.ordinal()] = "random.anvil_use";
-        sounds[ARROW_HIT.ordinal()] = "random.bowhit";
-        sounds[BREATH.ordinal()] = "random.breath";
-        sounds[BURP.ordinal()] = "random.burp";
-        sounds[CHEST_CLOSE.ordinal()] = "random.chestclosed";
-        sounds[CHEST_OPEN.ordinal()] = "random.chestopen";
-        sounds[CLICK.ordinal()] = "random.click";
-        sounds[DOOR_CLOSE.ordinal()] = "random.door_close";
-        sounds[DOOR_OPEN.ordinal()] = "random.door_open";
-        sounds[DRINK.ordinal()] = "random.drink";
-        sounds[EAT.ordinal()] = "random.eat";
-        sounds[EXPLODE.ordinal()] = "random.explode";
-        sounds[FALL_BIG.ordinal()] = "damage.fallbig";
-        sounds[FALL_SMALL.ordinal()] = "damage.fallsmall";
-        sounds[FIRE.ordinal()] = "fire.fire";
-        sounds[FIRE_IGNITE.ordinal()] = "fire.ignite";
-        sounds[FIZZ.ordinal()] = "random.fizz";
-        sounds[FUSE.ordinal()] = "random.fuse";
-        sounds[GLASS.ordinal()] = "random.glass";
-        sounds[HURT.ordinal()] = "random.classic_hurt";
-        sounds[HURT_FLESH.ordinal()] = "damage.hit";
-        sounds[ITEM_BREAK.ordinal()] = "random.break";
-        sounds[ITEM_PICKUP.ordinal()] = "random.pop";
-        sounds[LAVA.ordinal()] = "liquid.lava";
-        sounds[LAVA_POP.ordinal()] = "liquid.lavapop";
-        sounds[LEVEL_UP.ordinal()] = "random.levelup";
-        sounds[MINECART_BASE.ordinal()] = "minecart.base";
-        sounds[MINECART_INSIDE.ordinal()] = "minecart.inside";
-        sounds[NOTE_BASS.ordinal()] = "note.bass";
-        sounds[NOTE_PIANO.ordinal()] = "note.harp";
-        sounds[NOTE_BASS_DRUM.ordinal()] = "note.bd";
-        sounds[NOTE_STICKS.ordinal()] = "note.hat";
-        sounds[NOTE_BASS_GUITAR.ordinal()] = "note.bassattack";
-        sounds[NOTE_SNARE_DRUM.ordinal()] = "note.snare";
-        sounds[NOTE_PLING.ordinal()] = "note.pling";
-        sounds[ORB_PICKUP.ordinal()] = "random.orb";
-        sounds[PISTON_EXTEND.ordinal()] = "tile.piston.out";
-        sounds[PISTON_RETRACT.ordinal()] = "tile.piston.in";
-        sounds[PORTAL.ordinal()] = "portal.portal";
-        sounds[PORTAL_TRAVEL.ordinal()] = "portal.travel";
-        sounds[PORTAL_TRIGGER.ordinal()] = "portal.trigger";
-        sounds[SHOOT_ARROW.ordinal()] = "random.bow";
-        sounds[SPLASH.ordinal()] = "random.splash";
-        sounds[SPLASH2.ordinal()] = "liquid.splash";
-        sounds[STEP_GRASS.ordinal()] = "step.grass";
-        sounds[STEP_GRAVEL.ordinal()] = "step.gravel";
-        sounds[STEP_LADDER.ordinal()] = "step.ladder";
-        sounds[STEP_SAND.ordinal()] = "step.sand";
-        sounds[STEP_SNOW.ordinal()] = "step.snow";
-        sounds[STEP_STONE.ordinal()] = "step.stone";
-        sounds[STEP_WOOD.ordinal()] = "step.wood";
-        sounds[STEP_WOOL.ordinal()] = "step.cloth";
-        sounds[SWIM.ordinal()] = "liquid.swim";
-        sounds[WATER.ordinal()] = "liquid.water";
-        sounds[WOOD_CLICK.ordinal()] = "random.wood click";
-        // Mob sounds
-        sounds[BAT_DEATH.ordinal()] = "mob.bat.death";
-        sounds[BAT_HURT.ordinal()] = "mob.bat.hurt";
-        sounds[BAT_IDLE.ordinal()] = "mob.bat.idle";
-        sounds[BAT_LOOP.ordinal()] = "mob.bat.loop";
-        sounds[BAT_TAKEOFF.ordinal()] = "mob.bat.takeoff";
-        sounds[BLAZE_BREATH.ordinal()] = "mob.blaze.breathe";
-        sounds[BLAZE_DEATH.ordinal()] = "mob.blaze.death";
-        sounds[BLAZE_HIT.ordinal()] = "mob.blaze.hit";
-        sounds[CAT_HISS.ordinal()] = "mob.cat.hiss";
-        sounds[CAT_HIT.ordinal()] = "mob.cat.hitt";
-        sounds[CAT_MEOW.ordinal()] = "mob.cat.meow";
-        sounds[CAT_PURR.ordinal()] = "mob.cat.purr";
-        sounds[CAT_PURREOW.ordinal()] = "mob.cat.purreow";
-        sounds[CHICKEN_IDLE.ordinal()] = "mob.chicken.say";
-        sounds[CHICKEN_HURT.ordinal()] = "mob.chicken.hurt";
-        sounds[CHICKEN_EGG_POP.ordinal()] = "mob.chicken.plop";
-        sounds[CHICKEN_WALK.ordinal()] = "mob.chicken.step";
-        sounds[COW_IDLE.ordinal()] = "mob.cow.say";
-        sounds[COW_HURT.ordinal()] = "mob.cow.hurt";
-        sounds[COW_WALK.ordinal()] = "mob.cow.step";
-        sounds[CREEPER_HISS.ordinal()] = "mob.creeper.say";
-        sounds[CREEPER_DEATH.ordinal()] = "mob.creeper.death";
-        sounds[ENDERDRAGON_DEATH.ordinal()] = "mob.enderdragon.end";
-        sounds[ENDERDRAGON_GROWL.ordinal()] = "mob.enderdragon.growl";
-        sounds[ENDERDRAGON_HIT.ordinal()] = "mob.enderdragon.hit";
-        sounds[ENDERDRAGON_WINGS.ordinal()] = "mob.enderdragon.wings";
-        sounds[ENDERMAN_DEATH.ordinal()] = "mob.endermen.death";
-        sounds[ENDERMAN_HIT.ordinal()] = "mob.endermen.hit";
-        sounds[ENDERMAN_IDLE.ordinal()] = "mob.endermen.idle";
-        sounds[ENDERMAN_TELEPORT.ordinal()] = "mob.endermen.portal";
-        sounds[ENDERMAN_SCREAM.ordinal()] = "mob.endermen.scream";
-        sounds[ENDERMAN_STARE.ordinal()] = "mob.endermen.stare";
-        sounds[GHAST_SCREAM.ordinal()] = "mob.ghast.scream";
-        sounds[GHAST_SCREAM2.ordinal()] = "mob.ghast.affectionate scream";
-        sounds[GHAST_CHARGE.ordinal()] = "mob.ghast.charge";
-        sounds[GHAST_DEATH.ordinal()] = "mob.ghast.death";
-        sounds[GHAST_FIREBALL.ordinal()] = "mob.ghast.fireball";
-        sounds[GHAST_MOAN.ordinal()] = "mob.ghast.moan";
-        sounds[IRONGOLEM_DEATH.ordinal()] = "mob.irongolem.death";
-        sounds[IRONGOLEM_HIT.ordinal()] = "mob.irongolem.hit";
-        sounds[IRONGOLEM_THROW.ordinal()] = "mob.irongolem.throw";
-        sounds[IRONGOLEM_WALK.ordinal()] = "mob.irongolem.walk";
-        sounds[MAGMACUBE_WALK.ordinal()] = "mob.magmacube.small";
-        sounds[MAGMACUBE_WALK2.ordinal()] = "mob.magmacube.big";
-        sounds[MAGMACUBE_JUMP.ordinal()] = "mob.magmacube.jump";
-        sounds[PIG_IDLE.ordinal()] = "mob.pig.say";
-        sounds[PIG_DEATH.ordinal()] = "mob.pig.death";
-        sounds[PIG_WALK.ordinal()] = "mob.pig.step";
-        sounds[SHEEP_IDLE.ordinal()] = "mob.sheep.say";
-        sounds[SHEEP_SHEAR.ordinal()] = "mob.sheep.shear";
-        sounds[SHEEP_WALK.ordinal()] = "mob.sheep.step";
-        sounds[SILVERFISH_HIT.ordinal()] = "mob.silverfish.hit";
-        sounds[SILVERFISH_KILL.ordinal()] = "mob.silverfish.kill";
-        sounds[SILVERFISH_IDLE.ordinal()] = "mob.silverfish.say";
-        sounds[SILVERFISH_WALK.ordinal()] = "mob.silverfish.step";
-        sounds[SKELETON_IDLE.ordinal()] = "mob.skeleton.say";
-        sounds[SKELETON_DEATH.ordinal()] = "mob.skeleton.death";
-        sounds[SKELETON_HURT.ordinal()] = "mob.skeleton.hurt";
-        sounds[SKELETON_WALK.ordinal()] = "mob.skeleton.step";
-        sounds[SLIME_ATTACK.ordinal()] = "mob.slime.attack";
-        sounds[SLIME_WALK.ordinal()] = "mob.slime.small";
-        sounds[SLIME_WALK2.ordinal()] = "mob.slime.big";
-        sounds[SPIDER_IDLE.ordinal()] = "mob.spider.say";
-        sounds[SPIDER_DEATH.ordinal()] = "mob.spider.death";
-        sounds[SPIDER_WALK.ordinal()] = "mob.spider.step";
-        sounds[WITHER_DEATH.ordinal()] = "mob.wither.death";
-        sounds[WITHER_HURT.ordinal()] = "mob.wither.hurt";
-        sounds[WITHER_IDLE.ordinal()] = "mob.wither.idle";
-        sounds[WITHER_SHOOT.ordinal()] = "mob.wither.shoot";
-        sounds[WITHER_SPAWN.ordinal()] = "mob.wither.spawn";
-        sounds[WOLF_BARK.ordinal()] = "mob.wolf.bark";
-        sounds[WOLF_DEATH.ordinal()] = "mob.wolf.death";
-        sounds[WOLF_GROWL.ordinal()] = "mob.wolf.growl";
-        sounds[WOLF_HOWL.ordinal()] = "mob.wolf.howl";
-        sounds[WOLF_HURT.ordinal()] = "mob.wolf.hurt";
-        sounds[WOLF_PANT.ordinal()] = "mob.wolf.panting";
-        sounds[WOLF_SHAKE.ordinal()] = "mob.wolf.shake";
-        sounds[WOLF_WALK.ordinal()] = "mob.wolf.step";
-        sounds[WOLF_WHINE.ordinal()] = "mob.wolf.whine";
-        sounds[ZOMBIE_METAL.ordinal()] = "mob.zombie.metal";
-        sounds[ZOMBIE_WOOD.ordinal()] = "mob.zombie.wood";
-        sounds[ZOMBIE_WOODBREAK.ordinal()] = "mob.zombie.woodbreak";
-        sounds[ZOMBIE_IDLE.ordinal()] = "mob.zombie.say";
-        sounds[ZOMBIE_DEATH.ordinal()] = "mob.zombie.death";
-        sounds[ZOMBIE_HURT.ordinal()] = "mob.zombie.hurt";
-        sounds[ZOMBIE_INFECT.ordinal()] = "mob.zombie.infect";
-        sounds[ZOMBIE_UNFECT.ordinal()] = "mob.zombie.unfect";
-        sounds[ZOMBIE_REMEDY.ordinal()] = "mob.zombie.remedy";
-        sounds[ZOMBIE_PIG_IDLE.ordinal()] = "mob.zombiepig.zpig";
-        sounds[ZOMBIE_PIG_ANGRY.ordinal()] = "mob.zombiepig.zpigangry";
-        sounds[ZOMBIE_PIG_DEATH.ordinal()] = "mob.zombiepig.zpigdeath";
-        sounds[ZOMBIE_PIG_HURT.ordinal()] = "mob.zombiepig.zpighurt";
+        // Ambient
+        set(AMBIENCE_CAVE, "ambient.cave.cave");
+        set(AMBIENCE_RAIN, "ambient.weather.rain");
+        set(AMBIENCE_THUNDER, "ambient.weather.thunder");
+        // Damage
+        set(HURT_FLESH, "damage.hit");
+        set(FALL_BIG, "damage.fallbig");
+        set(FALL_SMALL, "damage.fallsmall");
         // Dig Sounds
-        sounds[DIG_WOOL.ordinal()] = "dig.cloth";
-        sounds[DIG_GRASS.ordinal()] = "dig.grass";
-        sounds[DIG_GRAVEL.ordinal()] = "dig.gravel";
-        sounds[DIG_SAND.ordinal()] = "dig.sand";
-        sounds[DIG_SNOW.ordinal()] = "dig.snow";
-        sounds[DIG_STONE.ordinal()] = "dig.stone";
-        sounds[DIG_WOOD.ordinal()] = "dig.wood";
+        set(DIG_WOOL, "dig.cloth");
+        set(DIG_GRASS, "dig.grass");
+        set(DIG_GRAVEL, "dig.gravel");
+        set(DIG_SAND, "dig.sand");
+        set(DIG_SNOW, "dig.snow");
+        set(DIG_STONE, "dig.stone");
+        set(DIG_WOOD, "dig.wood");
+        set(DIG_WOOD, "dig.wood");
+        // Fire
+        set(FIRE, "fire.fire");
+        set(FIRE_IGNITE, "fire.ignite");
+        // Fireworks
+        set(FIREWORK_BLAST, "fireworks.blast");
+        set(FIREWORK_BLAST2, "fireworks.blast_far");
+        set(FIREWORK_LARGE_BLAST, "fireworks.largeBlast");
+        set(FIREWORK_LARGE_BLAST2, "fireworks.largeBlast_far");
+        set(FIREWORK_TWINKLE, "fireworks.twinkle");
+        set(FIREWORK_TWINKLE2, "fireworks.twinkle_far");
+        set(FIREWORK_LAUNCH, "fireworks.launch");
+        // Liquid
+        set(SPLASH2, "liquid.splash");
+        set(SWIM, "liquid.swim");
+        set(WATER, "liquid.water");
+        set(LAVA, "liquid.lava");
+        set(LAVA_POP, "liquid.lavapop");
+        // Minecart
+        set(MINECART_BASE, "minecart.base");
+        set(MINECART_INSIDE, "minecart.inside");
+        // Mob
+        set(BAT_DEATH, "mob.bat.death");
+        set(BAT_HURT, "mob.bat.hurt");
+        set(BAT_IDLE, "mob.bat.idle");
+        set(BAT_LOOP, "mob.bat.loop");
+        set(BAT_TAKEOFF, "mob.bat.takeoff");
+        set(BLAZE_BREATH, "mob.blaze.breathe");
+        set(BLAZE_DEATH, "mob.blaze.death");
+        set(BLAZE_HIT, "mob.blaze.hit");
+        set(CAT_HISS, "mob.cat.hiss");
+        set(CAT_HIT, "mob.cat.hitt");
+        set(CAT_MEOW, "mob.cat.meow");
+        set(CAT_PURR, "mob.cat.purr");
+        set(CAT_PURREOW, "mob.cat.purreow");
+        set(CHICKEN_IDLE, "mob.chicken.say");
+        set(CHICKEN_HURT, "mob.chicken.hurt");
+        set(CHICKEN_EGG_POP, "mob.chicken.plop");
+        set(CHICKEN_WALK, "mob.chicken.step");
+        set(COW_HURT, "mob.cow.hurt");
+        set(COW_IDLE, "mob.cow.say");
+        set(COW_WALK, "mob.cow.step");
+        set(CREEPER_DEATH, "mob.creeper.death");
+        set(CREEPER_HISS, "mob.creeper.say");
+        set(ENDERDRAGON_DEATH, "mob.enderdragon.end");
+        set(ENDERDRAGON_GROWL, "mob.enderdragon.growl");
+        set(ENDERDRAGON_HIT, "mob.enderdragon.hit");
+        set(ENDERDRAGON_WINGS, "mob.enderdragon.wings");
+        set(ENDERMAN_DEATH, "mob.endermen.death");
+        set(ENDERMAN_HIT, "mob.endermen.hit");
+        set(ENDERMAN_IDLE, "mob.endermen.idle");
+        set(ENDERMAN_TELEPORT, "mob.endermen.portal");
+        set(ENDERMAN_SCREAM, "mob.endermen.scream");
+        set(ENDERMAN_STARE, "mob.endermen.stare");
+        set(GHAST_SCREAM2, "mob.ghast.affectionate_scream");
+        set(GHAST_CHARGE, "mob.ghast.charge");
+        set(GHAST_DEATH, "mob.ghast.death");
+        set(GHAST_FIREBALL, "mob.ghast.fireball");
+        set(GHAST_MOAN, "mob.ghast.moan");
+        set(GHAST_SCREAM, "mob.ghast.scream");
+        set(HORSE_ANGRY, "horse.angry");
+        set(HORSE_ARMOR, "horse.armor");
+        set(HORSE_BREATHE, "horse.breathe");
+        set(HORSE_GALLOP, "horse.gallop");
+        set(HORSE_HIT, "horse.hit");
+        set(HORSE_IDLE, "horse.idle");
+        set(HORSE_JUMP, "horse.jump");
+        set(HORSE_LAND, "horse.land");
+        set(HORSE_SADDLE, "horse.leather");
+        set(HORSE_SOFT, "horse.soft");
+        set(HORSE_WOOD, "horse.wood");
+        set(DONKEY_ANGRY, "horse.donkey.angry");
+        set(DONKEY_DEATH, "horse.donkey.death");
+        set(DONKEY_HIT, "horse.donkey.hit");
+        set(DONKEY_IDLE, "horse.donkey.idle");
+        set(HORSE_SKELETON_DEATH, "horse.skeleton.death");
+        set(HORSE_SKELETON_IDLE, "horse.skeleton.idle");
+        set(HORSE_ZOMBIE_DEATH, "horse.zombie.death");
+        set(HORSE_ZOMBIE_HIT, "horse.zombie.hit");
+        set(HORSE_ZOMBIE_IDLE, "horse.zombie.idle");
+        set(IRONGOLEM_DEATH, "mob.irongolem.death");
+        set(IRONGOLEM_HIT, "mob.irongolem.hit");
+        set(IRONGOLEM_THROW, "mob.irongolem.throw");
+        set(IRONGOLEM_WALK, "mob.irongolem.walk");
+        set(MAGMACUBE_WALK, "mob.magmacube.small");
+        set(MAGMACUBE_WALK2, "mob.magmacube.big");
+        set(MAGMACUBE_JUMP, "mob.magmacube.jump");
+        set(PIG_IDLE, "mob.pig.say");
+        set(PIG_DEATH, "mob.pig.death");
+        set(PIG_WALK, "mob.pig.step");
+        set(SHEEP_IDLE, "mob.sheep.say");
+        set(SHEEP_SHEAR, "mob.sheep.shear");
+        set(SHEEP_WALK, "mob.sheep.step");
+        set(SILVERFISH_HIT, "mob.silverfish.hit");
+        set(SILVERFISH_KILL, "mob.silverfish.kill");
+        set(SILVERFISH_IDLE, "mob.silverfish.say");
+        set(SILVERFISH_WALK, "mob.silverfish.step");
+        set(SKELETON_IDLE, "mob.skeleton.say");
+        set(SKELETON_DEATH, "mob.skeleton.death");
+        set(SKELETON_HURT, "mob.skeleton.hurt");
+        set(SKELETON_WALK, "mob.skeleton.step");
+        set(SLIME_ATTACK, "mob.slime.attack");
+        set(SLIME_WALK, "mob.slime.small");
+        set(SLIME_WALK2, "mob.slime.big");
+        set(SPIDER_IDLE, "mob.spider.say");
+        set(SPIDER_DEATH, "mob.spider.death");
+        set(SPIDER_WALK, "mob.spider.step");
+        set(WITHER_DEATH, "mob.wither.death");
+        set(WITHER_HURT, "mob.wither.hurt");
+        set(WITHER_IDLE, "mob.wither.idle");
+        set(WITHER_SHOOT, "mob.wither.shoot");
+        set(WITHER_SPAWN, "mob.wither.spawn");
+        set(WOLF_BARK, "mob.wolf.bark");
+        set(WOLF_DEATH, "mob.wolf.death");
+        set(WOLF_GROWL, "mob.wolf.growl");
+        set(WOLF_HOWL, "mob.wolf.howl");
+        set(WOLF_HURT, "mob.wolf.hurt");
+        set(WOLF_PANT, "mob.wolf.panting");
+        set(WOLF_SHAKE, "mob.wolf.shake");
+        set(WOLF_WALK, "mob.wolf.step");
+        set(WOLF_WHINE, "mob.wolf.whine");
+        set(ZOMBIE_METAL, "mob.zombie.metal");
+        set(ZOMBIE_WOOD, "mob.zombie.wood");
+        set(ZOMBIE_WOODBREAK, "mob.zombie.woodbreak");
+        set(ZOMBIE_IDLE, "mob.zombie.say");
+        set(ZOMBIE_DEATH, "mob.zombie.death");
+        set(ZOMBIE_HURT, "mob.zombie.hurt");
+        set(ZOMBIE_INFECT, "mob.zombie.infect");
+        set(ZOMBIE_UNFECT, "mob.zombie.unfect");
+        set(ZOMBIE_REMEDY, "mob.zombie.remedy");
+        set(ZOMBIE_PIG_IDLE, "mob.zombiepig.zpig");
+        set(ZOMBIE_PIG_ANGRY, "mob.zombiepig.zpigangry");
+        set(ZOMBIE_PIG_DEATH, "mob.zombiepig.zpigdeath");
+        set(ZOMBIE_PIG_HURT, "mob.zombiepig.zpighurt");
+        // Note (blocks)
+        set(NOTE_BASS_GUITAR, "note.bassattack");
+        set(NOTE_SNARE_DRUM, "note.snare");
+        set(NOTE_PLING, "note.pling");
+        set(NOTE_BASS, "note.bass");
+        set(NOTE_PIANO, "note.harp");
+        set(NOTE_BASS_DRUM, "note.bd");
+        set(NOTE_STICKS, "note.hat");
+        // Portal
+        set(PORTAL, "portal.portal");
+        set(PORTAL_TRAVEL, "portal.travel");
+        set(PORTAL_TRIGGER, "portal.trigger");
+        // Random
+        set(ANVIL_BREAK, "random.anvil_break");
+        set(ANVIL_LAND, "random.anvil_land");
+        set(ANVIL_USE, "random.anvil_use");
+        set(SHOOT_ARROW, "random.bow");
+        set(ARROW_HIT, "random.bowhit");
+        set(ITEM_BREAK, "random.break");
+        set(BREATH, "random.breath");
+        set(BURP, "random.burp");
+        set(CHEST_CLOSE, "random.chestclosed");
+        set(CHEST_OPEN, "random.chestopen");
+        set(HURT, "random.classic_hurt");
+        set(CLICK, "random.click");
+        set(DOOR_CLOSE, "random.door_close");
+        set(DOOR_OPEN, "random.door_open");
+        set(DRINK, "random.drink");
+        set(EAT, "random.eat");
+        set(EXPLODE, "random.explode");
+        set(FIZZ, "random.fizz");
+        set(FUSE, "random.fuse");
+        set(GLASS, "random.glass");
+        set(LEVEL_UP, "random.levelup");
+        set(ORB_PICKUP, "random.orb");
+        set(ITEM_PICKUP, "random.pop");
+        set(SPLASH, "random.splash");
+        set(SUCCESSFUL_HIT, "random.successful_hit");
+        set(WOOD_CLICK, "random.wood_click");
+        // Step
+        set(STEP_WOOL, "step.cloth");
+        set(STEP_GRASS, "step.grass");
+        set(STEP_GRAVEL, "step.gravel");
+        set(STEP_LADDER, "step.ladder");
+        set(STEP_SAND, "step.sand");
+        set(STEP_SNOW, "step.snow");
+        set(STEP_STONE, "step.stone");
+        set(STEP_WOOD, "step.wood");
+        // Tile
+        set(PISTON_EXTEND, "tile.piston.out");
+        set(PISTON_RETRACT, "tile.piston.in");
+    }
+
+    private static void set(Sound sound, String key) {
+        sounds[sound.ordinal()] = key;
     }
 
     public static String getSound(final Sound sound) {