Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 21:19:00 +01:00
Code Issues Projects Releases Wiki Activity

[Bleeding] Correct naming of sounds for 1.7. Fixes BUKKIT-5065

Browse Source 
Several sounds were renamed in Minecraft 1.7, and have been updated
accordingly. Additionally, two sounds, HURT and BREATH, were removed from
Minecraft.
This commit is contained in:
GJ 2013-12-06 10:36:20 -05:00 committed by Nate Mortensen
parent 24ff27b408
commit cee6a7bab5
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/java/org/bukkit/craftbukkit/CraftSound.java
View File

@ -14,9 +14,9 @@ public class CraftSound {
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");
set(HURT_FLESH, "game.neutral.hurt");
set(FALL_BIG, "game.neutral.hurt.fall.big");
set(FALL_SMALL, "game.neutral.hurt.fall.small");
// Dig Sounds
set(DIG_WOOL, "dig.cloth");
set(DIG_GRASS, "dig.grass");
@ -25,7 +25,6 @@ public class CraftSound {
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");
@ -38,8 +37,8 @@ public class CraftSound {
set(FIREWORK_TWINKLE2, "fireworks.twinkle_far");
set(FIREWORK_LAUNCH, "fireworks.launch");
// Liquid
set(SPLASH2, "liquid.splash");
set(SWIM, "liquid.swim");
set(SPLASH2, "game.neutral.swim.splash");
set(SWIM, "game.neutral.swim");
set(WATER, "liquid.water");
set(LAVA, "liquid.lava");
set(LAVA_POP, "liquid.lavapop");
@ -85,26 +84,28 @@ public class CraftSound {
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(HORSE_ANGRY, "mob.horse.angry");
set(HORSE_ARMOR, "mob.horse.armor");
set(HORSE_BREATHE, "mob.horse.breathe");
set(HORSE_DEATH, "mob.horse.death");
set(HORSE_GALLOP, "mob.horse.gallop");
set(HORSE_HIT, "mob.horse.hit");
set(HORSE_IDLE, "mob.horse.idle");
set(HORSE_JUMP, "mob.horse.jump");
set(HORSE_LAND, "mob.horse.land");
set(HORSE_SADDLE, "mob.horse.leather");
set(HORSE_SOFT, "mob.horse.soft");
set(HORSE_WOOD, "mob.horse.wood");
set(DONKEY_ANGRY, "mob.horse.donkey.angry");
set(DONKEY_DEATH, "mob.horse.donkey.death");
set(DONKEY_HIT, "mob.horse.donkey.hit");
set(DONKEY_IDLE, "mob.horse.donkey.idle");
set(HORSE_SKELETON_DEATH, "mob.horse.skeleton.death");
set(HORSE_SKELETON_HIT, "mob.horse.skeleton.hit");
set(HORSE_SKELETON_IDLE, "mob.horse.skeleton.idle");
set(HORSE_ZOMBIE_DEATH, "mob.horse.zombie.death");
set(HORSE_ZOMBIE_HIT, "mob.horse.zombie.hit");
set(HORSE_ZOMBIE_IDLE, "mob.horse.zombie.idle");
set(IRONGOLEM_DEATH, "mob.irongolem.death");
set(IRONGOLEM_HIT, "mob.irongolem.hit");
set(IRONGOLEM_THROW, "mob.irongolem.throw");
@ -161,6 +162,7 @@ public class CraftSound {
set(ZOMBIE_INFECT, "mob.zombie.infect");
set(ZOMBIE_UNFECT, "mob.zombie.unfect");
set(ZOMBIE_REMEDY, "mob.zombie.remedy");
set(ZOMBIE_WALK, "mob.zombie.step");
set(ZOMBIE_PIG_IDLE, "mob.zombiepig.zpig");
set(ZOMBIE_PIG_ANGRY, "mob.zombiepig.zpigangry");
set(ZOMBIE_PIG_DEATH, "mob.zombiepig.zpigdeath");
@ -184,11 +186,9 @@ public class CraftSound {
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");
@ -196,8 +196,8 @@ public class CraftSound {
set(EAT, "random.eat");
set(EXPLODE, "random.explode");
set(FIZZ, "random.fizz");
set(FUSE, "random.fuse");
set(GLASS, "random.glass");
set(FUSE, "creeper.primed");
set(GLASS, "dig.glass");
set(LEVEL_UP, "random.levelup");
set(ORB_PICKUP, "random.orb");
set(ITEM_PICKUP, "random.pop");