BETA: '''!PcRace''' to upper case.

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTreesData.java

@@ -1248,7 +1248,7 @@ public final class SkillTreesData extends DocumentParser
 		int dwarvenOnlyFishingSkillCount = 0;
 		for (L2SkillLearn fishSkill : _fishingSkillTree.values())
 		{
-			if (fishSkill.getRaces().contains(PcRace.Dwarf))
+			if (fishSkill.getRaces().contains(PcRace.DWARF))
 			{
 				dwarvenOnlyFishingSkillCount++;
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/PcRace.java

@@ -18,16 +18,12 @@
  */
 package com.l2jserver.gameserver.enums;
 
-/**
- * This class defines all races (human, elf, darkelf, orc, dwarf) that a player can chose.
- * @version $Revision: 1.2.4.2 $ $Date: 2005/03/27 15:29:32 $
- */
 public enum PcRace
 {
-	Human,
-	Elf,
-	DarkElf,
-	Orc,
-	Dwarf,
-	Kamael;
+	HUMAN,
+	ELF,
+	DARK_ELF,
+	ORC,
+	DWARF,
+	KAMAEL;
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -12227,7 +12227,7 @@ public final class L2PcInstance extends L2Playable
 		{
 			ivlim = Config.INVENTORY_MAXIMUM_GM;
 		}
-		else if (getRace() == PcRace.Dwarf)
+		else if (getRace() == PcRace.DWARF)
 		{
 			ivlim = Config.INVENTORY_MAXIMUM_DWARF;
 		}
@@ -12243,7 +12243,7 @@ public final class L2PcInstance extends L2Playable
 	public int getWareHouseLimit()
 	{
 		int whlim;
-		if (getRace() == PcRace.Dwarf)
+		if (getRace() == PcRace.DWARF)
 		{
 			whlim = Config.WAREHOUSE_SLOTS_DWARF;
 		}
@@ -12261,7 +12261,7 @@ public final class L2PcInstance extends L2Playable
 	{
 		int pslim;
 		
-		if (getRace() == PcRace.Dwarf)
+		if (getRace() == PcRace.DWARF)
 		{
 			pslim = Config.MAX_PVTSTORESELL_SLOTS_DWARF;
 		}
@@ -12279,7 +12279,7 @@ public final class L2PcInstance extends L2Playable
 	{
 		int pblim;
 		
-		if (getRace() == PcRace.Dwarf)
+		if (getRace() == PcRace.DWARF)
 		{
 			pblim = Config.MAX_PVTSTOREBUY_SLOTS_DWARF;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterDElfInstance.java

@@ -37,6 +37,6 @@ public final class L2VillageMasterDElfInstance extends L2VillageMasterInstance
 			return false;
 		}
 		
-		return pclass.isOfRace(PcRace.DarkElf);
+		return pclass.isOfRace(PcRace.DARK_ELF);
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterDwarfInstance.java

@@ -37,6 +37,6 @@ public final class L2VillageMasterDwarfInstance extends L2VillageMasterInstance
 			return false;
 		}
 		
-		return pclass.isOfRace(PcRace.Dwarf);
+		return pclass.isOfRace(PcRace.DWARF);
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterFighterInstance.java

@@ -38,7 +38,7 @@ public final class L2VillageMasterFighterInstance extends L2VillageMasterInstanc
 			return false;
 		}
 		
-		return pclass.isOfRace(PcRace.Human) || pclass.isOfRace(PcRace.Elf);
+		return pclass.isOfRace(PcRace.HUMAN) || pclass.isOfRace(PcRace.ELF);
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java

@@ -385,12 +385,12 @@ public class L2VillageMasterInstance extends L2NpcInstance
 					}
 					else
 					{
-						if ((player.getRace() == PcRace.Elf) || (player.getRace() == PcRace.DarkElf))
+						if ((player.getRace() == PcRace.ELF) || (player.getRace() == PcRace.DARK_ELF))
 						{
 							html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Fail_Elves.htm");
 							player.sendPacket(html);
 						}
-						else if (player.getRace() == PcRace.Kamael)
+						else if (player.getRace() == PcRace.KAMAEL)
 						{
 							html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Fail_Kamael.htm");
 							player.sendPacket(html);
@@ -686,7 +686,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
 	
 	protected String getSubClassMenu(PcRace pRace)
 	{
-		if (Config.ALT_GAME_SUBCLASS_EVERYWHERE || (pRace != PcRace.Kamael))
+		if (Config.ALT_GAME_SUBCLASS_EVERYWHERE || (pRace != PcRace.KAMAEL))
 		{
 			return "data/html/villagemaster/SubClass.htm";
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterKamaelInstance.java

@@ -34,7 +34,7 @@ public final class L2VillageMasterKamaelInstance extends L2VillageMasterInstance
 	@Override
 	protected final String getSubClassMenu(PcRace pRace)
 	{
-		if (Config.ALT_GAME_SUBCLASS_EVERYWHERE || (pRace == PcRace.Kamael))
+		if (Config.ALT_GAME_SUBCLASS_EVERYWHERE || (pRace == PcRace.KAMAEL))
 		{
 			return "data/html/villagemaster/SubClass.htm";
 		}
@@ -80,6 +80,6 @@ public final class L2VillageMasterKamaelInstance extends L2VillageMasterInstance
 			return false;
 		}
 		
-		return pclass.isOfRace(PcRace.Kamael);
+		return pclass.isOfRace(PcRace.KAMAEL);
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterMysticInstance.java

@@ -38,7 +38,7 @@ public final class L2VillageMasterMysticInstance extends L2VillageMasterInstance
 			return false;
 		}
 		
-		return pclass.isOfRace(PcRace.Human) || pclass.isOfRace(PcRace.Elf);
+		return pclass.isOfRace(PcRace.HUMAN) || pclass.isOfRace(PcRace.ELF);
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterOrcInstance.java

@@ -37,6 +37,6 @@ public final class L2VillageMasterOrcInstance extends L2VillageMasterInstance
 			return false;
 		}
 		
-		return pclass.isOfRace(PcRace.Orc);
+		return pclass.isOfRace(PcRace.ORC);
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterPriestInstance.java

@@ -38,7 +38,7 @@ public final class L2VillageMasterPriestInstance extends L2VillageMasterInstance
 			return false;
 		}
 		
-		return pclass.isOfRace(PcRace.Human) || pclass.isOfRace(PcRace.Elf);
+		return pclass.isOfRace(PcRace.HUMAN) || pclass.isOfRace(PcRace.ELF);
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/base/ClassId.java

@@ -34,73 +34,73 @@ import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
  */
 public enum ClassId implements IIdentifiable
 {
-	fighter(0x00, false, PcRace.Human, null),
-	
-	warrior(0x01, false, PcRace.Human, fighter),
-	gladiator(0x02, false, PcRace.Human, warrior),
-	warlord(0x03, false, PcRace.Human, warrior),
-	knight(0x04, false, PcRace.Human, fighter),
-	paladin(0x05, false, PcRace.Human, knight),
-	darkAvenger(0x06, false, PcRace.Human, knight),
-	rogue(0x07, false, PcRace.Human, fighter),
-	treasureHunter(0x08, false, PcRace.Human, rogue),
-	hawkeye(0x09, false, PcRace.Human, rogue),
-	
-	mage(0x0a, true, PcRace.Human, null),
-	wizard(0x0b, true, PcRace.Human, mage),
-	sorceror(0x0c, true, PcRace.Human, wizard),
-	necromancer(0x0d, true, PcRace.Human, wizard),
-	warlock(0x0e, true, true, PcRace.Human, wizard),
-	cleric(0x0f, true, PcRace.Human, mage),
-	bishop(0x10, true, PcRace.Human, cleric),
-	prophet(0x11, true, PcRace.Human, cleric),
-	
-	elvenFighter(0x12, false, PcRace.Elf, null),
-	elvenKnight(0x13, false, PcRace.Elf, elvenFighter),
-	templeKnight(0x14, false, PcRace.Elf, elvenKnight),
-	swordSinger(0x15, false, PcRace.Elf, elvenKnight),
-	elvenScout(0x16, false, PcRace.Elf, elvenFighter),
-	plainsWalker(0x17, false, PcRace.Elf, elvenScout),
-	silverRanger(0x18, false, PcRace.Elf, elvenScout),
-	
-	elvenMage(0x19, true, PcRace.Elf, null),
-	elvenWizard(0x1a, true, PcRace.Elf, elvenMage),
-	spellsinger(0x1b, true, PcRace.Elf, elvenWizard),
-	elementalSummoner(0x1c, true, true, PcRace.Elf, elvenWizard),
-	oracle(0x1d, true, PcRace.Elf, elvenMage),
-	elder(0x1e, true, PcRace.Elf, oracle),
-	
-	darkFighter(0x1f, false, PcRace.DarkElf, null),
-	palusKnight(0x20, false, PcRace.DarkElf, darkFighter),
-	shillienKnight(0x21, false, PcRace.DarkElf, palusKnight),
-	bladedancer(0x22, false, PcRace.DarkElf, palusKnight),
-	assassin(0x23, false, PcRace.DarkElf, darkFighter),
-	abyssWalker(0x24, false, PcRace.DarkElf, assassin),
-	phantomRanger(0x25, false, PcRace.DarkElf, assassin),
-	
-	darkMage(0x26, true, PcRace.DarkElf, null),
-	darkWizard(0x27, true, PcRace.DarkElf, darkMage),
-	spellhowler(0x28, true, PcRace.DarkElf, darkWizard),
-	phantomSummoner(0x29, true, true, PcRace.DarkElf, darkWizard),
-	shillienOracle(0x2a, true, PcRace.DarkElf, darkMage),
-	shillenElder(0x2b, true, PcRace.DarkElf, shillienOracle),
-	
-	orcFighter(0x2c, false, PcRace.Orc, null),
-	orcRaider(0x2d, false, PcRace.Orc, orcFighter),
-	destroyer(0x2e, false, PcRace.Orc, orcRaider),
-	orcMonk(0x2f, false, PcRace.Orc, orcFighter),
-	tyrant(0x30, false, PcRace.Orc, orcMonk),
-	
-	orcMage(0x31, false, PcRace.Orc, null),
-	orcShaman(0x32, true, PcRace.Orc, orcMage),
-	overlord(0x33, true, PcRace.Orc, orcShaman),
-	warcryer(0x34, true, PcRace.Orc, orcShaman),
-	
-	dwarvenFighter(0x35, false, PcRace.Dwarf, null),
-	scavenger(0x36, false, PcRace.Dwarf, dwarvenFighter),
-	bountyHunter(0x37, false, PcRace.Dwarf, scavenger),
-	artisan(0x38, false, PcRace.Dwarf, dwarvenFighter),
-	warsmith(0x39, false, PcRace.Dwarf, artisan),
+	fighter(0x00, false, PcRace.HUMAN, null),
+	
+	warrior(0x01, false, PcRace.HUMAN, fighter),
+	gladiator(0x02, false, PcRace.HUMAN, warrior),
+	warlord(0x03, false, PcRace.HUMAN, warrior),
+	knight(0x04, false, PcRace.HUMAN, fighter),
+	paladin(0x05, false, PcRace.HUMAN, knight),
+	darkAvenger(0x06, false, PcRace.HUMAN, knight),
+	rogue(0x07, false, PcRace.HUMAN, fighter),
+	treasureHunter(0x08, false, PcRace.HUMAN, rogue),
+	hawkeye(0x09, false, PcRace.HUMAN, rogue),
+	
+	mage(0x0a, true, PcRace.HUMAN, null),
+	wizard(0x0b, true, PcRace.HUMAN, mage),
+	sorceror(0x0c, true, PcRace.HUMAN, wizard),
+	necromancer(0x0d, true, PcRace.HUMAN, wizard),
+	warlock(0x0e, true, true, PcRace.HUMAN, wizard),
+	cleric(0x0f, true, PcRace.HUMAN, mage),
+	bishop(0x10, true, PcRace.HUMAN, cleric),
+	prophet(0x11, true, PcRace.HUMAN, cleric),
+	
+	elvenFighter(0x12, false, PcRace.ELF, null),
+	elvenKnight(0x13, false, PcRace.ELF, elvenFighter),
+	templeKnight(0x14, false, PcRace.ELF, elvenKnight),
+	swordSinger(0x15, false, PcRace.ELF, elvenKnight),
+	elvenScout(0x16, false, PcRace.ELF, elvenFighter),
+	plainsWalker(0x17, false, PcRace.ELF, elvenScout),
+	silverRanger(0x18, false, PcRace.ELF, elvenScout),
+	
+	elvenMage(0x19, true, PcRace.ELF, null),
+	elvenWizard(0x1a, true, PcRace.ELF, elvenMage),
+	spellsinger(0x1b, true, PcRace.ELF, elvenWizard),
+	elementalSummoner(0x1c, true, true, PcRace.ELF, elvenWizard),
+	oracle(0x1d, true, PcRace.ELF, elvenMage),
+	elder(0x1e, true, PcRace.ELF, oracle),
+	
+	darkFighter(0x1f, false, PcRace.DARK_ELF, null),
+	palusKnight(0x20, false, PcRace.DARK_ELF, darkFighter),
+	shillienKnight(0x21, false, PcRace.DARK_ELF, palusKnight),
+	bladedancer(0x22, false, PcRace.DARK_ELF, palusKnight),
+	assassin(0x23, false, PcRace.DARK_ELF, darkFighter),
+	abyssWalker(0x24, false, PcRace.DARK_ELF, assassin),
+	phantomRanger(0x25, false, PcRace.DARK_ELF, assassin),
+	
+	darkMage(0x26, true, PcRace.DARK_ELF, null),
+	darkWizard(0x27, true, PcRace.DARK_ELF, darkMage),
+	spellhowler(0x28, true, PcRace.DARK_ELF, darkWizard),
+	phantomSummoner(0x29, true, true, PcRace.DARK_ELF, darkWizard),
+	shillienOracle(0x2a, true, PcRace.DARK_ELF, darkMage),
+	shillenElder(0x2b, true, PcRace.DARK_ELF, shillienOracle),
+	
+	orcFighter(0x2c, false, PcRace.ORC, null),
+	orcRaider(0x2d, false, PcRace.ORC, orcFighter),
+	destroyer(0x2e, false, PcRace.ORC, orcRaider),
+	orcMonk(0x2f, false, PcRace.ORC, orcFighter),
+	tyrant(0x30, false, PcRace.ORC, orcMonk),
+	
+	orcMage(0x31, false, PcRace.ORC, null),
+	orcShaman(0x32, true, PcRace.ORC, orcMage),
+	overlord(0x33, true, PcRace.ORC, orcShaman),
+	warcryer(0x34, true, PcRace.ORC, orcShaman),
+	
+	dwarvenFighter(0x35, false, PcRace.DWARF, null),
+	scavenger(0x36, false, PcRace.DWARF, dwarvenFighter),
+	bountyHunter(0x37, false, PcRace.DWARF, scavenger),
+	artisan(0x38, false, PcRace.DWARF, dwarvenFighter),
+	warsmith(0x39, false, PcRace.DWARF, artisan),
 	
 	/*
 	 * Dummy Entries (id's already in decimal format) btw FU NCSoft for the amount of work you put me through to do this!! <START>
@@ -142,61 +142,61 @@ public enum ClassId implements IIdentifiable
 	/*
 	 * Now the bad boys! new class ids :)) (3rd classes)
 	 */
-	duelist(0x58, false, PcRace.Human, gladiator),
-	dreadnought(0x59, false, PcRace.Human, warlord),
-	phoenixKnight(0x5a, false, PcRace.Human, paladin),
-	hellKnight(0x5b, false, PcRace.Human, darkAvenger),
-	sagittarius(0x5c, false, PcRace.Human, hawkeye),
-	adventurer(0x5d, false, PcRace.Human, treasureHunter),
-	archmage(0x5e, true, PcRace.Human, sorceror),
-	soultaker(0x5f, true, PcRace.Human, necromancer),
-	arcanaLord(0x60, true, true, PcRace.Human, warlock),
-	cardinal(0x61, true, PcRace.Human, bishop),
-	hierophant(0x62, true, PcRace.Human, prophet),
-	
-	evaTemplar(0x63, false, PcRace.Elf, templeKnight),
-	swordMuse(0x64, false, PcRace.Elf, swordSinger),
-	windRider(0x65, false, PcRace.Elf, plainsWalker),
-	moonlightSentinel(0x66, false, PcRace.Elf, silverRanger),
-	mysticMuse(0x67, true, PcRace.Elf, spellsinger),
-	elementalMaster(0x68, true, true, PcRace.Elf, elementalSummoner),
-	evaSaint(0x69, true, PcRace.Elf, elder),
-	
-	shillienTemplar(0x6a, false, PcRace.DarkElf, shillienKnight),
-	spectralDancer(0x6b, false, PcRace.DarkElf, bladedancer),
-	ghostHunter(0x6c, false, PcRace.DarkElf, abyssWalker),
-	ghostSentinel(0x6d, false, PcRace.DarkElf, phantomRanger),
-	stormScreamer(0x6e, true, PcRace.DarkElf, spellhowler),
-	spectralMaster(0x6f, true, true, PcRace.DarkElf, phantomSummoner),
-	shillienSaint(0x70, true, PcRace.DarkElf, shillenElder),
-	
-	titan(0x71, false, PcRace.Orc, destroyer),
-	grandKhavatari(0x72, false, PcRace.Orc, tyrant),
-	dominator(0x73, true, PcRace.Orc, overlord),
-	doomcryer(0x74, true, PcRace.Orc, warcryer),
-	
-	fortuneSeeker(0x75, false, PcRace.Dwarf, bountyHunter),
-	maestro(0x76, false, PcRace.Dwarf, warsmith),
+	duelist(0x58, false, PcRace.HUMAN, gladiator),
+	dreadnought(0x59, false, PcRace.HUMAN, warlord),
+	phoenixKnight(0x5a, false, PcRace.HUMAN, paladin),
+	hellKnight(0x5b, false, PcRace.HUMAN, darkAvenger),
+	sagittarius(0x5c, false, PcRace.HUMAN, hawkeye),
+	adventurer(0x5d, false, PcRace.HUMAN, treasureHunter),
+	archmage(0x5e, true, PcRace.HUMAN, sorceror),
+	soultaker(0x5f, true, PcRace.HUMAN, necromancer),
+	arcanaLord(0x60, true, true, PcRace.HUMAN, warlock),
+	cardinal(0x61, true, PcRace.HUMAN, bishop),
+	hierophant(0x62, true, PcRace.HUMAN, prophet),
+	
+	evaTemplar(0x63, false, PcRace.ELF, templeKnight),
+	swordMuse(0x64, false, PcRace.ELF, swordSinger),
+	windRider(0x65, false, PcRace.ELF, plainsWalker),
+	moonlightSentinel(0x66, false, PcRace.ELF, silverRanger),
+	mysticMuse(0x67, true, PcRace.ELF, spellsinger),
+	elementalMaster(0x68, true, true, PcRace.ELF, elementalSummoner),
+	evaSaint(0x69, true, PcRace.ELF, elder),
+	
+	shillienTemplar(0x6a, false, PcRace.DARK_ELF, shillienKnight),
+	spectralDancer(0x6b, false, PcRace.DARK_ELF, bladedancer),
+	ghostHunter(0x6c, false, PcRace.DARK_ELF, abyssWalker),
+	ghostSentinel(0x6d, false, PcRace.DARK_ELF, phantomRanger),
+	stormScreamer(0x6e, true, PcRace.DARK_ELF, spellhowler),
+	spectralMaster(0x6f, true, true, PcRace.DARK_ELF, phantomSummoner),
+	shillienSaint(0x70, true, PcRace.DARK_ELF, shillenElder),
+	
+	titan(0x71, false, PcRace.ORC, destroyer),
+	grandKhavatari(0x72, false, PcRace.ORC, tyrant),
+	dominator(0x73, true, PcRace.ORC, overlord),
+	doomcryer(0x74, true, PcRace.ORC, warcryer),
+	
+	fortuneSeeker(0x75, false, PcRace.DWARF, bountyHunter),
+	maestro(0x76, false, PcRace.DWARF, warsmith),
 	
 	dummyEntry31(0x77, false, null, null),
 	dummyEntry32(0x78, false, null, null),
 	dummyEntry33(0x79, false, null, null),
 	dummyEntry34(0x7a, false, null, null),
 	
-	maleSoldier(0x7b, false, PcRace.Kamael, null),
-	femaleSoldier(0x7C, false, PcRace.Kamael, null),
-	trooper(0x7D, false, PcRace.Kamael, maleSoldier),
-	warder(0x7E, false, PcRace.Kamael, femaleSoldier),
-	berserker(0x7F, false, PcRace.Kamael, trooper),
-	maleSoulbreaker(0x80, false, PcRace.Kamael, trooper),
-	femaleSoulbreaker(0x81, false, PcRace.Kamael, warder),
-	arbalester(0x82, false, PcRace.Kamael, warder),
-	doombringer(0x83, false, PcRace.Kamael, berserker),
-	maleSoulhound(0x84, false, PcRace.Kamael, maleSoulbreaker),
-	femaleSoulhound(0x85, false, PcRace.Kamael, femaleSoulbreaker),
-	trickster(0x86, false, PcRace.Kamael, arbalester),
-	inspector(0x87, false, PcRace.Kamael, warder), // DS: yes, both male/female inspectors use skills from warder
-	judicator(0x88, false, PcRace.Kamael, inspector);
+	maleSoldier(0x7b, false, PcRace.KAMAEL, null),
+	femaleSoldier(0x7C, false, PcRace.KAMAEL, null),
+	trooper(0x7D, false, PcRace.KAMAEL, maleSoldier),
+	warder(0x7E, false, PcRace.KAMAEL, femaleSoldier),
+	berserker(0x7F, false, PcRace.KAMAEL, trooper),
+	maleSoulbreaker(0x80, false, PcRace.KAMAEL, trooper),
+	femaleSoulbreaker(0x81, false, PcRace.KAMAEL, warder),
+	arbalester(0x82, false, PcRace.KAMAEL, warder),
+	doombringer(0x83, false, PcRace.KAMAEL, berserker),
+	maleSoulhound(0x84, false, PcRace.KAMAEL, maleSoulbreaker),
+	femaleSoulhound(0x85, false, PcRace.KAMAEL, femaleSoulbreaker),
+	trickster(0x86, false, PcRace.KAMAEL, arbalester),
+	inspector(0x87, false, PcRace.KAMAEL, warder), // DS: yes, both male/female inspectors use skills from warder
+	judicator(0x88, false, PcRace.KAMAEL, inspector);
 	
 	/** The Identifier of the Class */
 	private final int _id;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/base/PlayerClass.java

@@ -18,12 +18,6 @@
  */
 package com.l2jserver.gameserver.model.base;
 
-import static com.l2jserver.gameserver.enums.PcRace.DarkElf;
-import static com.l2jserver.gameserver.enums.PcRace.Dwarf;
-import static com.l2jserver.gameserver.enums.PcRace.Elf;
-import static com.l2jserver.gameserver.enums.PcRace.Human;
-import static com.l2jserver.gameserver.enums.PcRace.Kamael;
-import static com.l2jserver.gameserver.enums.PcRace.Orc;
 import static com.l2jserver.gameserver.model.base.ClassLevel.First;
 import static com.l2jserver.gameserver.model.base.ClassLevel.Fourth;
 import static com.l2jserver.gameserver.model.base.ClassLevel.Second;
@@ -45,68 +39,68 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public enum PlayerClass
 {
-	HumanFighter(Human, Fighter, First),
-	Warrior(Human, Fighter, Second),
-	Gladiator(Human, Fighter, Third),
-	Warlord(Human, Fighter, Third),
-	HumanKnight(Human, Fighter, Second),
-	Paladin(Human, Fighter, Third),
-	DarkAvenger(Human, Fighter, Third),
-	Rogue(Human, Fighter, Second),
-	TreasureHunter(Human, Fighter, Third),
-	Hawkeye(Human, Fighter, Third),
-	HumanMystic(Human, Mystic, First),
-	HumanWizard(Human, Mystic, Second),
-	Sorceror(Human, Mystic, Third),
-	Necromancer(Human, Mystic, Third),
-	Warlock(Human, Mystic, Third),
-	Cleric(Human, Priest, Second),
-	Bishop(Human, Priest, Third),
-	Prophet(Human, Priest, Third),
+	HumanFighter(PcRace.HUMAN, Fighter, First),
+	Warrior(PcRace.HUMAN, Fighter, Second),
+	Gladiator(PcRace.HUMAN, Fighter, Third),
+	Warlord(PcRace.HUMAN, Fighter, Third),
+	HumanKnight(PcRace.HUMAN, Fighter, Second),
+	Paladin(PcRace.HUMAN, Fighter, Third),
+	DarkAvenger(PcRace.HUMAN, Fighter, Third),
+	Rogue(PcRace.HUMAN, Fighter, Second),
+	TreasureHunter(PcRace.HUMAN, Fighter, Third),
+	Hawkeye(PcRace.HUMAN, Fighter, Third),
+	HumanMystic(PcRace.HUMAN, Mystic, First),
+	HumanWizard(PcRace.HUMAN, Mystic, Second),
+	Sorceror(PcRace.HUMAN, Mystic, Third),
+	Necromancer(PcRace.HUMAN, Mystic, Third),
+	Warlock(PcRace.HUMAN, Mystic, Third),
+	Cleric(PcRace.HUMAN, Priest, Second),
+	Bishop(PcRace.HUMAN, Priest, Third),
+	Prophet(PcRace.HUMAN, Priest, Third),
 	
-	ElvenFighter(Elf, Fighter, First),
-	ElvenKnight(Elf, Fighter, Second),
-	TempleKnight(Elf, Fighter, Third),
-	Swordsinger(Elf, Fighter, Third),
-	ElvenScout(Elf, Fighter, Second),
-	Plainswalker(Elf, Fighter, Third),
-	SilverRanger(Elf, Fighter, Third),
-	ElvenMystic(Elf, Mystic, First),
-	ElvenWizard(Elf, Mystic, Second),
-	Spellsinger(Elf, Mystic, Third),
-	ElementalSummoner(Elf, Mystic, Third),
-	ElvenOracle(Elf, Priest, Second),
-	ElvenElder(Elf, Priest, Third),
+	ElvenFighter(PcRace.ELF, Fighter, First),
+	ElvenKnight(PcRace.ELF, Fighter, Second),
+	TempleKnight(PcRace.ELF, Fighter, Third),
+	Swordsinger(PcRace.ELF, Fighter, Third),
+	ElvenScout(PcRace.ELF, Fighter, Second),
+	Plainswalker(PcRace.ELF, Fighter, Third),
+	SilverRanger(PcRace.ELF, Fighter, Third),
+	ElvenMystic(PcRace.ELF, Mystic, First),
+	ElvenWizard(PcRace.ELF, Mystic, Second),
+	Spellsinger(PcRace.ELF, Mystic, Third),
+	ElementalSummoner(PcRace.ELF, Mystic, Third),
+	ElvenOracle(PcRace.ELF, Priest, Second),
+	ElvenElder(PcRace.ELF, Priest, Third),
 	
-	DarkElvenFighter(DarkElf, Fighter, First),
-	PalusKnight(DarkElf, Fighter, Second),
-	ShillienKnight(DarkElf, Fighter, Third),
-	Bladedancer(DarkElf, Fighter, Third),
-	Assassin(DarkElf, Fighter, Second),
-	AbyssWalker(DarkElf, Fighter, Third),
-	PhantomRanger(DarkElf, Fighter, Third),
-	DarkElvenMystic(DarkElf, Mystic, First),
-	DarkElvenWizard(DarkElf, Mystic, Second),
-	Spellhowler(DarkElf, Mystic, Third),
-	PhantomSummoner(DarkElf, Mystic, Third),
-	ShillienOracle(DarkElf, Priest, Second),
-	ShillienElder(DarkElf, Priest, Third),
+	DarkElvenFighter(PcRace.DARK_ELF, Fighter, First),
+	PalusKnight(PcRace.DARK_ELF, Fighter, Second),
+	ShillienKnight(PcRace.DARK_ELF, Fighter, Third),
+	Bladedancer(PcRace.DARK_ELF, Fighter, Third),
+	Assassin(PcRace.DARK_ELF, Fighter, Second),
+	AbyssWalker(PcRace.DARK_ELF, Fighter, Third),
+	PhantomRanger(PcRace.DARK_ELF, Fighter, Third),
+	DarkElvenMystic(PcRace.DARK_ELF, Mystic, First),
+	DarkElvenWizard(PcRace.DARK_ELF, Mystic, Second),
+	Spellhowler(PcRace.DARK_ELF, Mystic, Third),
+	PhantomSummoner(PcRace.DARK_ELF, Mystic, Third),
+	ShillienOracle(PcRace.DARK_ELF, Priest, Second),
+	ShillienElder(PcRace.DARK_ELF, Priest, Third),
 	
-	OrcFighter(Orc, Fighter, First),
-	OrcRaider(Orc, Fighter, Second),
-	Destroyer(Orc, Fighter, Third),
-	OrcMonk(Orc, Fighter, Second),
-	Tyrant(Orc, Fighter, Third),
-	OrcMystic(Orc, Mystic, First),
-	OrcShaman(Orc, Mystic, Second),
-	Overlord(Orc, Mystic, Third),
-	Warcryer(Orc, Mystic, Third),
+	OrcFighter(PcRace.ORC, Fighter, First),
+	OrcRaider(PcRace.ORC, Fighter, Second),
+	Destroyer(PcRace.ORC, Fighter, Third),
+	OrcMonk(PcRace.ORC, Fighter, Second),
+	Tyrant(PcRace.ORC, Fighter, Third),
+	OrcMystic(PcRace.ORC, Mystic, First),
+	OrcShaman(PcRace.ORC, Mystic, Second),
+	Overlord(PcRace.ORC, Mystic, Third),
+	Warcryer(PcRace.ORC, Mystic, Third),
 	
-	DwarvenFighter(Dwarf, Fighter, First),
-	DwarvenScavenger(Dwarf, Fighter, Second),
-	BountyHunter(Dwarf, Fighter, Third),
-	DwarvenArtisan(Dwarf, Fighter, Second),
-	Warsmith(Dwarf, Fighter, Third),
+	DwarvenFighter(PcRace.DWARF, Fighter, First),
+	DwarvenScavenger(PcRace.DWARF, Fighter, Second),
+	BountyHunter(PcRace.DWARF, Fighter, Third),
+	DwarvenArtisan(PcRace.DWARF, Fighter, Second),
+	Warsmith(PcRace.DWARF, Fighter, Third),
 	
 	dummyEntry1(null, null, null),
 	dummyEntry2(null, null, null),
@@ -141,61 +135,61 @@ public enum PlayerClass
 	/*
 	 * (3rd classes)
 	 */
-	duelist(Human, Fighter, Fourth),
-	dreadnought(Human, Fighter, Fourth),
-	phoenixKnight(Human, Fighter, Fourth),
-	hellKnight(Human, Fighter, Fourth),
-	sagittarius(Human, Fighter, Fourth),
-	adventurer(Human, Fighter, Fourth),
-	archmage(Human, Mystic, Fourth),
-	soultaker(Human, Mystic, Fourth),
-	arcanaLord(Human, Mystic, Fourth),
-	cardinal(Human, Priest, Fourth),
-	hierophant(Human, Priest, Fourth),
+	duelist(PcRace.HUMAN, Fighter, Fourth),
+	dreadnought(PcRace.HUMAN, Fighter, Fourth),
+	phoenixKnight(PcRace.HUMAN, Fighter, Fourth),
+	hellKnight(PcRace.HUMAN, Fighter, Fourth),
+	sagittarius(PcRace.HUMAN, Fighter, Fourth),
+	adventurer(PcRace.HUMAN, Fighter, Fourth),
+	archmage(PcRace.HUMAN, Mystic, Fourth),
+	soultaker(PcRace.HUMAN, Mystic, Fourth),
+	arcanaLord(PcRace.HUMAN, Mystic, Fourth),
+	cardinal(PcRace.HUMAN, Priest, Fourth),
+	hierophant(PcRace.HUMAN, Priest, Fourth),
 	
-	evaTemplar(Elf, Fighter, Fourth),
-	swordMuse(Elf, Fighter, Fourth),
-	windRider(Elf, Fighter, Fourth),
-	moonlightSentinel(Elf, Fighter, Fourth),
-	mysticMuse(Elf, Mystic, Fourth),
-	elementalMaster(Elf, Mystic, Fourth),
-	evaSaint(Elf, Priest, Fourth),
+	evaTemplar(PcRace.ELF, Fighter, Fourth),
+	swordMuse(PcRace.ELF, Fighter, Fourth),
+	windRider(PcRace.ELF, Fighter, Fourth),
+	moonlightSentinel(PcRace.ELF, Fighter, Fourth),
+	mysticMuse(PcRace.ELF, Mystic, Fourth),
+	elementalMaster(PcRace.ELF, Mystic, Fourth),
+	evaSaint(PcRace.ELF, Priest, Fourth),
 	
-	shillienTemplar(DarkElf, Fighter, Fourth),
-	spectralDancer(DarkElf, Fighter, Fourth),
-	ghostHunter(DarkElf, Fighter, Fourth),
-	ghostSentinel(DarkElf, Fighter, Fourth),
-	stormScreamer(DarkElf, Mystic, Fourth),
-	spectralMaster(DarkElf, Mystic, Fourth),
-	shillienSaint(DarkElf, Priest, Fourth),
+	shillienTemplar(PcRace.DARK_ELF, Fighter, Fourth),
+	spectralDancer(PcRace.DARK_ELF, Fighter, Fourth),
+	ghostHunter(PcRace.DARK_ELF, Fighter, Fourth),
+	ghostSentinel(PcRace.DARK_ELF, Fighter, Fourth),
+	stormScreamer(PcRace.DARK_ELF, Mystic, Fourth),
+	spectralMaster(PcRace.DARK_ELF, Mystic, Fourth),
+	shillienSaint(PcRace.DARK_ELF, Priest, Fourth),
 	
-	titan(Orc, Fighter, Fourth),
-	grandKhavatari(Orc, Fighter, Fourth),
-	dominator(Orc, Mystic, Fourth),
-	doomcryer(Orc, Mystic, Fourth),
+	titan(PcRace.ORC, Fighter, Fourth),
+	grandKhavatari(PcRace.ORC, Fighter, Fourth),
+	dominator(PcRace.ORC, Mystic, Fourth),
+	doomcryer(PcRace.ORC, Mystic, Fourth),
 	
-	fortuneSeeker(Dwarf, Fighter, Fourth),
-	maestro(Dwarf, Fighter, Fourth),
+	fortuneSeeker(PcRace.DWARF, Fighter, Fourth),
+	maestro(PcRace.DWARF, Fighter, Fourth),
 	
 	dummyEntry31(null, null, null),
 	dummyEntry32(null, null, null),
 	dummyEntry33(null, null, null),
 	dummyEntry34(null, null, null),
 	
-	maleSoldier(Kamael, Fighter, First),
-	femaleSoldier(Kamael, Fighter, First),
-	trooper(Kamael, Fighter, Second),
-	warder(Kamael, Fighter, Second),
-	berserker(Kamael, Fighter, Third),
-	maleSoulbreaker(Kamael, Fighter, Third),
-	femaleSoulbreaker(Kamael, Fighter, Third),
-	arbalester(Kamael, Fighter, Third),
-	doombringer(Kamael, Fighter, Fourth),
-	maleSoulhound(Kamael, Fighter, Fourth),
-	femaleSoulhound(Kamael, Fighter, Fourth),
-	trickster(Kamael, Fighter, Fourth),
-	inspector(Kamael, Fighter, Third),
-	judicator(Kamael, Fighter, Fourth);
+	maleSoldier(PcRace.KAMAEL, Fighter, First),
+	femaleSoldier(PcRace.KAMAEL, Fighter, First),
+	trooper(PcRace.KAMAEL, Fighter, Second),
+	warder(PcRace.KAMAEL, Fighter, Second),
+	berserker(PcRace.KAMAEL, Fighter, Third),
+	maleSoulbreaker(PcRace.KAMAEL, Fighter, Third),
+	femaleSoulbreaker(PcRace.KAMAEL, Fighter, Third),
+	arbalester(PcRace.KAMAEL, Fighter, Third),
+	doombringer(PcRace.KAMAEL, Fighter, Fourth),
+	maleSoulhound(PcRace.KAMAEL, Fighter, Fourth),
+	femaleSoulhound(PcRace.KAMAEL, Fighter, Fourth),
+	trickster(PcRace.KAMAEL, Fighter, Fourth),
+	inspector(PcRace.KAMAEL, Fighter, Third),
+	judicator(PcRace.KAMAEL, Fighter, Fourth);
 	
 	private PcRace _race;
 	private ClassLevel _level;
@@ -254,7 +248,7 @@ public enum PlayerClass
 		
 		if (_level == Third)
 		{
-			if (player.getRace() != Kamael)
+			if (player.getRace() != PcRace.KAMAEL)
 			{
 				subclasses = EnumSet.copyOf(mainSubclassSet);
 				
@@ -262,15 +256,15 @@ public enum PlayerClass
 				
 				switch (player.getRace())
 				{
-					case Elf:
-						subclasses.removeAll(getSet(DarkElf, Third));
+					case ELF:
+						subclasses.removeAll(getSet(PcRace.DARK_ELF, Third));
 						break;
-					case DarkElf:
-						subclasses.removeAll(getSet(Elf, Third));
+					case DARK_ELF:
+						subclasses.removeAll(getSet(PcRace.ELF, Third));
 						break;
 				}
 				
-				subclasses.removeAll(getSet(Kamael, Third));
+				subclasses.removeAll(getSet(PcRace.KAMAEL, Third));
 				
 				Set<PlayerClass> unavailableClasses = subclassSetMap.get(this);
 				
@@ -282,7 +276,7 @@ public enum PlayerClass
 			}
 			else
 			{
-				subclasses = getSet(Kamael, Third);
+				subclasses = getSet(PcRace.KAMAEL, Third);
 				subclasses.remove(this);
 				// Check sex, male subclasses female and vice versa
 				// If server owner set MaxSubclass > 3 some kamael's cannot take 4 sub

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java

@@ -85,7 +85,7 @@ public final class RequestCrystallizeItem extends L2GameClientPacket
 		{
 			activeChar.sendPacket(SystemMessageId.CRYSTALLIZE_LEVEL_TOO_LOW);
 			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-			if ((activeChar.getRace() != PcRace.Dwarf) && (activeChar.getClassId().ordinal() != 117) && (activeChar.getClassId().ordinal() != 55))
+			if ((activeChar.getRace() != PcRace.DWARF) && (activeChar.getClassId().ordinal() != 117) && (activeChar.getClassId().ordinal() != 55))
 			{
 				_log.info("Player " + activeChar.getClient() + " used crystalize with classid: " + activeChar.getClassId().ordinal());
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java

@@ -258,7 +258,7 @@ public final class UseItem extends L2GameClientPacket
 						
 						switch (activeChar.getRace())
 						{
-							case Kamael:
+							case KAMAEL:
 							{
 								switch (wpn.getItemType())
 								{
@@ -268,11 +268,11 @@ public final class UseItem extends L2GameClientPacket
 								}
 								break;
 							}
-							case Human:
-							case Dwarf:
-							case Elf:
-							case DarkElf:
-							case Orc:
+							case HUMAN:
+							case DWARF:
+							case ELF:
+							case DARK_ELF:
+							case ORC:
 							{
 								switch (wpn.getItemType())
 								{
@@ -296,7 +296,7 @@ public final class UseItem extends L2GameClientPacket
 				case L2Item.SLOT_FULL_ARMOR:
 				case L2Item.SLOT_LEGS:
 				{
-					if ((activeChar.getRace() == PcRace.Kamael) && ((item.getItem().getItemType() == ArmorType.HEAVY) || (item.getItem().getItemType() == ArmorType.MAGIC)))
+					if ((activeChar.getRace() == PcRace.KAMAEL) && ((item.getItem().getItemType() == ArmorType.HEAVY) || (item.getItem().getItemType() == ArmorType.MAGIC)))
 					{
 						activeChar.sendPacket(SystemMessageId.CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION);
 						return;
@@ -316,14 +316,7 @@ public final class UseItem extends L2GameClientPacket
 			if (activeChar.isCastingNow() || activeChar.isCastingSimultaneouslyNow())
 			{
 				// Creating next action class.
-				final NextAction nextAction = new NextAction(CtrlEvent.EVT_FINISH_CASTING, CtrlIntention.AI_INTENTION_CAST, new NextActionCallback()
-				{
-					@Override
-					public void doWork()
-					{
-						activeChar.useEquippableItem(item, true);
-					}
-				});
+				final NextAction nextAction = new NextAction(CtrlEvent.EVT_FINISH_CASTING, CtrlIntention.AI_INTENTION_CAST, (NextActionCallback) () -> activeChar.useEquippableItem(item, true));
 				
 				// Binding next action to AI.
 				activeChar.getAI().setNextAction(nextAction);