BETA: Implementing 2 more interfaces:

	* IParserUtils
	* IParserAdvUtils
	
	* Reviewed by: Nos

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSigns.java

@@ -754,9 +754,9 @@ public class SevenSigns
 		}
 		
 		int stoneCount = 0;
-		stoneCount += currPlayer.getInteger("red_stones");
-		stoneCount += currPlayer.getInteger("green_stones");
-		stoneCount += currPlayer.getInteger("blue_stones");
+		stoneCount += currPlayer.getInt("red_stones");
+		stoneCount += currPlayer.getInt("green_stones");
+		stoneCount += currPlayer.getInt("blue_stones");
 		
 		return stoneCount;
 	}
@@ -769,7 +769,7 @@ public class SevenSigns
 			return 0;
 		}
 		
-		return currPlayer.getInteger("contribution_score");
+		return currPlayer.getInt("contribution_score");
 	}
 	
 	public int getPlayerAdenaCollect(int objectId)
@@ -780,7 +780,7 @@ public class SevenSigns
 			return 0;
 		}
 		
-		return currPlayer.getInteger("ancient_adena_amount");
+		return currPlayer.getInt("ancient_adena_amount");
 	}
 	
 	public int getPlayerSeal(int objectId)
@@ -791,7 +791,7 @@ public class SevenSigns
 			return SEAL_NULL;
 		}
 		
-		return currPlayer.getInteger("seal");
+		return currPlayer.getInt("seal");
 	}
 	
 	public int getPlayerCabal(int objectId)
@@ -895,13 +895,13 @@ public class SevenSigns
 			for (StatsSet sevenDat : _signsPlayerData.values())
 			{
 				ps.setString(1, sevenDat.getString("cabal"));
-				ps.setInt(2, sevenDat.getInteger("seal"));
-				ps.setInt(3, sevenDat.getInteger("red_stones"));
-				ps.setInt(4, sevenDat.getInteger("green_stones"));
-				ps.setInt(5, sevenDat.getInteger("blue_stones"));
+				ps.setInt(2, sevenDat.getInt("seal"));
+				ps.setInt(3, sevenDat.getInt("red_stones"));
+				ps.setInt(4, sevenDat.getInt("green_stones"));
+				ps.setInt(5, sevenDat.getInt("blue_stones"));
 				ps.setDouble(6, sevenDat.getDouble("ancient_adena_amount"));
 				ps.setDouble(7, sevenDat.getDouble("contribution_score"));
-				ps.setInt(8, sevenDat.getInteger("charId"));
+				ps.setInt(8, sevenDat.getInt("charId"));
 				ps.execute();
 				ps.clearParameters();
 			}
@@ -924,13 +924,13 @@ public class SevenSigns
 			PreparedStatement ps = con.prepareStatement(UPDATE_PLAYER))
 		{
 			ps.setString(1, sevenDat.getString("cabal"));
-			ps.setInt(2, sevenDat.getInteger("seal"));
-			ps.setInt(3, sevenDat.getInteger("red_stones"));
-			ps.setInt(4, sevenDat.getInteger("green_stones"));
-			ps.setInt(5, sevenDat.getInteger("blue_stones"));
+			ps.setInt(2, sevenDat.getInt("seal"));
+			ps.setInt(3, sevenDat.getInt("red_stones"));
+			ps.setInt(4, sevenDat.getInt("green_stones"));
+			ps.setInt(5, sevenDat.getInt("blue_stones"));
 			ps.setDouble(6, sevenDat.getDouble("ancient_adena_amount"));
 			ps.setDouble(7, sevenDat.getDouble("contribution_score"));
-			ps.setInt(8, sevenDat.getInteger("charId"));
+			ps.setInt(8, sevenDat.getInt("charId"));
 			ps.execute();
 		}
 		catch (SQLException e)
@@ -987,7 +987,7 @@ public class SevenSigns
 		// Reset each player's contribution data as well as seal and cabal.
 		for (StatsSet sevenDat : _signsPlayerData.values())
 		{
-			charObjId = sevenDat.getInteger("charId");
+			charObjId = sevenDat.getInt("charId");
 			
 			// Reset the player's cabal and seal information
 			sevenDat.set("cabal", "");
@@ -1076,7 +1076,7 @@ public class SevenSigns
 	public int getAncientAdenaReward(int objectId, boolean removeReward)
 	{
 		StatsSet currPlayer = _signsPlayerData.get(objectId);
-		int rewardAmount = currPlayer.getInteger("ancient_adena_amount");
+		int rewardAmount = currPlayer.getInt("ancient_adena_amount");
 		
 		currPlayer.set("red_stones", 0);
 		currPlayer.set("green_stones", 0);
@@ -1119,9 +1119,9 @@ public class SevenSigns
 			return -1;
 		}
 		
-		currPlayer.set("red_stones", currPlayer.getInteger("red_stones") + redCount);
-		currPlayer.set("green_stones", currPlayer.getInteger("green_stones") + greenCount);
-		currPlayer.set("blue_stones", currPlayer.getInteger("blue_stones") + blueCount);
+		currPlayer.set("red_stones", currPlayer.getInt("red_stones") + redCount);
+		currPlayer.set("green_stones", currPlayer.getInt("green_stones") + greenCount);
+		currPlayer.set("blue_stones", currPlayer.getInt("blue_stones") + blueCount);
 		currPlayer.set("ancient_adena_amount", totalAncientAdena);
 		currPlayer.set("contribution_score", totalContribScore);
 		_signsPlayerData.put(objectId, currPlayer);

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -1028,13 +1028,13 @@ public class SevenSignsFestival implements SpawnListener
 			{
 				for (StatsSet festivalDat : currCycleData.values())
 				{
-					int festivalCycle = festivalDat.getInteger("cycle");
-					int festivalId = festivalDat.getInteger("festivalId");
+					int festivalCycle = festivalDat.getInt("cycle");
+					int festivalId = festivalDat.getInt("festivalId");
 					String cabal = festivalDat.getString("cabal");
 					
 					// Try to update an existing record.
 					psUpdate.setLong(1, Long.valueOf(festivalDat.getString("date")));
-					psUpdate.setInt(2, festivalDat.getInteger("score"));
+					psUpdate.setInt(2, festivalDat.getInt("score"));
 					psUpdate.setString(3, festivalDat.getString("members"));
 					psUpdate.setInt(4, festivalCycle);
 					psUpdate.setString(5, cabal);
@@ -1051,7 +1051,7 @@ public class SevenSignsFestival implements SpawnListener
 					psInsert.setString(2, cabal);
 					psInsert.setInt(3, festivalCycle);
 					psInsert.setLong(4, Long.valueOf(festivalDat.getString("date")));
-					psInsert.setInt(5, festivalDat.getInteger("score"));
+					psInsert.setInt(5, festivalDat.getInt("score"));
 					psInsert.setString(6, festivalDat.getString("members"));
 					psInsert.execute();
 					psInsert.clearParameters();
@@ -1477,7 +1477,7 @@ public class SevenSignsFestival implements SpawnListener
 	
 	public final int getHighestScore(int oracle, int festivalId)
 	{
-		return getHighestScoreData(oracle, festivalId).getInteger("score");
+		return getHighestScoreData(oracle, festivalId).getInt("score");
 	}
 	
 	/**
@@ -1527,8 +1527,8 @@ public class SevenSignsFestival implements SpawnListener
 		{
 			for (StatsSet currFestData : currCycleData.values())
 			{
-				int currFestID = currFestData.getInteger("festivalId");
-				int festivalScore = currFestData.getInteger("score");
+				int currFestID = currFestData.getInt("festivalId");
+				int festivalScore = currFestData.getInt("score");
 				
 				if (currFestID != festivalId)
 				{
@@ -1682,7 +1682,7 @@ public class SevenSignsFestival implements SpawnListener
 			{
 				if (festivalData.getString("members").indexOf(playerName) > -1)
 				{
-					int festivalId = festivalData.getInteger("festivalId");
+					int festivalId = festivalData.getInt("festivalId");
 					int numPartyMembers = festivalData.getString("members").split(",").length;
 					int totalAccumBonus = _accumulatedBonuses.get(festivalId);
 					

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

@@ -138,8 +138,8 @@ public final class CharTemplateTable extends DocumentParser
 							}
 						}
 						// calculate total pdef and mdef from parts
-						set.set("basePDef", (set.getInteger("basePDefchest", 0) + set.getInteger("basePDeflegs", 0) + set.getInteger("basePDefhead", 0) + set.getInteger("basePDeffeet", 0) + set.getInteger("basePDefgloves", 0) + set.getInteger("basePDefunderwear", 0) + set.getInteger("basePDefcloak", 0)));
-						set.set("baseMDef", (set.getInteger("baseMDefrear", 0) + set.getInteger("baseMDeflear", 0) + set.getInteger("baseMDefrfinger", 0) + set.getInteger("baseMDefrfinger", 0) + set.getInteger("baseMDefneck", 0)));
+						set.set("basePDef", (set.getInt("basePDefchest", 0) + set.getInt("basePDeflegs", 0) + set.getInt("basePDefhead", 0) + set.getInt("basePDeffeet", 0) + set.getInt("basePDefgloves", 0) + set.getInt("basePDefunderwear", 0) + set.getInt("basePDefcloak", 0)));
+						set.set("baseMDef", (set.getInt("baseMDefrear", 0) + set.getInt("baseMDeflear", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefneck", 0)));
 						
 						final L2PcTemplate ct = new L2PcTemplate(set, creationPoints);
 						_charTemplates.put(ClassId.getClassId(classId), ct);

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

@@ -86,7 +86,7 @@ public class DoorTable extends DocumentParser
 							set.set(att.getNodeName(), att.getNodeValue());
 						}
 						makeDoor(set);
-						_templates.put(set.getInteger("id"), set);
+						_templates.put(set.getInt("id"), set);
 					}
 				}
 			}
@@ -98,7 +98,7 @@ public class DoorTable extends DocumentParser
 	public void insertCollisionData(StatsSet set)
 	{
 		int posX, posY, nodeX, nodeY, height;
-		height = set.getInteger("height");
+		height = set.getInt("height");
 		String[] pos = set.getString("node1").split(",");
 		nodeX = Integer.parseInt(pos[0]);
 		nodeY = Integer.parseInt(pos[1]);

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

@@ -367,7 +367,7 @@ public class NpcTable extends DocumentParser
 	 */
 	public void saveNpc(StatsSet npc)
 	{
-		final int npcId = npc.getInteger("npcId");
+		final int npcId = npc.getInt("npcId");
 		
 		final StringBuilder npcAttributes = new StringBuilder();
 		final ArrayList<Object> npcAttributeValues = new ArrayList<>();

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

@@ -89,11 +89,11 @@ public final class StaticObjects extends DocumentParser
 	 */
 	private void addObject(StatsSet set)
 	{
-		L2StaticObjectInstance obj = new L2StaticObjectInstance(IdFactory.getInstance().getNextId(), new L2CharTemplate(new StatsSet()), set.getInteger("id"));
-		obj.setType(set.getInteger("type", 0));
+		L2StaticObjectInstance obj = new L2StaticObjectInstance(IdFactory.getInstance().getNextId(), new L2CharTemplate(new StatsSet()), set.getInt("id"));
+		obj.setType(set.getInt("type", 0));
 		obj.setName(set.getString("name"));
-		obj.setMap(set.getString("texture", "none"), set.getInteger("map_x", 0), set.getInteger("map_y", 0));
-		obj.spawnMe(set.getInteger("x"), set.getInteger("y"), set.getInteger("z"));
+		obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0));
+		obj.spawnMe(set.getInt("x"), set.getInt("y"), set.getInt("z"));
 		_staticObjects.put(obj.getObjectId(), obj);
 	}
 	

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

@@ -142,7 +142,7 @@ public final class TransformData extends DocumentParser
 												transform.setTemplate(isMale, templateData);
 											}
 											set.set("actions", z.getTextContent());
-											final int[] actions = set.getIntegerArray("actions", " ");
+											final int[] actions = set.getIntArray("actions", " ");
 											templateData.setBasicActionList(new ExBasicActionList(actions));
 											break;
 										}

L2J_Server_BETA/java/com/l2jserver/gameserver/engines/DocumentBase.java

@@ -309,7 +309,7 @@ public abstract class DocumentBase
 		else if (template instanceof L2Skill)
 		{
 			final L2Skill sk = (L2Skill) template;
-			if (set.getInteger("self", 0) == 1)
+			if (set.getInt("self", 0) == 1)
 			{
 				sk.attachSelf(effectTemplate);
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java

@@ -134,7 +134,7 @@ public class AirShipManager
 			_airShips.put(ownerId, airShip);
 			
 			airShip.setMaxFuel(600);
-			airShip.setFuel(info.getInteger("fuel"));
+			airShip.setFuel(info.getInt("fuel"));
 			airShip.getStat().setMoveSpeed(280);
 			airShip.getStat().setRotationSpeed(2000);
 		}
@@ -176,7 +176,7 @@ public class AirShipManager
 				PreparedStatement ps = con.prepareStatement(ADD_DB))
 			{
 				ps.setInt(1, ownerId);
-				ps.setInt(2, info.getInteger("fuel"));
+				ps.setInt(2, info.getInt("fuel"));
 				ps.executeUpdate();
 			}
 			catch (SQLException e)
@@ -302,7 +302,7 @@ public class AirShipManager
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
 			PreparedStatement ps = con.prepareStatement(UPDATE_DB))
 		{
-			ps.setInt(1, info.getInteger("fuel"));
+			ps.setInt(1, info.getInt("fuel"));
 			ps.setInt(2, ownerId);
 			ps.executeUpdate();
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GraciaSeedsManager.java

@@ -75,8 +75,8 @@ public final class GraciaSeedsManager
 		// Seed of Destruction variables
 		if (GlobalVariablesManager.getInstance().hasVariable("SoDState"))
 		{
-			_SoDState = GlobalVariablesManager.getInstance().getInteger("SoDState");
-			_SoDTiatKilled = GlobalVariablesManager.getInstance().getInteger("SoDTiatKilled");
+			_SoDState = GlobalVariablesManager.getInstance().getInt("SoDState");
+			_SoDTiatKilled = GlobalVariablesManager.getInstance().getInt("SoDTiatKilled");
 			_SoDLastStateChangeDate.setTimeInMillis(GlobalVariablesManager.getInstance().getLong("SoDLSCDate"));
 		}
 		else

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/HellboundManager.java

@@ -240,8 +240,8 @@ public class HellboundManager
 	{
 		if (GlobalVariablesManager.getInstance().hasVariable("HBLevel"))
 		{
-			_level = GlobalVariablesManager.getInstance().getInteger("HBLevel");
-			_trust = GlobalVariablesManager.getInstance().getInteger("HBTrust");
+			_level = GlobalVariablesManager.getInstance().getInt("HBLevel");
+			_trust = GlobalVariablesManager.getInstance().getInt("HBTrust");
 		}
 		else
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/ChanceCondition.java

@@ -73,11 +73,11 @@ public final class ChanceCondition
 		try
 		{
 			TriggerType trigger = set.getEnum("chanceType", TriggerType.class, null);
-			int chance = set.getInteger("activationChance", -1);
-			int mindmg = set.getInteger("activationMinDamage", -1);
+			int chance = set.getInt("activationChance", -1);
+			int mindmg = set.getInt("activationMinDamage", -1);
 			String elements = set.getString("activationElements", null);
 			String activationSkills = set.getString("activationSkills", null);
-			boolean pvpOnly = set.getBool("pvpChanceOnly", false);
+			boolean pvpOnly = set.getBoolean("pvpChanceOnly", false);
 			
 			if (trigger != null)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2AccessLevel.java

@@ -56,19 +56,19 @@ public class L2AccessLevel
 	
 	public L2AccessLevel(StatsSet set)
 	{
-		_accessLevel = set.getInteger("level");
+		_accessLevel = set.getInt("level");
 		_name = set.getString("name");
 		_nameColor = Integer.decode("0x" + set.getString("nameColor", "FFFFFF"));
 		_titleColor = Integer.decode("0x" + set.getString("titleColor", "FFFFFF"));
-		_child = set.getInteger("childAccess", 0);
-		_isGm = set.getBool("isGM", false);
-		_allowPeaceAttack = set.getBool("allowPeaceAttack", false);
-		_allowFixedRes = set.getBool("allowFixedRes", false);
-		_allowTransaction = set.getBool("allowTransaction", true);
-		_allowAltG = set.getBool("allowAltg", false);
-		_giveDamage = set.getBool("giveDamage", true);
-		_takeAggro = set.getBool("takeAggro", true);
-		_gainExp = set.getBool("gainExp", true);
+		_child = set.getInt("childAccess", 0);
+		_isGm = set.getBoolean("isGM", false);
+		_allowPeaceAttack = set.getBoolean("allowPeaceAttack", false);
+		_allowFixedRes = set.getBoolean("allowFixedRes", false);
+		_allowTransaction = set.getBoolean("allowTransaction", true);
+		_allowAltG = set.getBoolean("allowAltg", false);
+		_giveDamage = set.getBoolean("giveDamage", true);
+		_takeAggro = set.getBoolean("takeAggro", true);
+		_gainExp = set.getBoolean("gainExp", true);
 	}
 	
 	public L2AccessLevel()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2AdminCommandAccessRight.java

@@ -32,8 +32,8 @@ public class L2AdminCommandAccessRight
 	public L2AdminCommandAccessRight(StatsSet set)
 	{
 		_adminCommand = set.getString("command");
-		_requireConfirm = set.getBool("confirmDlg", false);
-		_accessLevel = set.getInteger("accessLevel", 7);
+		_requireConfirm = set.getBoolean("confirmDlg", false);
+		_accessLevel = set.getInt("accessLevel", 7);
 	}
 	
 	public L2AdminCommandAccessRight(String command, boolean confirm, int level)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2EnchantSkillGroup.java

@@ -58,10 +58,10 @@ public final class L2EnchantSkillGroup
 		
 		public EnchantSkillHolder(StatsSet set)
 		{
-			_level = set.getInteger("level");
-			_adenaCost = set.getInteger("adena");
-			_expCost = set.getInteger("exp");
-			_spCost = set.getInteger("sp");
+			_level = set.getInt("level");
+			_adenaCost = set.getInt("adena");
+			_expCost = set.getInt("exp");
+			_spCost = set.getInt("sp");
 			_rate = new byte[24];
 			for (int i = 0; i < 24; i++)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2PetLevelData.java

@@ -50,7 +50,7 @@ public class L2PetLevelData
 	
 	public L2PetLevelData(StatsSet set)
 	{
-		_ownerExpTaken = set.getInteger("get_exp_type");
+		_ownerExpTaken = set.getInt("get_exp_type");
 		_petMaxExp = set.getLong("exp");
 		_petMaxHP = set.getFloat("org_hp");
 		_petMaxMP = set.getFloat("org_mp");
@@ -58,19 +58,19 @@ public class L2PetLevelData
 		_petPDef = set.getFloat("org_pdefend");
 		_petMAtk = set.getFloat("org_mattack");
 		_petMDef = set.getFloat("org_mdefend");
-		_petMaxFeed = set.getInteger("max_meal");
-		_petFeedBattle = set.getInteger("consume_meal_in_battle");
-		_petFeedNormal = set.getInteger("consume_meal_in_normal");
+		_petMaxFeed = set.getInt("max_meal");
+		_petFeedBattle = set.getInt("consume_meal_in_battle");
+		_petFeedNormal = set.getInt("consume_meal_in_normal");
 		_petRegenHP = set.getFloat("org_hp_regen");
 		_petRegenMP = set.getFloat("org_mp_regen");
 		_petSoulShot = set.getShort("soulshot_count");
 		_petSpiritShot = set.getShort("spiritshot_count");
-		_walkSpeedOnRide = set.getInteger("walkSpeedOnRide", 0);
-		_runSpeedOnRide = set.getInteger("runSpeedOnRide", 0);
-		_slowSwimSpeedOnRide = set.getInteger("slowSwimSpeedOnRide", 0);
-		_fastSwimSpeedOnRide = set.getInteger("fastSwimSpeedOnRide", 0);
-		_slowFlySpeedOnRide = set.getInteger("slowFlySpeedOnRide", 0);
-		_fastFlySpeedOnRide = set.getInteger("fastFlySpeedOnRide", 0);
+		_walkSpeedOnRide = set.getInt("walkSpeedOnRide", 0);
+		_runSpeedOnRide = set.getInt("runSpeedOnRide", 0);
+		_slowSwimSpeedOnRide = set.getInt("slowSwimSpeedOnRide", 0);
+		_fastSwimSpeedOnRide = set.getInt("fastSwimSpeedOnRide", 0);
+		_slowFlySpeedOnRide = set.getInt("slowFlySpeedOnRide", 0);
+		_fastFlySpeedOnRide = set.getInt("fastFlySpeedOnRide", 0);
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2RecipeList.java

@@ -75,20 +75,20 @@ public class L2RecipeList
 		_recipes = new L2RecipeInstance[0];
 		_statUse = new L2RecipeStatInstance[0];
 		_altStatChange = new L2RecipeStatInstance[0];
-		_id = set.getInteger("id");
-		_level = set.getInteger("craftLevel");
-		_recipeId = set.getInteger("recipeId");
+		_id = set.getInt("id");
+		_level = set.getInt("craftLevel");
+		_recipeId = set.getInt("recipeId");
 		_recipeName = set.getString("recipeName");
-		_successRate = set.getInteger("successRate");
-		_itemId = set.getInteger("itemId");
-		_count = set.getInteger("count");
+		_successRate = set.getInt("successRate");
+		_itemId = set.getInt("itemId");
+		_count = set.getInt("count");
 		if (haveRare)
 		{
-			_rareItemId = set.getInteger("rareItemId");
-			_rareCount = set.getInteger("rareCount");
-			_rarity = set.getInteger("rarity");
+			_rareItemId = set.getInt("rareItemId");
+			_rareCount = set.getInt("rareCount");
+			_rarity = set.getInt("rarity");
 		}
-		_isDwarvenRecipe = set.getBool("isDwarvenRecipe");
+		_isDwarvenRecipe = set.getBoolean("isDwarvenRecipe");
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Seed.java

@@ -35,16 +35,16 @@ public class L2Seed
 	
 	public L2Seed(StatsSet set)
 	{
-		_cropId = set.getInteger("id");
-		_seedId = set.getInteger("seedId");
-		_level = set.getInteger("level");
-		_matureId = set.getInteger("mature_Id");
-		_reward1 = set.getInteger("reward1");
-		_reward2 = set.getInteger("reward2");
-		_castleId = set.getInteger("castleId");
-		_isAlternative = set.getBool("alternative");
-		_limitCrops = set.getInteger("limit_crops");
-		_limitSeeds = set.getInteger("limit_seed");
+		_cropId = set.getInt("id");
+		_seedId = set.getInt("seedId");
+		_level = set.getInt("level");
+		_matureId = set.getInt("mature_Id");
+		_reward1 = set.getInt("reward1");
+		_reward2 = set.getInt("reward2");
+		_castleId = set.getInt("castleId");
+		_isAlternative = set.getBoolean("alternative");
+		_limitCrops = set.getInt("limit_crops");
+		_limitSeeds = set.getInt("limit_seed");
 	}
 	
 	public int getCastleId()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2SkillLearn.java

@@ -84,14 +84,14 @@ public final class L2SkillLearn
 	public L2SkillLearn(StatsSet set)
 	{
 		_skillName = set.getString("skillName");
-		_skillId = set.getInteger("skillId");
-		_skillLvl = set.getInteger("skillLvl");
-		_getLevel = set.getInteger("getLevel");
-		_autoGet = set.getBool("autoGet", false);
-		_levelUpSp = set.getInteger("levelUpSp", 0);
-		_residenceSkill = set.getBool("residenceSkill", false);
-		_learnedByNpc = set.getBool("learnedByNpc", false);
-		_learnedByFS = set.getBool("learnedByFS", false);
+		_skillId = set.getInt("skillId");
+		_skillLvl = set.getInt("skillLvl");
+		_getLevel = set.getInt("getLevel");
+		_autoGet = set.getBoolean("autoGet", false);
+		_levelUpSp = set.getInt("levelUpSp", 0);
+		_residenceSkill = set.getBoolean("residenceSkill", false);
+		_learnedByNpc = set.getBoolean("learnedByNpc", false);
+		_learnedByFS = set.getBoolean("learnedByFS", false);
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/StatsSet.java

@@ -27,12 +27,14 @@ import java.util.logging.Logger;
 
 import javolution.util.FastMap;
 
+import com.l2jserver.gameserver.model.interfaces.IParserAdvUtils;
+
 /**
- * @author mkizub <BR>
- *         This class is used in order to have a set of couples (key,value).<BR>
- *         Methods deployed are accessors to the set (add/get value from its key) and addition of a whole set in the current one.
+ * This class is meant to hold a set of (key,value) pairs.<br>
+ * They are stored as object but can be retrieved in any type wanted. As long as cast is available.<br>
+ * @author mkizub
  */
-public class StatsSet
+public class StatsSet implements IParserAdvUtils
 {
 	private static final Logger _log = Logger.getLogger(StatsSet.class.getName());
 	private final Map<String, Object> _set;
@@ -70,13 +72,15 @@ public class StatsSet
 	}
 	
 	/**
-	 * Return the boolean associated to the key put in parameter ("name")
-	 * @param name : String designating the key in the set
+	 * Return the boolean value associated with key.
+	 * @param key : String designating the key in the set
 	 * @return boolean : value associated to the key
+	 * @throws IllegalArgumentException : If value is not set or value is not boolean
 	 */
-	public boolean getBool(String name)
+	@Override
+	public boolean getBoolean(String key)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
 			throw new IllegalArgumentException("Boolean value required, but not specified");
@@ -96,17 +100,18 @@ public class StatsSet
 	}
 	
 	/**
-	 * Return the boolean associated to the key put in parameter ("name"). If the value associated to the key is null, this method returns the value of the parameter deflt.
-	 * @param name : String designating the key in the set
-	 * @param deflt : boolean designating the default value if value associated with the key is null
-	 * @return boolean : value of the key
+	 * Return the boolean value associated with key.<br>
+	 * If no value is associated with key, or type of value is wrong, returns defaultValue.
+	 * @param key : String designating the key in the entry set
+	 * @return boolean : value associated to the key
 	 */
-	public boolean getBool(String name, boolean deflt)
+	@Override
+	public boolean getBoolean(String key, boolean defaultValue)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
-			return deflt;
+			return defaultValue;
 		}
 		if (val instanceof Boolean)
 		{
@@ -118,22 +123,17 @@ public class StatsSet
 		}
 		catch (Exception e)
 		{
-			throw new IllegalArgumentException("Boolean value required, but found: " + val);
+			return defaultValue;
 		}
 	}
 	
-	/**
-	 * Returns the int associated to the key put in parameter ("name"). If the value associated to the key is null, this method returns the value of the parameter deflt.
-	 * @param name : String designating the key in the set
-	 * @param deflt : byte designating the default value if value associated with the key is null
-	 * @return byte : value associated to the key
-	 */
-	public byte getByte(String name, byte deflt)
+	@Override
+	public byte getByte(String key)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
-			return deflt;
+			throw new IllegalArgumentException("Byte value required, but not specified");
 		}
 		if (val instanceof Number)
 		{
@@ -149,17 +149,13 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the byte associated to the key put in parameter ("name").
-	 * @param name : String designating the key in the set
-	 * @return byte : value associated to the key
-	 */
-	public byte getByte(String name)
+	@Override
+	public byte getByte(String key, byte defaultValue)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
-			throw new IllegalArgumentException("Byte value required, but not specified");
+			return defaultValue;
 		}
 		if (val instanceof Number)
 		{
@@ -175,15 +171,9 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the byte[] associated to the key put in parameter ("name"). If the value associated to the key is null, this method returns the value of the parameter deflt.
-	 * @param name : String designating the key in the set
-	 * @param splitOn
-	 * @return byte[] : value associated to the key
-	 */
-	public byte[] getByteArray(String name, String splitOn)
+	public byte[] getByteArray(String key, String splitOn)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
 			throw new IllegalArgumentException("Byte value required, but not specified");
@@ -213,28 +203,23 @@ public class StatsSet
 		return result;
 	}
 	
-	public List<Byte> getByteList(String name, String splitOn)
+	public List<Byte> getByteList(String key, String splitOn)
 	{
 		List<Byte> result = new ArrayList<>();
-		for (Byte i : getByteArray(name, splitOn))
+		for (Byte i : getByteArray(key, splitOn))
 		{
 			result.add(i);
 		}
 		return result;
 	}
 	
-	/**
-	 * Returns the short associated to the key put in parameter ("name"). If the value associated to the key is null, this method returns the value of the parameter deflt.
-	 * @param name : String designating the key in the set
-	 * @param deflt : short designating the default value if value associated with the key is null
-	 * @return short : value associated to the key
-	 */
-	public short getShort(String name, short deflt)
+	@Override
+	public short getShort(String key)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
-			return deflt;
+			throw new IllegalArgumentException("Short value required, but not specified");
 		}
 		if (val instanceof Number)
 		{
@@ -250,17 +235,13 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the short associated to the key put in parameter ("name").
-	 * @param name : String designating the key in the set
-	 * @return short : value associated to the key
-	 */
-	public short getShort(String name)
+	@Override
+	public short getShort(String key, short defaultValue)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
-			throw new IllegalArgumentException("Short value required, but not specified");
+			return defaultValue;
 		}
 		if (val instanceof Number)
 		{
@@ -276,17 +257,13 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the int associated to the key put in parameter ("name").
-	 * @param name : String designating the key in the set
-	 * @return int : value associated to the key
-	 */
-	public int getInteger(String name)
+	@Override
+	public int getInt(String key)
 	{
-		final Object val = _set.get(name);
+		final Object val = _set.get(key);
 		if (val == null)
 		{
-			throw new IllegalArgumentException("Integer value required, but not specified: " + name + "!");
+			throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!");
 		}
 		
 		if (val instanceof Number)
@@ -304,18 +281,13 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the int associated to the key put in parameter ("name"). If the value associated to the key is null, this method returns the value of the parameter deflt.
-	 * @param name : String designating the key in the set
-	 * @param deflt : int designating the default value if value associated with the key is null
-	 * @return int : value associated to the key
-	 */
-	public int getInteger(String name, int deflt)
+	@Override
+	public int getInt(String key, int defaultValue)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
-			return deflt;
+			return defaultValue;
 		}
 		if (val instanceof Number)
 		{
@@ -331,15 +303,9 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the int[] associated to the key put in parameter ("name"). If the value associated to the key is null, this method returns the value of the parameter deflt.
-	 * @param name : String designating the key in the set
-	 * @param splitOn
-	 * @return int[] : value associated to the key
-	 */
-	public int[] getIntegerArray(String name, String splitOn)
+	public int[] getIntArray(String key, String splitOn)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
 			throw new IllegalArgumentException("Integer value required, but not specified");
@@ -369,24 +335,20 @@ public class StatsSet
 		return result;
 	}
 	
-	public List<Integer> getIntegerList(String name, String splitOn)
+	public List<Integer> getIntegerList(String key, String splitOn)
 	{
 		List<Integer> result = new ArrayList<>();
-		for (int i : getIntegerArray(name, splitOn))
+		for (int i : getIntArray(key, splitOn))
 		{
 			result.add(i);
 		}
 		return result;
 	}
 	
-	/**
-	 * Returns the long associated to the key put in parameter ("name").
-	 * @param name : String designating the key in the set
-	 * @return long : value associated to the key
-	 */
-	public long getLong(String name)
+	@Override
+	public long getLong(String key)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
 			throw new IllegalArgumentException("Integer value required, but not specified");
@@ -405,18 +367,13 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the long associated to the key put in parameter ("name"). If the value associated to the key is null, this method returns the value of the parameter deflt.
-	 * @param name : String designating the key in the set
-	 * @param deflt : long designating the default value if value associated with the key is null
-	 * @return long : value associated to the key
-	 */
-	public long getLong(String name, long deflt)
+	@Override
+	public long getLong(String key, long defaultValue)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
-			return deflt;
+			return defaultValue;
 		}
 		if (val instanceof Number)
 		{
@@ -432,14 +389,10 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the float associated to the key put in parameter ("name").
-	 * @param name : String designating the key in the set
-	 * @return float : value associated to the key
-	 */
-	public float getFloat(String name)
+	@Override
+	public float getFloat(String key)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
 			throw new IllegalArgumentException("Float value required, but not specified");
@@ -458,18 +411,13 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the float associated to the key put in parameter ("name"). If the value associated to the key is null, this method returns the value of the parameter deflt.
-	 * @param name : String designating the key in the set
-	 * @param deflt : float designating the default value if value associated with the key is null
-	 * @return float : value associated to the key
-	 */
-	public float getFloat(String name, float deflt)
+	@Override
+	public float getFloat(String key, float defaultValue)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
-			return deflt;
+			return defaultValue;
 		}
 		if (val instanceof Number)
 		{
@@ -485,14 +433,10 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the double associated to the key put in parameter ("name").
-	 * @param name : String designating the key in the set
-	 * @return double : value associated to the key
-	 */
-	public double getDouble(String name)
+	@Override
+	public double getDouble(String key)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
 			throw new IllegalArgumentException("Float value required, but not specified");
@@ -511,18 +455,13 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the double associated to the key put in parameter ("name"). If the value associated to the key is null, this method returns the value of the parameter deflt.
-	 * @param name : String designating the key in the set
-	 * @param deflt : float designating the default value if value associated with the key is null
-	 * @return double : value associated to the key
-	 */
-	public double getDouble(String name, double deflt)
+	@Override
+	public double getDouble(String key, double defaultValue)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
-			return deflt;
+			return defaultValue;
 		}
 		if (val instanceof Number)
 		{
@@ -538,14 +477,10 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns the String associated to the key put in parameter ("name").
-	 * @param name : String designating the key in the set
-	 * @return String : value associated to the key
-	 */
-	public String getString(String name)
+	@Override
+	public String getString(String key)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
 			throw new IllegalArgumentException("String value required, but not specified");
@@ -553,33 +488,22 @@ public class StatsSet
 		return String.valueOf(val);
 	}
 	
-	/**
-	 * Returns the String associated to the key put in parameter ("name"). If the value associated to the key is null, this method returns the value of the parameter deflt.
-	 * @param name : String designating the key in the set
-	 * @param deflt : String designating the default value if value associated with the key is null
-	 * @return String : value associated to the key
-	 */
-	public String getString(String name, String deflt)
+	@Override
+	public String getString(String key, String defaultValue)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
-			return deflt;
+			return defaultValue;
 		}
 		return String.valueOf(val);
 	}
 	
-	/**
-	 * Returns an enumeration of &lt;T&gt; from the set
-	 * @param <T> : Class of the enumeration returned
-	 * @param name : String designating the key in the set
-	 * @param enumClass : Class designating the class of the value associated with the key in the set
-	 * @return Enum<T>
-	 */
+	@Override
 	@SuppressWarnings("unchecked")
-	public <T extends Enum<T>> T getEnum(String name, Class<T> enumClass)
+	public <T extends Enum<T>> T getEnum(String key, Class<T> enumClass)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
 			throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified");
@@ -598,21 +522,14 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Returns an enumeration of &lt;T&gt; from the set. If the enumeration is empty, the method returns the value of the parameter "deflt".
-	 * @param <T> : Class of the enumeration returned
-	 * @param name : String designating the key in the set
-	 * @param enumClass : Class designating the class of the value associated with the key in the set
-	 * @param deflt : <T> designating the value by default
-	 * @return Enum<T>
-	 */
+	@Override
 	@SuppressWarnings("unchecked")
-	public <T extends Enum<T>> T getEnum(String name, Class<T> enumClass, T deflt)
+	public <T extends Enum<T>> T getEnum(String key, Class<T> enumClass, T defaultValue)
 	{
-		Object val = _set.get(name);
+		Object val = _set.get(key);
 		if (val == null)
 		{
-			return deflt;
+			return defaultValue;
 		}
 		if (enumClass.isInstance(val))
 		{
@@ -628,83 +545,59 @@ public class StatsSet
 		}
 	}
 	
-	/**
-	 * Add the String hold in param "value" for the key "name"
-	 * @param name : String designating the key in the set
-	 * @param value : String corresponding to the value associated with the key
-	 */
-	public void set(String name, String value)
+	public void set(String key, boolean value)
 	{
-		_set.put(name, value);
+		_set.put(key, value);
 	}
 	
-	/**
-	 * Add the boolean hold in param "value" for the key "name"
-	 * @param name : String designating the key in the set
-	 * @param value : boolean corresponding to the value associated with the key
-	 */
-	public void set(String name, boolean value)
+	public void set(String key, byte value)
 	{
-		_set.put(name, value);
+		_set.put(key, value);
 	}
 	
-	/**
-	 * Add the int hold in param "value" for the key "name"
-	 * @param name : String designating the key in the set
-	 * @param value : int corresponding to the value associated with the key
-	 */
-	public void set(String name, int value)
+	public void set(String key, short value)
 	{
-		_set.put(name, value);
+		_set.put(key, value);
 	}
 	
-	/**
-	 * Safe version of "set". Expected values are within [min, max[<br>
-	 * Add the int hold in param "value" for the key "name".
-	 * @param name : String designating the key in the set
-	 * @param value : int corresponding to the value associated with the key
-	 * @param min
-	 * @param max
-	 * @param reference
-	 */
-	public void safeSet(String name, int value, int min, int max, String reference)
+	public void set(String key, int value)
 	{
-		assert !(((min <= max) && ((value < min) || (value >= max))));
-		if ((min <= max) && ((value < min) || (value >= max)))
-		{
-			_log.log(Level.SEVERE, "Incorrect value: " + value + "for: " + name + "Ref: " + reference);
-		}
-		
-		set(name, value);
+		_set.put(key, value);
 	}
 	
-	/**
-	 * Add the double hold in param "value" for the key "name"
-	 * @param name : String designating the key in the set
-	 * @param value : double corresponding to the value associated with the key
-	 */
-	public void set(String name, double value)
+	public void set(String key, long value)
 	{
-		_set.put(name, value);
+		_set.put(key, value);
 	}
 	
-	/**
-	 * Add the long hold in param "value" for the key "name"
-	 * @param name : String designating the key in the set
-	 * @param value : double corresponding to the value associated with the key
-	 */
-	public void set(String name, long value)
+	public void set(String key, float value)
 	{
-		_set.put(name, value);
+		_set.put(key, value);
 	}
 	
-	/**
-	 * Add the Enum hold in param "value" for the key "name"
-	 * @param name : String designating the key in the set
-	 * @param value : Enum corresponding to the value associated with the key
-	 */
-	public void set(String name, Enum<?> value)
+	public void set(String key, double value)
 	{
-		_set.put(name, value);
+		_set.put(key, value);
+	}
+	
+	public void set(String key, String value)
+	{
+		_set.put(key, value);
+	}
+	
+	public void set(String key, Enum<?> value)
+	{
+		_set.put(key, value);
+	}
+	
+	public void safeSet(String key, int value, int min, int max, String reference)
+	{
+		assert !(((min <= max) && ((value < min) || (value >= max))));
+		if ((min <= max) && ((value < min) || (value >= max)))
+		{
+			_log.log(Level.SEVERE, "Incorrect value: " + value + "for: " + key + "Ref: " + reference);
+		}
+		
+		set(key, value);
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2CharTemplate.java

@@ -115,66 +115,66 @@ public class L2CharTemplate
 	public void set(StatsSet set)
 	{
 		// Base stats
-		_baseSTR = set.getInteger("baseSTR", 0);
-		_baseCON = set.getInteger("baseCON", 0);
-		_baseDEX = set.getInteger("baseDEX", 0);
-		_baseINT = set.getInteger("baseINT", 0);
-		_baseWIT = set.getInteger("baseWIT", 0);
-		_baseMEN = set.getInteger("baseMEN", 0);
+		_baseSTR = set.getInt("baseSTR", 0);
+		_baseCON = set.getInt("baseCON", 0);
+		_baseDEX = set.getInt("baseDEX", 0);
+		_baseINT = set.getInt("baseINT", 0);
+		_baseWIT = set.getInt("baseWIT", 0);
+		_baseMEN = set.getInt("baseMEN", 0);
 		_baseHpMax = set.getFloat("baseHpMax", 0);
 		_baseCpMax = set.getFloat("baseCpMax", 0);
 		_baseMpMax = set.getFloat("baseMpMax", 0);
 		_baseHpReg = set.getFloat("baseHpReg", 0);
 		_baseMpReg = set.getFloat("baseMpReg", 0);
-		_basePAtk = set.getInteger("basePAtk", 0);
-		_baseMAtk = set.getInteger("baseMAtk", 0);
-		_basePDef = set.getInteger("basePDef", 0);
-		_baseMDef = set.getInteger("baseMDef", 0);
-		_basePAtkSpd = set.getInteger("basePAtkSpd", 300);
-		_baseMAtkSpd = set.getInteger("baseMAtkSpd", 333);
+		_basePAtk = set.getInt("basePAtk", 0);
+		_baseMAtk = set.getInt("baseMAtk", 0);
+		_basePDef = set.getInt("basePDef", 0);
+		_baseMDef = set.getInt("baseMDef", 0);
+		_basePAtkSpd = set.getInt("basePAtkSpd", 300);
+		_baseMAtkSpd = set.getInt("baseMAtkSpd", 333);
 		_baseMReuseRate = set.getFloat("baseMReuseDelay", 1.f);
-		_baseShldDef = set.getInteger("baseShldDef", 0);
-		_baseAttackRange = set.getInteger("baseAtkRange", 40);
+		_baseShldDef = set.getInt("baseShldDef", 0);
+		_baseAttackRange = set.getInt("baseAtkRange", 40);
 		_baseAttackType = L2WeaponType.findByName(set.getString("baseAtkType", "Fist"));
-		_baseShldRate = set.getInteger("baseShldRate", 0);
-		_baseCritRate = set.getInteger("baseCritRate", 4);
-		_baseMCritRate = set.getInteger("baseMCritRate", 0);
+		_baseShldRate = set.getInt("baseShldRate", 0);
+		_baseCritRate = set.getInt("baseCritRate", 4);
+		_baseMCritRate = set.getInt("baseMCritRate", 0);
 		
 		// SpecialStats
-		_baseBreath = set.getInteger("baseBreath", 100);
-		_baseAggression = set.getInteger("baseAggression", 0);
-		_baseBleed = set.getInteger("baseBleed", 0);
-		_basePoison = set.getInteger("basePoison", 0);
-		_baseStun = set.getInteger("baseStun", 0);
-		_baseRoot = set.getInteger("baseRoot", 0);
-		_baseMovement = set.getInteger("baseMovement", 0);
-		_baseConfusion = set.getInteger("baseConfusion", 0);
-		_baseSleep = set.getInteger("baseSleep", 0);
-		_baseFire = set.getInteger("baseFire", 0);
-		_baseWind = set.getInteger("baseWind", 0);
-		_baseWater = set.getInteger("baseWater", 0);
-		_baseEarth = set.getInteger("baseEarth", 0);
-		_baseHoly = set.getInteger("baseHoly", 0);
-		_baseDark = set.getInteger("baseDark", 0);
-		_baseAggressionVuln = set.getInteger("baseAggressionVuln", 0);
-		_baseBleedVuln = set.getInteger("baseBleedVuln", 0);
-		_basePoisonVuln = set.getInteger("basePoisonVuln", 0);
-		_baseStunVuln = set.getInteger("baseStunVuln", 0);
-		_baseRootVuln = set.getInteger("baseRootVuln", 0);
-		_baseMovementVuln = set.getInteger("baseMovementVuln", 0);
-		_baseSleepVuln = set.getInteger("baseSleepVuln", 0);
-		_baseCritVuln = set.getInteger("baseCritVuln", 1);
-		_baseFireRes = set.getInteger("baseFireRes", 0);
-		_baseWindRes = set.getInteger("baseWindRes", 0);
-		_baseWaterRes = set.getInteger("baseWaterRes", 0);
-		_baseEarthRes = set.getInteger("baseEarthRes", 0);
-		_baseHolyRes = set.getInteger("baseHolyRes", 0);
-		_baseDarkRes = set.getInteger("baseDarkRes", 0);
-		_baseElementRes = set.getInteger("baseElementRes", 0);
+		_baseBreath = set.getInt("baseBreath", 100);
+		_baseAggression = set.getInt("baseAggression", 0);
+		_baseBleed = set.getInt("baseBleed", 0);
+		_basePoison = set.getInt("basePoison", 0);
+		_baseStun = set.getInt("baseStun", 0);
+		_baseRoot = set.getInt("baseRoot", 0);
+		_baseMovement = set.getInt("baseMovement", 0);
+		_baseConfusion = set.getInt("baseConfusion", 0);
+		_baseSleep = set.getInt("baseSleep", 0);
+		_baseFire = set.getInt("baseFire", 0);
+		_baseWind = set.getInt("baseWind", 0);
+		_baseWater = set.getInt("baseWater", 0);
+		_baseEarth = set.getInt("baseEarth", 0);
+		_baseHoly = set.getInt("baseHoly", 0);
+		_baseDark = set.getInt("baseDark", 0);
+		_baseAggressionVuln = set.getInt("baseAggressionVuln", 0);
+		_baseBleedVuln = set.getInt("baseBleedVuln", 0);
+		_basePoisonVuln = set.getInt("basePoisonVuln", 0);
+		_baseStunVuln = set.getInt("baseStunVuln", 0);
+		_baseRootVuln = set.getInt("baseRootVuln", 0);
+		_baseMovementVuln = set.getInt("baseMovementVuln", 0);
+		_baseSleepVuln = set.getInt("baseSleepVuln", 0);
+		_baseCritVuln = set.getInt("baseCritVuln", 1);
+		_baseFireRes = set.getInt("baseFireRes", 0);
+		_baseWindRes = set.getInt("baseWindRes", 0);
+		_baseWaterRes = set.getInt("baseWaterRes", 0);
+		_baseEarthRes = set.getInt("baseEarthRes", 0);
+		_baseHolyRes = set.getInt("baseHolyRes", 0);
+		_baseDarkRes = set.getInt("baseDarkRes", 0);
+		_baseElementRes = set.getInt("baseElementRes", 0);
 		
 		// C4 Stats
-		_baseMpConsumeRate = set.getInteger("baseMpConsumeRate", 0);
-		_baseHpConsumeRate = set.getInteger("baseHpConsumeRate", 0);
+		_baseMpConsumeRate = set.getInt("baseMpConsumeRate", 0);
+		_baseHpConsumeRate = set.getInt("baseHpConsumeRate", 0);
 		
 		// Geometry
 		_fCollisionHeight = set.getDouble("collision_height", 0);
@@ -184,10 +184,10 @@ public class L2CharTemplate
 		
 		// speed.
 		Arrays.fill(_moveType, 1);
-		setBaseMoveSpeed(MoveType.RUN, set.getInteger("baseRunSpd", 1));
-		setBaseMoveSpeed(MoveType.WALK, set.getInteger("baseWalkSpd", 1));
-		setBaseMoveSpeed(MoveType.FAST_SWIM, set.getInteger("baseSwimRunSpd", 1));
-		setBaseMoveSpeed(MoveType.SLOW_SWIM, set.getInteger("baseSwimWalkSpd", 1));
+		setBaseMoveSpeed(MoveType.RUN, set.getInt("baseRunSpd", 1));
+		setBaseMoveSpeed(MoveType.WALK, set.getInt("baseWalkSpd", 1));
+		setBaseMoveSpeed(MoveType.FAST_SWIM, set.getInt("baseSwimRunSpd", 1));
+		setBaseMoveSpeed(MoveType.SLOW_SWIM, set.getInt("baseSwimWalkSpd", 1));
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2DoorTemplate.java

@@ -61,7 +61,7 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
 	public L2DoorTemplate(StatsSet set)
 	{
 		super(set);
-		_doorId = set.getInteger("id");
+		_doorId = set.getInt("id");
 		_name = set.getString("name");
 		
 		// position
@@ -69,8 +69,8 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
 		_posX = Integer.parseInt(pos[0]);
 		_posY = Integer.parseInt(pos[1]);
 		_posZ = Integer.parseInt(pos[2]);
-		_height = set.getInteger("height");
-		_nodeZ = set.getInteger("nodeZ");
+		_height = set.getInt("height");
+		_nodeZ = set.getInt("nodeZ");
 		_nodeX = new int[4]; // 4 * x
 		_nodeY = new int[4]; // 4 * y
 		for (int i = 0; i < 4; i++)
@@ -81,12 +81,12 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
 		}
 		
 		// optional
-		_emmiter = set.getInteger("emitter_id", 0);
-		_showHp = set.getBool("hp_showable", true);
-		_isWall = set.getBool("is_wall", false);
+		_emmiter = set.getInt("emitter_id", 0);
+		_showHp = set.getBoolean("hp_showable", true);
+		_isWall = set.getBoolean("is_wall", false);
 		_groupName = set.getString("group", null);
 		
-		_childDoorId = set.getInteger("child_id_event", -1);
+		_childDoorId = set.getInt("child_id_event", -1);
 		// true if door is opening
 		String masterevent = set.getString("master_close_event", "act_nothing");
 		_masterDoorClose = (byte) (masterevent.equals("act_open") ? 1 : masterevent.equals("act_close") ? -1 : 0);
@@ -94,19 +94,19 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
 		masterevent = set.getString("master_open_event", "act_nothing");
 		_masterDoorOpen = (byte) (masterevent.equals("act_open") ? 1 : masterevent.equals("act_close") ? -1 : 0);
 		
-		_isTargetable = set.getBool("targetable", true);
+		_isTargetable = set.getBoolean("targetable", true);
 		_default_status = set.getString("default_status", "close").equals("open");
-		_closeTime = set.getInteger("close_time", -1);
-		_level = set.getInteger("level", 0);
-		_openType = set.getInteger("open_method", 0);
-		_checkCollision = set.getBool("check_collision", true);
+		_closeTime = set.getInt("close_time", -1);
+		_level = set.getInt("level", 0);
+		_openType = set.getInt("open_method", 0);
+		_checkCollision = set.getBoolean("check_collision", true);
 		if ((_openType & L2DoorInstance.OPEN_BY_TIME) == L2DoorInstance.OPEN_BY_TIME)
 		{
-			_openTime = set.getInteger("open_time");
-			_randomTime = set.getInteger("random_time", -1);
+			_openTime = set.getInt("open_time");
+			_randomTime = set.getInt("random_time", -1);
 		}
-		_isAttackableDoor = set.getBool("is_attackable", false);
-		_clanhallId = set.getInteger("clanhall_id", 0);
+		_isAttackableDoor = set.getBoolean("is_attackable", false);
+		_clanhallId = set.getInt("clanhall_id", 0);
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java

@@ -103,22 +103,22 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
 	public void set(StatsSet set)
 	{
 		super.set(set);
-		_npcId = set.getInteger("npcId");
-		_idTemplate = set.getInteger("idTemplate");
+		_npcId = set.getInt("npcId");
+		_idTemplate = set.getInt("idTemplate");
 		_type = set.getString("type");
 		_name = set.getString("name");
-		_serverSideName = set.getBool("serverSideName");
+		_serverSideName = set.getBoolean("serverSideName");
 		_title = set.getString("title");
 		_isQuestMonster = getTitle().equalsIgnoreCase("Quest Monster");
-		_serverSideTitle = set.getBool("serverSideTitle");
+		_serverSideTitle = set.getBoolean("serverSideTitle");
 		_sex = set.getString("sex");
 		_level = set.getByte("level");
-		_rewardExp = set.getInteger("rewardExp");
-		_rewardSp = set.getInteger("rewardSp");
-		_rHand = set.getInteger("rhand");
-		_lHand = set.getInteger("lhand");
-		_enchantEffect = set.getInteger("enchant");
-		final int herbGroup = set.getInteger("dropHerbGroup");
+		_rewardExp = set.getInt("rewardExp");
+		_rewardSp = set.getInt("rewardSp");
+		_rHand = set.getInt("rhand");
+		_lHand = set.getInt("lhand");
+		_enchantEffect = set.getInt("enchant");
+		final int herbGroup = set.getInt("dropHerbGroup");
 		if ((herbGroup > 0) && (HerbDropTable.getInstance().getHerbDroplist(herbGroup) == null))
 		{
 			_log.warning("Missing Herb Drop Group for npcId: " + getId());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2PcTemplate.java

@@ -59,7 +59,7 @@ public class L2PcTemplate extends L2CharTemplate
 	public L2PcTemplate(StatsSet set, List<Location> creationPoints)
 	{
 		super(set);
-		_classId = ClassId.getClassId(set.getInteger("classId"));
+		_classId = ClassId.getClassId(set.getInt("classId"));
 		
 		_baseHp = new float[ExperienceTable.getInstance().getMaxLevel()];
 		_baseMp = new float[ExperienceTable.getInstance().getMaxLevel()];
@@ -69,23 +69,23 @@ public class L2PcTemplate extends L2CharTemplate
 		_baseCpReg = new double[ExperienceTable.getInstance().getMaxLevel()];
 		
 		_baseSlotDef = new HashMap<>(12);
-		_baseSlotDef.put(Inventory.PAPERDOLL_CHEST, set.getInteger("basePDefchest", 0));
-		_baseSlotDef.put(Inventory.PAPERDOLL_LEGS, set.getInteger("basePDeflegs", 0));
-		_baseSlotDef.put(Inventory.PAPERDOLL_HEAD, set.getInteger("basePDefhead", 0));
-		_baseSlotDef.put(Inventory.PAPERDOLL_FEET, set.getInteger("basePDeffeet", 0));
-		_baseSlotDef.put(Inventory.PAPERDOLL_GLOVES, set.getInteger("basePDefgloves", 0));
-		_baseSlotDef.put(Inventory.PAPERDOLL_UNDER, set.getInteger("basePDefunderwear", 0));
-		_baseSlotDef.put(Inventory.PAPERDOLL_CLOAK, set.getInteger("basePDefcloak", 0));
-		_baseSlotDef.put(Inventory.PAPERDOLL_REAR, set.getInteger("baseMDefrear", 0));
-		_baseSlotDef.put(Inventory.PAPERDOLL_LEAR, set.getInteger("baseMDeflear", 0));
-		_baseSlotDef.put(Inventory.PAPERDOLL_RFINGER, set.getInteger("baseMDefrfinger", 0));
-		_baseSlotDef.put(Inventory.PAPERDOLL_LFINGER, set.getInteger("baseMDefrfinger", 0));
-		_baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInteger("baseMDefneck", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_CHEST, set.getInt("basePDefchest", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_LEGS, set.getInt("basePDeflegs", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_HEAD, set.getInt("basePDefhead", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_FEET, set.getInt("basePDeffeet", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_GLOVES, set.getInt("basePDefgloves", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_UNDER, set.getInt("basePDefunderwear", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_CLOAK, set.getInt("basePDefcloak", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_REAR, set.getInt("baseMDefrear", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_LEAR, set.getInt("baseMDeflear", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_RFINGER, set.getInt("baseMDefrfinger", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_LFINGER, set.getInt("baseMDefrfinger", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0));
 		
 		_fCollisionRadiusFemale = set.getDouble("collisionFemaleradius");
 		_fCollisionHeightFemale = set.getDouble("collisionFemaleheight");
 		
-		_baseSafeFallHeight = set.getInteger("baseSafeFall", 333);
+		_baseSafeFallHeight = set.getInt("baseSafeFall", 333);
 		
 		_initialEquipment = InitialEquipmentData.getInstance().getEquipmentList(_classId);
 		_creationPoints = creationPoints;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/transform/Transform.java

@@ -51,12 +51,12 @@ public final class Transform implements IIdentifiable
 	
 	public Transform(StatsSet set)
 	{
-		_id = set.getInteger("id");
-		_displayId = set.getInteger("displayId", _id);
+		_id = set.getInt("id");
+		_displayId = set.getInt("displayId", _id);
 		_type = set.getEnum("type", TransformType.class, TransformType.COMBAT);
-		_canSwim = set.getInteger("can_swim", 0) == 1;
-		_canAttack = set.getInteger("normal_attackable", 1) == 1;
-		_spawnHeight = set.getInteger("spawn_height", 0);
+		_canSwim = set.getInt("can_swim", 0) == 1;
+		_canAttack = set.getInt("normal_attackable", 1) == 1;
+		_spawnHeight = set.getInt("spawn_height", 0);
 		_name = set.getString("setName", null);
 		_title = set.getString("setTitle", null);
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/transform/TransformLevelData.java

@@ -35,7 +35,7 @@ public final class TransformLevelData
 	
 	public TransformLevelData(StatsSet set)
 	{
-		_level = set.getInteger("val");
+		_level = set.getInt("val");
 		_levelMod = set.getDouble("levelMod");
 		addStats(Stats.MAX_HP, set.getDouble("hp"));
 		addStats(Stats.MAX_MP, set.getDouble("mp"));

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/transform/TransformTemplate.java

@@ -70,28 +70,28 @@ public final class TransformTemplate
 		
 		addStats(Stats.POWER_ATTACK, set.getDouble("pAtk", 0));
 		addStats(Stats.MAGIC_ATTACK, set.getDouble("mAtk", 0));
-		addStats(Stats.POWER_ATTACK_RANGE, set.getInteger("range", 0));
-		addStats(Stats.POWER_ATTACK_SPEED, set.getInteger("attackSpeed", 0));
-		addStats(Stats.CRITICAL_RATE, set.getInteger("critRate", 0));
-		addStats(Stats.STAT_STR, set.getInteger("str", 0));
-		addStats(Stats.STAT_INT, set.getInteger("int", 0));
-		addStats(Stats.STAT_CON, set.getInteger("con", 0));
-		addStats(Stats.STAT_DEX, set.getInteger("dex", 0));
-		addStats(Stats.STAT_WIT, set.getInteger("wit", 0));
-		addStats(Stats.STAT_MEN, set.getInteger("men", 0));
+		addStats(Stats.POWER_ATTACK_RANGE, set.getInt("range", 0));
+		addStats(Stats.POWER_ATTACK_SPEED, set.getInt("attackSpeed", 0));
+		addStats(Stats.CRITICAL_RATE, set.getInt("critRate", 0));
+		addStats(Stats.STAT_STR, set.getInt("str", 0));
+		addStats(Stats.STAT_INT, set.getInt("int", 0));
+		addStats(Stats.STAT_CON, set.getInt("con", 0));
+		addStats(Stats.STAT_DEX, set.getInt("dex", 0));
+		addStats(Stats.STAT_WIT, set.getInt("wit", 0));
+		addStats(Stats.STAT_MEN, set.getInt("men", 0));
 		
-		addDefense(Inventory.PAPERDOLL_CHEST, set.getInteger("chest", 0));
-		addDefense(Inventory.PAPERDOLL_LEGS, set.getInteger("legs", 0));
-		addDefense(Inventory.PAPERDOLL_HEAD, set.getInteger("head", 0));
-		addDefense(Inventory.PAPERDOLL_FEET, set.getInteger("feet", 0));
-		addDefense(Inventory.PAPERDOLL_GLOVES, set.getInteger("gloves", 0));
-		addDefense(Inventory.PAPERDOLL_UNDER, set.getInteger("underwear", 0));
-		addDefense(Inventory.PAPERDOLL_CLOAK, set.getInteger("cloak", 0));
-		addDefense(Inventory.PAPERDOLL_REAR, set.getInteger("rear", 0));
-		addDefense(Inventory.PAPERDOLL_LEAR, set.getInteger("lear", 0));
-		addDefense(Inventory.PAPERDOLL_RFINGER, set.getInteger("rfinger", 0));
-		addDefense(Inventory.PAPERDOLL_LFINGER, set.getInteger("lfinger", 0));
-		addDefense(Inventory.PAPERDOLL_NECK, set.getInteger("neck", 0));
+		addDefense(Inventory.PAPERDOLL_CHEST, set.getInt("chest", 0));
+		addDefense(Inventory.PAPERDOLL_LEGS, set.getInt("legs", 0));
+		addDefense(Inventory.PAPERDOLL_HEAD, set.getInt("head", 0));
+		addDefense(Inventory.PAPERDOLL_FEET, set.getInt("feet", 0));
+		addDefense(Inventory.PAPERDOLL_GLOVES, set.getInt("gloves", 0));
+		addDefense(Inventory.PAPERDOLL_UNDER, set.getInt("underwear", 0));
+		addDefense(Inventory.PAPERDOLL_CLOAK, set.getInt("cloak", 0));
+		addDefense(Inventory.PAPERDOLL_REAR, set.getInt("rear", 0));
+		addDefense(Inventory.PAPERDOLL_LEAR, set.getInt("lear", 0));
+		addDefense(Inventory.PAPERDOLL_RFINGER, set.getInt("rfinger", 0));
+		addDefense(Inventory.PAPERDOLL_LFINGER, set.getInt("lfinger", 0));
+		addDefense(Inventory.PAPERDOLL_NECK, set.getInt("neck", 0));
 	}
 	
 	private void addSpeed(MoveType type, float val)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/effects/EffectTemplate.java

@@ -67,8 +67,8 @@ public class EffectTemplate
 		// _applyCond = applyCond;
 		_lambda = lambda;
 		_name = set.getString("name");
-		_totalTickCount = set.getInteger("ticks", 0);
-		_abnormalTime = set.getInteger("abnormalTime", 0);
+		_totalTickCount = set.getInt("ticks", 0);
+		_abnormalTime = set.getInt("abnormalTime", 0);
 		_abnormalEffect = AbnormalEffect.getByName(set.getString("abnormalVisualEffect", ""));
 		final String[] specialEffects = set.getString("special", "").split(",");
 		_specialEffect = new AbnormalEffect[specialEffects.length];
@@ -77,10 +77,10 @@ public class EffectTemplate
 			_specialEffect[i] = AbnormalEffect.getByName(specialEffects[i]);
 		}
 		_eventEffect = AbnormalEffect.getByName(set.getString("event", ""));
-		_showIcon = set.getInteger("noicon", 0) == 0;
-		_triggeredId = set.getInteger("triggeredId", 0);
-		_triggeredLevel = set.getInteger("triggeredLevel", 1);
-		_chanceCondition = ChanceCondition.parse(set.getString("chanceType", null), set.getInteger("activationChance", -1), set.getInteger("activationMinDamage", -1), set.getString("activationElements", null), set.getString("activationSkills", null), set.getBool("pvpChanceOnly", false));
+		_showIcon = set.getInt("noicon", 0) == 0;
+		_triggeredId = set.getInt("triggeredId", 0);
+		_triggeredLevel = set.getInt("triggeredLevel", 1);
+		_chanceCondition = ChanceCondition.parse(set.getString("chanceType", null), set.getInt("activationChance", -1), set.getInt("activationMinDamage", -1), set.getString("activationElements", null), set.getString("activationSkills", null), set.getBoolean("pvpChanceOnly", false));
 		_parameters = params;
 		_handler = EffectHandler.getInstance().getHandler(_name);
 		if (_handler == null)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/ClanHall.java

@@ -209,9 +209,9 @@ public abstract class ClanHall
 	
 	public ClanHall(StatsSet set)
 	{
-		_clanHallId = set.getInteger("id");
+		_clanHallId = set.getInt("id");
 		_name = set.getString("name");
-		_ownerId = set.getInteger("ownerId");
+		_ownerId = set.getInt("ownerId");
 		_desc = set.getString("desc");
 		_location = set.getString("location");
 		_functions = new FastMap<>();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Hero.java

@@ -427,7 +427,7 @@ public class Hero
 	{
 		for (Entry<Integer, StatsSet> e : _heroes.entrySet())
 		{
-			if (e.getValue().getInteger(Olympiad.CLASS_ID) == classid)
+			if (e.getValue().getInt(Olympiad.CLASS_ID) == classid)
 			{
 				return e.getKey();
 			}
@@ -551,9 +551,9 @@ public class Hero
 					if (_herocounts.containsKey(charid))
 					{
 						StatsSet _herocount = _herocounts.get(charid);
-						_win = _herocount.getInteger("victory");
-						_loss = _herocount.getInteger("loss");
-						_draw = _herocount.getInteger("draw");
+						_win = _herocount.getInt("victory");
+						_loss = _herocount.getInt("loss");
+						_draw = _herocount.getInt("draw");
 					}
 					
 					boolean color = true;
@@ -573,7 +573,7 @@ public class Hero
 						{
 							StringUtil.append(fList, "<table width=270>");
 						}
-						StringUtil.append(fList, "<tr><td width=220><font color=\"LEVEL\">" + fight.getString("start") + "</font>&nbsp;&nbsp;" + fight.getString("result") + "</td><td width=50 align=right>" + (fight.getInteger("classed") > 0 ? "<font color=\"FFFF99\">cls</font>" : "<font color=\"999999\">non-cls<font>") + "</td></tr>");
+						StringUtil.append(fList, "<tr><td width=220><font color=\"LEVEL\">" + fight.getString("start") + "</font>&nbsp;&nbsp;" + fight.getString("result") + "</td><td width=50 align=right>" + (fight.getInt("classed") > 0 ? "<font color=\"FFFF99\">cls</font>" : "<font color=\"999999\">non-cls<font>") + "</td></tr>");
 						StringUtil.append(fList, "<tr><td width=220>vs " + fight.getString("oponent") + " (" + fight.getString("oponentclass") + ")</td><td width=50 align=right>(" + fight.getString("time") + ")</td></tr>");
 						StringUtil.append(fList, "<tr><td colspan=2>&nbsp;</td></tr></table>");
 						StringUtil.append(fList, "</td></tr>");
@@ -679,12 +679,12 @@ public class Hero
 		
 		for (StatsSet hero : newHeroes)
 		{
-			int charId = hero.getInteger(Olympiad.CHAR_ID);
+			int charId = hero.getInt(Olympiad.CHAR_ID);
 			
 			if ((_completeHeroes != null) && _completeHeroes.containsKey(charId))
 			{
 				StatsSet oldHero = _completeHeroes.get(charId);
-				int count = oldHero.getInteger(COUNT);
+				int count = oldHero.getInt(COUNT);
 				oldHero.set(COUNT, count + 1);
 				oldHero.set(PLAYED, 1);
 				
@@ -694,7 +694,7 @@ public class Hero
 			{
 				StatsSet newHero = new StatsSet();
 				newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME));
-				newHero.set(Olympiad.CLASS_ID, hero.getInteger(Olympiad.CLASS_ID));
+				newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID));
 				newHero.set(COUNT, 1);
 				newHero.set(PLAYED, 1);
 				
@@ -801,9 +801,9 @@ public class Hero
 						try (PreparedStatement insert = con.prepareStatement(INSERT_HERO))
 						{
 							insert.setInt(1, heroId);
-							insert.setInt(2, hero.getInteger(Olympiad.CLASS_ID));
-							insert.setInt(3, hero.getInteger(COUNT));
-							insert.setInt(4, hero.getInteger(PLAYED));
+							insert.setInt(2, hero.getInt(Olympiad.CLASS_ID));
+							insert.setInt(3, hero.getInt(COUNT));
+							insert.setInt(4, hero.getInt(PLAYED));
 							insert.execute();
 							insert.close();
 						}
@@ -851,8 +851,8 @@ public class Hero
 					{
 						try (PreparedStatement statement = con.prepareStatement(UPDATE_HERO))
 						{
-							statement.setInt(1, hero.getInteger(COUNT));
-							statement.setInt(2, hero.getInteger(PLAYED));
+							statement.setInt(1, hero.getInt(COUNT));
+							statement.setInt(2, hero.getInt(PLAYED));
 							statement.setInt(3, heroId);
 							statement.execute();
 						}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java

@@ -48,9 +48,9 @@ public final class AuctionableHall extends ClanHall
 	{
 		super(set);
 		_paidUntil = set.getLong("paidUntil");
-		_grade = set.getInteger("grade");
-		_paid = set.getBool("paid");
-		_lease = set.getInteger("lease");
+		_grade = set.getInt("grade");
+		_paid = set.getBoolean("paid");
+		_lease = set.getInt("lease");
 		
 		if (getOwnerId() != 0)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/fishing/L2Fish.java

@@ -46,20 +46,20 @@ public class L2Fish implements Cloneable
 	
 	public L2Fish(StatsSet set)
 	{
-		_fishId = set.getInteger("fishId");
-		_itemId = set.getInteger("itemId");
+		_fishId = set.getInt("fishId");
+		_itemId = set.getInt("itemId");
 		_itemName = set.getString("itemName");
 		_fishGroup = getGroupId(set.getString("fishGroup"));
-		_fishLevel = set.getInteger("fishLevel");
+		_fishLevel = set.getInt("fishLevel");
 		_fishBiteRate = set.getDouble("fishBiteRate"); // TODO: Support needed.
 		_fishGuts = set.getDouble("fishGuts");
-		_fishHp = set.getInteger("fishHp");
-		_fishMaxLength = set.getInteger("fishMaxLength"); // TODO: Support needed.
+		_fishHp = set.getInt("fishHp");
+		_fishMaxLength = set.getInt("fishMaxLength"); // TODO: Support needed.
 		_fishLengthRate = set.getDouble("fishLengthRate"); // TODO: Support needed.
 		_hpRegen = set.getDouble("hpRegen");
-		_startCombatTime = set.getInteger("startCombatTime");
-		_combatDuration = set.getInteger("combatDuration");
-		_gutsCheckTime = set.getInteger("gutsCheckTime");
+		_startCombatTime = set.getInt("startCombatTime");
+		_combatDuration = set.getInt("combatDuration");
+		_gutsCheckTime = set.getInt("gutsCheckTime");
 		_gutsCheckProbability = set.getDouble("gutsCheckProbability"); // TODO: Support needed.
 		_cheatingProb = set.getDouble("cheatingProb"); // TODO: Support needed.
 		_fishGrade = getGradeId(set.getString("fishGrade"));

L2J_Server_BETA/java/com/l2jserver/gameserver/model/fishing/L2FishingMonster.java

@@ -33,10 +33,10 @@ public class L2FishingMonster
 	
 	public L2FishingMonster(StatsSet set)
 	{
-		_userMinLevel = set.getInteger("userMinLevel");
-		_userMaxLevel = set.getInteger("userMaxLevel");
-		_fishingMonsterId = set.getInteger("fishingMonsterId");
-		_probability = set.getInteger("probability");
+		_userMinLevel = set.getInt("userMinLevel");
+		_userMaxLevel = set.getInt("userMaxLevel");
+		_fishingMonsterId = set.getInt("fishingMonsterId");
+		_probability = set.getInt("probability");
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/fishing/L2FishingRod.java

@@ -34,9 +34,9 @@ public class L2FishingRod
 	
 	public L2FishingRod(StatsSet set)
 	{
-		_fishingRodId = set.getInteger("fishingRodId");
-		_fishingRodItemId = set.getInteger("fishingRodItemId");
-		_fishingRodLevel = set.getInteger("fishingRodLevel");
+		_fishingRodId = set.getInt("fishingRodId");
+		_fishingRodItemId = set.getInt("fishingRodItemId");
+		_fishingRodLevel = set.getInt("fishingRodLevel");
 		_fishingRodName = set.getString("fishingRodName");
 		_fishingRodDamage = set.getDouble("fishingRodDamage");
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IParserAdvUtils.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2004-2013 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * More advanced interface for parsers.<br>
+ * Allows usage of get methods without fall back value.<br>
+ * @author xban1x
+ */
+public interface IParserAdvUtils extends IParserUtils
+{
+	
+	public boolean getBoolean(String key);
+	
+	public byte getByte(String key);
+	
+	public short getShort(String key);
+	
+	public int getInt(String key);
+	
+	public long getLong(String key);
+	
+	public float getFloat(String key);
+	
+	public double getDouble(String key);
+	
+	public String getString(String key);
+	
+	public <T extends Enum<T>> T getEnum(String key, Class<T> clazz);
+	
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IParserUtils.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2004-2013 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * Simple interface for parser, enforces of a fall back value.<br>
+ * More suitable for developers not sure about their data.<br>
+ * @author xban1x
+ */
+public interface IParserUtils
+{
+	public boolean getBoolean(String key, boolean defaultValue);
+	
+	public byte getByte(String key, byte defaultValue);
+	
+	public short getShort(String key, short defaultValue);
+	
+	public int getInt(String key, int defaultValue);
+	
+	public long getLong(String key, long defaultValue);
+	
+	public float getFloat(String key, float defaultValue);
+	
+	public double getDouble(String key, double defaultValue);
+	
+	public String getString(String key, String defaultValue);
+	
+	public <T extends Enum<T>> T getEnum(String key, Class<T> clazz, T defaultValue);
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/AuctionDateGenerator.java

@@ -45,12 +45,12 @@ public final class AuctionDateGenerator
 	public AuctionDateGenerator(final StatsSet config) throws IllegalArgumentException
 	{
 		_calendar = Calendar.getInstance();
-		_interval = config.getInteger(FIELD_INTERVAL, -1);
+		_interval = config.getInt(FIELD_INTERVAL, -1);
 		// NC week start in Monday.
-		final int fixedDayWeek = config.getInteger(FIELD_DAY_OF_WEEK, -1) + 1;
+		final int fixedDayWeek = config.getInt(FIELD_DAY_OF_WEEK, -1) + 1;
 		_day_of_week = (fixedDayWeek > 7) ? 1 : fixedDayWeek;
-		_hour_of_day = config.getInteger(FIELD_HOUR_OF_DAY, -1);
-		_minute_of_hour = config.getInteger(FIELD_MINUTE_OF_HOUR, -1);
+		_hour_of_day = config.getInt(FIELD_HOUR_OF_DAY, -1);
+		_minute_of_hour = config.getInt(FIELD_MINUTE_OF_HOUR, -1);
 		
 		checkDayOfWeek(-1);
 		checkHourOfDay(-1);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/AuctionItem.java

@@ -89,7 +89,7 @@ public final class AuctionItem
 		
 		item.setEnchantLevel(item.getDefaultEnchantLevel());
 		
-		final int augmentationId = _itemExtra.getInteger("augmentation_id", 0);
+		final int augmentationId = _itemExtra.getInt("augmentation_id", 0);
 		if (augmentationId > 0)
 		{
 			item.setAugmentation(new L2Augmentation(augmentationId));

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2EtcItem.java

@@ -77,7 +77,7 @@ public final class L2EtcItem extends L2Item
 		}
 		
 		_handler = set.getString("handler", null); // ! null !
-		_isBlessed = set.getBool("blessed", false);
+		_isBlessed = set.getBoolean("blessed", false);
 		
 		// Extractable
 		String capsuled_items = set.getString("capsuled_items", null);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Henna.java

@@ -47,19 +47,19 @@ public class L2Henna
 	
 	public L2Henna(StatsSet set)
 	{
-		_dyeId = set.getInteger("dyeId");
+		_dyeId = set.getInt("dyeId");
 		_dyeName = set.getString("dyeName");
-		_dyeItemId = set.getInteger("dyeItemId");
-		_str = set.getInteger("str");
-		_con = set.getInteger("con");
-		_dex = set.getInteger("dex");
-		_int = set.getInteger("int");
-		_men = set.getInteger("men");
-		_wit = set.getInteger("wit");
-		_wear_fee = set.getInteger("wear_fee");
-		_wear_count = set.getInteger("wear_count");
-		_cancel_fee = set.getInteger("cancel_fee");
-		_cancel_count = set.getInteger("cancel_count");
+		_dyeItemId = set.getInt("dyeItemId");
+		_str = set.getInt("str");
+		_con = set.getInt("con");
+		_dex = set.getInt("dex");
+		_int = set.getInt("int");
+		_men = set.getInt("men");
+		_wit = set.getInt("wit");
+		_wear_fee = set.getInt("wear_fee");
+		_wear_count = set.getInt("wear_count");
+		_cancel_fee = set.getInt("cancel_fee");
+		_cancel_count = set.getInt("cancel_count");
 		_wear_class = new ArrayList<>();
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Item.java

@@ -246,43 +246,43 @@ public abstract class L2Item implements IIdentifiable
 	 */
 	protected L2Item(StatsSet set)
 	{
-		_itemId = set.getInteger("item_id");
-		_displayId = set.getInteger("displayId", _itemId);
+		_itemId = set.getInt("item_id");
+		_displayId = set.getInt("displayId", _itemId);
 		_name = set.getString("name");
 		_icon = set.getString("icon", null);
-		_weight = set.getInteger("weight", 0);
+		_weight = set.getInt("weight", 0);
 		_materialType = ItemTable._materials.get(set.getString("material", "steel")); // default is steel, yeah and what?
-		_equipReuseDelay = set.getInteger("equip_reuse_delay", 0) * 1000;
-		_duration = set.getInteger("duration", -1);
-		_time = set.getInteger("time", -1);
-		_autoDestroyTime = set.getInteger("auto_destroy_time", -1) * 1000;
+		_equipReuseDelay = set.getInt("equip_reuse_delay", 0) * 1000;
+		_duration = set.getInt("duration", -1);
+		_time = set.getInt("time", -1);
+		_autoDestroyTime = set.getInt("auto_destroy_time", -1) * 1000;
 		_bodyPart = ItemTable._slots.get(set.getString("bodypart", "none"));
-		_referencePrice = set.getInteger("price", 0);
+		_referencePrice = set.getInt("price", 0);
 		_crystalType = ItemTable._crystalTypes.get(set.getString("crystal_type", "none")); // default to none-grade
-		_crystalCount = set.getInteger("crystal_count", 0);
+		_crystalCount = set.getInt("crystal_count", 0);
 		
-		_stackable = set.getBool("is_stackable", false);
-		_sellable = set.getBool("is_sellable", true);
-		_dropable = set.getBool("is_dropable", true);
-		_destroyable = set.getBool("is_destroyable", true);
-		_tradeable = set.getBool("is_tradable", true);
-		_depositable = set.getBool("is_depositable", true);
-		_elementable = set.getBool("element_enabled", false);
-		_enchantable = set.getInteger("enchant_enabled", 0);
-		_questItem = set.getBool("is_questitem", false);
-		_freightable = set.getBool("is_freightable", false);
-		_is_oly_restricted = set.getBool("is_oly_restricted", false);
-		_for_npc = set.getBool("for_npc", false);
+		_stackable = set.getBoolean("is_stackable", false);
+		_sellable = set.getBoolean("is_sellable", true);
+		_dropable = set.getBoolean("is_dropable", true);
+		_destroyable = set.getBoolean("is_destroyable", true);
+		_tradeable = set.getBoolean("is_tradable", true);
+		_depositable = set.getBoolean("is_depositable", true);
+		_elementable = set.getBoolean("element_enabled", false);
+		_enchantable = set.getInt("enchant_enabled", 0);
+		_questItem = set.getBoolean("is_questitem", false);
+		_freightable = set.getBoolean("is_freightable", false);
+		_is_oly_restricted = set.getBoolean("is_oly_restricted", false);
+		_for_npc = set.getBoolean("for_npc", false);
 		
 		// _immediate_effect - herb
-		_ex_immediate_effect = set.getBool("ex_immediate_effect", false);
+		_ex_immediate_effect = set.getBoolean("ex_immediate_effect", false);
 		
 		// used for custom type select
 		_defaultAction = set.getEnum("default_action", L2ActionType.class, L2ActionType.none);
-		_useSkillDisTime = set.getInteger("useSkillDisTime", 0);
-		_defaultEnchantLevel = set.getInteger("enchanted", 0);
-		_reuseDelay = set.getInteger("reuse_delay", 0);
-		_sharedReuseGroup = set.getInteger("shared_reuse_group", 0);
+		_useSkillDisTime = set.getInt("useSkillDisTime", 0);
+		_defaultEnchantLevel = set.getInt("enchanted", 0);
+		_reuseDelay = set.getInt("reuse_delay", 0);
+		_sharedReuseGroup = set.getInt("shared_reuse_group", 0);
 		
 		// TODO: This should be done with proper conditions and a categoryData.xml file.
 		String equip_condition = set.getString("equip_condition", null);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Weapon.java

@@ -85,11 +85,11 @@ public final class L2Weapon extends L2Item
 		_type = L2WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase());
 		_type1 = L2Item.TYPE1_WEAPON_RING_EARRING_NECKLACE;
 		_type2 = L2Item.TYPE2_WEAPON;
-		_isMagicWeapon = set.getBool("is_magic_weapon", false);
-		_soulShotCount = set.getInteger("soulshots", 0);
-		_spiritShotCount = set.getInteger("spiritshots", 0);
-		_rndDam = set.getInteger("random_damage", 0);
-		_mpConsume = set.getInteger("mp_consume", 0);
+		_isMagicWeapon = set.getBoolean("is_magic_weapon", false);
+		_soulShotCount = set.getInt("soulshots", 0);
+		_spiritShotCount = set.getInt("spiritshots", 0);
+		_rndDam = set.getInt("random_damage", 0);
+		_mpConsume = set.getInt("mp_consume", 0);
 		
 		String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");
 		_reducedSoulshotChance = (reduced_soulshots.length == 2) ? Integer.parseInt(reduced_soulshots[0]) : 0;
@@ -129,7 +129,7 @@ public final class L2Weapon extends L2Item
 		if (skill != null)
 		{
 			String[] info = skill.split("-");
-			final int chance = set.getInteger("onmagic_chance", 100);
+			final int chance = set.getInt("onmagic_chance", 100);
 			if ((info != null) && (info.length == 2))
 			{
 				int id = 0;
@@ -156,7 +156,7 @@ public final class L2Weapon extends L2Item
 		if (skill != null)
 		{
 			String[] info = skill.split("-");
-			final int chance = set.getInteger("oncrit_chance", 100);
+			final int chance = set.getInt("oncrit_chance", 100);
 			if ((info != null) && (info.length == 2))
 			{
 				int id = 0;
@@ -179,10 +179,10 @@ public final class L2Weapon extends L2Item
 			}
 		}
 		
-		_changeWeaponId = set.getInteger("change_weaponId", 0);
-		_isForceEquip = set.getBool("isForceEquip", false);
-		_isAttackWeapon = set.getBool("isAttackWeapon", true);
-		_useWeaponSkillsOnly = set.getBool("useWeaponSkillsOnly", false);
+		_changeWeaponId = set.getInt("change_weaponId", 0);
+		_isForceEquip = set.getBoolean("isForceEquip", false);
+		_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
+		_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/PcItemTemplate.java

@@ -33,8 +33,8 @@ public final class PcItemTemplate extends ItemHolder
 	 */
 	public PcItemTemplate(StatsSet set)
 	{
-		super(set.getInteger("id"), set.getInteger("count"));
-		_equipped = set.getBool("equipped", false);
+		super(set.getInt("id"), set.getInt("count"));
+		_equipped = set.getBoolean("equipped", false);
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/enchant/AbstractEnchantItem.java

@@ -54,7 +54,7 @@ public abstract class AbstractEnchantItem
 	
 	public AbstractEnchantItem(StatsSet set)
 	{
-		_id = set.getInteger("id");
+		_id = set.getInt("id");
 		if (getItem() == null)
 		{
 			throw new NullPointerException();
@@ -64,7 +64,7 @@ public abstract class AbstractEnchantItem
 			throw new IllegalAccessError();
 		}
 		_grade = ItemTable._crystalTypes.get(set.getString("targetGrade", "none"));
-		_maxEnchantLevel = set.getInteger("maxEnchant", 65535);
+		_maxEnchantLevel = set.getInt("maxEnchant", 65535);
 		_bonusRate = set.getDouble("bonusRate", 0);
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/enchant/EnchantScroll.java

@@ -46,7 +46,7 @@ public final class EnchantScroll extends AbstractEnchantItem
 	public EnchantScroll(StatsSet set)
 	{
 		super(set);
-		_scrollGroupId = set.getInteger("scrollGroupId", 0);
+		_scrollGroupId = set.getInt("scrollGroupId", 0);
 		
 		final L2ItemType type = getItem().getItemType();
 		_isWeapon = (type == L2EtcItemType.ANCIENT_CRYSTAL_ENCHANT_WP) || (type == L2EtcItemType.BLESS_SCRL_ENCHANT_WP) || (type == L2EtcItemType.SCRL_ENCHANT_WP);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/multisell/Ingredient.java

@@ -39,7 +39,7 @@ public class Ingredient
 	
 	public Ingredient(StatsSet set)
 	{
-		this(set.getInteger("id"), set.getLong("count"), set.getBool("isTaxIngredient", false), set.getBool("maintainIngredient", false));
+		this(set.getInt("id"), set.getLong("count"), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false));
 	}
 	
 	public Ingredient(int itemId, long itemCount, boolean isTaxIngredient, boolean maintainIngredient)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java

@@ -680,7 +680,7 @@ public class Olympiad
 		int currentPoints;
 		for (StatsSet nobleInfo : _nobles.values())
 		{
-			currentPoints = nobleInfo.getInteger(POINTS);
+			currentPoints = nobleInfo.getInt(POINTS);
 			currentPoints += WEEKLY_POINTS;
 			nobleInfo.set(POINTS, currentPoints);
 		}
@@ -737,17 +737,17 @@ public class Olympiad
 				}
 				
 				int charId = entry.getKey();
-				int classId = nobleInfo.getInteger(CLASS_ID);
-				int points = nobleInfo.getInteger(POINTS);
-				int compDone = nobleInfo.getInteger(COMP_DONE);
-				int compWon = nobleInfo.getInteger(COMP_WON);
-				int compLost = nobleInfo.getInteger(COMP_LOST);
-				int compDrawn = nobleInfo.getInteger(COMP_DRAWN);
-				int compDoneWeek = nobleInfo.getInteger(COMP_DONE_WEEK);
-				int compDoneWeekClassed = nobleInfo.getInteger(COMP_DONE_WEEK_CLASSED);
-				int compDoneWeekNonClassed = nobleInfo.getInteger(COMP_DONE_WEEK_NON_CLASSED);
-				int compDoneWeekTeam = nobleInfo.getInteger(COMP_DONE_WEEK_TEAM);
-				boolean toSave = nobleInfo.getBool("to_save");
+				int classId = nobleInfo.getInt(CLASS_ID);
+				int points = nobleInfo.getInt(POINTS);
+				int compDone = nobleInfo.getInt(COMP_DONE);
+				int compWon = nobleInfo.getInt(COMP_WON);
+				int compLost = nobleInfo.getInt(COMP_LOST);
+				int compDrawn = nobleInfo.getInt(COMP_DRAWN);
+				int compDoneWeek = nobleInfo.getInt(COMP_DONE_WEEK);
+				int compDoneWeekClassed = nobleInfo.getInt(COMP_DONE_WEEK_CLASSED);
+				int compDoneWeekNonClassed = nobleInfo.getInt(COMP_DONE_WEEK_NON_CLASSED);
+				int compDoneWeekTeam = nobleInfo.getInt(COMP_DONE_WEEK_TEAM);
+				boolean toSave = nobleInfo.getBoolean("to_save");
 				
 				try (PreparedStatement statement = con.prepareStatement(toSave ? OLYMPIAD_SAVE_NOBLES : OLYMPIAD_UPDATE_NOBLES))
 				{
@@ -872,10 +872,10 @@ public class Olympiad
 				}
 				
 				int charId = entry.getKey();
-				int classId = nobleInfo.getInteger(CLASS_ID);
+				int classId = nobleInfo.getInt(CLASS_ID);
 				String charName = nobleInfo.getString(CHAR_NAME);
-				int points = nobleInfo.getInteger(POINTS);
-				int compDone = nobleInfo.getInteger(COMP_DONE);
+				int points = nobleInfo.getInt(POINTS);
+				int compDone = nobleInfo.getInt(COMP_DONE);
 				
 				record = new LogRecord(Level.INFO, charName);
 				record.setParameters(new Object[]
@@ -912,7 +912,7 @@ public class Olympiad
 					
 					if ((element == 132) || (element == 133)) // Male & Female Soulhounds rank as one hero class
 					{
-						hero = _nobles.get(hero.getInteger(CHAR_ID));
+						hero = _nobles.get(hero.getInt(CHAR_ID));
 						hero.set(CHAR_ID, rset.getInt(CHAR_ID));
 						soulHounds.add(hero);
 					}
@@ -921,8 +921,8 @@ public class Olympiad
 						record = new LogRecord(Level.INFO, "Hero " + hero.getString(CHAR_NAME));
 						record.setParameters(new Object[]
 						{
-							hero.getInteger(CHAR_ID),
-							hero.getInteger(CLASS_ID)
+							hero.getInt(CHAR_ID),
+							hero.getInt(CLASS_ID)
 						});
 						_logResults.log(record);
 						_heroesToBe.add(hero);
@@ -941,15 +941,15 @@ public class Olympiad
 				{
 					hero = new StatsSet();
 					StatsSet winner = soulHounds.get(0);
-					hero.set(CLASS_ID, winner.getInteger(CLASS_ID));
-					hero.set(CHAR_ID, winner.getInteger(CHAR_ID));
+					hero.set(CLASS_ID, winner.getInt(CLASS_ID));
+					hero.set(CHAR_ID, winner.getInt(CHAR_ID));
 					hero.set(CHAR_NAME, winner.getString(CHAR_NAME));
 					
 					record = new LogRecord(Level.INFO, "Hero " + hero.getString(CHAR_NAME));
 					record.setParameters(new Object[]
 					{
-						hero.getInteger(CHAR_ID),
-						hero.getInteger(CLASS_ID)
+						hero.getInt(CHAR_ID),
+						hero.getInt(CLASS_ID)
 					});
 					_logResults.log(record);
 					_heroesToBe.add(hero);
@@ -961,12 +961,12 @@ public class Olympiad
 					StatsSet winner;
 					StatsSet hero1 = soulHounds.get(0);
 					StatsSet hero2 = soulHounds.get(1);
-					int hero1Points = hero1.getInteger(POINTS);
-					int hero2Points = hero2.getInteger(POINTS);
-					int hero1Comps = hero1.getInteger(COMP_DONE);
-					int hero2Comps = hero2.getInteger(COMP_DONE);
-					int hero1Wins = hero1.getInteger(COMP_WON);
-					int hero2Wins = hero2.getInteger(COMP_WON);
+					int hero1Points = hero1.getInt(POINTS);
+					int hero2Points = hero2.getInt(POINTS);
+					int hero1Comps = hero1.getInt(COMP_DONE);
+					int hero2Comps = hero2.getInt(COMP_DONE);
+					int hero1Wins = hero1.getInt(COMP_WON);
+					int hero2Wins = hero2.getInt(COMP_WON);
 					
 					if (hero1Points > hero2Points)
 					{
@@ -999,15 +999,15 @@ public class Olympiad
 						}
 					}
 					
-					hero.set(CLASS_ID, winner.getInteger(CLASS_ID));
-					hero.set(CHAR_ID, winner.getInteger(CHAR_ID));
+					hero.set(CLASS_ID, winner.getInt(CLASS_ID));
+					hero.set(CHAR_ID, winner.getInt(CHAR_ID));
 					hero.set(CHAR_NAME, winner.getString(CHAR_NAME));
 					
 					record = new LogRecord(Level.INFO, "Hero " + hero.getString(CHAR_NAME));
 					record.setParameters(new Object[]
 					{
-						hero.getInteger(CHAR_ID),
-						hero.getInteger(CLASS_ID)
+						hero.getInt(CHAR_ID),
+						hero.getInt(CLASS_ID)
 					});
 					_logResults.log(record);
 					_heroesToBe.add(hero);
@@ -1059,7 +1059,7 @@ public class Olympiad
 		}
 		
 		final StatsSet noble = _nobles.get(objId);
-		if ((noble == null) || (noble.getInteger(POINTS) == 0))
+		if ((noble == null) || (noble.getInt(POINTS) == 0))
 		{
 			return 0;
 		}
@@ -1098,7 +1098,7 @@ public class Olympiad
 		{
 			return 0;
 		}
-		return _nobles.get(objId).getInteger(POINTS);
+		return _nobles.get(objId).getInt(POINTS);
 	}
 	
 	public int getLastNobleOlympiadPoints(int objId)
@@ -1129,7 +1129,7 @@ public class Olympiad
 		{
 			return 0;
 		}
-		return _nobles.get(objId).getInteger(COMP_DONE);
+		return _nobles.get(objId).getInt(COMP_DONE);
 	}
 	
 	public int getCompetitionWon(int objId)
@@ -1138,7 +1138,7 @@ public class Olympiad
 		{
 			return 0;
 		}
-		return _nobles.get(objId).getInteger(COMP_WON);
+		return _nobles.get(objId).getInt(COMP_WON);
 	}
 	
 	public int getCompetitionLost(int objId)
@@ -1147,7 +1147,7 @@ public class Olympiad
 		{
 			return 0;
 		}
-		return _nobles.get(objId).getInteger(COMP_LOST);
+		return _nobles.get(objId).getInt(COMP_LOST);
 	}
 	
 	/**
@@ -1161,7 +1161,7 @@ public class Olympiad
 		{
 			return 0;
 		}
-		return _nobles.get(objId).getInteger(COMP_DONE_WEEK);
+		return _nobles.get(objId).getInt(COMP_DONE_WEEK);
 	}
 	
 	/**
@@ -1175,7 +1175,7 @@ public class Olympiad
 		{
 			return 0;
 		}
-		return _nobles.get(objId).getInteger(COMP_DONE_WEEK_CLASSED);
+		return _nobles.get(objId).getInt(COMP_DONE_WEEK_CLASSED);
 	}
 	
 	/**
@@ -1189,7 +1189,7 @@ public class Olympiad
 		{
 			return 0;
 		}
-		return _nobles.get(objId).getInteger(COMP_DONE_WEEK_NON_CLASSED);
+		return _nobles.get(objId).getInt(COMP_DONE_WEEK_NON_CLASSED);
 	}
 	
 	/**
@@ -1203,7 +1203,7 @@ public class Olympiad
 		{
 			return 0;
 		}
-		return _nobles.get(objId).getInteger(COMP_DONE_WEEK_TEAM);
+		return _nobles.get(objId).getInt(COMP_DONE_WEEK_TEAM);
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java

@@ -327,8 +327,8 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
 		final boolean _pOneCrash = ((_playerOne.getPlayer() == null) || _playerOne.isDisconnected());
 		final boolean _pTwoCrash = ((_playerTwo.getPlayer() == null) || _playerTwo.isDisconnected());
 		
-		final int playerOnePoints = _playerOne.getStats().getInteger(POINTS);
-		final int playerTwoPoints = _playerTwo.getStats().getInteger(POINTS);
+		final int playerOnePoints = _playerOne.getStats().getInt(POINTS);
+		final int playerTwoPoints = _playerTwo.getStats().getInt(POINTS);
 		int pointDiff = Math.min(playerOnePoints, playerTwoPoints) / getDivider();
 		if (pointDiff <= 0)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTeams.java

@@ -585,8 +585,8 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 					for (int i = _teamOneSize; --i >= 0;)
 					{
 						par = _teamOne[i];
-						points = par.getStats().getInteger(POINTS) / getDivider();
-						int val = Math.min(par.getStats().getInteger(POINTS) / 3, Config.ALT_OLY_MAX_POINTS);
+						points = par.getStats().getInt(POINTS) / getDivider();
+						int val = Math.min(par.getStats().getInt(POINTS) / 3, Config.ALT_OLY_MAX_POINTS);
 						removePointsFromParticipant(par, val);
 						list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, points - val, -val));
 					}
@@ -597,8 +597,8 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 					for (int i = _teamTwoSize; --i >= 0;)
 					{
 						par = _teamTwo[i];
-						points = par.getStats().getInteger(POINTS) / getDivider();
-						int val = Math.min(par.getStats().getInteger(POINTS) / 3, Config.ALT_OLY_MAX_POINTS);
+						points = par.getStats().getInt(POINTS) / getDivider();
+						int val = Math.min(par.getStats().getInt(POINTS) / 3, Config.ALT_OLY_MAX_POINTS);
 						removePointsFromParticipant(par, val);
 						list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, points - val, -val));
 					}
@@ -637,7 +637,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 		int totalPointsTeamTwo = 0;
 		for (int i = 0; i < _teamOneSize; i++)
 		{
-			points = _teamOne[i].getStats().getInteger(POINTS) / getDivider();
+			points = _teamOne[i].getStats().getInt(POINTS) / getDivider();
 			if (points <= 0)
 			{
 				points = 1;
@@ -654,7 +654,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 		
 		for (int i = _teamTwoSize; --i >= 0;)
 		{
-			points = _teamTwo[i].getStats().getInteger(POINTS) / getDivider();
+			points = _teamTwo[i].getStats().getInt(POINTS) / getDivider();
 			if (points <= 0)
 			{
 				points = 1;
@@ -732,7 +732,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 						par.updateStat(COMP_LOST, 1);
 						points = pointsTeamTwo[i];
 						removePointsFromParticipant(par, points);
-						list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInteger(POINTS) - points, -points));
+						list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) - points, -points));
 					}
 					
 					points = min / MAX_TEAM_SIZE;
@@ -741,7 +741,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 						par = _teamOne[i];
 						par.updateStat(COMP_WON, 1);
 						addPointsToParticipant(par, points);
-						list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInteger(POINTS) + points, points));
+						list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) + points, points));
 					}
 					
 					for (int i = 0; i < _teamOneSize; i++)
@@ -763,7 +763,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 						par.updateStat(COMP_LOST, 1);
 						points = pointsTeamOne[i];
 						removePointsFromParticipant(par, points);
-						list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInteger(POINTS) - points, -points));
+						list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) - points, -points));
 					}
 					
 					points = min / MAX_TEAM_SIZE;
@@ -772,7 +772,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 						par = _teamTwo[i];
 						par.updateStat(COMP_WON, 1);
 						addPointsToParticipant(par, points);
-						list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInteger(POINTS) + points, points));
+						list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) + points, points));
 					}
 					
 					winside = 2;
@@ -791,7 +791,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 						par = _teamOne[i];
 						par.updateStat(COMP_LOST, 1);
 						removePointsFromParticipant(par, pointsTeamOne[i]);
-						list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInteger(POINTS) - pointsTeamOne[i], -pointsTeamOne[i]));
+						list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) - pointsTeamOne[i], -pointsTeamOne[i]));
 					}
 					
 					for (int i = _teamTwoSize; --i >= 0;)
@@ -799,7 +799,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 						par = _teamTwo[i];
 						par.updateStat(COMP_LOST, 1);
 						removePointsFromParticipant(par, pointsTeamTwo[i]);
-						list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInteger(POINTS) - pointsTeamOne[i], -pointsTeamOne[i]));
+						list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) - pointsTeamOne[i], -pointsTeamOne[i]));
 					}
 					
 					tie = true;
@@ -884,7 +884,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 					par.updateStat(COMP_LOST, 1);
 					points = pointsTeamTwo[i];
 					removePointsFromParticipant(par, points);
-					list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInteger(POINTS) - points, -points));
+					list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) - points, -points));
 				}
 				
 				points = min / MAX_TEAM_SIZE;
@@ -893,7 +893,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 					par = _teamOne[i];
 					par.updateStat(COMP_WON, 1);
 					addPointsToParticipant(par, points);
-					list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInteger(POINTS) + points, points));
+					list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) + points, points));
 				}
 				
 				winside = 1;
@@ -915,7 +915,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 					par.updateStat(COMP_LOST, 1);
 					points = pointsTeamOne[i];
 					removePointsFromParticipant(par, points);
-					list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInteger(POINTS) - points, -points));
+					list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) - points, -points));
 				}
 				
 				points = min / MAX_TEAM_SIZE;
@@ -924,7 +924,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 					par = _teamTwo[i];
 					par.updateStat(COMP_WON, 1);
 					addPointsToParticipant(par, points);
-					list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInteger(POINTS) + points, points));
+					list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) + points, points));
 				}
 				
 				winside = 2;
@@ -942,18 +942,18 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 				{
 					par = _teamOne[i];
 					par.updateStat(COMP_DRAWN, 1);
-					points = Math.min(par.getStats().getInteger(POINTS) / getDivider(), Config.ALT_OLY_MAX_POINTS);
+					points = Math.min(par.getStats().getInt(POINTS) / getDivider(), Config.ALT_OLY_MAX_POINTS);
 					removePointsFromParticipant(par, points);
-					list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInteger(POINTS) - points, -points));
+					list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) - points, -points));
 				}
 				
 				for (int i = 0; i < _teamTwoSize; i++)
 				{
 					par = _teamTwo[i];
 					par.updateStat(COMP_DRAWN, 1);
-					points = Math.min(par.getStats().getInteger(POINTS) / getDivider(), Config.ALT_OLY_MAX_POINTS);
+					points = Math.min(par.getStats().getInt(POINTS) / getDivider(), Config.ALT_OLY_MAX_POINTS);
 					removePointsFromParticipant(par, points);
-					list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInteger(POINTS) - points, -points));
+					list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) - points, -points));
 				}
 				tie = true;
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/Participant.java

@@ -81,7 +81,7 @@ public final class Participant
 	 */
 	public final void updateStat(String statName, int increment)
 	{
-		stats.set(statName, Math.max(stats.getInteger(statName) + increment, 0));
+		stats.set(statName, Math.max(stats.getInt(statName) + increment, 0));
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -227,31 +227,31 @@ public abstract class L2Skill implements IChanceSkillTrigger, IIdentifiable
 	
 	protected L2Skill(StatsSet set)
 	{
-		_isAbnormalInstant = set.getBool("abnormalInstant", false);
-		_id = set.getInteger("skill_id");
-		_level = set.getInteger("level");
-		_refId = set.getInteger("referenceId", 0);
-		_displayId = set.getInteger("displayId", _id);
-		_displayLevel = set.getInteger("displayLevel", _level);
+		_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
+		_id = set.getInt("skill_id");
+		_level = set.getInt("level");
+		_refId = set.getInt("referenceId", 0);
+		_displayId = set.getInt("displayId", _id);
+		_displayLevel = set.getInt("displayLevel", _level);
 		_name = set.getString("name", "");
 		_operateType = set.getEnum("operateType", L2SkillOpType.class);
-		_magic = set.getInteger("isMagic", 0);
+		_magic = set.getInt("isMagic", 0);
 		_traitType = set.getEnum("trait", TraitType.class, TraitType.NONE);
-		_staticReuse = set.getBool("staticReuse", false);
-		_mpConsume = set.getInteger("mpConsume", 0);
-		_mpInitialConsume = set.getInteger("mpInitialConsume", 0);
-		_hpConsume = set.getInteger("hpConsume", 0);
-		_itemConsumeCount = set.getInteger("itemConsumeCount", 0);
-		_itemConsumeId = set.getInteger("itemConsumeId", 0);
-		_afterEffectId = set.getInteger("afterEffectId", 0);
-		_afterEffectLvl = set.getInteger("afterEffectLvl", 1);
+		_staticReuse = set.getBoolean("staticReuse", false);
+		_mpConsume = set.getInt("mpConsume", 0);
+		_mpInitialConsume = set.getInt("mpInitialConsume", 0);
+		_hpConsume = set.getInt("hpConsume", 0);
+		_itemConsumeCount = set.getInt("itemConsumeCount", 0);
+		_itemConsumeId = set.getInt("itemConsumeId", 0);
+		_afterEffectId = set.getInt("afterEffectId", 0);
+		_afterEffectLvl = set.getInt("afterEffectLvl", 1);
 		
-		_castRange = set.getInteger("castRange", -1);
-		_effectRange = set.getInteger("effectRange", -1);
-		_abnormalLvl = set.getInteger("abnormalLvl", 0);
+		_castRange = set.getInt("castRange", -1);
+		_effectRange = set.getInt("effectRange", -1);
+		_abnormalLvl = set.getInt("abnormalLvl", 0);
 		_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
 		
-		int abnormalTime = set.getInteger("abnormalTime", 1); // TODO: Should be 0, but instant effects need it until implementation is done.
+		int abnormalTime = set.getInt("abnormalTime", 1); // TODO: Should be 0, but instant effects need it until implementation is done.
 		if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(getId()))
 		{
 			if ((getLevel() < 100) || (getLevel() > 140))
@@ -267,10 +267,10 @@ public abstract class L2Skill implements IChanceSkillTrigger, IIdentifiable
 		_abnormalTime = abnormalTime;
 		_attribute = set.getString("attribute", "");
 		
-		_stayAfterDeath = set.getBool("stayAfterDeath", false);
-		_stayOnSubclassChange = set.getBool("stayOnSubclassChange", true);
+		_stayAfterDeath = set.getBoolean("stayAfterDeath", false);
+		_stayOnSubclassChange = set.getBoolean("stayOnSubclassChange", true);
 		
-		_hitTime = set.getInteger("hitTime", 0);
+		_hitTime = set.getInt("hitTime", 0);
 		String hitTimings = set.getString("hitTimings", null);
 		if (hitTimings != null)
 		{
@@ -293,25 +293,25 @@ public abstract class L2Skill implements IChanceSkillTrigger, IIdentifiable
 			_hitTimings = new int[0];
 		}
 		
-		_coolTime = set.getInteger("coolTime", 0);
-		_isDebuff = set.getBool("isDebuff", false);
-		_feed = set.getInteger("feed", 0);
+		_coolTime = set.getInt("coolTime", 0);
+		_isDebuff = set.getBoolean("isDebuff", false);
+		_feed = set.getInt("feed", 0);
 		_reuseHashCode = SkillTable.getSkillHashCode(_id, _level);
 		
 		if (Config.ENABLE_MODIFY_SKILL_REUSE && Config.SKILL_REUSE_LIST.containsKey(_id))
 		{
 			if (Config.DEBUG)
 			{
-				_log.info("*** Skill " + _name + " (" + _level + ") changed reuse from " + set.getInteger("reuseDelay", 0) + " to " + Config.SKILL_REUSE_LIST.get(_id) + " seconds.");
+				_log.info("*** Skill " + _name + " (" + _level + ") changed reuse from " + set.getInt("reuseDelay", 0) + " to " + Config.SKILL_REUSE_LIST.get(_id) + " seconds.");
 			}
 			_reuseDelay = Config.SKILL_REUSE_LIST.get(_id);
 		}
 		else
 		{
-			_reuseDelay = set.getInteger("reuseDelay", 0);
+			_reuseDelay = set.getInt("reuseDelay", 0);
 		}
 		
-		_affectRange = set.getInteger("affectRange", 0);
+		_affectRange = set.getInt("affectRange", 0);
 		
 		final String affectLimit = set.getString("affectLimit", null);
 		if (affectLimit != null)
@@ -332,61 +332,61 @@ public abstract class L2Skill implements IChanceSkillTrigger, IIdentifiable
 		_power = set.getFloat("power", 0.f);
 		_pvpPower = set.getFloat("pvpPower", (float) getPower());
 		_pvePower = set.getFloat("pvePower", (float) getPower());
-		_magicLevel = set.getInteger("magicLvl", 0);
-		_lvlBonusRate = set.getInteger("lvlBonusRate", 0);
-		_activateRate = set.getInteger("activateRate", -1);
-		_minChance = set.getInteger("minChance", Config.MIN_ABNORMAL_STATE_SUCCESS_RATE);
-		_maxChance = set.getInteger("maxChance", Config.MAX_ABNORMAL_STATE_SUCCESS_RATE);
-		_ignoreShield = set.getBool("ignoreShld", false);
+		_magicLevel = set.getInt("magicLvl", 0);
+		_lvlBonusRate = set.getInt("lvlBonusRate", 0);
+		_activateRate = set.getInt("activateRate", -1);
+		_minChance = set.getInt("minChance", Config.MIN_ABNORMAL_STATE_SUCCESS_RATE);
+		_maxChance = set.getInt("maxChance", Config.MAX_ABNORMAL_STATE_SUCCESS_RATE);
+		_ignoreShield = set.getBoolean("ignoreShld", false);
 		_skillType = set.getEnum("skillType", L2SkillType.class, L2SkillType.DUMMY);
-		_effectId = set.getInteger("effectId", 0);
-		_effectLvl = set.getInteger("effectLevel", 0);
+		_effectId = set.getInt("effectId", 0);
+		_effectLvl = set.getInt("effectLevel", 0);
 		
-		_nextActionIsAttack = set.getBool("nextActionAttack", false);
+		_nextActionIsAttack = set.getBoolean("nextActionAttack", false);
 		
-		_removedOnAnyActionExceptMove = set.getBool("removedOnAnyActionExceptMove", false);
-		_removedOnDamage = set.getBool("removedOnDamage", false);
+		_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
+		_removedOnDamage = set.getBoolean("removedOnDamage", false);
 		
 		_element = set.getByte("element", (byte) -1);
-		_elementPower = set.getInteger("elementPower", 0);
+		_elementPower = set.getInt("elementPower", 0);
 		
 		_saveVs = set.getEnum("saveVs", BaseStats.class, BaseStats.NULL);
 		
-		_overhit = set.getBool("overHit", false);
-		_isSuicideAttack = set.getBool("isSuicideAttack", false);
+		_overhit = set.getBoolean("overHit", false);
+		_isSuicideAttack = set.getBoolean("isSuicideAttack", false);
 		
-		_minPledgeClass = set.getInteger("minPledgeClass", 0);
-		_chargeConsume = set.getInteger("chargeConsume", 0);
-		_triggeredId = set.getInteger("triggeredId", 0);
-		_triggeredLevel = set.getInteger("triggeredLevel", 1);
+		_minPledgeClass = set.getInt("minPledgeClass", 0);
+		_chargeConsume = set.getInt("chargeConsume", 0);
+		_triggeredId = set.getInt("triggeredId", 0);
+		_triggeredLevel = set.getInt("triggeredLevel", 1);
 		_chanceType = set.getString("chanceType", "");
 		if (!_chanceType.isEmpty())
 		{
 			_chanceCondition = ChanceCondition.parse(set);
 		}
 		
-		_soulMaxConsume = set.getInteger("soulMaxConsumeCount", 0);
-		_blowChance = set.getInteger("blowChance", 0);
+		_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
+		_blowChance = set.getInt("blowChance", 0);
 		
 		_isHeroSkill = SkillTreesData.getInstance().isHeroSkill(_id, _level);
 		_isGMSkill = SkillTreesData.getInstance().isGMSkill(_id, _level);
 		_isSevenSigns = (_id > 4360) && (_id < 4367);
 		_isClanSkill = SkillTreesData.getInstance().isClanSkill(_id, _level);
 		
-		_baseCritRate = set.getInteger("baseCritRate", 0);
-		_directHpDmg = set.getBool("dmgDirectlyToHp", false);
-		_isTriggeredSkill = set.getBool("isTriggeredSkill", false);
-		_effectPoint = set.getInteger("effectPoint", 0);
+		_baseCritRate = set.getInt("baseCritRate", 0);
+		_directHpDmg = set.getBoolean("dmgDirectlyToHp", false);
+		_isTriggeredSkill = set.getBoolean("isTriggeredSkill", false);
+		_effectPoint = set.getInt("effectPoint", 0);
 		
 		_flyType = set.getString("flyType", null);
-		_flyRadius = set.getInteger("flyRadius", 0);
+		_flyRadius = set.getInt("flyRadius", 0);
 		_flyCourse = set.getFloat("flyCourse", 0);
 		
-		_canBeDispeled = set.getBool("canBeDispeled", true);
+		_canBeDispeled = set.getBoolean("canBeDispeled", true);
 		
-		_excludedFromCheck = set.getBool("excludedFromCheck", false);
-		_dependOnTargetBuff = set.getBool("dependOnTargetBuff", false);
-		_simultaneousCast = set.getBool("simultaneousCast", false);
+		_excludedFromCheck = set.getBoolean("excludedFromCheck", false);
+		_dependOnTargetBuff = set.getBoolean("dependOnTargetBuff", false);
+		_simultaneousCast = set.getBoolean("simultaneousCast", false);
 		
 		String capsuled_items = set.getString("capsuled_items_skill", null);
 		if (capsuled_items != null)
@@ -398,7 +398,7 @@ public abstract class L2Skill implements IChanceSkillTrigger, IIdentifiable
 			
 			_extractableItems = parseExtractableSkill(_id, _level, capsuled_items);
 		}
-		_npcId = set.getInteger("npcId", 0);
+		_npcId = set.getInt("npcId", 0);
 		_icon = set.getString("icon", "icon.skill0000");
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillSiegeFlag.java

@@ -49,8 +49,8 @@ public class L2SkillSiegeFlag extends L2Skill
 	public L2SkillSiegeFlag(StatsSet set)
 	{
 		super(set);
-		_isAdvanced = set.getBool("isAdvanced", false);
-		_isOutpost = set.getBool("isOutpost", false);
+		_isAdvanced = set.getBoolean("isAdvanced", false);
+		_isOutpost = set.getBoolean("isOutpost", false);
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillSummon.java

@@ -58,16 +58,16 @@ public class L2SkillSummon extends L2Skill
 		
 		_expPenalty = set.getFloat("expPenalty", 0.f);
 		
-		_summonTotalLifeTime = set.getInteger("summonTotalLifeTime", 1200000); // 20 minutes default
-		_summonTimeLostIdle = set.getInteger("summonTimeLostIdle", 0);
-		_summonTimeLostActive = set.getInteger("summonTimeLostActive", 0);
+		_summonTotalLifeTime = set.getInt("summonTotalLifeTime", 1200000); // 20 minutes default
+		_summonTimeLostIdle = set.getInt("summonTimeLostIdle", 0);
+		_summonTimeLostActive = set.getInt("summonTimeLostActive", 0);
 		
-		_itemConsumeOT = set.getInteger("itemConsumeCountOT", 0);
-		_itemConsumeIdOT = set.getInteger("itemConsumeIdOT", 0);
-		_itemConsumeTime = set.getInteger("itemConsumeTime", 0);
-		_itemConsumeSteps = set.getInteger("itemConsumeSteps", 0);
+		_itemConsumeOT = set.getInt("itemConsumeCountOT", 0);
+		_itemConsumeIdOT = set.getInt("itemConsumeIdOT", 0);
+		_itemConsumeTime = set.getInt("itemConsumeTime", 0);
+		_itemConsumeSteps = set.getInt("itemConsumeSteps", 0);
 		
-		_inheritElementals = set.getBool("inheritElementals", false);
+		_inheritElementals = set.getBoolean("inheritElementals", false);
 		_elementalSharePercent = set.getDouble("inheritPercent", 1);
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/communityserver/writepackets/InitWorldInfo.java

@@ -107,18 +107,18 @@ public final class InitWorldInfo extends BaseWritePacket
 					{
 						break;
 					}
-					super.writeD(p.getInteger("charId"));
+					super.writeD(p.getInt("charId"));
 					super.writeS(p.getString("char_name"));
 					super.writeS(p.getString("account_name"));
-					super.writeD(p.getInteger("level"));
-					super.writeD(p.getInteger("clanid"));
-					super.writeD(p.getInteger("accesslevel"));
-					super.writeC(p.getInteger("online"));
+					super.writeD(p.getInt("level"));
+					super.writeD(p.getInt("clanid"));
+					super.writeD(p.getInt("accesslevel"));
+					super.writeC(p.getInt("online"));
 					FastList<Integer> list = FastList.newInstance();
 					try (Connection con = L2DatabaseFactory.getInstance().getConnection();
 						PreparedStatement statement = con.prepareStatement("SELECT friendId FROM character_friends WHERE charId=?"))
 					{
-						statement.setInt(1, p.getInteger("charId"));
+						statement.setInt(1, p.getInt("charId"));
 						try (ResultSet rset = statement.executeQuery())
 						{
 							while (rset.next())

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExHeroList.java

@@ -47,12 +47,12 @@ public class ExHeroList extends L2GameServerPacket
 		{
 			StatsSet hero = _heroList.get(heroId);
 			writeS(hero.getString(Olympiad.CHAR_NAME));
-			writeD(hero.getInteger(Olympiad.CLASS_ID));
+			writeD(hero.getInt(Olympiad.CLASS_ID));
 			writeS(hero.getString(Hero.CLAN_NAME, ""));
-			writeD(hero.getInteger(Hero.CLAN_CREST, 0));
+			writeD(hero.getInt(Hero.CLAN_CREST, 0));
 			writeS(hero.getString(Hero.ALLY_NAME, ""));
-			writeD(hero.getInteger(Hero.ALLY_CREST, 0));
-			writeD(hero.getInteger(Hero.COUNT));
+			writeD(hero.getInt(Hero.ALLY_CREST, 0));
+			writeD(hero.getInt(Hero.COUNT));
 		}
 	}
 }