GameServerTable now uses IXmlReader

Moved IXmlReader to util/data/xml package.
Fixed minor typo in method name.

L2J_Server/java/com/l2jserver/Config.java

@@ -55,7 +55,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.enums.IllegalActionPunishmentType;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -64,6 +63,7 @@ import com.l2jserver.gameserver.util.FloodProtectorConfig;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.PropertiesParser;
 import com.l2jserver.util.StringUtil;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class loads all the game server related configurations from files.<br>

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/AdminData.java

@@ -30,7 +30,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.L2AccessLevel;
 import com.l2jserver.gameserver.model.L2AdminCommandAccessRight;
 import com.l2jserver.gameserver.model.StatsSet;
@@ -38,6 +37,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * Loads administrator access levels and commands.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/ArmorSetsData.java

@@ -25,9 +25,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.L2ArmorSet;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * Loads armor set bonuses.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/BuyListData.java

@@ -33,11 +33,11 @@ import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.model.buylist.L2BuyList;
 import com.l2jserver.gameserver.model.buylist.Product;
 import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.util.data.xml.IXmlReader;
 import com.l2jserver.util.file.filter.NumericNameFilter;
 
 /**

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/CategoryData.java

@@ -29,8 +29,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * Loads the category data with Class or NPC IDs.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/ClassListData.java

@@ -25,9 +25,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.base.ClassInfo;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * Loads the the list of classes and it's info.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/DoorData.java

@@ -30,13 +30,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2DoorTemplate;
 import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * Loads doors.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemData.java

@@ -26,11 +26,11 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jserver.gameserver.model.items.enchant.EnchantSupportItem;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * Loads item enchant data.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemGroupsData.java

@@ -26,7 +26,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.model.holders.RangeChanceHolder;
 import com.l2jserver.gameserver.model.items.L2Item;
@@ -34,6 +33,7 @@ import com.l2jserver.gameserver.model.items.enchant.EnchantItemGroup;
 import com.l2jserver.gameserver.model.items.enchant.EnchantRateItem;
 import com.l2jserver.gameserver.model.items.enchant.EnchantScrollGroup;
 import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * @author UnAfraid

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemHPBonusData.java

@@ -27,7 +27,6 @@ import java.util.Map;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.enums.StatFunction;
 import com.l2jserver.gameserver.model.items.L2Item;
@@ -35,6 +34,7 @@ import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.items.type.CrystalType;
 import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.model.stats.functions.FuncTemplate;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class holds the Enchant HP Bonus Data.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemOptionsData.java

@@ -25,10 +25,10 @@ import java.util.logging.Level;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.options.EnchantOptions;
 import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * @author UnAfraid

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java

@@ -27,13 +27,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
 import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class holds the Enchant Groups information.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/ExperienceData.java

@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/FishData.java

@@ -27,9 +27,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.fishing.L2Fish;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class holds the Fish information.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/FishingMonstersData.java

@@ -25,9 +25,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.fishing.L2FishingMonster;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class holds the Fishing Monsters information.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/FishingRodsData.java

@@ -25,9 +25,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.fishing.L2FishingRod;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class holds the Fishing Rods information.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/HennaData.java

@@ -27,10 +27,10 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.items.L2Henna;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class holds the henna related information.<br>

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/HitConditionBonusData.java

@@ -24,8 +24,8 @@ import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.GameTimeController;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class load, holds and calculates the hit condition bonuses.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/InitialEquipmentData.java

@@ -28,10 +28,10 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.items.PcItemTemplate;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class holds the Initial Equipment information.<br>

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/InitialShortcutData.java

@@ -27,7 +27,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.enums.MacroType;
 import com.l2jserver.gameserver.enums.ShortcutType;
 import com.l2jserver.gameserver.model.Macro;
@@ -37,6 +36,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.serverpackets.ShortCutRegister;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class holds the Initial Shortcuts information.<br>

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/KarmaData.java

@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * @author UnAfraid

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/MultisellData.java

@@ -31,7 +31,6 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -45,6 +44,7 @@ import com.l2jserver.gameserver.network.serverpackets.MultiSellList;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
 import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.util.data.xml.IXmlReader;
 import com.l2jserver.util.file.filter.NumericNameFilter;
 
 public final class MultisellData implements IXmlReader

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/NpcData.java

@@ -36,7 +36,6 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.AISkillScope;
 import com.l2jserver.gameserver.model.StatsSet;
@@ -51,6 +50,7 @@ import com.l2jserver.gameserver.model.holders.MinionHolder;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * NPC data parser.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/OptionData.java

@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.options.Options;
 import com.l2jserver.gameserver.model.options.OptionsSkillHolder;
 import com.l2jserver.gameserver.model.options.OptionsSkillType;
 import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.model.stats.functions.FuncTemplate;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * @author UnAfraid

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/PetDataTable.java

@@ -25,11 +25,11 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.enums.MountType;
 import com.l2jserver.gameserver.model.L2PetData;
 import com.l2jserver.gameserver.model.L2PetLevelData;
 import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class parse and hold all pet parameters.<br>

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/PlayerTemplateData.java

@@ -28,11 +28,11 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate;
 import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * Loads player's base stats.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/PlayerXpPercentLostData.java

@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/RecipeData.java

@@ -27,12 +27,12 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.L2RecipeInstance;
 import com.l2jserver.gameserver.model.L2RecipeList;
 import com.l2jserver.gameserver.model.L2RecipeStatInstance;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * The Class RecipeData.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/SecondaryAuthData.java

@@ -26,7 +26,7 @@ import java.util.logging.Level;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * @author NosBit

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/SiegeScheduleData.java

@@ -27,10 +27,10 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.SiegeScheduleDate;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * @author UnAfraid

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/SkillLearnData.java

@@ -26,8 +26,8 @@ import java.util.Map;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * Holds all skill learn data for all npcs.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java

@@ -32,7 +32,6 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.L2Clan;
@@ -50,6 +49,7 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.interfaces.ISkillsHolder;
 import com.l2jserver.gameserver.model.skills.CommonSkill;
 import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class loads and manage the characters and pledges skills trees.<br>

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/StaticObjectData.java

@@ -26,10 +26,10 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class loads and holds all static object data.

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/TransformData.java

@@ -26,7 +26,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.transform.Transform;
@@ -36,6 +35,7 @@ import com.l2jserver.gameserver.model.holders.AdditionalItemHolder;
 import com.l2jserver.gameserver.model.holders.AdditionalSkillHolder;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * @author UnAfraid

L2J_Server/java/com/l2jserver/gameserver/data/xml/impl/UIData.java

@@ -27,8 +27,8 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.ActionKey;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * UI Data parser.

L2J_Server/java/com/l2jserver/gameserver/datatables/SpawnTable.java

@@ -37,13 +37,13 @@ import org.w3c.dom.Node;
 
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.data.xml.impl.NpcData;
 import com.l2jserver.gameserver.instancemanager.DayNightSpawnManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * Spawn data retriever.

L2J_Server/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java

@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.enums.ManorMode;
 import com.l2jserver.gameserver.model.CropProcure;
 import com.l2jserver.gameserver.model.L2Clan;
@@ -53,6 +52,7 @@ import com.l2jserver.gameserver.model.interfaces.IStorable;
 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.util.Rnd;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * Castle manor system.

L2J_Server/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java

@@ -30,10 +30,10 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.L2DatabaseFactory;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * @author evill33t, GodKratos

L2J_Server/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java

@@ -27,7 +27,6 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.gameserver.SevenSigns;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.L2MapRegion;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.Location;
@@ -43,6 +42,7 @@ import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
 import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
 import com.l2jserver.gameserver.model.zone.type.L2RespawnZone;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * @author Nyaran

L2J_Server/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java

@@ -29,7 +29,6 @@ import org.w3c.dom.Node;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.instancemanager.tasks.StartMovingTask;
 import com.l2jserver.gameserver.model.L2NpcWalkerNode;
 import com.l2jserver.gameserver.model.L2WalkRoute;
@@ -45,6 +44,7 @@ import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
 import com.l2jserver.gameserver.util.Broadcast;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class manages walking monsters.

L2J_Server/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java

@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
@@ -49,6 +48,7 @@ import com.l2jserver.gameserver.model.zone.type.L2ArenaZone;
 import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone;
 import com.l2jserver.gameserver.model.zone.type.L2RespawnZone;
 import com.l2jserver.gameserver.model.zone.type.NpcSpawnTerritory;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * This class manages the zones

L2J_Server/java/com/l2jserver/loginserver/GameServerTable.java

@@ -18,9 +18,6 @@
  */
 package com.l2jserver.loginserver;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -34,30 +31,26 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.logging.Logger;
 
-import javolution.io.UTF8StreamReader;
-import javolution.xml.stream.XMLStreamConstants;
-import javolution.xml.stream.XMLStreamReaderImpl;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
 
-import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.loginserver.network.gameserverpackets.ServerStatus;
 import com.l2jserver.util.IPSubnet;
 import com.l2jserver.util.Rnd;
+import com.l2jserver.util.data.xml.IXmlReader;
 
 /**
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable
+public final class GameServerTable implements IXmlReader
 {
-	private static final Logger _log = Logger.getLogger(GameServerTable.class.getName());
-	// Server Names Config
-	private static final Map<Integer, String> _serverNames = new HashMap<>();
+	// Server Names
+	private static final Map<Integer, String> SERVER_NAMES = new HashMap<>();
 	// Game Server Table
-	private static final Map<Integer, GameServerInfo> _gameServerTable = new HashMap<>();
+	private static final Map<Integer, GameServerInfo> GAME_SERVER_TABLE = new HashMap<>();
 	// RSA Config
 	private static final int KEYS_SIZE = 10;
 	private KeyPair[] _keyPairs;
@@ -67,44 +60,30 @@ public final class GameServerTable
 	 */
 	public GameServerTable()
 	{
-		loadGameServerNames();
-		_log.info(getClass().getSimpleName() + ": Loaded " + _serverNames.size() + " server names");
+		load();
 		
 		loadRegisteredGameServers();
-		_log.info(getClass().getSimpleName() + ": Loaded " + _gameServerTable.size() + " registered Game Servers");
+		LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers");
 		
 		initRSAKeys();
-		_log.info(getClass().getSimpleName() + ": Cached " + _keyPairs.length + " RSA keys for Game Server communication.");
+		LOGGER.info(GameServerTable.class.getSimpleName() + ": Cached " + _keyPairs.length + " RSA keys for Game Server communication.");
 	}
 	
-	/**
-	 * Load game server names.
-	 */
-	private void loadGameServerNames()
+	@Override
+	public void load()
 	{
-		final File xml = new File(Config.DATAPACK_ROOT, "data/servername.xml");
-		try (InputStream in = new FileInputStream(xml);
-			UTF8StreamReader utf8 = new UTF8StreamReader())
-		{
-			final XMLStreamReaderImpl xpp = new XMLStreamReaderImpl();
-			xpp.setInput(utf8.setInput(in));
-			for (int e = xpp.getEventType(); e != XMLStreamConstants.END_DOCUMENT; e = xpp.next())
-			{
-				if (e == XMLStreamConstants.START_ELEMENT)
-				{
-					if (xpp.getLocalName().toString().equals("server"))
-					{
-						Integer id = Integer.valueOf(xpp.getAttributeValue(null, "id").toString());
-						String name = xpp.getAttributeValue(null, "name").toString();
-						_serverNames.put(id, name);
-					}
-				}
-			}
-			xpp.close();
-		}
-		catch (Exception e)
+		SERVER_NAMES.clear();
+		parseDatapackFile("data/servername.xml");
+		LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + SERVER_NAMES.size() + " server names");
+	}
+	
+	@Override
+	public void parseDocument(Document doc)
+	{
+		final NodeList servers = doc.getElementsByTagName("server");
+		for (int s = 0; s < servers.getLength(); s++)
 		{
-			_log.info(getClass().getSimpleName() + ": Cannot load " + xml.getAbsolutePath() + "!");
+			SERVER_NAMES.put(parseInteger(servers.item(s).getAttributes(), "id"), parseString(servers.item(s).getAttributes(), "name"));
 		}
 	}
 	
@@ -125,7 +104,7 @@ public final class GameServerTable
 		}
 		catch (Exception e)
 		{
-			_log.severe(getClass().getSimpleName() + ": Error loading RSA keys for Game Server communication!");
+			LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading RSA keys for Game Server communication!");
 		}
 	}
 	
@@ -142,12 +121,12 @@ public final class GameServerTable
 			while (rs.next())
 			{
 				id = rs.getInt("server_id");
-				_gameServerTable.put(id, new GameServerInfo(id, stringToHex(rs.getString("hexid"))));
+				GAME_SERVER_TABLE.put(id, new GameServerInfo(id, stringToHex(rs.getString("hexid"))));
 			}
 		}
 		catch (Exception e)
 		{
-			_log.severe(getClass().getSimpleName() + ": Error loading registered game servers!");
+			LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading registered game servers!");
 		}
 	}
 	
@@ -157,7 +136,7 @@ public final class GameServerTable
 	 */
 	public Map<Integer, GameServerInfo> getRegisteredGameServers()
 	{
-		return _gameServerTable;
+		return GAME_SERVER_TABLE;
 	}
 	
 	/**
@@ -167,7 +146,7 @@ public final class GameServerTable
 	 */
 	public GameServerInfo getRegisteredGameServerById(int id)
 	{
-		return _gameServerTable.get(id);
+		return GAME_SERVER_TABLE.get(id);
 	}
 	
 	/**
@@ -177,7 +156,7 @@ public final class GameServerTable
 	 */
 	public boolean hasRegisteredGameServerOnId(int id)
 	{
-		return _gameServerTable.containsKey(id);
+		return GAME_SERVER_TABLE.containsKey(id);
 	}
 	
 	/**
@@ -185,17 +164,17 @@ public final class GameServerTable
 	 * @param gsi the game server information DTO
 	 * @return true, if successful
 	 */
-	public boolean registerWithFirstAvaliableId(GameServerInfo gsi)
+	public boolean registerWithFirstAvailableId(GameServerInfo gsi)
 	{
 		// avoid two servers registering with the same "free" id
-		synchronized (_gameServerTable)
+		synchronized (GAME_SERVER_TABLE)
 		{
-			for (Entry<Integer, String> entry : _serverNames.entrySet())
+			for (Integer serverId : SERVER_NAMES.keySet())
 			{
-				if (!_gameServerTable.containsKey(entry.getKey()))
+				if (!GAME_SERVER_TABLE.containsKey(serverId))
 				{
-					_gameServerTable.put(entry.getKey(), gsi);
-					gsi.setId(entry.getKey());
+					GAME_SERVER_TABLE.put(serverId, gsi);
+					gsi.setId(serverId);
 					return true;
 				}
 			}
@@ -212,12 +191,11 @@ public final class GameServerTable
 	public boolean register(int id, GameServerInfo gsi)
 	{
 		// avoid two servers registering with the same id
-		synchronized (_gameServerTable)
+		synchronized (GAME_SERVER_TABLE)
 		{
-			if (!_gameServerTable.containsKey(id))
+			if (!GAME_SERVER_TABLE.containsKey(id))
 			{
-				_gameServerTable.put(id, gsi);
-				gsi.setId(id);
+				GAME_SERVER_TABLE.put(id, gsi);
 				return true;
 			}
 		}
@@ -252,7 +230,7 @@ public final class GameServerTable
 		}
 		catch (Exception e)
 		{
-			_log.severe(getClass().getSimpleName() + ": Error while saving gameserver!");
+			LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error while saving gameserver!");
 		}
 	}
 	
@@ -263,7 +241,7 @@ public final class GameServerTable
 	 */
 	public String getServerNameById(int id)
 	{
-		return _serverNames.get(id);
+		return SERVER_NAMES.get(id);
 	}
 	
 	/**
@@ -272,7 +250,7 @@ public final class GameServerTable
 	 */
 	public Map<Integer, String> getServerNames()
 	{
-		return _serverNames;
+		return SERVER_NAMES;
 	}
 	
 	/**
@@ -381,6 +359,12 @@ public final class GameServerTable
 			return _hexId;
 		}
 		
+		public String getName()
+		{
+			// this value can't be stored in a private variable because the ID can be changed by setId()
+			return GameServerTable.getInstance().getServerNameById(_id);
+		}
+		
 		/**
 		 * Sets the authed.
 		 * @param isAuthed the new authed
@@ -435,6 +419,27 @@ public final class GameServerTable
 			return _status;
 		}
 		
+		public String getStatusName()
+		{
+			switch (_status)
+			{
+				case 0:
+					return "Auto";
+				case 1:
+					return "Good";
+				case 2:
+					return "Normal";
+				case 3:
+					return "Full";
+				case 4:
+					return "Down";
+				case 5:
+					return "GM Only";
+				default:
+					return "Unknown";
+			}
+		}
+		
 		/**
 		 * Gets the current player count.
 		 * @return the current player count

L2J_Server/java/com/l2jserver/loginserver/network/gameserverpackets/GameServerAuth.java

@@ -129,7 +129,7 @@ public class GameServerAuth extends BaseRecievePacket
 				if (Config.ACCEPT_NEW_GAMESERVER && _acceptAlternativeId)
 				{
 					gsi = new GameServerInfo(id, hexId, _server);
-					if (gameServerTable.registerWithFirstAvaliableId(gsi))
+					if (gameServerTable.registerWithFirstAvailableId(gsi))
 					{
 						_server.attachGameServerInfo(gsi, _port, _hosts, _maxPlayers);
 						gameServerTable.registerServerOnDB(gsi);

L2J_Server/java/com/l2jserver/gameserver/data/xml/IXmlReader.java → L2J_Server/java/com/l2jserver/util/data/xml/IXmlReader.java

@@ -16,7 +16,7 @@
  * 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.data.xml;
+package com.l2jserver.util.data.xml;
 
 import java.io.File;
 import java.io.FileFilter;