Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove internals from org.bukkit.Sound.

Browse Source 
The internal Minecraft names of Sounds should not be exposed in the API.
This commit is contained in:
Wesley Wolfe 2012-09-26 16:30:43 -05:00 committed by EvilSeph
parent bc6b976dac
commit 503151584c
1 changed files with 118 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

267
src/main/java/org/bukkit/Sound.java
View File

@ -1,8 +1,5 @@
package org.bukkit; package org.bukkit;
import java.util.HashMap;
import java.util.Map;
/** /**
* An Enum of Sounds the server is able to send to players. * An Enum of Sounds the server is able to send to players.
* <p /> * <p />
@ -10,152 +7,124 @@ import java.util.Map;
* There is no guarantee values will not be removed from this Enum. As such, you should not depend on the ordinal values of this class. * There is no guarantee values will not be removed from this Enum. As such, you should not depend on the ordinal values of this class.
*/ */
public enum Sound { public enum Sound {
AMBIENCE_CAVE("ambient.cave.cave"), AMBIENCE_CAVE,
AMBIENCE_RAIN("ambient.weather.rain"), AMBIENCE_RAIN,
AMBIENCE_THUNDER("ambient.weather.thunder"), AMBIENCE_THUNDER,
ARROW_HIT("random.bowhit"), ARROW_HIT,
ARROW_SHAKE("random.drr"), ARROW_SHAKE,
BREATH("random.breath"), BREATH,
BURP("random.burp"), BURP,
CHEST_CLOSE("random.chestclosed"), CHEST_CLOSE,
CHEST_OPEN("random.chestopen"), CHEST_OPEN,
CLICK("random.click"), CLICK,
DOOR_CLOSE("random.door_close"), DOOR_CLOSE,
DOOR_OPEN("random.door_open"), DOOR_OPEN,
DRINK("random.drink"), DRINK,
EAT("random.eat"), EAT,
EXPLODE("random.explode"), EXPLODE,
EXPLODE_OLD("random.old_explode"), EXPLODE_OLD,
FALL_BIG("damage.fallbig"), FALL_BIG,
FALL_SMALL("damage.fallsmall"), FALL_SMALL,
FIRE("fire.fire"), FIRE,
FIRE_IGNITE("fire.ignite"), FIRE_IGNITE,
FIZZ("random.fizz"), FIZZ,
FUSE("random.fuse"), FUSE,
HURT("random.hurt"), HURT,
HURT_FLESH("damage.hurtflesh"), HURT_FLESH,
ITEM_BREAK("random.break"), ITEM_BREAK,
ITEM_PICKUP("random.pop"), ITEM_PICKUP,
LAVA("liquid.lava"), LAVA,
LAVA_POP("liquid.lavapop"), LAVA_POP,
LEVEL_UP("random.levelup"), LEVEL_UP,
NOTE_PIANO("note.harp"), NOTE_PIANO,
NOTE_BASS_DRUM("note.bd"), NOTE_BASS_DRUM,
NOTE_STICKS("note.hat"), NOTE_STICKS,
NOTE_BASS_GUITAR("note.bassattack"), NOTE_BASS_GUITAR,
NOTE_SNARE_DRUM("note.snare"), NOTE_SNARE_DRUM,
// NOTE_BASS("note.bass"), // NOTE_BASS("note.bass"),
NOTE_PLING("note.pling"), NOTE_PLING,
ORB_PICKUP("random.orb"), ORB_PICKUP,
PISTON_EXTEND("tile.piston.out"), PISTON_EXTEND,
PISTON_RETRACT("tile.piston.in"), PISTON_RETRACT,
PORTAL("portal.portal"), PORTAL,
PORTAL_TRAVEL("portal.travel"), PORTAL_TRAVEL,
PORTAL_TRIGGER("portal.trigger"), PORTAL_TRIGGER,
SHOOT_ARROW("random.bow"), SHOOT_ARROW,
SPLASH("random.splash"), SPLASH,
SPLASH2("liquid.splash"), SPLASH2,
STEP_GRAVEL("step.gravel"), STEP_GRAVEL,
STEP_SAND("step.sand"), STEP_SAND,
STEP_SNOW("step.snow"), STEP_SNOW,
STEP_STONE("step.stone"), STEP_STONE,
STEP_WOOD("step.wood"), STEP_WOOD,
STEP_WOOL("step.wool"), STEP_WOOL,
WATER("liquid.water"), WATER,
WOOD_CLICK("random.wood click"), WOOD_CLICK,
// Mob sounds // Mob sounds
BLAZE_BREATH("mob.blaze.breath"), BLAZE_BREATH,
BLAZE_DEATH("mob.blaze.death"), BLAZE_DEATH,
BLAZE_HIT("mob.blaze.hit"), BLAZE_HIT,
CAT_HISS("mob.cat.hiss"), CAT_HISS,
CAT_HIT("mob.cat.hitt"), CAT_HIT,
CAT_MEOW("mob.cat.meow"), CAT_MEOW,
CAT_PURR("mob.cat.purr"), CAT_PURR,
CAT_PURREOW("mob.cat.purreow"), CAT_PURREOW,
CHICKEN_IDLE("mob.chicken"), CHICKEN_IDLE,
CHICKEN_HURT("mob.chickenhurt"), CHICKEN_HURT,
CHICKEN_EGG_POP("mob.chickenplop"), CHICKEN_EGG_POP,
COW_IDLE("mob.cow"), COW_IDLE,
COW_HURT("mob.cowhurt"), COW_HURT,
CREEPER_HISS("mob.creeper"), CREEPER_HISS,
CREEPER_DEATH("mob.creeperdeath"), CREEPER_DEATH,
ENDERMAN_DEATH("mob.endermen.death"), ENDERMAN_DEATH,
ENDERMAN_HIT("mob.endermen.hit"), ENDERMAN_HIT,
ENDERMAN_IDLE("mob.endermen.idle"), ENDERMAN_IDLE,
ENDERMAN_TELEPORT("mob.endermen.portal"), ENDERMAN_TELEPORT,
ENDERMAN_SCREAM("mob.endermen.scream"), ENDERMAN_SCREAM,
ENDERMAN_STARE("mob.endermen.stare"), ENDERMAN_STARE,
GHAST_SCREAM("mob.ghast.scream"), GHAST_SCREAM,
GHAST_SCREAM2("mob.ghast.affectionate scream"), GHAST_SCREAM2,
GHAST_CHARGE("mob.ghast.charge"), GHAST_CHARGE,
GHAST_DEATH("mob.ghast.death"), GHAST_DEATH,
GHAST_FIREBALL("mob.ghast.fireball"), GHAST_FIREBALL,
GHAST_MOAN("mob.ghast.moan"), GHAST_MOAN,
IRONGOLEM_DEATH("mob.irongolem.death"), IRONGOLEM_DEATH,
IRONGOLEM_HIT("mob.irongolem.hit"), IRONGOLEM_HIT,
IRONGOLEM_THROW("mob.irongolem.throw"), IRONGOLEM_THROW,
IRONGOLEM_WALK("mob.irongolem.walk"), IRONGOLEM_WALK,
MAGMACUBE_WALK("mob.magmacube.small"), MAGMACUBE_WALK,
MAGMACUBE_WALK2("mob.magmacube.big"), MAGMACUBE_WALK2,
MAGMACUBE_JUMP("mob.magmacube.jump"), MAGMACUBE_JUMP,
PIG_IDLE("mob.pig"), PIG_IDLE,
PIG_DEATH("mob.pigdeath"), PIG_DEATH,
SHEEP_IDLE("mob.sheep"), SHEEP_IDLE,
SILVERFISH_HIT("mob.silverfish.hit"), SILVERFISH_HIT,
SILVERFISH_KILL("mob.silverfish.kill"), SILVERFISH_KILL,
SILVERFISH_IDLE("mob.silverfish.say"), SILVERFISH_IDLE,
SILVERFISH_WALK("mob.silverfish.step"), SILVERFISH_WALK,
SKELETON_IDLE("mob.skeleton"), SKELETON_IDLE,
SKELETON_DEATH("mob.skeletondeath"), SKELETON_DEATH,
SKELETON_HURT("mob.skeletonhurt"), SKELETON_HURT,
SLIME_IDLE("mob.slime"), SLIME_IDLE,
SLIME_ATTACK("mob.slimeattack"), SLIME_ATTACK,
SPIDER_IDLE("mob.spider"), SPIDER_IDLE,
SPIDER_DEATH("mob.spiderdeath"), SPIDER_DEATH,
WOLF_BARK("mob.wolf.bark"), WOLF_BARK,
WOLF_DEATH("mob.wolf.death"), WOLF_DEATH,
WOLF_GROWL("mob.wolf.growl"), WOLF_GROWL,
WOLF_HOWL("mob.wolf.howl"), WOLF_HOWL,
WOLF_HURT("mob.wolf.hurt"), WOLF_HURT,
WOLF_PANT("mob.wolf.panting"), WOLF_PANT,
WOLF_SHAKE("mob.wolf.shake"), WOLF_SHAKE,
WOLF_WHINE("mob.wolf.whine"), WOLF_WHINE,
ZOMBIE_METAL("mob.zombie.metal"), ZOMBIE_METAL,
ZOMBIE_WOOD("mob.zombie.wood"), ZOMBIE_WOOD,
ZOMBIE_WOODBREAK("mob.zombie.woodbreak"), ZOMBIE_WOODBREAK,
ZOMBIE_IDLE("mob.zombie"), ZOMBIE_IDLE,
ZOMBIE_DEATH("mob.zombiedeath"), ZOMBIE_DEATH,
ZOMBIE_HURT("mob.zombiehurt"), ZOMBIE_HURT,
ZOMBIE_PIG_IDLE("mob.zombiepig.zpig"), ZOMBIE_PIG_IDLE,
ZOMBIE_PIG_ANGRY("mob.zombiepig.zpigangry"), ZOMBIE_PIG_ANGRY,
ZOMBIE_PIG_DEATH("mob.zombiepig.zpigdeath"), ZOMBIE_PIG_DEATH,
ZOMBIE_PIG_HURT("mob.zombiepig.zpighurt"); ZOMBIE_PIG_HURT;
private final String sound;
private static final Map<String, Sound> byName = new HashMap<String, Sound>();
Sound(String name) {
sound = name;
}
public String getSound() {
return sound;
}
/**
* Look up a sound by it's raw sound name
*
* @param name The Sounds raw name to look up
* @return Sound if it exists, null if not
*/
public static Sound getSound(String name) {
return byName.get(name);
}
static {
for (Sound sound : values()) {
byName.put(sound.getSound(), sound);
}
}
} }