Rename and clean up MapleJob

src/main/java/server/MapleItemInformationProvider.java

@@ -324,7 +324,7 @@ public class MapleItemInformationProvider {
 
         // thanks GMChuck for detecting player sensitive data being cached into getSlotMax
         if (ItemConstants.isThrowingStar(itemId)) {
-            if(c.getPlayer().getJob().isA(MapleJob.NIGHTWALKER1)) {
+            if(c.getPlayer().getJob().isA(Job.NIGHTWALKER1)) {
                 ret += c.getPlayer().getSkillLevel(SkillFactory.getSkill(NightWalker.CLAW_MASTERY)) * 10;
             } else {
                 ret += c.getPlayer().getSkillLevel(SkillFactory.getSkill(Assassin.CLAW_MASTERY)) * 10;
@@ -1587,7 +1587,7 @@ public class MapleItemInformationProvider {
             return items;
         }
         Collection<Item> itemz = new LinkedList<>();
-        if (chr.getJob() == MapleJob.SUPERGM || chr.getJob() == MapleJob.GM) {
+        if (chr.getJob() == Job.SUPERGM || chr.getJob() == Job.GM) {
             for (Item item : items) {
                 Equip equip = (Equip) item;
                 equip.wear(true);
@@ -1609,7 +1609,7 @@ public class MapleItemInformationProvider {
             ex.printStackTrace();
          }*/
         int tdex = chr.getDex(), tstr = chr.getStr(), tint = chr.getInt(), tluk = chr.getLuk(), fame = chr.getFame();
-        if (chr.getJob() != MapleJob.SUPERGM || chr.getJob() != MapleJob.GM) {
+        if (chr.getJob() != Job.SUPERGM || chr.getJob() != Job.GM) {
             for (Item item : inv.list()) {
                 Equip equip = (Equip) item;
                 tdex += equip.getDex();
@@ -1675,7 +1675,7 @@ public class MapleItemInformationProvider {
             return false;
         }
 
-        if (chr.getJob() == MapleJob.SUPERGM || chr.getJob() == MapleJob.GM) {
+        if (chr.getJob() == Job.SUPERGM || chr.getJob() == Job.GM) {
             equip.wear(true);
             return true;
         }

src/main/java/server/MapleStatEffect.java

@@ -1395,10 +1395,10 @@ public class MapleStatEffect {
         if (primary) {
             if (mpCon != 0) {
                 double mod = 1.0;
-                boolean isAFpMage = applyfrom.getJob().isA(MapleJob.FP_MAGE);
-                boolean isCygnus = applyfrom.getJob().isA(MapleJob.BLAZEWIZARD2);
-                boolean isEvan = applyfrom.getJob().isA(MapleJob.EVAN7);
-                if (isAFpMage || isCygnus || isEvan || applyfrom.getJob().isA(MapleJob.IL_MAGE)) {
+                boolean isAFpMage = applyfrom.getJob().isA(Job.FP_MAGE);
+                boolean isCygnus = applyfrom.getJob().isA(Job.BLAZEWIZARD2);
+                boolean isEvan = applyfrom.getJob().isA(Job.EVAN7);
+                if (isAFpMage || isCygnus || isEvan || applyfrom.getJob().isA(Job.IL_MAGE)) {
                     Skill amp = isAFpMage ? SkillFactory.getSkill(FPMage.ELEMENT_AMPLIFICATION) : (isCygnus ? SkillFactory.getSkill(BlazeWizard.ELEMENT_AMPLIFICATION) : (isEvan ? SkillFactory.getSkill(Evan.MAGIC_AMPLIFICATION) : SkillFactory.getSkill(ILMage.ELEMENT_AMPLIFICATION)));
                     int ampLevel = applyfrom.getSkillLevel(amp);
                     if (ampLevel > 0) {
@@ -1421,7 +1421,7 @@ public class MapleStatEffect {
     }
 
     private int alchemistModifyVal(Character chr, int val, boolean withX) {
-        if (!skill && (chr.getJob().isA(MapleJob.HERMIT) || chr.getJob().isA(MapleJob.NIGHTWALKER3))) {
+        if (!skill && (chr.getJob().isA(Job.HERMIT) || chr.getJob().isA(Job.NIGHTWALKER3))) {
             MapleStatEffect alchemistEffect = getAlchemistEffect(chr);
             if (alchemistEffect != null) {
                 return (int) (val * ((withX ? alchemistEffect.getX() : alchemistEffect.getY()) / 100.0));

src/main/java/server/life/MapleMonster.java

@@ -1204,7 +1204,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
             overtimeAction = new DamageTask(poisonDamage, from, status, 0);
             overtimeDelay = 1000;
         } else if (venom) {
-            if (from.getJob() == MapleJob.NIGHTLORD || from.getJob() == MapleJob.SHADOWER || from.getJob().isA(MapleJob.NIGHTWALKER3)) {
+            if (from.getJob() == Job.NIGHTLORD || from.getJob() == Job.SHADOWER || from.getJob().isA(Job.NIGHTWALKER3)) {
                 int poisonLevel, matk, jobid = from.getJob().getId();
                 int skillid = (jobid == 412 ? NightLord.VENOMOUS_STAR : (jobid == 422 ? Shadower.VENOMOUS_STAB : NightWalker.VENOM));
                 poisonLevel = from.getSkillLevel(SkillFactory.getSkill(skillid));

src/main/java/server/quest/actions/SkillAction.java

@@ -22,7 +22,7 @@
 package server.quest.actions;
 
 import client.Character;
-import client.MapleJob;
+import client.Job;
 import client.Skill;
 import client.SkillFactory;
 import provider.MapleData;
@@ -114,7 +114,7 @@ public class SkillAction extends MapleQuestAction {
 			return masterLevel;
 		}
 		
-		public boolean jobsContains(MapleJob job) {
+		public boolean jobsContains(Job job) {
 			return jobs.contains(job.getId());
 		}
 		

src/main/java/server/quest/requirements/JobRequirement.java

@@ -22,7 +22,7 @@
 package server.quest.requirements;
 
 import client.Character;
-import client.MapleJob;
+import client.Job;
 import provider.MapleData;
 import provider.MapleDataTool;
 import server.quest.MapleQuest;
@@ -58,7 +58,7 @@ public class JobRequirement extends MapleQuestRequirement {
 	@Override
 	public boolean check(Character chr, Integer npcid) {
 		for(Integer job : jobs) {
-			if (chr.getJob().equals(MapleJob.getById(job)) || chr.isGM()) {
+			if (chr.getJob().equals(Job.getById(job)) || chr.isGM()) {
 				return true;
 			}
 		}