SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität

Implement sound changes for Minecraft 1.4.2 changes. Fixes BUKKIT-2849

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Karl Fritsche 2012-11-05 22:09:33 +01:00 committet von Travis Watkins
Ursprung a575e6b075
Commit 028860399b
1 geänderte Dateien mit 67 neuen und 26 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

93
src/main/java/org/bukkit/craftbukkit/CraftSound.java
Datei anzeigen

@ -12,8 +12,10 @@ public class CraftSound {
sounds[AMBIENCE_CAVE.ordinal()] = "ambient.cave.cave"; sounds[AMBIENCE_CAVE.ordinal()] = "ambient.cave.cave";
sounds[AMBIENCE_RAIN.ordinal()] = "ambient.weather.rain"; sounds[AMBIENCE_RAIN.ordinal()] = "ambient.weather.rain";
sounds[AMBIENCE_THUNDER.ordinal()] = "ambient.weather.thunder"; 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[ARROW_HIT.ordinal()] = "random.bowhit";
sounds[ARROW_SHAKE.ordinal()] = "random.drr";
sounds[BREATH.ordinal()] = "random.breath"; sounds[BREATH.ordinal()] = "random.breath";
sounds[BURP.ordinal()] = "random.burp"; sounds[BURP.ordinal()] = "random.burp";
sounds[CHEST_CLOSE.ordinal()] = "random.chestclosed"; sounds[CHEST_CLOSE.ordinal()] = "random.chestclosed";
@ -24,26 +26,28 @@ public class CraftSound {
sounds[DRINK.ordinal()] = "random.drink"; sounds[DRINK.ordinal()] = "random.drink";
sounds[EAT.ordinal()] = "random.eat"; sounds[EAT.ordinal()] = "random.eat";
sounds[EXPLODE.ordinal()] = "random.explode"; sounds[EXPLODE.ordinal()] = "random.explode";
sounds[EXPLODE_OLD.ordinal()] = "random.old_explode";
sounds[FALL_BIG.ordinal()] = "damage.fallbig"; sounds[FALL_BIG.ordinal()] = "damage.fallbig";
sounds[FALL_SMALL.ordinal()] = "damage.fallsmall"; sounds[FALL_SMALL.ordinal()] = "damage.fallsmall";
sounds[FIRE.ordinal()] = "fire.fire"; sounds[FIRE.ordinal()] = "fire.fire";
sounds[FIRE_IGNITE.ordinal()] = "fire.ignite"; sounds[FIRE_IGNITE.ordinal()] = "fire.ignite";
sounds[FIZZ.ordinal()] = "random.fizz"; sounds[FIZZ.ordinal()] = "random.fizz";
sounds[FUSE.ordinal()] = "random.fuse"; sounds[FUSE.ordinal()] = "random.fuse";
sounds[HURT.ordinal()] = "random.hurt"; sounds[GLASS.ordinal()] = "random.glass";
sounds[HURT_FLESH.ordinal()] = "damage.hurtflesh"; sounds[HURT.ordinal()] = "random.classic_hurt";
sounds[HURT_FLESH.ordinal()] = "damage.hit";
sounds[ITEM_BREAK.ordinal()] = "random.break"; sounds[ITEM_BREAK.ordinal()] = "random.break";
sounds[ITEM_PICKUP.ordinal()] = "random.pop"; sounds[ITEM_PICKUP.ordinal()] = "random.pop";
sounds[LAVA.ordinal()] = "liquid.lava"; sounds[LAVA.ordinal()] = "liquid.lava";
sounds[LAVA_POP.ordinal()] = "liquid.lavapop"; sounds[LAVA_POP.ordinal()] = "liquid.lavapop";
sounds[LEVEL_UP.ordinal()] = "random.levelup"; 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_PIANO.ordinal()] = "note.harp";
sounds[NOTE_BASS_DRUM.ordinal()] = "note.bd"; sounds[NOTE_BASS_DRUM.ordinal()] = "note.bd";
sounds[NOTE_STICKS.ordinal()] = "note.hat"; sounds[NOTE_STICKS.ordinal()] = "note.hat";
sounds[NOTE_BASS_GUITAR.ordinal()] = "note.bassattack"; sounds[NOTE_BASS_GUITAR.ordinal()] = "note.bassattack";
sounds[NOTE_SNARE_DRUM.ordinal()] = "note.snare"; sounds[NOTE_SNARE_DRUM.ordinal()] = "note.snare";
// NOTE_BASS("note.bass"),
sounds[NOTE_PLING.ordinal()] = "note.pling"; sounds[NOTE_PLING.ordinal()] = "note.pling";
sounds[ORB_PICKUP.ordinal()] = "random.orb"; sounds[ORB_PICKUP.ordinal()] = "random.orb";
sounds[PISTON_EXTEND.ordinal()] = "tile.piston.out"; sounds[PISTON_EXTEND.ordinal()] = "tile.piston.out";
@ -54,15 +58,23 @@ public class CraftSound {
sounds[SHOOT_ARROW.ordinal()] = "random.bow"; sounds[SHOOT_ARROW.ordinal()] = "random.bow";
sounds[SPLASH.ordinal()] = "random.splash"; sounds[SPLASH.ordinal()] = "random.splash";
sounds[SPLASH2.ordinal()] = "liquid.splash"; sounds[SPLASH2.ordinal()] = "liquid.splash";
sounds[STEP_GRASS.ordinal()] = "step.grass";
sounds[STEP_GRAVEL.ordinal()] = "step.gravel"; sounds[STEP_GRAVEL.ordinal()] = "step.gravel";
sounds[STEP_LADDER.ordinal()] = "step.ladder";
sounds[STEP_SAND.ordinal()] = "step.sand"; sounds[STEP_SAND.ordinal()] = "step.sand";
sounds[STEP_SNOW.ordinal()] = "step.snow"; sounds[STEP_SNOW.ordinal()] = "step.snow";
sounds[STEP_STONE.ordinal()] = "step.stone"; sounds[STEP_STONE.ordinal()] = "step.stone";
sounds[STEP_WOOD.ordinal()] = "step.wood"; sounds[STEP_WOOD.ordinal()] = "step.wood";
sounds[STEP_WOOL.ordinal()] = "step.wool"; sounds[STEP_WOOL.ordinal()] = "step.cloth";
sounds[SWIM.ordinal()] = "liquid.swim";
sounds[WATER.ordinal()] = "liquid.water"; sounds[WATER.ordinal()] = "liquid.water";
sounds[WOOD_CLICK.ordinal()] = "random.wood click"; sounds[WOOD_CLICK.ordinal()] = "random.wood click";
// Mob sounds // 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.breath"; sounds[BLAZE_BREATH.ordinal()] = "mob.blaze.breath";
sounds[BLAZE_DEATH.ordinal()] = "mob.blaze.death"; sounds[BLAZE_DEATH.ordinal()] = "mob.blaze.death";
sounds[BLAZE_HIT.ordinal()] = "mob.blaze.hit"; sounds[BLAZE_HIT.ordinal()] = "mob.blaze.hit";
@ -71,13 +83,19 @@ public class CraftSound {
sounds[CAT_MEOW.ordinal()] = "mob.cat.meow"; sounds[CAT_MEOW.ordinal()] = "mob.cat.meow";
sounds[CAT_PURR.ordinal()] = "mob.cat.purr"; sounds[CAT_PURR.ordinal()] = "mob.cat.purr";
sounds[CAT_PURREOW.ordinal()] = "mob.cat.purreow"; sounds[CAT_PURREOW.ordinal()] = "mob.cat.purreow";
sounds[CHICKEN_IDLE.ordinal()] = "mob.chicken"; sounds[CHICKEN_IDLE.ordinal()] = "mob.chicken.say";
sounds[CHICKEN_HURT.ordinal()] = "mob.chickenhurt"; sounds[CHICKEN_HURT.ordinal()] = "mob.chicken.hurt";
sounds[CHICKEN_EGG_POP.ordinal()] = "mob.chickenplop"; sounds[CHICKEN_EGG_POP.ordinal()] = "mob.chicken.plop";
sounds[COW_IDLE.ordinal()] = "mob.cow"; sounds[CHICKEN_WALK.ordinal()] = "mob.chicken.step";
sounds[COW_HURT.ordinal()] = "mob.cowhurt"; sounds[COW_IDLE.ordinal()] = "mob.cow.say";
sounds[CREEPER_HISS.ordinal()] = "mob.creeper"; sounds[COW_HURT.ordinal()] = "mob.cow.hurt";
sounds[CREEPER_DEATH.ordinal()] = "mob.creeperdeath"; 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_DEATH.ordinal()] = "mob.endermen.death";
sounds[ENDERMAN_HIT.ordinal()] = "mob.endermen.hit"; sounds[ENDERMAN_HIT.ordinal()] = "mob.endermen.hit";
sounds[ENDERMAN_IDLE.ordinal()] = "mob.endermen.idle"; sounds[ENDERMAN_IDLE.ordinal()] = "mob.endermen.idle";
@ -97,20 +115,31 @@ public class CraftSound {
sounds[MAGMACUBE_WALK.ordinal()] = "mob.magmacube.small"; sounds[MAGMACUBE_WALK.ordinal()] = "mob.magmacube.small";
sounds[MAGMACUBE_WALK2.ordinal()] = "mob.magmacube.big"; sounds[MAGMACUBE_WALK2.ordinal()] = "mob.magmacube.big";
sounds[MAGMACUBE_JUMP.ordinal()] = "mob.magmacube.jump"; sounds[MAGMACUBE_JUMP.ordinal()] = "mob.magmacube.jump";
sounds[PIG_IDLE.ordinal()] = "mob.pig"; sounds[PIG_IDLE.ordinal()] = "mob.pig.say";
sounds[PIG_DEATH.ordinal()] = "mob.pigdeath"; sounds[PIG_DEATH.ordinal()] = "mob.pig.death";
sounds[SHEEP_IDLE.ordinal()] = "mob.sheep"; 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_HIT.ordinal()] = "mob.silverfish.hit";
sounds[SILVERFISH_KILL.ordinal()] = "mob.silverfish.kill"; sounds[SILVERFISH_KILL.ordinal()] = "mob.silverfish.kill";
sounds[SILVERFISH_IDLE.ordinal()] = "mob.silverfish.say"; sounds[SILVERFISH_IDLE.ordinal()] = "mob.silverfish.say";
sounds[SILVERFISH_WALK.ordinal()] = "mob.silverfish.step"; sounds[SILVERFISH_WALK.ordinal()] = "mob.silverfish.step";
sounds[SKELETON_IDLE.ordinal()] = "mob.skeleton"; sounds[SKELETON_IDLE.ordinal()] = "mob.skeleton.say";
sounds[SKELETON_DEATH.ordinal()] = "mob.skeletondeath"; sounds[SKELETON_DEATH.ordinal()] = "mob.skeleton.death";
sounds[SKELETON_HURT.ordinal()] = "mob.skeletonhurt"; sounds[SKELETON_HURT.ordinal()] = "mob.skeleton.hurt";
sounds[SLIME_IDLE.ordinal()] = "mob.slime"; sounds[SKELETON_WALK.ordinal()] = "mob.skeleton.step";
sounds[SLIME_ATTACK.ordinal()] = "mob.slimeattack"; sounds[SLIME_ATTACK.ordinal()] = "mob.slime.attack";
sounds[SPIDER_IDLE.ordinal()] = "mob.spider"; sounds[SLIME_WALK.ordinal()] = "mob.slime.small";
sounds[SPIDER_DEATH.ordinal()] = "mob.spiderdeath"; 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_BARK.ordinal()] = "mob.wolf.bark";
sounds[WOLF_DEATH.ordinal()] = "mob.wolf.death"; sounds[WOLF_DEATH.ordinal()] = "mob.wolf.death";
sounds[WOLF_GROWL.ordinal()] = "mob.wolf.growl"; sounds[WOLF_GROWL.ordinal()] = "mob.wolf.growl";
@ -118,17 +147,29 @@ public class CraftSound {
sounds[WOLF_HURT.ordinal()] = "mob.wolf.hurt"; sounds[WOLF_HURT.ordinal()] = "mob.wolf.hurt";
sounds[WOLF_PANT.ordinal()] = "mob.wolf.panting"; sounds[WOLF_PANT.ordinal()] = "mob.wolf.panting";
sounds[WOLF_SHAKE.ordinal()] = "mob.wolf.shake"; sounds[WOLF_SHAKE.ordinal()] = "mob.wolf.shake";
sounds[WOLF_WALK.ordinal()] = "mob.wolf.step";
sounds[WOLF_WHINE.ordinal()] = "mob.wolf.whine"; sounds[WOLF_WHINE.ordinal()] = "mob.wolf.whine";
sounds[ZOMBIE_METAL.ordinal()] = "mob.zombie.metal"; sounds[ZOMBIE_METAL.ordinal()] = "mob.zombie.metal";
sounds[ZOMBIE_WOOD.ordinal()] = "mob.zombie.wood"; sounds[ZOMBIE_WOOD.ordinal()] = "mob.zombie.wood";
sounds[ZOMBIE_WOODBREAK.ordinal()] = "mob.zombie.woodbreak"; sounds[ZOMBIE_WOODBREAK.ordinal()] = "mob.zombie.woodbreak";
sounds[ZOMBIE_IDLE.ordinal()] = "mob.zombie"; sounds[ZOMBIE_IDLE.ordinal()] = "mob.zombie.say";
sounds[ZOMBIE_DEATH.ordinal()] = "mob.zombiedeath"; sounds[ZOMBIE_DEATH.ordinal()] = "mob.zombie.death";
sounds[ZOMBIE_HURT.ordinal()] = "mob.zombiehurt"; 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_IDLE.ordinal()] = "mob.zombiepig.zpig";
sounds[ZOMBIE_PIG_ANGRY.ordinal()] = "mob.zombiepig.zpigangry"; sounds[ZOMBIE_PIG_ANGRY.ordinal()] = "mob.zombiepig.zpigangry";
sounds[ZOMBIE_PIG_DEATH.ordinal()] = "mob.zombiepig.zpigdeath"; sounds[ZOMBIE_PIG_DEATH.ordinal()] = "mob.zombiepig.zpigdeath";
sounds[ZOMBIE_PIG_HURT.ordinal()] = "mob.zombiepig.zpighurt"; sounds[ZOMBIE_PIG_HURT.ordinal()] = "mob.zombiepig.zpighurt";
// 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";
} }
public static String getSound(final Sound sound) { public static String getSound(final Sound sound) {