Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix indent and broken with setter

Browse Source
This commit is contained in:
Olof Larsson 2016-03-01 19:36:23 +01:00
parent 5b835073e0
commit ea0539b24e
2 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/massivecraft/massivecore/SoundEffect.java
View File

@ -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); }

20
src/com/massivecraft/massivecore/command/type/enumeration/TypeSound.java
View File

@ -111,12 +111,12 @@ public class TypeSound extends TypeEnum<Sound>
"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",
@ -124,14 +124,14 @@ public class TypeSound extends TypeEnum<Sound>
"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",
@ -140,7 +140,7 @@ public class TypeSound extends TypeEnum<Sound>
"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",
@ -148,12 +148,12 @@ public class TypeSound extends TypeEnum<Sound>
"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",
@ -162,11 +162,11 @@ public class TypeSound extends TypeEnum<Sound>
"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",
@ -231,7 +231,7 @@ public class TypeSound extends TypeEnum<Sound>
"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",