BETA: Renaming some classes in datatables package:

	* EnchantGroupsData -> EnchantSkillGroupsData
	* EnchantOptionsData -> EnchantItemOptionsData
	* EnchantHPBonusData -> EnchantItemHPBonusData

L2J_Server_BETA/java/com/l2jserver/gameserver/GameServer.java

@@ -49,11 +49,11 @@ import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.ClassListData;
 import com.l2jserver.gameserver.datatables.CrestTable;
 import com.l2jserver.gameserver.datatables.DoorTable;
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
-import com.l2jserver.gameserver.datatables.EnchantHPBonusData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantItemHPBonusData;
 import com.l2jserver.gameserver.datatables.EnchantItemData;
 import com.l2jserver.gameserver.datatables.EnchantItemGroupsData;
-import com.l2jserver.gameserver.datatables.EnchantOptionsData;
+import com.l2jserver.gameserver.datatables.EnchantItemOptionsData;
 import com.l2jserver.gameserver.datatables.EventDroplist;
 import com.l2jserver.gameserver.datatables.ExperienceTable;
 import com.l2jserver.gameserver.datatables.FishData;
@@ -219,7 +219,7 @@ public class GameServer
 		
 		printSection("Skills");
 		EffectHandler.getInstance().executeScript();
-		EnchantGroupsData.getInstance();
+		EnchantSkillGroupsData.getInstance();
 		SkillTreesData.getInstance();
 		SkillTable.getInstance();
 		SummonSkillsTable.getInstance();
@@ -228,9 +228,9 @@ public class GameServer
 		ItemTable.getInstance();
 		EnchantItemGroupsData.getInstance();
 		EnchantItemData.getInstance();
-		EnchantOptionsData.getInstance();
+		EnchantItemOptionsData.getInstance();
 		OptionsData.getInstance();
-		EnchantHPBonusData.getInstance();
+		EnchantItemHPBonusData.getInstance();
 		MerchantPriceConfigTable.getInstance().loadInstances();
 		BuyListData.getInstance();
 		MultisellData.getInstance();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantHPBonusData.java → L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantItemHPBonusData.java

@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.model.stats.Stats;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantHPBonusData extends DocumentParser
+public class EnchantItemHPBonusData extends DocumentParser
 {
 	private final Map<Integer, List<Integer>> _armorHPBonuses = new HashMap<>();
 	
@@ -46,7 +46,7 @@ public class EnchantHPBonusData extends DocumentParser
 	/**
 	 * Instantiates a new enchant hp bonus data.
 	 */
-	protected EnchantHPBonusData()
+	protected EnchantItemHPBonusData()
 	{
 		load();
 	}
@@ -159,13 +159,13 @@ public class EnchantHPBonusData extends DocumentParser
 	 * Gets the single instance of EnchantHPBonusData.
 	 * @return single instance of EnchantHPBonusData
 	 */
-	public static final EnchantHPBonusData getInstance()
+	public static final EnchantItemHPBonusData getInstance()
 	{
 		return SingletonHolder._instance;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final EnchantHPBonusData _instance = new EnchantHPBonusData();
+		protected static final EnchantItemHPBonusData _instance = new EnchantItemHPBonusData();
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantOptionsData.java → L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantItemOptionsData.java

@@ -32,11 +32,11 @@ import com.l2jserver.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantOptionsData extends DocumentParser
+public class EnchantItemOptionsData extends DocumentParser
 {
 	private final Map<Integer, Map<Integer, EnchantOptions>> _data = new HashMap<>();
 	
-	protected EnchantOptionsData()
+	protected EnchantItemOptionsData()
 	{
 		load();
 	}
@@ -118,13 +118,13 @@ public class EnchantOptionsData extends DocumentParser
 	 * Gets the single instance of EnchantOptionsData.
 	 * @return single instance of EnchantOptionsData
 	 */
-	public static final EnchantOptionsData getInstance()
+	public static final EnchantItemOptionsData getInstance()
 	{
 		return SingletonHolder._instance;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final EnchantOptionsData _instance = new EnchantOptionsData();
+		protected static final EnchantItemOptionsData _instance = new EnchantItemOptionsData();
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantGroupsData.java → L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantSkillGroupsData.java

@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.model.skills.L2Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantGroupsData extends DocumentParser
+public class EnchantSkillGroupsData extends DocumentParser
 {
 	public static final int NORMAL_ENCHANT_COST_MULTIPLIER = Config.NORMAL_ENCHANT_COST_MULTIPLIER;
 	public static final int SAFE_ENCHANT_COST_MULTIPLIER = Config.SAFE_ENCHANT_COST_MULTIPLIER;
@@ -54,7 +54,7 @@ public class EnchantGroupsData extends DocumentParser
 	/**
 	 * Instantiates a new enchant groups table.
 	 */
-	protected EnchantGroupsData()
+	protected EnchantSkillGroupsData()
 	{
 		load();
 	}
@@ -244,13 +244,13 @@ public class EnchantGroupsData extends DocumentParser
 	 * Gets the single instance of EnchantGroupsData.
 	 * @return single instance of EnchantGroupsData
 	 */
-	public static EnchantGroupsData getInstance()
+	public static EnchantSkillGroupsData getInstance()
 	{
 		return SingletonHolder._instance;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final EnchantGroupsData _instance = new EnchantGroupsData();
+		protected static final EnchantSkillGroupsData _instance = new EnchantSkillGroupsData();
 	}
 }

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

@@ -476,7 +476,7 @@ public class ItemTable
 	public void reload()
 	{
 		load();
-		EnchantHPBonusData.getInstance().load();
+		EnchantItemHPBonusData.getInstance().load();
 	}
 	
 	protected static class ResetOwner implements Runnable

L2J_Server_BETA/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java

@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
 import com.l2jserver.gameserver.engines.DocumentBase;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
@@ -154,35 +154,35 @@ public class DocumentSkill extends DocumentBase
 		int lastLvl = Integer.parseInt(levels);
 		if (attrs.getNamedItem("enchantGroup1") != null)
 		{
-			enchantLevels1 = EnchantGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 1, Integer.parseInt(attrs.getNamedItem("enchantGroup1").getNodeValue()));
+			enchantLevels1 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 1, Integer.parseInt(attrs.getNamedItem("enchantGroup1").getNodeValue()));
 		}
 		if (attrs.getNamedItem("enchantGroup2") != null)
 		{
-			enchantLevels2 = EnchantGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 2, Integer.parseInt(attrs.getNamedItem("enchantGroup2").getNodeValue()));
+			enchantLevels2 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 2, Integer.parseInt(attrs.getNamedItem("enchantGroup2").getNodeValue()));
 		}
 		if (attrs.getNamedItem("enchantGroup3") != null)
 		{
-			enchantLevels3 = EnchantGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 3, Integer.parseInt(attrs.getNamedItem("enchantGroup3").getNodeValue()));
+			enchantLevels3 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 3, Integer.parseInt(attrs.getNamedItem("enchantGroup3").getNodeValue()));
 		}
 		if (attrs.getNamedItem("enchantGroup4") != null)
 		{
-			enchantLevels4 = EnchantGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 4, Integer.parseInt(attrs.getNamedItem("enchantGroup4").getNodeValue()));
+			enchantLevels4 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 4, Integer.parseInt(attrs.getNamedItem("enchantGroup4").getNodeValue()));
 		}
 		if (attrs.getNamedItem("enchantGroup5") != null)
 		{
-			enchantLevels5 = EnchantGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 5, Integer.parseInt(attrs.getNamedItem("enchantGroup5").getNodeValue()));
+			enchantLevels5 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 5, Integer.parseInt(attrs.getNamedItem("enchantGroup5").getNodeValue()));
 		}
 		if (attrs.getNamedItem("enchantGroup6") != null)
 		{
-			enchantLevels6 = EnchantGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 6, Integer.parseInt(attrs.getNamedItem("enchantGroup6").getNodeValue()));
+			enchantLevels6 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 6, Integer.parseInt(attrs.getNamedItem("enchantGroup6").getNodeValue()));
 		}
 		if (attrs.getNamedItem("enchantGroup7") != null)
 		{
-			enchantLevels7 = EnchantGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 7, Integer.parseInt(attrs.getNamedItem("enchantGroup7").getNodeValue()));
+			enchantLevels7 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 7, Integer.parseInt(attrs.getNamedItem("enchantGroup7").getNodeValue()));
 		}
 		if (attrs.getNamedItem("enchantGroup8") != null)
 		{
-			enchantLevels8 = EnchantGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 8, Integer.parseInt(attrs.getNamedItem("enchantGroup8").getNodeValue()));
+			enchantLevels8 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 8, Integer.parseInt(attrs.getNamedItem("enchantGroup8").getNodeValue()));
 		}
 		
 		_currentSkill.id = skillId;

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

@@ -18,7 +18,7 @@
  */
 package com.l2jserver.gameserver.model;
 
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
 
 import gnu.trove.map.hash.TIntIntHashMap;
@@ -77,7 +77,7 @@ public final class L2EnchantSkillLearn
 	
 	public L2EnchantSkillGroup getFirstRouteGroup()
 	{
-		return EnchantGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.values()[0]);
+		return EnchantSkillGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.values()[0]);
 	}
 	
 	public int[] getAllRoutes()
@@ -103,7 +103,7 @@ public final class L2EnchantSkillLearn
 		}
 		int index = L2EnchantSkillLearn.getEnchantIndex(level);
 		
-		if ((index + 1) >= EnchantGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(enchantType)).getEnchantGroupDetails().size())
+		if ((index + 1) >= EnchantSkillGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(enchantType)).getEnchantGroupDetails().size())
 		{
 			return true;
 		}
@@ -118,7 +118,7 @@ public final class L2EnchantSkillLearn
 			return null;
 		}
 		int index = L2EnchantSkillLearn.getEnchantIndex(level);
-		L2EnchantSkillGroup group = EnchantGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(enchantType));
+		L2EnchantSkillGroup group = EnchantSkillGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(enchantType));
 		
 		if (index < 0)
 		{
@@ -126,7 +126,7 @@ public final class L2EnchantSkillLearn
 		}
 		else if (index >= group.getEnchantGroupDetails().size())
 		{
-			return group.getEnchantGroupDetails().get(EnchantGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(enchantType)).getEnchantGroupDetails().size() - 1);
+			return group.getEnchantGroupDetails().get(EnchantSkillGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(enchantType)).getEnchantGroupDetails().size() - 1);
 		}
 		return group.getEnchantGroupDetails().get(index);
 	}

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

@@ -73,7 +73,7 @@ import com.l2jserver.gameserver.datatables.CharSummonTable;
 import com.l2jserver.gameserver.datatables.CharTemplateTable;
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.ClassListData;
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
 import com.l2jserver.gameserver.datatables.ExperienceTable;
 import com.l2jserver.gameserver.datatables.FishData;
 import com.l2jserver.gameserver.datatables.HennaData;
@@ -10392,7 +10392,7 @@ public final class L2PcInstance extends L2Playable
 			boolean isEnchantable = SkillTable.getInstance().isEnchantable(s.getId());
 			if (isEnchantable)
 			{
-				L2EnchantSkillLearn esl = EnchantGroupsData.getInstance().getSkillEnchantmentBySkillId(s.getId());
+				L2EnchantSkillLearn esl = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(s.getId());
 				if (esl != null)
 				{
 					// if player dont have min level to enchant

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java

@@ -40,7 +40,7 @@ import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.cache.HtmCache;
-import com.l2jserver.gameserver.datatables.EnchantOptionsData;
+import com.l2jserver.gameserver.datatables.EnchantItemOptionsData;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.OptionsData;
 import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
@@ -2237,7 +2237,7 @@ public final class L2ItemInstance extends L2Object
 	 */
 	public int[] getEnchantOptions()
 	{
-		EnchantOptions op = EnchantOptionsData.getInstance().getOptions(this);
+		EnchantOptions op = EnchantItemOptionsData.getInstance().getOptions(this);
 		if (op != null)
 		{
 			return op.getOptions();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/FuncEnchantHp.java

@@ -18,7 +18,7 @@
  */
 package com.l2jserver.gameserver.model.skills.funcs;
 
-import com.l2jserver.gameserver.datatables.EnchantHPBonusData;
+import com.l2jserver.gameserver.datatables.EnchantItemHPBonusData;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.model.stats.Stats;
@@ -44,7 +44,7 @@ public class FuncEnchantHp extends Func
 		final L2ItemInstance item = (L2ItemInstance) funcOwner;
 		if (item.getEnchantLevel() > 0)
 		{
-			env.addValue(EnchantHPBonusData.getInstance().getHPBonus(item));
+			env.addValue(EnchantItemHPBonusData.getInstance().getHPBonus(item));
 		}
 	}
 }

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

@@ -23,7 +23,7 @@ import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
 import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
@@ -97,7 +97,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
 			return;
 		}
 		
-		final L2EnchantSkillLearn s = EnchantGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
+		final L2EnchantSkillLearn s = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
 		if (s == null)
 		{
 			return;
@@ -109,13 +109,13 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
 			return;
 		}
 		
-		final int costMultiplier = EnchantGroupsData.NORMAL_ENCHANT_COST_MULTIPLIER;
+		final int costMultiplier = EnchantSkillGroupsData.NORMAL_ENCHANT_COST_MULTIPLIER;
 		final int requiredSp = esd.getSpCost() * costMultiplier;
 		if (player.getSp() >= requiredSp)
 		{
 			// only first lvl requires book
 			final boolean usesBook = (_skillLvl % 100) == 1; // 101, 201, 301 ...
-			final int reqItemId = EnchantGroupsData.NORMAL_ENCHANT_BOOK;
+			final int reqItemId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK;
 			final L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
 			
 			if (Config.ES_SP_BOOK_NEEDED && usesBook && (spb == null)) // Haven't spellbook

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

@@ -18,7 +18,7 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
@@ -68,7 +68,7 @@ public final class RequestExEnchantSkillInfo extends L2GameClientPacket
 			return;
 		}
 		
-		if (EnchantGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId) == null)
+		if (EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId) == null)
 		{
 			return;
 		}

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

@@ -18,7 +18,7 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
 import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
@@ -84,7 +84,7 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket
 		// if reqlvl is 100,200,.. check base skill lvl enchant
 		if ((reqSkillLvl % 100) == 0)
 		{
-			L2EnchantSkillLearn esl = EnchantGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
+			L2EnchantSkillLearn esl = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
 			if (esl != null)
 			{
 				// if player dont have min level to enchant

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

@@ -23,7 +23,7 @@ import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
 import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
@@ -97,9 +97,9 @@ public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket
 			return;
 		}
 		
-		int reqItemId = EnchantGroupsData.CHANGE_ENCHANT_BOOK;
+		int reqItemId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK;
 		
-		L2EnchantSkillLearn s = EnchantGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
+		L2EnchantSkillLearn s = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
 		if (s == null)
 		{
 			return;

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

@@ -23,7 +23,7 @@ import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
 import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
@@ -97,10 +97,10 @@ public final class RequestExEnchantSkillSafe extends L2GameClientPacket
 			return;
 		}
 		
-		int costMultiplier = EnchantGroupsData.SAFE_ENCHANT_COST_MULTIPLIER;
-		int reqItemId = EnchantGroupsData.SAFE_ENCHANT_BOOK;
+		int costMultiplier = EnchantSkillGroupsData.SAFE_ENCHANT_COST_MULTIPLIER;
+		int reqItemId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK;
 		
-		L2EnchantSkillLearn s = EnchantGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
+		L2EnchantSkillLearn s = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
 		if (s == null)
 		{
 			return;

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

@@ -23,7 +23,7 @@ import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
 import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
@@ -90,7 +90,7 @@ public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
 			return;
 		}
 		
-		L2EnchantSkillLearn s = EnchantGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
+		L2EnchantSkillLearn s = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
 		if (s == null)
 		{
 			return;
@@ -107,7 +107,7 @@ public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
 			return;
 		}
 		
-		int reqItemId = EnchantGroupsData.UNTRAIN_ENCHANT_BOOK;
+		int reqItemId = EnchantSkillGroupsData.UNTRAIN_ENCHANT_BOOK;
 		
 		final int beforeUntrainSkillLevel = player.getSkillLevel(_skillId);
 		if (((beforeUntrainSkillLevel - 1) != _skillLvl) && (((beforeUntrainSkillLevel % 100) != 1) || (_skillLvl != s.getBaseLevel())))

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

@@ -20,7 +20,7 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import javolution.util.FastList;
 
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
 import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
 
@@ -38,7 +38,7 @@ public final class ExEnchantSkillInfo extends L2GameServerPacket
 		_id = id;
 		_lvl = lvl;
 		
-		L2EnchantSkillLearn enchantLearn = EnchantGroupsData.getInstance().getSkillEnchantmentBySkillId(_id);
+		L2EnchantSkillLearn enchantLearn = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_id);
 		// do we have this skill?
 		if (enchantLearn != null)
 		{

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

@@ -19,7 +19,7 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.EnchantGroupsData;
+import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
 import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
 import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -48,7 +48,7 @@ public class ExEnchantSkillInfoDetail extends L2GameServerPacket
 	public ExEnchantSkillInfoDetail(int type, int skillid, int skilllvl, L2PcInstance ply)
 	{
 		
-		L2EnchantSkillLearn enchantLearn = EnchantGroupsData.getInstance().getSkillEnchantmentBySkillId(skillid);
+		L2EnchantSkillLearn enchantLearn = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(skillid);
 		EnchantSkillHolder esd = null;
 		// do we have this skill?
 		if (enchantLearn != null)
@@ -70,11 +70,11 @@ public class ExEnchantSkillInfoDetail extends L2GameServerPacket
 		
 		if (type == 0)
 		{
-			multi = EnchantGroupsData.NORMAL_ENCHANT_COST_MULTIPLIER;
+			multi = EnchantSkillGroupsData.NORMAL_ENCHANT_COST_MULTIPLIER;
 		}
 		else if (type == 1)
 		{
-			multi = EnchantGroupsData.SAFE_ENCHANT_COST_MULTIPLIER;
+			multi = EnchantSkillGroupsData.SAFE_ENCHANT_COST_MULTIPLIER;
 		}
 		_chance = esd.getRate(ply);
 		_sp = esd.getSpCost();
@@ -90,19 +90,19 @@ public class ExEnchantSkillInfoDetail extends L2GameServerPacket
 		switch (type)
 		{
 			case TYPE_NORMAL_ENCHANT:
-				bookId = EnchantGroupsData.NORMAL_ENCHANT_BOOK;
+				bookId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK;
 				reqCount = (((_skilllvl % 100) > 1) ? 0 : 1);
 				break;
 			case TYPE_SAFE_ENCHANT:
-				bookId = EnchantGroupsData.SAFE_ENCHANT_BOOK;
+				bookId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK;
 				reqCount = 1;
 				break;
 			case TYPE_UNTRAIN_ENCHANT:
-				bookId = EnchantGroupsData.UNTRAIN_ENCHANT_BOOK;
+				bookId = EnchantSkillGroupsData.UNTRAIN_ENCHANT_BOOK;
 				reqCount = 1;
 				break;
 			case TYPE_CHANGE_ENCHANT:
-				bookId = EnchantGroupsData.CHANGE_ENCHANT_BOOK;
+				bookId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK;
 				reqCount = 1;
 				break;
 			default: