BETA: Updated getType() for ex client packets

Moved GS utils to the proper package

L2J_Server_BETA/java/com/l2jserver/accountmanager/SQLAccountManager.java

@@ -25,12 +25,12 @@ import java.util.Locale;
 
 import javolution.util.FastList;
 
-import com.l2jserver.Base64;
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.Server;
 import com.l2jserver.ngl.ConsoleLocalizator;
 import com.l2jserver.ngl.LocaleCodes;
+import com.l2jserver.util.Base64;
 
 /**
  * This class SQL Account Manager

L2J_Server_BETA/java/com/l2jserver/gameserver/GeoData.java

@@ -21,7 +21,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/GeoEngine.java

@@ -41,7 +41,7 @@ import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 /**
  *

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

@@ -50,7 +50,7 @@ import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.templates.item.L2Weapon;
 import com.l2jserver.gameserver.templates.item.L2WeaponType;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.util.Rnd;
 /**
  * This class manages AI of L2Character.<BR><BR>

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

@@ -40,7 +40,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
 import com.l2jserver.gameserver.templates.item.L2Item;
 import com.l2jserver.gameserver.util.Broadcast;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.util.Rnd;
 
 

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

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.datatables.CharNameTable;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.util.StringUtil;
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -115,8 +115,8 @@ import com.l2jserver.gameserver.templates.item.L2Weapon;
 import com.l2jserver.gameserver.templates.item.L2WeaponType;
 import com.l2jserver.gameserver.templates.skills.L2EffectType;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Point3D;
 import com.l2jserver.util.Rnd;
 /**
  * Mother class of all character objects of the world (PC, NPC...)<BR><BR>

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

@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExGetOnAirShip;
 import com.l2jserver.gameserver.network.serverpackets.ExMoveToLocationAirShip;
 import com.l2jserver.gameserver.network.serverpackets.ExStopMoveAirShip;
 import com.l2jserver.gameserver.templates.chars.L2CharTemplate;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 /**
  * Flying airships. Very similar to Maktakien boats (see L2BoatInstance) but these do fly :P

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

@@ -263,9 +263,9 @@ import com.l2jserver.gameserver.templates.item.L2WeaponType;
 import com.l2jserver.gameserver.templates.skills.L2EffectType;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.FloodProtectors;
+import com.l2jserver.gameserver.util.PlayerEventStatus;
+import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.PlayerEventStatus;
-import com.l2jserver.util.Point3D;
 import com.l2jserver.util.Rnd;
 
 /**

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

@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.network.serverpackets.StopMove;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.util.Rnd;
 
 // While a tamed beast behaves a lot like a pet (ingame) and does have

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/position/ObjectPosition.java

@@ -20,7 +20,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 
 public class ObjectPosition

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

@@ -42,7 +42,7 @@ import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
-import com.l2jserver.util.PlayerEventStatus;
+import com.l2jserver.gameserver.util.PlayerEventStatus;
 import com.l2jserver.util.ValueSortMap;
 
 /**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/waypoint/WayPointNode.java

@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 /**
  * This class ...

L2J_Server_BETA/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java

@@ -730,7 +730,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 							case 0x0b:
 								msg = new RequestWithdrawPartyRoom();
 								break;
-							case 0x0c: // RequestHandOverPartyMaster
+							case 0x0c:
 								msg = new RequestChangePartyLeader();
 								break;
 							case 0x0d:
@@ -841,13 +841,13 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 							case 0x31:
 								msg = new RequestListPartyMatchingWaitingRoom();
 								break;
-							case 0x32: // test me
+							case 0x32:
 								msg = new RequestExEnchantSkillSafe();
 								break;
-							case 0x33: // test me
+							case 0x33:
 								msg = new RequestExEnchantSkillUntrain();
 								break;
-							case 0x34: // test me
+							case 0x34:
 								msg = new RequestExEnchantSkillRouteChange();
 								break;
 							case 0x35:
@@ -980,7 +980,6 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 								// NotifyStartMiniGame
 								break;
 							case 0x57:
-								// RequestJoinDominionWar
 								msg = new RequestJoinDominionWar();
 								break;
 							case 0x58:
@@ -1032,7 +1031,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
 								msg = new RequestSentPost();
 								break;
 							case 0x6f:
-								msg = new RequestCancelPost();
+								msg = new RequestCancelPostAttachment();
 								break;
 							case 0x70:
 								// RequestShowNewUserPetition

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

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.util.Util;
  */
 public class AnswerCoupleAction extends L2GameClientPacket
 {
-	private static final String _S__3D_SOCIALACTION = "[C] D0:7A AnswerCoupleAction";
+	private static final String _S__D0_7A_ANSWERCOUPLEACTION = "[C] D0:7A AnswerCoupleAction";
 	
 	private int _charObjId;
 	private int _actionId;
@@ -86,7 +86,7 @@ public class AnswerCoupleAction extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _S__3D_SOCIALACTION;
+		return _S__D0_7A_ANSWERCOUPLEACTION;
 	}
 	
 }

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

@@ -21,7 +21,7 @@ package com.l2jserver.gameserver.network.clientpackets;
  */
 public final class AnswerJoinPartyRoom extends L2GameClientPacket
 {
-	private static final String _C__D0_15_ANSWERJOINPARTYROOM = "[C] D0:15 AnswerJoinPartyRoom";
+	private static final String _C__D0_30_ANSWERJOINPARTYROOM = "[C] D0:30 AnswerJoinPartyRoom";
 	@SuppressWarnings("unused")
 	private int _requesterID; // not tested, just guessed
 	
@@ -47,7 +47,7 @@ public final class AnswerJoinPartyRoom extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_15_ANSWERJOINPARTYROOM;
+		return _C__D0_30_ANSWERJOINPARTYROOM;
 	}
 	
 }

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public class AnswerPartyLootModification extends L2GameClientPacket
 {
-	private static final String TYPE = "[C] D0:79 AnswerPartyLootModification";
+	private static final String _C__D0_79_ANSWERPARTYLOOTMODIFICATION = "[C] D0:79 AnswerPartyLootModification";
 	
 	public int _answer;
 	
@@ -47,7 +47,7 @@ public class AnswerPartyLootModification extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return TYPE;
+		return _C__D0_79_ANSWERPARTYLOOTMODIFICATION;
 	}
 	
 }

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

@@ -24,20 +24,13 @@ import com.l2jserver.gameserver.network.serverpackets.ExBrLoadEventTopRankers;
  */
 public class BrEventRankerList extends L2GameClientPacket
 {
+	private static final String _C__D0_7B_BREVENTRANKERLIST = "[C] D0:7B BrEventRankerList";
+	
 	private int _eventId;
 	private int _day;
 	@SuppressWarnings("unused")
 	private int _ranking;
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:7D BrEventRankerList";
-	}
-	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
 	 */
@@ -62,4 +55,12 @@ public class BrEventRankerList extends L2GameClientPacket
 		getClient().sendPacket(new ExBrLoadEventTopRankers(_eventId, _day, count, bestScore, myScore));
 	}
 	
+	/* (non-Javadoc)
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_7B_BREVENTRANKERLIST;
+	}
 }

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

@@ -16,7 +16,7 @@ package com.l2jserver.gameserver.network.clientpackets;
 
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.StopMoveInVehicle;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 /**
  * @author Maktakien

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

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public final class EndScenePlayer extends L2GameClientPacket
 {
-	private static final String _C__d05b_EndScenePlayer = "[C] d0:5b EndScenePlayer";
+	private static final String _C__D0_5B_ENDSCENEPLAYER = "[C] D0:5B EndScenePlayer";
 	private static Logger _log = Logger.getLogger(EndScenePlayer.class.getName());
 	
 	private int _movieId;
@@ -61,6 +61,6 @@ public final class EndScenePlayer extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__d05b_EndScenePlayer;
+		return _C__D0_5B_ENDSCENEPLAYER;
 	}
 }

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

@@ -17,7 +17,6 @@ package com.l2jserver.gameserver.network.clientpackets;
 import java.io.UnsupportedEncodingException;
 import java.util.logging.Logger;
 
-import com.l2jserver.Base64;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.Announcements;
 import com.l2jserver.gameserver.GmListTable;
@@ -67,8 +66,8 @@ import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
 import com.l2jserver.gameserver.network.serverpackets.ExBirthdayPopup;
 import com.l2jserver.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
-import com.l2jserver.gameserver.network.serverpackets.ExNavitAdventPointInfoPacket;
-import com.l2jserver.gameserver.network.serverpackets.ExNavitAdventTimeChange;
+import com.l2jserver.gameserver.network.serverpackets.ExNevitAdventPointInfoPacket;
+import com.l2jserver.gameserver.network.serverpackets.ExNevitAdventTimeChange;
 import com.l2jserver.gameserver.network.serverpackets.ExNoticePostArrived;
 import com.l2jserver.gameserver.network.serverpackets.ExNotifyPremiumItem;
 import com.l2jserver.gameserver.network.serverpackets.ExShowContactList;
@@ -87,6 +86,7 @@ import com.l2jserver.gameserver.network.serverpackets.QuestList;
 import com.l2jserver.gameserver.network.serverpackets.ShortCutInit;
 import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.util.Base64;
 
 
 /**
@@ -416,8 +416,8 @@ public class EnterWorld extends L2GameClientPacket
 		
 		sendPacket(new SkillCoolTime(activeChar));
 		sendPacket(new ExVoteSystemInfo(activeChar));
-		sendPacket(new ExNavitAdventPointInfoPacket(0));
-		sendPacket(new ExNavitAdventTimeChange(-1)); // only set pause state...
+		sendPacket(new ExNevitAdventPointInfoPacket(0));
+		sendPacket(new ExNevitAdventTimeChange(-1)); // only set pause state...
 		sendPacket(new ExShowContactList(activeChar));
 		
 		for (L2ItemInstance i : activeChar.getInventory().getItems())

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

@@ -28,6 +28,8 @@ import java.util.logging.Logger;
  */
 public class ExGetOnAirShip extends L2GameClientPacket
 {
+	private static final String _C__D0_36_EXGETONAIRSHIP = "[C] D0:36 ExGetOnAirShip";
+	
 	protected static final Logger _log = Logger.getLogger(ExGetOnAirShip.class.getName());
 	private int _x;
 	private int _y;
@@ -55,7 +57,6 @@ public class ExGetOnAirShip extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] 0xD0:0x36 ExGetOnAirShip";
+		return _C__D0_36_EXGETONAIRSHIP;
 	}
-	
 }

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

@@ -21,7 +21,7 @@ import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ExMoveToLocationInAirShip;
 import com.l2jserver.gameserver.network.serverpackets.StopMoveInVehicle;
 import com.l2jserver.gameserver.templates.item.L2WeaponType;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 /**
  * format: ddddddd

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

@@ -23,16 +23,8 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowAgitInfo;
  */
 public class RequestAllAgitInfo extends L2GameClientPacket
 {
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:41 RequestAllAgitInfo";
-	}
-	
+	private static final String _C__D0_3E_REQUESTALLAGITINFO = "[C] D0:3E RequestAllAgitInfo";
+		
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
 	 */
@@ -54,5 +46,13 @@ public class RequestAllAgitInfo extends L2GameClientPacket
 			client.sendPacket(new ExShowAgitInfo());
 		}
 	}
-	
+
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_3E_REQUESTALLAGITINFO;
+	}
 }

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

@@ -23,16 +23,8 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowCastleInfo;
  */
 public class RequestAllCastleInfo extends L2GameClientPacket
 {
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:3F RequestAllCastleInfo";
-	}
-	
+	private static final String _C__D0_3C_REQUESTALLCASTLEINFO = "[C] D0:3C RequestAllCastleInfo";
+		
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
 	 */
@@ -60,4 +52,13 @@ public class RequestAllCastleInfo extends L2GameClientPacket
 	{
 		return false;
 	}
+
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_3C_REQUESTALLCASTLEINFO;
+	}
 }

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

@@ -23,16 +23,8 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowFortressInfo;
  */
 public class RequestAllFortressInfo extends L2GameClientPacket
 {
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:3D RequestAllFortressInfo";
-	}
-	
+	private static final String _C__D0_3D_REQUESTALLFORTRESSINFO = "[C] D0:3D RequestAllFortressInfo";
+		
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
 	 */
@@ -60,4 +52,13 @@ public class RequestAllFortressInfo extends L2GameClientPacket
 	{
 		return false;
 	}
+
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_3D_REQUESTALLFORTRESSINFO;
+	}
 }

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

@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 public class RequestAskJoinPartyRoom extends L2GameClientPacket
 {
 	protected static final Logger _log = Logger.getLogger(RequestAskJoinPartyRoom.class.getName());
-	private static final String _C__D0_14_REQUESTASKJOINPARTYROOM = "[C] D0:14 RequestAskJoinPartyRoom";
+	private static final String _C__D0_2F_REQUESTASKJOINPARTYROOM = "[C] D0:2F RequestAskJoinPartyRoom";
 	private String _player; // not tested, just guessed
 	
 	
@@ -45,7 +45,7 @@ public class RequestAskJoinPartyRoom extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_14_REQUESTASKJOINPARTYROOM;
+		return _C__D0_2F_REQUESTASKJOINPARTYROOM;
 	}
 	
 }

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

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestAutoSoulShot extends L2GameClientPacket
 {
-	private static final String _C__CF_REQUESTAUTOSOULSHOT = "[C] D0:0D RequestAutoSoulShot";
+	private static final String _C__D0_0D_REQUESTAUTOSOULSHOT = "[C] D0:0D RequestAutoSoulShot";
 	private static Logger _log = Logger.getLogger(RequestAutoSoulShot.class.getName());
 	
 	// format cd
@@ -153,7 +153,7 @@ public final class RequestAutoSoulShot extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__CF_REQUESTAUTOSOULSHOT;
+		return _C__D0_0D_REQUESTAUTOSOULSHOT;
 	}
 	
 	@Override

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

@@ -25,6 +25,8 @@ import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
  */
 public final class RequestBidItemAuction extends L2GameClientPacket
 {
+	private static final String _C__D0_39_REQUESTBIDITEMAUCTION = "[C] D0:39 RequestBidItemAuction";
+	
 	private int _instanceId;
 	private long _bid;
 	
@@ -64,6 +66,6 @@ public final class RequestBidItemAuction extends L2GameClientPacket
 	@Override
 	public final String getType()
 	{
-		return "[C] D0:39 RequestBidItemAuction";
+		return _C__D0_39_REQUESTBIDITEMAUCTION;
 	}
 }

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

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
  */
 public final class RequestBookMarkSlotInfo extends L2GameClientPacket
 {
-	private static final String _C__51_REQUESTBOOKMARKSLOTINFO = "[C] 51 RequestBookMarkSlotInfo";
+	private static final String _C__D0_51_00_REQUESTBOOKMARKSLOTINFO = "[C] D0:51:00 RequestBookMarkSlotInfo";
 	
 	@Override
 	protected void readImpl()
@@ -43,6 +43,6 @@ public final class RequestBookMarkSlotInfo extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__51_REQUESTBOOKMARKSLOTINFO;
+		return _C__D0_51_00_REQUESTBOOKMARKSLOTINFO;
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPost.java → L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java

@@ -35,7 +35,7 @@ import com.l2jserver.gameserver.util.Util;
 /**
  * @author Migi, DS
  */
-public final class RequestCancelPost extends L2GameClientPacket
+public final class RequestCancelPostAttachment extends L2GameClientPacket
 {
 	private static final String _C__D0_6F_REQUESTCANCELPOSTATTACHMENT = "[C] D0:6F RequestCancelPostAttachment";
 	

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

@@ -21,7 +21,7 @@ package com.l2jserver.gameserver.network.clientpackets;
  */
 public final class RequestChangeBookMarkSlot extends L2GameClientPacket
 {
-	private static final String _C__51_REQUESTCHANGEBOOKMARKSLOT = "[C] 51 RequestChangeBookMarkSlot";
+	private static final String _C__D0_51_05_REQUESCHANGEBOOKMARKSLOT = "[C] D0:51:05 RequestChangeBookMarkSlot";
 	
 	@Override
 	protected void readImpl()
@@ -39,6 +39,6 @@ public final class RequestChangeBookMarkSlot extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__51_REQUESTCHANGEBOOKMARKSLOT;
+		return _C__D0_51_05_REQUESCHANGEBOOKMARKSLOT;
 	}
 }

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

@@ -23,6 +23,8 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public class RequestChangeNicknameColor extends L2GameClientPacket
 {
+	private static final String _C__D0_4F_REQUESTCHANGENICKNAMECOLOR = "[C] D0:4F RequestChangeNicknameColor";
+	
 	private static final int COLORS[] =
 	{
 		0x9393FF,	// Pink
@@ -84,6 +86,6 @@ public class RequestChangeNicknameColor extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] D0:4F RequestChangeNicknameColor";
+		return _C__D0_4F_REQUESTCHANGENICKNAMECOLOR;
 	}
 }

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public final class RequestChangePartyLeader extends L2GameClientPacket{
 	
-	private static final String _C__EE_REQUESTCHANGEPARTYLEADER = "[C] D0:0C RequestChangePartyLeader";
+	private static final String _C__D0_0C_REQUESTCHANGEPARTYLEADER = "[C] D0:0C RequestChangePartyLeader";
 	//private static Logger _log = Logger.getLogger(RequestJoinParty.class.getName());
 	
 	private String _name;
@@ -49,6 +49,6 @@ public final class RequestChangePartyLeader extends L2GameClientPacket{
 	@Override
 	public String getType()
 	{
-		return _C__EE_REQUESTCHANGEPARTYLEADER;
+		return _C__D0_0C_REQUESTCHANGEPARTYLEADER;
 	}
 }

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

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.util.Util;
  */
 public final class RequestConfirmCancelItem extends L2GameClientPacket
 {
-	private static final String _C__D0_2D_REQUESTCONFIRMCANCELITEM = "[C] D0:2D RequestConfirmCancelItem";
+	private static final String _C__D0_42_REQUESTCONFIRMCANCELITEM = "[C] D0:42 RequestConfirmCancelItem";
 	private int _objectId;
 	
 	/**
@@ -120,6 +120,6 @@ public final class RequestConfirmCancelItem extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_2D_REQUESTCONFIRMCANCELITEM;
+		return _C__D0_42_REQUESTCONFIRMCANCELITEM;
 	}
 }

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

@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestConfirmGemStone extends AbstractRefinePacket
 {
-	private static final String _C__D0_2B_REQUESTCONFIRMGEMSTONE = "[C] D0:2B RequestConfirmGemStone";
+	private static final String _C__D0_28_REQUESTCONFIRMGEMSTONE = "[C] D0:28 RequestConfirmGemStone";
 	private int _targetItemObjId;
 	private int _refinerItemObjId;
 	private int _gemstoneItemObjId;
@@ -92,6 +92,6 @@ public final class RequestConfirmGemStone extends AbstractRefinePacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_2B_REQUESTCONFIRMGEMSTONE;
+		return _C__D0_28_REQUESTCONFIRMGEMSTONE;
 	}
 }

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

@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public class RequestConfirmRefinerItem extends AbstractRefinePacket
 {
-	private static final String _C__D0_2A_REQUESTCONFIRMREFINERITEM = "[C] D0:2A RequestConfirmRefinerItem";
+	private static final String _C__D0_27_REQUESTCONFIRMREFINERITEM = "[C] D0:27 RequestConfirmRefinerItem";
 	
 	private int _targetItemObjId;
 	private int _refinerItemObjId;
@@ -75,7 +75,7 @@ public class RequestConfirmRefinerItem extends AbstractRefinePacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_2A_REQUESTCONFIRMREFINERITEM;
+		return _C__D0_27_REQUESTCONFIRMREFINERITEM;
 	}
 	
 }

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

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExCursedWeaponList;
  */
 public class RequestCursedWeaponList extends L2GameClientPacket
 {
-	private static final String _C__D0_22_REQUESTCURSEDWEAPONLIST = "[C] D0:22 RequestCursedWeaponList";
+	private static final String _C__D0_2A_REQUESTCURSEDWEAPONLIST = "[C] D0:2A RequestCursedWeaponList";
 	
 	@Override
 	protected void readImpl()
@@ -60,7 +60,7 @@ public class RequestCursedWeaponList extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_22_REQUESTCURSEDWEAPONLIST;
+		return _C__D0_2A_REQUESTCURSEDWEAPONLIST;
 	}
 	
 	@Override

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.CursedWeapon;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.network.serverpackets.ExCursedWeaponLocation;
 import com.l2jserver.gameserver.network.serverpackets.ExCursedWeaponLocation.CursedWeaponInfo;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 /**
  * Format: (ch)
@@ -31,7 +31,7 @@ import com.l2jserver.util.Point3D;
  */
 public final class RequestCursedWeaponLocation extends L2GameClientPacket
 {
-	private static final String _C__D0_23_REQUESTCURSEDWEAPONLOCATION = "[C] D0:23 RequestCursedWeaponLocation";
+	private static final String _C__D0_2B_REQUESTCURSEDWEAPONLOCATION = "[C] D0:2B RequestCursedWeaponLocation";
 	
 	@Override
 	protected void readImpl()
@@ -71,7 +71,7 @@ public final class RequestCursedWeaponLocation extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_23_REQUESTCURSEDWEAPONLOCATION;
+		return _C__D0_2B_REQUESTCURSEDWEAPONLOCATION;
 	}
 	
 	@Override

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public final class RequestDeleteBookMarkSlot extends L2GameClientPacket
 {
-	private static final String _C__51_REQUESTDELETEBOOKMARKSLOT = "[C] 51 RequestDeleteBookMarkSlot";
+	private static final String _C__D0_51_03_REQUESTDELETEBOOKMARKSLOT = "[C] D0:51:03 RequestDeleteBookMarkSlot";
 	
 	private int id;
 	
@@ -47,6 +47,6 @@ public final class RequestDeleteBookMarkSlot extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__51_REQUESTDELETEBOOKMARKSLOT;
+		return _C__D0_51_03_REQUESTDELETEBOOKMARKSLOT;
 	}
 }

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

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.util.Util;
  */
 public final class RequestDeleteSentPost extends L2GameClientPacket
 {
-	private static final String _C__D0_6C_REQUESTDELETESENTPOST = "[C] D0:6D RequestDeleteSentPost";
+	private static final String _C__D0_6D_REQUESTDELETESENTPOST = "[C] D0:6D RequestDeleteSentPost";
 	
 	private static final int BATCH_LENGTH = 4; // length of the one item
 	
@@ -86,7 +86,7 @@ public final class RequestDeleteSentPost extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_6C_REQUESTDELETESENTPOST;
+		return _C__D0_6D_REQUESTDELETESENTPOST;
 	}
 	
 	@Override

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

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 public class RequestDispel extends L2GameClientPacket
 {
 	private static final String _C_D0_4B_REQUESTDISPEL = "[C] D0:4B RequestDispel";
+	
 	private int _objectId;
 	private int _skillId;
 	private int _skillLevel;

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

@@ -23,14 +23,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowOwnthingPos;
  */
 public class RequestDominionInfo extends L2GameClientPacket
 {
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:58 RequestDominionInfo";
-	}
+	private static final String _C__D0_58_REQUESTDOMINIONINFO = "[C] D0:58 RequestDominionInfo";
 	
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
@@ -56,4 +49,13 @@ public class RequestDominionInfo extends L2GameClientPacket
 	{
 		return false;
 	}
+	
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_58_REQUESTDOMINIONINFO;
+	}
 }

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

@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestDuelAnswerStart extends L2GameClientPacket
 {
-	private static final String _C__D0_28_REQUESTDUELANSWERSTART = "[C] D0:28 RequestDuelAnswerStart";
+	private static final String _C__D0_1C_REQUESTDUELANSWERSTART = "[C] D0:1C RequestDuelAnswerStart";
 	private int _partyDuel;
 	@SuppressWarnings("unused")
 	private int _unk1;
@@ -117,7 +117,7 @@ public final class RequestDuelAnswerStart extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_28_REQUESTDUELANSWERSTART;
+		return _C__D0_1C_REQUESTDUELANSWERSTART;
 	}
 	
 }

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

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestDuelStart extends L2GameClientPacket
 {
-	private static final String _C__D0_27_REQUESTDUELSTART = "[C] D0:27 RequestDuelStart";
+	private static final String _C__D0_1B_REQUESTDUELSTART = "[C] D0:1B RequestDuelStart";
 	private static Logger _log = Logger.getLogger(RequestDuelStart.class.getName());
 	private String _player;
 	private int _partyDuel;
@@ -183,7 +183,7 @@ public final class RequestDuelStart extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_27_REQUESTDUELSTART;
+		return _C__D0_1B_REQUESTDUELSTART;
 	}
 	
 }

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.instancemanager.DuelManager;
  */
 public final class RequestDuelSurrender extends L2GameClientPacket
 {
-	private static final String _C__D0_30_REQUESTDUELSURRENDER = "[C] D0:30 RequestDuelSurrender";
+	private static final String _C__D0_45_REQUESTDUELSURRENDER = "[C] D0:45 RequestDuelSurrender";
 	
 	@Override
 	protected void readImpl()
@@ -46,7 +46,7 @@ public final class RequestDuelSurrender extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_30_REQUESTDUELSURRENDER;
+		return _C__D0_45_REQUESTDUELSURRENDER;
 	}
 	
 }

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

@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestExAcceptJoinMPCC extends L2GameClientPacket
 {
-	private static final String _C__D0_0E_REQUESTEXASKJOINMPCC = "[C] D0:0E RequestExAcceptJoinMPCC";
+	private static final String _C__D0_07_REQUESTEXASKJOINMPCC = "[C] D0:07 RequestExAcceptJoinMPCC";
 	private int _response;
 	
 	/**
@@ -87,7 +87,7 @@ public final class RequestExAcceptJoinMPCC extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_0E_REQUESTEXASKJOINMPCC;
+		return _C__D0_07_REQUESTEXASKJOINMPCC;
 	}
 	
 }

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

@@ -31,8 +31,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestExAskJoinMPCC extends L2GameClientPacket
 {
-	//private static Logger _log = Logger.getLogger(RequestExAskJoinMPCC.class.getName());
-	private static final String _C__D0_0D_REQUESTEXASKJOINMPCC = "[C] D0:0D RequestExAskJoinMPCC";
+	private static final String _C__D0_06_REQUESTEXASKJOINMPCC = "[C] D0:06 RequestExAskJoinMPCC";
 	private String _name;
 	
 	@Override
@@ -182,7 +181,7 @@ public final class RequestExAskJoinMPCC extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_0D_REQUESTEXASKJOINMPCC;
+		return _C__D0_06_REQUESTEXASKJOINMPCC;
 	}
 	
 }

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

@@ -23,14 +23,7 @@ import com.l2jserver.gameserver.network.serverpackets.EnchantResult;
  */
 public class RequestExCancelEnchantItem extends L2GameClientPacket
 {
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:4E RequestExCancelEnchantItem";
-	}
+	private static final String _C__D0_4E_REQUESTEXCANCELENCHANTITEM = "[C] D0:4E RequestExCancelEnchantItem";
 	
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
@@ -54,4 +47,13 @@ public class RequestExCancelEnchantItem extends L2GameClientPacket
 			activeChar.setActiveEnchantItem(null);
 		}
 	}
+	
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_4E_REQUESTEXCANCELENCHANTITEM;
+	}
 }

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

@@ -24,6 +24,8 @@ import com.l2jserver.gameserver.network.serverpackets.ExNeedToChangeName;
  */
 public class RequestExChangeName extends L2GameClientPacket
 {
+	private static final String _C__D0_3B_REQUESTEXCHANGENAME = "[C] D0:3B RequestExChangeName";
+	
 	private String _newName;
 	private int _type;
 	private int _charSlot;
@@ -55,7 +57,7 @@ public class RequestExChangeName extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] D0:3B RequestExChangeName".intern();
+		return _C__D0_3B_REQUESTEXCHANGENAME;
 	}
 	
 }

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

@@ -32,7 +32,7 @@ import com.l2jserver.util.Rnd;
 
 public class RequestExEnchantItemAttribute extends L2GameClientPacket
 {
-	private static final String D0_35_REQUEST_EX_ENCHANT_ITEM_ATTRIBUTE = "[C] D0:35 RequestExEnchantItemAttribute";
+	private static final String _C__D0_35_REQUESTEXENCHANTITEMATTRIBUTE = "[C] D0:35 RequestExEnchantItemAttribute";
 	
 	private int _objectId;
 	
@@ -279,6 +279,6 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return D0_35_REQUEST_EX_ENCHANT_ITEM_ATTRIBUTE;
+		return _C__D0_35_REQUESTEXENCHANTITEMATTRIBUTE;
 	}
 }

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

@@ -47,7 +47,7 @@ import com.l2jserver.util.Rnd;
  */
 public final class RequestExEnchantSkill extends L2GameClientPacket
 {
-	private static final String _C__D0_07_REQUESTEXENCHANTSKILL = "[C] D0:0F RequestExEnchantSkill";
+	private static final String _C__D0_0F_REQUESTEXENCHANTSKILL = "[C] D0:0F RequestExEnchantSkill";
 	private static final Logger _log = Logger.getLogger(RequestAcquireSkill.class.getName());
 	private static final Logger _logEnchant = Logger.getLogger("enchant");
 	
@@ -234,6 +234,6 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_07_REQUESTEXENCHANTSKILL;
+		return _C__D0_0F_REQUESTEXENCHANTSKILL;
 	}
 }

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

@@ -30,6 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
  */
 public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket
 {
+	private static final String _C_D0_46_REQUESTEXENCHANTSKILLINFO = "[C] D0:46 RequestExEnchantSkillInfoDetail";
 	protected static final Logger _log = Logger.getLogger(RequestExEnchantSkillInfoDetail.class.getName());
 	
 	private int _type;
@@ -109,7 +110,7 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] D0:46 RequestExEnchantSkillInfo";
+		return _C_D0_46_REQUESTEXENCHANTSKILLINFO;
 	}
 	
 }

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

@@ -46,6 +46,7 @@ import com.l2jserver.util.Rnd;
  */
 public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket
 {
+	private static final String _C__D0_34_REQUESTEXENCHANTSKILLROUTECHANGE = "[C] D0:34 RequestExEnchantSkillRouteChange";
 	protected static final Logger _log = Logger.getLogger(RequestExEnchantSkillRouteChange.class.getName());
 	private static final Logger _logEnchant = Logger.getLogger("enchant");
 	
@@ -243,7 +244,7 @@ public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] D0:34 RequestExEnchantSkillRouteChange";
+		return _C__D0_34_REQUESTEXENCHANTSKILLROUTECHANGE;
 	}
 	
 }

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

@@ -46,6 +46,7 @@ import com.l2jserver.util.Rnd;
  */
 public final class RequestExEnchantSkillSafe extends L2GameClientPacket
 {
+	private static final String _C__D0_32_REQUESTEXENCHANTSKILLSAFE = "[C] D0:32 RequestExEnchantSkillSafe";
 	private static final Logger _log = Logger.getLogger(RequestExEnchantSkillSafe.class.getName());
 	private static final Logger _logEnchant = Logger.getLogger("enchant");
 	
@@ -228,7 +229,7 @@ public final class RequestExEnchantSkillSafe extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] D0:32 RequestExEnchantSkillSafe";
+		return _C__D0_32_REQUESTEXENCHANTSKILLSAFE;
 	}
 	
 }

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

@@ -48,6 +48,7 @@ import com.l2jserver.gameserver.network.serverpackets.UserInfo;
  */
 public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
 {
+	private static final String _C__D0_33_REQUESTEXENCHANTSKILLUNTRAIN = "[C] D0:33 RequestExEnchantSkillUntrain";
 	private static final Logger _log = Logger.getLogger(RequestExEnchantSkillUntrain.class.getName());
 	private static final Logger _logEnchant = Logger.getLogger("enchant");
 	
@@ -208,7 +209,7 @@ public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] D0:33 RequestExEnchantSkillUntrain";
+		return _C__D0_33_REQUESTEXENCHANTSKILLUNTRAIN;
 	}
 	
 }

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

@@ -25,7 +25,7 @@ import java.util.logging.Logger;
 public final class RequestExFishRanking extends L2GameClientPacket
 {
 	protected static final Logger _log = Logger.getLogger(RequestExFishRanking.class.getName());
-	private static final String _C__D0_1F_REQUESTEXFISHRANKING = "[C] D0:1F RequestExFishRanking";
+	private static final String _C__D0_18_REQUESTEXFISHRANKING = "[C] D0:18 RequestExFishRanking";
 	
 	@Override
 	protected void readImpl()
@@ -48,7 +48,7 @@ public final class RequestExFishRanking extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_1F_REQUESTEXFISHRANKING;
+		return _C__D0_18_REQUESTEXFISHRANKING;
 	}
 	
 }

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

@@ -21,8 +21,8 @@ import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
+import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Point3D;
 
 
 /**
@@ -31,7 +31,7 @@ import com.l2jserver.util.Point3D;
  */
 public final class RequestExMagicSkillUseGround extends L2GameClientPacket
 {
-	private static final String _C__D0_2F_REQUESTEXMAGICSKILLUSEGROUND = "[C] D0:2F RequestExMagicSkillUseGround";
+	private static final String _C__D0_44_REQUESTEXMAGICSKILLUSEGROUND = "[C] D0:44 RequestExMagicSkillUseGround";
 	private static Logger _log = Logger.getLogger(RequestExMagicSkillUseGround.class.getName());
 	
 	private int _x;
@@ -99,6 +99,6 @@ public final class RequestExMagicSkillUseGround extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_2F_REQUESTEXMAGICSKILLUSEGROUND;
+		return _C__D0_44_REQUESTEXMAGICSKILLUSEGROUND;
 	}
 }

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

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 public final class RequestExOustFromMPCC extends L2GameClientPacket
 {
 	//private static Logger _log = Logger.getLogger(RequestExOustFromMPCC.class.getName());
-	private static final String _C__D0_0F_REQUESTEXOUSTFROMMPCC = "[C] D0:0F RequestExOustFromMPCC";
+	private static final String _C__D0_08_REQUESTEXOUSTFROMMPCC = "[C] D0:08 RequestExOustFromMPCC";
 	private String _name;
 	
 	@Override
@@ -79,7 +79,7 @@ public final class RequestExOustFromMPCC extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_0F_REQUESTEXOUSTFROMMPCC;
+		return _C__D0_08_REQUESTEXOUSTFROMMPCC;
 	}
 	
 }

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

@@ -30,6 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExPledgeCrestLarge;
 public final class RequestExPledgeCrestLarge extends L2GameClientPacket
 {
 	private static final String _C__D0_10_REQUESTEXPLEDGECRESTLARGE = "[C] D0:10 RequestExPledgeCrestLarge";
+	
 	private int _crestId;
 	
 	@Override

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

@@ -29,19 +29,10 @@ import com.l2jserver.gameserver.network.serverpackets.ExRpItemLink;
  */
 public class RequestExRqItemLink extends L2GameClientPacket
 {
-	private static String name = "[C] DO:1E RequestExRqItemLink";
+	private static String _C__D0_1E_REQUESTEXRQITEMLINK = "[C] D0:1E RequestExRqItemLink";
 	private int _objectId;
 	private Logger _log = Logger.getLogger(RequestExRqItemLink.class.getName());
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return name;
-	}
-	
+		
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
 	 */
@@ -71,9 +62,18 @@ public class RequestExRqItemLink extends L2GameClientPacket
 				else
 				{
 					if (Config.DEBUG)
-						_log.info(getClient()+" requested "+name+" for item which wasnt published! ID:"+_objectId);
+						_log.info(getClient()+" requested item link for item which wasnt published! ID:"+_objectId);
 				}
 			}
 		}
 	}
+
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_1E_REQUESTEXRQITEMLINK;
+	}
 }

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

@@ -124,5 +124,4 @@ public final class RequestExSetPledgeCrestLarge extends L2GameClientPacket
 	{
 		return _C__D0_11_REQUESTEXSETPLEDGECRESTLARGE;
 	}
-	
 }

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

@@ -26,19 +26,11 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public class RequestExTryToPutEnchantSupportItem extends AbstractEnchantPacket
 {
+	private static final String _C__D0_4D_REQUESTEXTRYTOPUTENCHANTSUPPORTITEM = "[C] D0:4D RequestExTryToPutEnchantSupportItem";
 	
 	private int _supportObjectId;
 	private int _enchantObjectId;
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:50 RequestExTryToPutEnchantSupportItem".intern();
-	}
-	
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
 	 */
@@ -81,5 +73,13 @@ public class RequestExTryToPutEnchantSupportItem extends AbstractEnchantPacket
 			}
 		}
 	}
-	
+
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_4D_REQUESTEXTRYTOPUTENCHANTSUPPORTITEM;
+	}
 }

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

@@ -26,18 +26,10 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public class RequestExTryToPutEnchantTargetItem extends AbstractEnchantPacket
 {
+	private static final String _C__D0_4C_REQUESTEXTRYTOPUTENCHANTTARGETITEM = "[C] D0:4C RequestExTryToPutEnchantTargetItem";
 	
 	private int _objectId = 0;
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:4F RequestExTryToPutEnchantTargetItem".intern();
-	}
-	
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
 	 */
@@ -84,4 +76,13 @@ public class RequestExTryToPutEnchantTargetItem extends AbstractEnchantPacket
 			activeChar.sendPacket(new ExPutEnchantTargetItemResult(_objectId));
 		}
 	}
+	
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_4C_REQUESTEXTRYTOPUTENCHANTTARGETITEM;
+	}
 }

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

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public final class RequestExitPartyMatchingWaitingRoom extends L2GameClientPacket
 {
-	private static final String _C__D0_17_REQUESTEXITPARTYMATCHINGWAITINGROOM = "[C] D0:17 RequestExitPartyMatchingWaitingRoom";
+	private static final String _C__D0_25_REQUESTEXITPARTYMATCHINGWAITINGROOM = "[C] D0:25 RequestExitPartyMatchingWaitingRoom";
 	
 	@Override
 	protected void readImpl()
@@ -45,7 +45,7 @@ public final class RequestExitPartyMatchingWaitingRoom extends L2GameClientPacke
 	@Override
 	public String getType()
 	{
-		return _C__D0_17_REQUESTEXITPARTYMATCHINGWAITINGROOM;
+		return _C__D0_25_REQUESTEXITPARTYMATCHINGWAITINGROOM;
 	}
 	
 }

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

@@ -24,17 +24,9 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowFortressMapInfo;
  */
 public class RequestFortressMapInfo extends L2GameClientPacket
 {
+	private static final String _C_D0_48_REQUESTFORTRESSMAPINFO = "[C] D0:48 RequestFortressMapInfo";
 	private int _fortressId;
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:4B RequestFortressMapInfo";
-	}
-	
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
 	 */
@@ -54,4 +46,12 @@ public class RequestFortressMapInfo extends L2GameClientPacket
 		sendPacket(new ExShowFortressMapInfo(fort));
 	}
 	
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C_D0_48_REQUESTFORTRESSMAPINFO;
+	}
 }

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

@@ -25,16 +25,8 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowFortressSiegeInfo;
  */
 public class RequestFortressSiegeInfo extends L2GameClientPacket
 {
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:42 RequestFortressSiegeInfo";
-	}
-	
+	private static final String _C__D0_3F_REQUESTFORTRESSSIEGEINFO = "[C] D0:3F RequestFortressSiegeInfo";
+		
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
 	 */
@@ -68,4 +60,13 @@ public class RequestFortressSiegeInfo extends L2GameClientPacket
 	{
 		return false;
 	}
+
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_3F_REQUESTFORTRESSSIEGEINFO;
+	}
 }

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

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExGetBossRecord;
 public class RequestGetBossRecord extends L2GameClientPacket
 {
 	protected static final Logger _log = Logger.getLogger(RequestGetBossRecord.class.getName());
-	private static final String _C__D0_18_REQUESTGETBOSSRECORD = "[C] D0:18 RequestGetBossRecord";
+	private static final String _C__D0_40_REQUESTGETBOSSRECORD = "[C] D0:40 RequestGetBossRecord";
 	private int _bossId;
 	
 	@Override
@@ -68,7 +68,7 @@ public class RequestGetBossRecord extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_18_REQUESTGETBOSSRECORD;
+		return _C__D0_40_REQUESTGETBOSSRECORD;
 	}
 	
 	@Override

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

@@ -19,7 +19,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.GetOnVehicle;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 /**
  * This class ...

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

@@ -25,6 +25,8 @@ import com.l2jserver.gameserver.network.serverpackets.ExItemAuctionInfoPacket;
  */
 public final class RequestInfoItemAuction extends L2GameClientPacket
 {
+	private static final String _C__D0_3A_REQUESTINFOITEMAUCTION = "[C] D0:3A RequestInfoItemAuction";
+	
 	private int _instanceId;
 	
 	@Override
@@ -58,6 +60,6 @@ public final class RequestInfoItemAuction extends L2GameClientPacket
 	@Override
 	public final String getType()
 	{
-		return "[C] D0:3A RequestBidItemAuction";
+		return _C__D0_3A_REQUESTINFOITEMAUCTION;
 	}
 }

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

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestJoinDominionWar extends L2GameClientPacket
 {
-	private static final String _C__57_RequestJoinDominionWar = "[C] 57 RequestJoinDominionWar";
+	private static final String _C__D0_57_REQUESTJOINDOMINIONWAR = "[C] D0:57 RequestJoinDominionWar";
 	// private static Logger _log = Logger.getLogger(RequestJoinDominionWar.class.getName());
 	
 	private int _territoryId;
@@ -120,6 +120,6 @@ public final class RequestJoinDominionWar extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__57_RequestJoinDominionWar;
+		return _C__D0_57_REQUESTJOINDOMINIONWAR;
 	}
 }

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

@@ -24,15 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExUISetting;
  */
 public class RequestKeyMapping extends L2GameClientPacket
 {
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:21 RequestKeyMapping";
-	}
+	private static String _C__D0_21_REQUESTKEYMAPPING = "[C] D0:21 RequestKeyMapping";
 	
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
@@ -62,4 +54,13 @@ public class RequestKeyMapping extends L2GameClientPacket
 	{
 		return false;
 	}
+	
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_21_REQUESTKEYMAPPING;
+	}
 }

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

@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExListPartyMatchingWaiting
  */
 public class RequestListPartyMatchingWaitingRoom extends L2GameClientPacket
 {
+	private static final String _C__D0_31_REQUESTLISTPARTYMATCHINGWAITINGROOM = "[C] D0:31 RequestListPartyMatchingWaitingRoom";
 	private static int _page;
 	private static int _minlvl;
 	private static int _maxlvl;
@@ -52,7 +53,7 @@ public class RequestListPartyMatchingWaitingRoom extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] D0:31 RequestListPartyMatchingWaitingRoom";
+		return _C__D0_31_REQUESTLISTPARTYMATCHINGWAITINGROOM;
 	}
 	
 }

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public final class RequestModifyBookMarkSlot extends L2GameClientPacket
 {
-	private static final String _C__51_REQUESTMODIFYBOOKMARKSLOT = "[C] 51 RequestModifyBookMarkSlot";
+	private static final String _C__D0_51_02_REQUESTMODIFYBOOKMARKSLOT = "[C] D0:51:02 RequestModifyBookMarkSlot";
 	
 	private int id,icon;
 	private String name,tag;
@@ -50,6 +50,6 @@ public final class RequestModifyBookMarkSlot extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__51_REQUESTMODIFYBOOKMARKSLOT;
+		return _C__D0_51_02_REQUESTMODIFYBOOKMARKSLOT;
 	}
 }

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

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.MoveToLocationInVehicle;
 import com.l2jserver.gameserver.network.serverpackets.StopMoveInVehicle;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.item.L2WeaponType;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 
 public final class RequestMoveToLocationInVehicle extends L2GameClientPacket

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

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public final class RequestOlympiadMatchList extends L2GameClientPacket
 {
-	private static final String _C__D0_13_REQUESTOLYMPIADMATCHLIST = "[C] D0:13 RequestOlympiadMatchList";
+	private static final String _C__D0_2E_REQUESTOLYMPIADMATCHLIST = "[C] D0:2E RequestOlympiadMatchList";
 	private static final String COMMAND = "arenalist";
 	
 	@Override
@@ -54,6 +54,6 @@ public final class RequestOlympiadMatchList extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_13_REQUESTOLYMPIADMATCHLIST;
+		return _C__D0_2E_REQUESTOLYMPIADMATCHLIST;
 	}
 }

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

@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public final class RequestOlympiadObserverEnd extends L2GameClientPacket
 {
-	private static final String _C__D0_12_REQUESTOLYMPIADOBSERVEREND = "[C] D0:12 RequestOlympiadObserverEnd";
+	private static final String _C__D0_29_REQUESTOLYMPIADOBSERVEREND = "[C] D0:29 RequestOlympiadObserverEnd";
 	
 	
 	@Override
@@ -54,7 +54,7 @@ public final class RequestOlympiadObserverEnd extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_12_REQUESTOLYMPIADOBSERVEREND;
+		return _C__D0_29_REQUESTOLYMPIADOBSERVEREND;
 	}
 	
 }

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

@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 public final class RequestPCCafeCouponUse extends L2GameClientPacket
 {
 	protected static final Logger _log = Logger.getLogger(RequestPCCafeCouponUse.class.getName());
-	private static final String _C__D0_20_REQUESTPCCAFECOUPONUSE = "[C] D0:?? RequestPCCafeCouponUse";
+	private static final String _C__D0_19_REQUESTPCCAFECOUPONUSE = "[C] D0:19 RequestPCCafeCouponUse";
 	private String _str;
 	
 	@Override
@@ -42,7 +42,7 @@ public final class RequestPCCafeCouponUse extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_20_REQUESTPCCAFECOUPONUSE;
+		return _C__D0_19_REQUESTPCCAFECOUPONUSE;
 	}
 	
 }

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public class RequestPartyLootModification extends L2GameClientPacket
 {
-	private static final String TYPE = "[C] D0:78 RequestPartyLootModification";
+	private static final String _C__D0_78_REQUESTPARTYLOOTMODIFICATION = "[C] D0:78 RequestPartyLootModification";
 	
 	private byte _mode;
 	
@@ -50,7 +50,7 @@ public class RequestPartyLootModification extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return TYPE;
+		return _C__D0_78_REQUESTPARTYLOOTMODIFICATION;
 	}
 	
 }

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

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.PledgeReceiveMemberInfo;
 public final class RequestPledgeMemberInfo extends L2GameClientPacket
 {
 	protected static final Logger _log = Logger.getLogger(RequestPledgeMemberInfo.class.getName());
-	private static final String _C__D0_1D_REQUESTPLEDGEMEMBERINFO = "[C] D0:1D RequestPledgeMemberInfo";
+	private static final String _C__D0_16_REQUESTPLEDGEMEMBERINFO = "[C] D0:16 RequestPledgeMemberInfo";
 	@SuppressWarnings("unused")
 	private int _unk1;
 	private String _player;
@@ -69,7 +69,7 @@ public final class RequestPledgeMemberInfo extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_1D_REQUESTPLEDGEMEMBERINFO;
+		return _C__D0_16_REQUESTPLEDGEMEMBERINFO;
 	}
 	
 }

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

@@ -28,7 +28,6 @@ public final class RequestPledgePowerGradeList extends L2GameClientPacket
 {
 	private static final String _C__D0_13_REQUESTPLEDGEPOWERGRADELIST = "[C] D0:13 RequestPledgePowerGradeList";
 	
-	
 	@Override
 	protected void readImpl()
 	{

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

@@ -28,6 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 public final class RequestPledgeSetAcademyMaster extends L2GameClientPacket
 {
 	private static final String _C__D0_12_REQUESTSETPLEADGEACADEMYMASTER = "[C] D0:12 RequestPledgeSetAcademyMaster";
+	
 	private String _currPlayerName;
 	private int _set; // 1 set, 0 delete
 	private String _targetPlayerName;
@@ -131,6 +132,4 @@ public final class RequestPledgeSetAcademyMaster extends L2GameClientPacket
 	{
 		return _C__D0_12_REQUESTSETPLEADGEACADEMYMASTER;
 	}
-	
-	
 }

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

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.PledgeReceiveWarList;
 public final class RequestPledgeWarList extends L2GameClientPacket
 {
 	protected static final Logger _log = Logger.getLogger(RequestPledgeWarList.class.getName());
-	private static final String _C__D0_1E_REQUESTPLEDGEWARLIST = "[C] D0:1E RequestPledgeWarList";
+	private static final String _C__D0_17_REQUESTPLEDGEWARLIST = "[C] D0:17 RequestPledgeWarList";
 	@SuppressWarnings("unused")
 	private int _unk1;
 	private int _tab;
@@ -64,7 +64,7 @@ public final class RequestPledgeWarList extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_1E_REQUESTPLEDGEWARLIST;
+		return _C__D0_17_REQUESTPLEDGEWARLIST;
 	}
 	
 }

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

@@ -45,7 +45,7 @@ import com.l2jserver.gameserver.templates.item.L2Item;
  */
 public class RequestProcureCropList extends L2GameClientPacket
 {
-	private static final String _C__D0_09_REQUESTPROCURECROPLIST = "[C] D0:09 RequestProcureCropList";
+	private static final String _C__D0_02_REQUESTPROCURECROPLIST = "[C] D0:02 RequestProcureCropList";
 	
 	private static final int BATCH_LENGTH = 20; // length of the one item
 	
@@ -274,6 +274,6 @@ public class RequestProcureCropList extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_09_REQUESTPROCURECROPLIST;
+		return _C__D0_02_REQUESTPROCURECROPLIST;
 	}
 }

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

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestRefine extends AbstractRefinePacket
 {
-	private static final String _C__D0_2C_REQUESTREFINE = "[C] D0:2C RequestRefine";
+	private static final String _C__D0_41_REQUESTREFINE = "[C] D0:41 RequestRefine";
 	private int _targetItemObjId;
 	private int _refinerItemObjId;
 	private int _gemStoneItemObjId;
@@ -125,6 +125,6 @@ public final class RequestRefine extends AbstractRefinePacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_2C_REQUESTREFINE;
+		return _C__D0_41_REQUESTREFINE;
 	}
 }

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

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.util.Util;
  */
 public final class RequestRefineCancel extends L2GameClientPacket
 {
-	private static final String _C__D0_2E_REQUESTREFINECANCEL = "[C] D0:2E RequestRefineCancel";
+	private static final String _C__D0_43_REQUESTREFINECANCEL = "[C] D0:43 RequestRefineCancel";
 	private int _targetItemObjId;
 	
 	@Override
@@ -137,6 +137,6 @@ public final class RequestRefineCancel extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__D0_2E_REQUESTREFINECANCEL;
+		return _C__D0_43_REQUESTREFINECANCEL;
 	}
 }

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

@@ -22,6 +22,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public class RequestResetNickname extends L2GameClientPacket
 {
+	private static final String _C__D0_50_REQUESTRESETNICKNAME = "[C] D0:50 RequestResetNickname";
 	
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
@@ -53,6 +54,6 @@ public class RequestResetNickname extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] D0:53 RequestResetNickname";
+		return _C__D0_50_REQUESTRESETNICKNAME;
 	}
 }

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public final class RequestSaveBookMarkSlot extends L2GameClientPacket
 {
-	private static final String _C__51_REQUESTSAVEBOOKMARKSLOT = "[C] 51 RequestSaveBookMarkSlot";
+	private static final String _C__D0_51_01_REQUESTSAVEBOOKMARKSLOT = "[C] D0:51:01 RequestSaveBookMarkSlot";
 	
 	private int icon;
 	private String name,tag;
@@ -49,6 +49,6 @@ public final class RequestSaveBookMarkSlot extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__51_REQUESTSAVEBOOKMARKSLOT;
+		return _C__D0_51_01_REQUESTSAVEBOOKMARKSLOT;
 	}
 }

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

@@ -30,6 +30,8 @@ import com.l2jserver.gameserver.model.itemcontainer.Inventory;
  */
 public final class RequestSaveInventoryOrder extends L2GameClientPacket
 {
+	private static final String _C__D0_24_REQUESTSAVEINVENTORYORDER = "[C] D0:24 RequestSaveInventoryOrder";
+	
 	private List<InventoryOrder> _order;
 	
 	/** client limit */
@@ -72,16 +74,7 @@ public final class RequestSaveInventoryOrder extends L2GameClientPacket
 			}
 		}
 	}
-	
-	/**
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:49 RequestSaveInventoryOrder";
-	}
-	
+		
 	private static class InventoryOrder
 	{
 		int order;
@@ -103,4 +96,13 @@ public final class RequestSaveInventoryOrder extends L2GameClientPacket
 	{
 		return false;
 	}
+
+	/**
+	 * @see com.l2jserver.gameserver.BasePacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_24_REQUESTSAVEINVENTORYORDER;
+	}
 }

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

@@ -31,20 +31,13 @@ import com.l2jserver.gameserver.network.L2GameClient.GameClientState;
  */
 public class RequestSaveKeyMapping extends L2GameClientPacket
 {
+	private static String _C__D0_22_REQUESTSAVEKEYMAPPING = "[C] D0:22 RequestSaveKeyMapping";
+	
 	int _tabNum;
 	
 	Map<Integer, List<ActionKey>> _keyMap = new FastMap<Integer, List<ActionKey>>();
 	Map<Integer, List<Integer>> _catMap = new FastMap<Integer, List<Integer>>();
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:22 RequestSaveKeyMapping";
-	}
-	
+		
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
 	 */
@@ -129,4 +122,14 @@ public class RequestSaveKeyMapping extends L2GameClientPacket
 		if (Config.STORE_UI_SETTINGS)
 			player.getUISettings().storeAll(_catMap, _keyMap);
 	}
+	
+
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__D0_22_REQUESTSAVEKEYMAPPING;
+	}
 }

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowSeedMapInfo;
  */
 public class RequestSeedPhase extends L2GameClientPacket
 {
-	private static final String _C__REQUESTSEEDPHASE = "[C] RequestSeedPhase";
+	private static final String _C__D0_63_REQUESTSEEDPHASE = "[C] D0:63 RequestSeedPhase";
 	
 	@Override
 	protected void readImpl()
@@ -49,6 +49,6 @@ public class RequestSeedPhase extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__REQUESTSEEDPHASE;
+		return _C__D0_63_REQUESTSEEDPHASE;
 	}
 }

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

@@ -45,7 +45,7 @@ import com.l2jserver.gameserver.util.Util;
  *
  */
 public class RequestSetCrop extends L2GameClientPacket {
-	private static final String _C__D0_0B_REQUESTSETCROP = "[C] D0:0B RequestSetCrop";
+	private static final String _C__D0_04_REQUESTSETCROP = "[C] D0:04 RequestSetCrop";
 	//private static Logger _log = Logger.getLogger(RequestSetCrop.class.getName());
 	
 	private static final int BATCH_LENGTH = 21; // length of the one item
@@ -161,6 +161,6 @@ public class RequestSetCrop extends L2GameClientPacket {
 	@Override
 	public String getType()
 	{
-		return _C__D0_0B_REQUESTSETCROP;
+		return _C__D0_04_REQUESTSETCROP;
 	}
 }

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

@@ -44,7 +44,7 @@ import com.l2jserver.gameserver.util.Util;
  *
  */
 public class RequestSetSeed extends L2GameClientPacket {
-	private static final String _C__D0_0A_REQUESTSETSEED = "[C] D0:0A RequestSetSeed";
+	private static final String _C__D0_03_REQUESTSETSEED = "[C] D0:03 RequestSetSeed";
 	//private static Logger _log = Logger.getLogger(RequestSetSeed.class.getName());
 	
 	private static final int BATCH_LENGTH = 20; // length of the one item
@@ -161,6 +161,6 @@ public class RequestSetSeed extends L2GameClientPacket {
 	@Override
 	public String getType()
 	{
-		return _C__D0_0A_REQUESTSETSEED;
+		return _C__D0_03_REQUESTSETSEED;
 	}
 }

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

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public final class RequestTeleportBookMark extends L2GameClientPacket
 {
-	private static final String _C__51_REQUESTTELEPORTBOOKMARK = "[C] 51 RequestTeleportBookMark";
+	private static final String _C__D0_51_04_REQUESTTELEPORTBOOKMARK = "[C] D0:51:04 RequestTeleportBookMark";
 	
 	private int id;
 	@Override
@@ -45,6 +45,6 @@ public final class RequestTeleportBookMark extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__51_REQUESTTELEPORTBOOKMARK;
+		return _C__D0_51_04_REQUESTTELEPORTBOOKMARK;
 	}
 }

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

@@ -24,6 +24,8 @@ import com.l2jserver.gameserver.network.serverpackets.UserInfo;
 
 public final class RequestVoteNew extends L2GameClientPacket
 {
+	private static final String _C__D0_7E_REQUESTVOTENEW = "[C] D0:7E RequestVoteNew";
+	
 	private int _targetId;
 	
 	@Override
@@ -100,6 +102,6 @@ public final class RequestVoteNew extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] D0:7E RequestVoteNew";
+		return _C__D0_7E_REQUESTVOTENEW;
 	}
 }

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

@@ -28,6 +28,8 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestWithdrawPartyRoom extends L2GameClientPacket
 {
+	private static final String _C__D0_0B_REQUESTWITHDRAWPARTYROOM = "[C] D0:0B RequestWithdrawPartyRoom";
+	
 	private int _roomid;
 	@SuppressWarnings("unused")
 	private int _unk1;
@@ -75,7 +77,7 @@ public final class RequestWithdrawPartyRoom extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return "[C] D0:0B RequestWithdrawPartyRoom";
+		return _C__D0_0B_REQUESTWITHDRAWPARTYROOM;
 	}
 	
 }

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

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.entity.Hero;
  */
 public final class RequestWriteHeroWords extends L2GameClientPacket
 {
-	private static final String _C__FE_0C_REQUESTWRITEHEROWORDS = "[C] D0:0C RequestWriteHeroWords";
+	private static final String _C__FE_05_REQUESTWRITEHEROWORDS = "[C] D0:05 RequestWriteHeroWords";
 	
 	private String _heroWords;
 	
@@ -57,6 +57,6 @@ public final class RequestWriteHeroWords extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return _C__FE_0C_REQUESTWRITEHEROWORDS;
+		return _C__FE_05_REQUESTWRITEHEROWORDS;
 	}
 }

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

@@ -25,19 +25,11 @@ import com.l2jserver.gameserver.util.Util;
  */
 public class SetPrivateStoreWholeMsg extends L2GameClientPacket
 {
+	private static final String _C_D0_4A_SETPRIVATESTOREWHOLEMSG = "[C] D0:4A SetPrivateStoreWholeMsg";
 	private static final int MAX_MSG_LENGTH = 29;
 	
 	private String _msg;
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return "[C] D0:4D SetPrivateStoreWholeMsg";
-	}
-	
 	/**
 	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
 	 */
@@ -66,5 +58,13 @@ public class SetPrivateStoreWholeMsg extends L2GameClientPacket
 		player.getSellList().setTitle(_msg);
 		sendPacket(new ExPrivateStoreSetWholeMsg(player));
 	}
-	
+
+	/**
+	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C_D0_4A_SETPRIVATESTOREWHOLEMSG;
+	}
 }

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

@@ -16,7 +16,7 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import java.util.List;
 
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 
 /**

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

@@ -16,7 +16,7 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.util.Point3D;
+import com.l2jserver.gameserver.util.Point3D;
 
 public class ExGetOnAirShip extends L2GameServerPacket
 {