From ea0539b24e5d1165e17f635f09d404d33d80ef05 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Tue, 1 Mar 2016 19:36:23 +0100 Subject: [PATCH] Fix indent and broken with setter --- .../massivecraft/massivecore/SoundEffect.java | 3 +- .../command/type/enumeration/TypeSound.java | 84 +++++++++---------- 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/com/massivecraft/massivecore/SoundEffect.java b/src/com/massivecraft/massivecore/SoundEffect.java index 2aa804d4..83589978 100644 --- a/src/com/massivecraft/massivecore/SoundEffect.java +++ b/src/com/massivecraft/massivecore/SoundEffect.java @@ -36,7 +36,8 @@ public final class SoundEffect implements Serializable // FIELDS: WITH // -------------------------------------------- // - public SoundEffect withSound(Sound sound) { return new SoundEffect(soundId, volume, pitch); } + public SoundEffect withSoundId(String soundId) { return new SoundEffect(soundId, volume, pitch); } + public SoundEffect withSound(Sound sound) { return new SoundEffect(TypeSound.get().getId(sound), volume, pitch); } public SoundEffect withVolume(float volume) { return new SoundEffect(soundId, volume, pitch); } public SoundEffect withPitch(float pitch) { return new SoundEffect(soundId, volume, pitch); } diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeSound.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeSound.java index 83fe7ac9..f48d09a2 100644 --- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeSound.java +++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeSound.java @@ -37,12 +37,12 @@ public class TypeSound extends TypeEnum "EXPLODE", "ENTITY_GENERIC_EXPLODE", "FALL_BIG", "ENTITY_GENERIC_BIG_FALL", "FALL_SMALL", "ENTITY_GENERIC_SMALL_FALL", - + "FIRE", "BLOCK_FIRE_AMBIENT", "FIRE_IGNITE", "ITEM_FLINTANDSTEEL_USE", "FIZZ", "ENTITY_GENERIC_EXTINGUISH_FIRE", "FUSE", "ENTITY_TNT_PRIMED", - + "GLASS", "BLOCK_GLASS_BREAK", "HURT_FLESH", "ENTITY_GENERIC_HURT", "ITEM_BREAK", "ENTITY_ITEM_BREAK", @@ -52,7 +52,7 @@ public class TypeSound extends TypeEnum "LEVEL_UP", "ENTITY_PLAYER_LEVELUP", "MINECART_BASE", "ENTITY_MINECART_RIDING", "MINECART_INSIDE", "ENTITY_MINECART_INSIDE", - + "NOTE_BASS", "BLOCK_NOTE_BASS", // NOTE: Duplicate since 1 less sound in 1.9. "NOTE_PIANO", "BLOCK_NOTE_HARP", "NOTE_BASS_DRUM", "BLOCK_NOTE_BASEDRUM", @@ -60,7 +60,7 @@ public class TypeSound extends TypeEnum "NOTE_BASS_GUITAR", "BLOCK_NOTE_BASS", // NOTE: Duplicate since 1 less sound in 1.9. "NOTE_SNARE_DRUM", "BLOCK_NOTE_SNARE", "NOTE_PLING", "BLOCK_NOTE_PLING", - + "ORB_PICKUP", "ENTITY_EXPERIENCE_ORB_PICKUP", "PISTON_EXTEND", "BLOCK_PISTON_EXTEND", "PISTON_RETRACT", "BLOCK_PISTON_CONTRACT", @@ -81,97 +81,97 @@ public class TypeSound extends TypeEnum "SWIM", "ENTITY_GENERIC_SWIM", "WATER", "BLOCK_WATER_AMBIENT", "WOOD_CLICK", "BLOCK_WOOD_BUTTON_CLICK_ON", - + // Mob sounds "BAT_DEATH", "ENTITY_BAT_DEATH", "BAT_HURT", "ENTITY_BAT_HURT", "BAT_IDLE", "ENTITY_BAT_AMBIENT", "BAT_LOOP", "ENTITY_BAT_LOOP", "BAT_TAKEOFF", "ENTITY_BAT_TAKEOFF", - + "BLAZE_BREATH", "ENTITY_BLAZE_AMBIENT", "BLAZE_DEATH", "ENTITY_BLAZE_DEATH", "BLAZE_HIT", "ENTITY_BLAZE_HURT", - + "CAT_HISS", "ENTITY_CAT_HISS", "CAT_HIT", "ENTITY_CAT_HURT", "CAT_MEOW", "ENTITY_CAT_AMBIENT", "CAT_PURR", "ENTITY_CAT_PURR", "CAT_PURREOW", "ENTITY_CAT_PURREOW", - + "CHICKEN_IDLE", "ENTITY_CHICKEN_AMBIENT", "CHICKEN_HURT", "ENTITY_CHICKEN_HURT", "CHICKEN_EGG_POP", "ENTITY_CHICKEN_EGG", "CHICKEN_WALK", "ENTITY_CHICKEN_STEP", - + "COW_IDLE", "ENTITY_COW_AMBIENT", "COW_HURT", "ENTITY_COW_HURT", "COW_WALK", "ENTITY_COW_STEP", - + "CREEPER_HISS", "ENTITY_CREEPER_PRIMED", "CREEPER_DEATH", "ENTITY_CREEPER_DEATH", - - "ENDERDRAGON_DEATH", "ENTITY_ENDERDRAGON_DEATH", + + "ENDERDRAGON_DEATH", "ENTITY_ENDERDRAGON_DEATH", "ENDERDRAGON_GROWL", "ENTITY_ENDERDRAGON_GROWL", "ENDERDRAGON_HIT", "ENTITY_ENDERDRAGON_HURT", "ENDERDRAGON_WINGS", "ENTITY_ENDERDRAGON_FLAP", - - "ENDERMAN_DEATH", "ENTITY_ENDERMEN_DEATH", + + "ENDERMAN_DEATH", "ENTITY_ENDERMEN_DEATH", "ENDERMAN_HIT", "ENTITY_ENDERMEN_HURT", "ENDERMAN_IDLE", "ENTITY_ENDERMEN_AMBIENT", "ENDERMAN_TELEPORT", "ENTITY_ENDERMEN_TELEPORT", "ENDERMAN_SCREAM", "ENTITY_ENDERMEN_SCREAM", "ENDERMAN_STARE", "ENTITY_ENDERMEN_STARE", - + // Really unsure about all of these - "GHAST_SCREAM", "ENTITY_GHAST_AMBIENT", + "GHAST_SCREAM", "ENTITY_GHAST_AMBIENT", "GHAST_SCREAM2", "ENTITY_GHAST_SCREAM", "GHAST_CHARGE", "ENTITY_GHAST_WARN", "GHAST_DEATH", "ENTITY_GHAST_DEATH", "GHAST_FIREBALL", "ENTITY_GHAST_SHOOT", "GHAST_MOAN", "ENTITY_GHAST_HURT", - - "IRONGOLEM_DEATH", "ENTITY_IRONGOLEM_DEATH", + + "IRONGOLEM_DEATH", "ENTITY_IRONGOLEM_DEATH", "IRONGOLEM_HIT", "ENTITY_IRONGOLEM_HURT", "IRONGOLEM_THROW", "ENTITY_IRONGOLEM_ATTACK", "IRONGOLEM_WALK", "ENTITY_IRONGOLEM_STEP", - + "MAGMACUBE_WALK", "ENTITY_MAGMACUBE_SQUISH", // TODO: This is a wild guess. "MAGMACUBE_WALK2", "ENTITY_MAGMACUBE_HURT", // TODO: This is a wild guess. "MAGMACUBE_JUMP", "ENTITY_MAGMACUBE_JUMP", - - "PIG_IDLE", "ENTITY_PIG_AMBIENT", + + "PIG_IDLE", "ENTITY_PIG_AMBIENT", "PIG_DEATH", "ENTITY_PIG_DEATH", "PIG_WALK", "ENTITY_PIG_STEP", - + "SHEEP_IDLE", "ENTITY_SHEEP_AMBIENT", "SHEEP_SHEAR", "ENTITY_SHEEP_SHEAR", "SHEEP_WALK", "ENTITY_SHEEP_STEP", - - "SILVERFISH_HIT", "ENTITY_SILVERFISH_HURT", + + "SILVERFISH_HIT", "ENTITY_SILVERFISH_HURT", "SILVERFISH_KILL", "ENTITY_SILVERFISH_DEATH", "SILVERFISH_IDLE", "ENTITY_SILVERFISH_AMBIENT", "SILVERFISH_WALK", "ENTITY_SILVERFISH_STEP", - - "SKELETON_IDLE", "ENTITY_SKELETON_AMBIENT", + + "SKELETON_IDLE", "ENTITY_SKELETON_AMBIENT", "SKELETON_DEATH", "ENTITY_SKELETON_DEATH", "SKELETON_HURT", "ENTITY_SKELETON_HURT", "SKELETON_WALK", "ENTITY_SKELETON_STEP", - + "SLIME_ATTACK", "ENTITY_SLIME_ATTACK", "SLIME_WALK", "ENTITY_SLIME_SQUISH", "SLIME_WALK2", "ENTITY_SLIME_JUMP", - - "SPIDER_IDLE", "ENTITY_SPIDER_AMBIENT", + + "SPIDER_IDLE", "ENTITY_SPIDER_AMBIENT", "SPIDER_DEATH", "ENTITY_SPIDER_DEATH", "SPIDER_WALK", "ENTITY_SPIDER_STEP", - - "WITHER_DEATH", "ENTITY_WITHER_DEATH", + + "WITHER_DEATH", "ENTITY_WITHER_DEATH", "WITHER_HURT", "ENTITY_WITHER_HURT", "WITHER_IDLE", "ENTITY_WITHER_AMBIENT", "WITHER_SHOOT", "ENTITY_WITHER_SHOOT", "WITHER_SPAWN", "ENTITY_WITHER_SPAWN", - + "WOLF_BARK", "ENTITY_WOLF_AMBIENT", "WOLF_DEATH", "ENTITY_WOLF_DEATH", "WOLF_GROWL", "ENTITY_WOLF_GROWL", @@ -181,7 +181,7 @@ public class TypeSound extends TypeEnum "WOLF_SHAKE", "ENTITY_WOLF_SHAKE", "WOLF_WALK", "ENTITY_WOLF_STEP", "WOLF_WHINE", "ENTITY_WOLF_WHINE", - + "ZOMBIE_METAL", "ENTITY_ZOMBIE_ATTACK_IRON_DOOR", "ZOMBIE_WOOD", "ENTITY_ZOMBIE_ATTACK_DOOR_WOOD", "ZOMBIE_WOODBREAK", "ENTITY_ZOMBIE_BREAK_DOOR_WOOD", @@ -192,12 +192,12 @@ public class TypeSound extends TypeEnum "ZOMBIE_UNFECT", "ENTITY_ZOMBIE_VILLAGER_CONVERTED", // TODO: I'm not sure about this one. "ZOMBIE_REMEDY", "ENTITY_ZOMBIE_VILLAGER_CURE", // TODO: I'm not sure about this one. "ZOMBIE_WALK", "ENTITY_ZOMBIE_STEP", - + "ZOMBIE_PIG_IDLE", "ENTITY_ZOMBIE_PIG_AMBIENT", "ZOMBIE_PIG_ANGRY", "ENTITY_ZOMBIE_PIG_ANGRY", "ZOMBIE_PIG_DEATH", "ENTITY_ZOMBIE_PIG_DEATH", "ZOMBIE_PIG_HURT", "ENTITY_ZOMBIE_PIG_HURT", - + // Dig Sounds "DIG_WOOL", "BLOCK_CLOTH_BREAK", "DIG_GRASS", "BLOCK_GRASS_BREAK", @@ -206,7 +206,7 @@ public class TypeSound extends TypeEnum "DIG_SNOW", "BLOCK_SNOW_BREAK", "DIG_STONE", "BLOCK_STONE_BREAK", "DIG_WOOD", "BLOCK_WOOD_BREAK", - + // Fireworks "FIREWORK_BLAST", "ENTITY_FIREWORK_BLAST", "FIREWORK_BLAST2", "ENTITY_FIREWORK_BLAST_FAR", @@ -216,7 +216,7 @@ public class TypeSound extends TypeEnum "FIREWORK_TWINKLE2", "ENTITY_FIREWORK_TWINKLE_FAR", "FIREWORK_LAUNCH", "ENTITY_FIREWORK_LAUNCH", "SUCCESSFUL_HIT", "ENTITY_FIREWORK_SHOOT", - + // Horses "HORSE_ANGRY", "ENTITY_HORSE_ANGRY", "HORSE_ARMOR", "ENTITY_HORSE_ARMOR", @@ -230,20 +230,20 @@ public class TypeSound extends TypeEnum "HORSE_SADDLE", "ENTITY_HORSE_SADDLE", "HORSE_SOFT", "ENTITY_HORSE_STEP", "HORSE_WOOD", "ENTITY_HORSE_STEP_WOOD", - - "DONKEY_ANGRY", "ENTITY_DONKEY_ANGRY", + + "DONKEY_ANGRY", "ENTITY_DONKEY_ANGRY", "DONKEY_DEATH", "ENTITY_DONKEY_DEATH", "DONKEY_HIT", "ENTITY_DONKEY_HURT", "DONKEY_IDLE", "ENTITY_DONKEY_AMBIENT", - + "HORSE_SKELETON_DEATH", "ENTITY_SKELETON_HORSE_DEATH", "HORSE_SKELETON_HIT", "ENTITY_SKELETON_HORSE_HURT", "HORSE_SKELETON_IDLE", "ENTITY_SKELETON_HORSE_AMBIENT", - + "HORSE_ZOMBIE_DEATH", "ENTITY_ZOMBIE_HORSE_DEATH", "HORSE_ZOMBIE_HIT", "ENTITY_ZOMBIE_HORSE_HURT", "HORSE_ZOMBIE_IDLE", "ENTITY_ZOMBIE_HORSE_AMBIENT", - + // Villager "VILLAGER_DEATH", "ENTITY_VILLAGER_DEATH", "VILLAGER_HAGGLE", "ENTITY_VILLAGER_TRADING",