Discripline type enum created

src/engine/Enum.java

@@ -46,7 +46,7 @@ public class Enum {
         EXPLOIT,
         BUG,
         GAME_STOPPER,
-        TECH_SUPPORT;
+        TECH_SUPPORT
 
     }
 
@@ -112,7 +112,7 @@ public class Enum {
         Undead,
         Nephilim,
         Vampire,
-        SiegeEngineer;
+        SiegeEngineer
 
     }
 
@@ -120,7 +120,7 @@ public class Enum {
         MALE,
         FEMALE,
         FUZZY,
-        OTHER;
+        OTHER
     }
 
     public enum RaceType {
@@ -155,13 +155,13 @@ public class Enum {
         VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1);
 
         @SuppressWarnings("unchecked")
-        private static HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();
+        private static final HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();
 
         int runeID;
-        private MonsterType monsterType;
-        private CharacterSex characterSex;
-        private RunSpeed runSpeed;
-        private float scaleHeight;
+        private final MonsterType monsterType;
+        private final CharacterSex characterSex;
+        private final RunSpeed runSpeed;
+        private final float scaleHeight;
 
         RaceType(int runeID, MonsterType aggroType, RunSpeed runspeed, CharacterSex characterSex, float scaleHeight) {
             this.runeID = runeID;
@@ -210,13 +210,13 @@ public class Enum {
         CENTAUR(6.1900001f, 16.940001f, 5.5500002f, 16.940001f, 6.3299999f, 18.379999f, 6.5f),
         MINOTAUR(6.6300001f, 15.95f, 4.2199998f, 15.95f, 6.3299999f, 18.379999f, 6.5f);
 
-        private float walkStandard;
-        private float walkCombat;
-        private float runStandard;
-        private float runCombat;
-        private float swim;
-        private float flyRun;
-        private float flyWalk;
+        private final float walkStandard;
+        private final float walkCombat;
+        private final float runStandard;
+        private final float runCombat;
+        private final float swim;
+        private final float flyRun;
+        private final float flyWalk;
 
         RunSpeed(float walkStandard, float runStandard, float walkCombat, float runCombat, float flyWalk, float flyRun, float swim) {
             this.walkStandard = walkStandard;
@@ -310,13 +310,13 @@ public class Enum {
 
     public enum PvpHistoryType {
         KILLS,
-        DEATHS;
+        DEATHS
     }
 
     public enum ChatMessageType {
         ERROR,
         INFO,
-        MOTD;
+        MOTD
     }
 
     public enum DataRecordType {
@@ -327,7 +327,7 @@ public class Enum {
         CITY,
         ZONE,
         REALM,
-        MINE;
+        MINE
     }
 
     public enum RecordEventType {
@@ -338,7 +338,7 @@ public class Enum {
         TRANSFER,
         PENDING,
         DEFEND,
-        LOST; // Realm event
+        LOST // Realm event
     }
 
     public enum CharterType {
@@ -346,8 +346,8 @@ public class Enum {
         MERCANTILE(-15978914, 5060400),
         BELLIGERENT(762228431, 5060800);
 
-        private int charterID;
-        private int meshID;
+        private final int charterID;
+        private final int meshID;
 
         CharterType(int charterID, int meshID) {
             this.charterID = charterID;
@@ -402,7 +402,7 @@ public class Enum {
         Npc,
         PlayerCharacter,
         Account,
-        Mob;
+        Mob
     }
 
     public enum SiegePhase {
@@ -410,20 +410,20 @@ public class Enum {
         CHALLENGE,
         STANDOFF,
         WAR,
-        CEASEFIRE;
+        CEASEFIRE
     }
 
     public enum SiegeResult {
         PENDING,
         DEFEND,
         DESTROY,
-        CAPTURE;
+        CAPTURE
     }
 
     public enum TaxType {
         PROFIT,
         WEEKLY,
-        NONE;
+        NONE
 
     }
 
@@ -1261,7 +1261,7 @@ public class Enum {
         SITTING,
         RUNNING,
         FLYING,
-        SWIMMING;
+        SWIMMING
     }
 
     public enum DoorState {
@@ -1269,7 +1269,7 @@ public class Enum {
         OPEN,
         CLOSED,
         LOCKED,
-        UNLOCKED;
+        UNLOCKED
     }
 
     // Used with stored procedure GET_UID_ENUM() for
@@ -1290,11 +1290,9 @@ public class Enum {
         SHRINE,
         WORLDSERVER,
         ZONE,
-        WAREHOUSE;
+        WAREHOUSE
     }
 
-    ;
-
     /**
      * Enumeration of Building Protection Status stored in the database as a
      * mysql enumfield. WARNING: This enumeration is fragile. Do not rename. Do
@@ -1309,11 +1307,64 @@ public class Enum {
         CONTRACT,
         DESTROYED,
         PENDING,
-        NPC;
+        NPC
+    }
+
+    public enum DisciplineType {
+
+        Alchemist,
+        Animator,
+        Archer,
+        Berserker,
+        BlackMask,
+        Blacksmith,
+        BladeMaster,
+        BladeWeaver,
+        BloodProphet,
+        BountyHunter,
+        Clanwarden,
+        Commander,
+        DarkKnight,
+        Duelist,
+        ForgeMaster,
+        GiantKiller,
+        Gladiator,
+        Huntsman,
+        Knight,
+        RatCatcher,
+        RuneCaster,
+        Enchanter,
+        StormLord,
+        Summoner,
+        Sundancer,
+        Trainer,
+        Traveler,
+        UndeadHunter,
+        Werebear,
+        Wererat,
+        Werewolf,
+        Wyrmslayer,
+        Conjurer,
+        Darksworn,
+        Valkyr,
+        BloodHorn,
+        Shroudborne,
+        Archmage,
+        Thrall,
+        Artillerist,
+        Savant,
+        SkyDancer,
+        Prospector,
+        Belgosch,
+        Drannok,
+        Gorgoi,
+        Strigoi,
+        Sapper,
+        Saboteur,
+        BattleMagus,
+        Sanctifier,
     }
 
-    ;
-
     public enum CharacterSkills {
 
         Archery((1L << 1), -529201545, 20),
@@ -1382,7 +1433,7 @@ public class Enum {
 
         private long flag;
         private int token;
-        private int reqLvl;
+        private final int reqLvl;
 
         CharacterSkills(long flag, int token, int reqLvl) {
             this.flag = flag;
@@ -1421,8 +1472,6 @@ public class Enum {
         }
     }
 
-    ;
-
     public enum GuildHistoryType {
         JOIN(1),
         LEAVE(4),
@@ -1443,14 +1492,14 @@ public class Enum {
     public enum SexType {
         NONE,
         MALE,
-        FEMALE;
+        FEMALE
     }
 
     public enum ClassType {
         FIGHTER,
         HEALER,
         ROGUE,
-        MAGE;
+        MAGE
     }
 
     public enum PromoteType {
@@ -1478,7 +1527,7 @@ public class Enum {
         Necromancer(SexType.NONE),
         ;
 
-        private SexType sexRestriction;
+        private final SexType sexRestriction;
 
         PromoteType(SexType sexRestriction) {
             this.sexRestriction = sexRestriction;
@@ -1660,13 +1709,13 @@ public class Enum {
         REGEN,
         FLIGHT,
         LOCATION,
-        MOVEMENTSTATE;
+        MOVEMENTSTATE
     }
 
     public enum ServerType {
         WORLDSERVER,
         LOGINSERVER,
-        NONE;
+        NONE
     }
 
     public enum ChatChannel implements EnumBitSetHelper<ChatChannel> {
@@ -1720,7 +1769,7 @@ public class Enum {
         Thief,
         Warlock,
         Warrior,
-        Wizard;
+        Wizard
 
     }
 
@@ -1728,13 +1777,13 @@ public class Enum {
         RecommendedAlly,
         RecommendedEnemy,
         Ally,
-        Enemy;
+        Enemy
     }
 
     public enum FriendStatus {
         Available,
         Away,
-        Busy;
+        Busy
     }
 
     public enum ProfitType {
@@ -1749,7 +1798,7 @@ public class Enum {
 
         public String dbField;
 
-        private ProfitType(String dbField) {
+        ProfitType(String dbField) {
             this.dbField = dbField;
         }
     }
@@ -1842,17 +1891,15 @@ public class Enum {
         WorldServerInfoSnapshot,
         Shrine,
         Zone,
-        Transaction;
+        Transaction
     }
 
     public enum ContainerType {
         BANK,
         INVENTORY,
-        VAULT;
+        VAULT
     }
 
-    ;
-
     public enum CompoundCurveType {
         DefaultFlat(0),
         DefaultSlope(1),
@@ -2160,7 +2207,7 @@ public class Enum {
 
         private final double value;
 
-        private CompoundCurveType(double value) {
+        CompoundCurveType(double value) {
 
             this.value = value;
         }
@@ -2183,7 +2230,7 @@ public class Enum {
         Sit,
         TakeDamage,
         TerritoryClaim,
-        UnEquip;
+        UnEquip
     }
 
     public enum PowerSubType {
@@ -2193,7 +2240,7 @@ public class Enum {
         DamageType1,
         DamageType2,
         DamageType3,
-        Cancel;
+        Cancel
     }
 
     public enum PowerCategoryType {
@@ -2228,7 +2275,7 @@ public class Enum {
         RECALL,
         SPIREPROOFTELEPORT,
         SPIREDISABLE,
-        THIEF;
+        THIEF
     }
 
     public enum PowerTargetType {
@@ -2247,7 +2294,7 @@ public class Enum {
         JEWELRY,
         WEAPONARMOR,
         ARMOR,
-        ITEM;
+        ITEM
     }
 
     public enum objectMaskType {
@@ -2280,7 +2327,7 @@ public class Enum {
         BANK,
         VAULT,
         FORGE,
-        WAREHOUSE;
+        WAREHOUSE
     }
 
     public enum ItemSlotType implements EnumBitSetHelper<ItemSlotType> {
@@ -2301,7 +2348,7 @@ public class Enum {
         UPARM,
         WINGS,
         BEARD,
-        HAIR;
+        HAIR
     }
 
     public enum CityBoundsType {
@@ -2603,12 +2650,12 @@ public class Enum {
                 EnumSet.of(MonsterType.Aracoix),
                 EnumSet.allOf(SexType.class));
 
-        private final String name;
-        private final String[][] ranks;    //Stored Rank#->Gender(M,F)
-        private final String[] leadershipTypes;
         public final EnumSet<PromoteType> requiredClasses;
         public final EnumSet<MonsterType> requiredRaces;
         public final EnumSet<SexType> sexRequired;
+        private final String name;
+        private final String[][] ranks;    //Stored Rank#->Gender(M,F)
+        private final String[] leadershipTypes;
 
         GuildCharterType(String name, String[][] ranks, String[] leadershipTypes, EnumSet<PromoteType> requiredClasses,
                          EnumSet<MonsterType> requiredRaces, EnumSet<SexType> sexRequired) {
@@ -2728,7 +2775,7 @@ public class Enum {
     public enum MinionClass {
         MELEE,
         ARCHER,
-        MAGE;
+        MAGE
     }
 
     public enum MinionType {
@@ -2798,14 +2845,14 @@ public class Enum {
             return race;
         }
 
-        public Boolean isMage(){
+        public Boolean isMage() {
             return this.minionClass.ordinal() == MinionClass.MAGE.ordinal();
         }
     }
 
     public enum GridObjectType {
         STATIC,
-        DYNAMIC;
+        DYNAMIC
     }
 
     public enum SupportMsgType {
@@ -2908,7 +2955,7 @@ public class Enum {
     public enum AccountStatus {
         BANNED,
         ACTIVE,
-        ADMIN;
+        ADMIN
     }
 
     public enum MobBehaviourType {
@@ -2973,6 +3020,6 @@ public class Enum {
         GUARDWALLARCHER,
         PET,
         CHARMED,
-        SIEGEENGINE;
+        SIEGEENGINE
     }
 }