Fix for readF, readQ for login<->gs. Small refactor :)

L2_GameServer/java/com/l2jserver/gameserver/LoginServerThread.java

@@ -45,7 +45,6 @@ import com.l2jserver.gameserver.network.L2GameClient.GameClientState;
 import com.l2jserver.gameserver.network.gameserverpackets.AuthRequest;
 import com.l2jserver.gameserver.network.gameserverpackets.BlowFishKey;
 import com.l2jserver.gameserver.network.gameserverpackets.ChangeAccessLevel;
-import com.l2jserver.gameserver.network.gameserverpackets.GameServerBasePacket;
 import com.l2jserver.gameserver.network.gameserverpackets.PlayerAuthRequest;
 import com.l2jserver.gameserver.network.gameserverpackets.PlayerInGame;
 import com.l2jserver.gameserver.network.gameserverpackets.PlayerLogout;
@@ -61,6 +60,7 @@ import com.l2jserver.gameserver.network.serverpackets.LoginFail;
 import com.l2jserver.loginserver.crypt.NewCrypt;
 import com.l2jserver.util.Rnd;
 import com.l2jserver.util.Util;
+import com.l2jserver.util.network.BaseSendablePacket;
 
 public class LoginServerThread extends Thread
 {
@@ -505,7 +505,7 @@ public class LoginServerThread extends Thread
 	 * @param sl
 	 * @throws IOException
 	 */
-	private void sendPacket(GameServerBasePacket sl) throws IOException
+	private void sendPacket(BaseSendablePacket sl) throws IOException
 	{
 		byte[] data = sl.getContent();
 		NewCrypt.appendChecksum(data);

L2_GameServer/java/com/l2jserver/gameserver/model/L2Multisell.java

@@ -101,7 +101,7 @@ public class L2Multisell
 	 * 		  be at +0
 	 * 3) apply taxes: Uses the "taxIngredient" entry in order to add a certain amount of adena to the ingredients
 	 *
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#runImpl()
 	 */
 	private MultiSellListContainer generateMultiSell(int listId, boolean inventoryOnly, L2PcInstance player, int npcId, double taxRate)
 	{

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

@@ -32,7 +32,7 @@ public final class AnswerJoinPartyRoom extends L2GameClientPacket
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
     protected void runImpl()

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

@@ -44,7 +44,7 @@ public final class RequestConfirmCancelItem extends L2GameClientPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected void runImpl()

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

@@ -47,7 +47,7 @@ public final class RequestConfirmGemStone extends AbstractRefinePacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected

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

@@ -37,7 +37,7 @@ public class RequestCursedWeaponList extends L2GameClientPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected void runImpl()

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

@@ -40,7 +40,7 @@ public final class RequestCursedWeaponLocation extends L2GameClientPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected void runImpl()

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

@@ -40,7 +40,7 @@ public final class RequestDuelAnswerStart extends L2GameClientPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected void runImpl()

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

@@ -44,7 +44,7 @@ public final class RequestDuelStart extends L2GameClientPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected void runImpl()

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

@@ -32,7 +32,7 @@ public final class RequestDuelSurrender extends L2GameClientPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected void runImpl()

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

@@ -34,7 +34,7 @@ public final class RequestExFishRanking extends L2GameClientPacket
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
 	protected void runImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java

@@ -36,7 +36,7 @@ public final class RequestExMPCCShowPartyMembersInfo extends L2GameClientPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected void runImpl()

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

@@ -53,7 +53,7 @@ public final class RequestExMagicSkillUseGround extends L2GameClientPacket
     }
     
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
     protected void runImpl()

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

@@ -34,7 +34,7 @@ public final class RequestExitPartyMatchingWaitingRoom extends L2GameClientPacke
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
 	protected void runImpl()

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

@@ -39,7 +39,7 @@ public class RequestGetBossRecord extends L2GameClientPacket
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
     protected void runImpl()

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

@@ -34,7 +34,7 @@ public class RequestListPartyMatchingWaitingRoom extends L2GameClientPacket
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
 	protected void runImpl()

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

@@ -35,7 +35,7 @@ public final class RequestPCCafeCouponUse extends L2GameClientPacket
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
 	protected void runImpl()

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

@@ -43,7 +43,7 @@ public final class RequestPledgeMemberInfo extends L2GameClientPacket
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
 	protected void runImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java

@@ -44,7 +44,7 @@ public final class RequestPledgeMemberPowerInfo extends L2GameClientPacket
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
 	protected void runImpl()

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

@@ -36,7 +36,7 @@ public final class RequestPledgePowerGradeList extends L2GameClientPacket
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
 	protected void runImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java

@@ -42,7 +42,7 @@ public final class RequestPledgeReorganizeMember extends L2GameClientPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected void runImpl()

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

@@ -41,7 +41,7 @@ public final class RequestPledgeSetAcademyMaster extends L2GameClientPacket
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
 	protected void runImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java

@@ -38,7 +38,7 @@ public final class RequestPledgeSetMemberPowerGrade extends L2GameClientPacket
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
 	protected void runImpl()

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

@@ -42,7 +42,7 @@ public final class RequestPledgeWarList extends L2GameClientPacket
     }
 
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
 	protected void runImpl()

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

@@ -47,7 +47,7 @@ public final class RequestRefine extends AbstractRefinePacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected void runImpl()

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

@@ -41,7 +41,7 @@ public final class RequestRefineCancel extends L2GameClientPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+	 * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
 	 */
 	@Override
 	protected void runImpl()

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

@@ -53,7 +53,7 @@ public final class RequestSaveInventoryOrder extends L2GameClientPacket
     }
     
     /**
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
      */
     @Override
     protected void runImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/gameserverpackets/AuthRequest.java

@@ -16,7 +16,9 @@ package com.l2jserver.gameserver.network.gameserverpackets;
 
 import java.io.IOException;
 
-public class AuthRequest extends GameServerBasePacket
+import com.l2jserver.util.network.BaseSendablePacket;
+
+public class AuthRequest extends BaseSendablePacket
 {
 	/**
 	 * Format: cccSddb

L2_GameServer/java/com/l2jserver/gameserver/network/gameserverpackets/BlowFishKey.java

@@ -21,11 +21,13 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
+import com.l2jserver.util.network.BaseSendablePacket;
+
 /**
  * @author -Wooden-
  *
  */
-public class BlowFishKey extends GameServerBasePacket
+public class BlowFishKey extends BaseSendablePacket
 {
 	private static Logger _log = Logger.getLogger(BlowFishKey.class.getName());
 	/**

L2_GameServer/java/com/l2jserver/gameserver/network/gameserverpackets/ChangeAccessLevel.java

@@ -16,11 +16,13 @@ package com.l2jserver.gameserver.network.gameserverpackets;
 
 import java.io.IOException;
 
+import com.l2jserver.util.network.BaseSendablePacket;
+
 /**
  * @author -Wooden-
  *
  */
-public class ChangeAccessLevel extends GameServerBasePacket
+public class ChangeAccessLevel extends BaseSendablePacket
 {
 	public ChangeAccessLevel(String player, int access)
 	{

L2_GameServer/java/com/l2jserver/gameserver/network/gameserverpackets/GameServerBasePacket.java

@@ -1,122 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jserver.gameserver.network.gameserverpackets;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import com.l2jserver.gameserver.TaskPriority;
-
-
-/**
- * @author -Wooden-
- *
- */
-public abstract class GameServerBasePacket
-{
-	private ByteArrayOutputStream _bao;
-
-	protected GameServerBasePacket()
-	{
-		_bao = new ByteArrayOutputStream();
-	}
-
-	protected void writeD(int value)
-	{
-		_bao.write(value &0xff);
-		_bao.write(value >> 8 &0xff);
-		_bao.write(value >> 16 &0xff);
-		_bao.write(value >> 24 &0xff);
-	}
-
-	protected void writeH(int value)
-	{
-		_bao.write(value &0xff);
-		_bao.write(value >> 8 &0xff);
-	}
-
-	protected void writeC(int value)
-	{
-		_bao.write(value &0xff);
-	}
-
-	protected void writeF(double org)
-	{
-		long value = Double.doubleToRawLongBits(org);
-		_bao.write((int)(value &0xff));
-		_bao.write((int)(value >> 8 &0xff));
-		_bao.write((int)(value >> 16 &0xff));
-		_bao.write((int)(value >> 24 &0xff));
-		_bao.write((int)(value >> 32 &0xff));
-		_bao.write((int)(value >> 40 &0xff));
-		_bao.write((int)(value >> 48 &0xff));
-		_bao.write((int)(value >> 56 &0xff));
-	}
-
-	protected void writeS(String text)
-	{
-		try
-		{
-			if (text != null)
-			{
-				_bao.write(text.getBytes("UTF-16LE"));
-			}
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-
-		_bao.write(0);
-		_bao.write(0);
-	}
-
-	protected void writeB(byte[] array)
-	{
-		try
-		{
-			_bao.write(array);
-		}
-		catch (IOException e)
-		{
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public int getLength()
-	{
-		return _bao.size()+2;
-	}
-
-	public byte[] getBytes()
-	{
-		writeD(0x00);	// reserve for checksum
-
-		int padding = _bao.size() % 8;
-		if (padding != 0)
-		{
-			for (int i = padding; i<8;i++)
-			{
-				writeC(0x00);
-			}
-		}
-
-		return _bao.toByteArray();
-	}
-
-	public TaskPriority getPriority() { return TaskPriority.PR_HIGH; }
-	public abstract byte[] getContent() throws IOException;
-}

L2_GameServer/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerAuthRequest.java

@@ -17,13 +17,14 @@ package com.l2jserver.gameserver.network.gameserverpackets;
 import java.io.IOException;
 
 import com.l2jserver.gameserver.LoginServerThread.SessionKey;
+import com.l2jserver.util.network.BaseSendablePacket;
 
 
 /**
  * @author -Wooden-
  *
  */
-public class PlayerAuthRequest extends GameServerBasePacket
+public class PlayerAuthRequest extends BaseSendablePacket
 {
 	public PlayerAuthRequest(String account, SessionKey key)
 	{

L2_GameServer/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerInGame.java

@@ -18,11 +18,13 @@ import java.io.IOException;
 
 import javolution.util.FastList;
 
+import com.l2jserver.util.network.BaseSendablePacket;
+
 /**
  * @author -Wooden-
  *
  */
-public class PlayerInGame extends GameServerBasePacket
+public class PlayerInGame extends BaseSendablePacket
 {
 	public PlayerInGame (String player)
 	{

L2_GameServer/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerLogout.java

@@ -16,11 +16,13 @@ package com.l2jserver.gameserver.network.gameserverpackets;
 
 import java.io.IOException;
 
+import com.l2jserver.util.network.BaseSendablePacket;
+
 /**
  * @author -Wooden-
  *
  */
-public class PlayerLogout extends GameServerBasePacket
+public class PlayerLogout extends BaseSendablePacket
 {
 	public PlayerLogout(String player)
 	{

L2_GameServer/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerTracert.java

@@ -16,11 +16,13 @@ package com.l2jserver.gameserver.network.gameserverpackets;
 
 import java.io.IOException;
 
+import com.l2jserver.util.network.BaseSendablePacket;
+
 /**
  * @author mrTJO
  *
  */
-public class PlayerTracert extends GameServerBasePacket
+public class PlayerTracert extends BaseSendablePacket
 {
 	public PlayerTracert(String account, String pcIp, 
 			String hop1, String hop2, String hop3, String hop4)

L2_GameServer/java/com/l2jserver/gameserver/network/gameserverpackets/ServerStatus.java

@@ -17,11 +17,13 @@ package com.l2jserver.gameserver.network.gameserverpackets;
 import java.io.IOException;
 import java.util.ArrayList;
 
+import com.l2jserver.util.network.BaseSendablePacket;
+
 /**
  * @author -Wooden-
  *
  */
-public class ServerStatus extends GameServerBasePacket
+public class ServerStatus extends BaseSendablePacket
 {
     private ArrayList<Attribute> _attributes;
 

L2_GameServer/java/com/l2jserver/gameserver/network/loginserverpackets/AuthResponse.java

@@ -14,12 +14,14 @@
  */
 package com.l2jserver.gameserver.network.loginserverpackets;
 
+import com.l2jserver.util.network.BaseRecievePacket;
+
 
 /**
  * @author -Wooden-
  *
  */
-public class AuthResponse extends LoginServerBasePacket
+public class AuthResponse extends BaseRecievePacket
 {
 
 	private int _serverId;

L2_GameServer/java/com/l2jserver/gameserver/network/loginserverpackets/InitLS.java

@@ -14,8 +14,10 @@
  */
 package com.l2jserver.gameserver.network.loginserverpackets;
 
+import com.l2jserver.util.network.BaseRecievePacket;
 
-public class InitLS extends LoginServerBasePacket
+
+public class InitLS extends BaseRecievePacket
 {
 	private int _rev;
 	private byte[] _key;

L2_GameServer/java/com/l2jserver/gameserver/network/loginserverpackets/KickPlayer.java

@@ -14,8 +14,10 @@
  */
 package com.l2jserver.gameserver.network.loginserverpackets;
 
+import com.l2jserver.util.network.BaseRecievePacket;
 
-public class KickPlayer extends LoginServerBasePacket
+
+public class KickPlayer extends BaseRecievePacket
 {
 
 	private String _account;

L2_GameServer/java/com/l2jserver/gameserver/network/loginserverpackets/LoginServerBasePacket.java

@@ -1,97 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jserver.gameserver.network.loginserverpackets;
-
-import com.l2jserver.gameserver.TaskPriority;
-
-/**
- * @author -Wooden-
- *
- */
-public abstract class LoginServerBasePacket
-{
-	private byte[] _decrypt;
-	private int _off;
-
-	public LoginServerBasePacket(byte[] decrypt)
-	{
-		_decrypt = decrypt;
-		_off = 1;		// skip packet type id
-	}
-
-	public int readD()
-	{
-		int result = _decrypt[_off++] &0xff;
-		result |= _decrypt[_off++] << 8 &0xff00;
-		result |= _decrypt[_off++] << 0x10 &0xff0000;
-		result |= _decrypt[_off++] << 0x18 &0xff000000;
-		return result;
-	}
-
-	public int readC()
-	{
-		int result = _decrypt[_off++] &0xff;
-		return result;
-	}
-
-	public int readH()
-	{
-		int result = _decrypt[_off++] &0xff;
-		result |= _decrypt[_off++] << 8 &0xff00;
-		return result;
-	}
-
-	public double readF()
-	{
-		long result = _decrypt[_off++] &0xff;
-		result |= _decrypt[_off++] << 8 &0xff00;
-		result |= _decrypt[_off++] << 0x10 &0xff0000;
-		result |= _decrypt[_off++] << 0x18 &0xff000000;
-		result |= _decrypt[_off++] << 0x20 &0xff00000000l;
-		result |= _decrypt[_off++] << 0x28 &0xff0000000000l;
-		result |= _decrypt[_off++] << 0x30 &0xff000000000000l;
-		result |= _decrypt[_off++] << 0x38 &0xff00000000000000l;
-		return Double.longBitsToDouble(result);
-	}
-
-	public String readS()
-	{
-		String result = null;
-		try
-		{
-			result = new String(_decrypt,_off,_decrypt.length-_off, "UTF-16LE");
-			result = result.substring(0, result.indexOf(0x00));
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-		_off += result.length()*2 + 2;
-		return result;
-	}
-
-	public final byte[] readB(int length)
-	{
-		byte[] result = new byte[length];
-		for(int i = 0; i < length; i++)
-		{
-			result[i]=_decrypt[_off+i];
-		}
-		_off += length;
-		return result;
-	}
-
-	public TaskPriority getPriority() { return TaskPriority.PR_HIGH; }
-}

L2_GameServer/java/com/l2jserver/gameserver/network/loginserverpackets/LoginServerFail.java

@@ -14,8 +14,10 @@
  */
 package com.l2jserver.gameserver.network.loginserverpackets;
 
+import com.l2jserver.util.network.BaseRecievePacket;
 
-public class LoginServerFail extends LoginServerBasePacket
+
+public class LoginServerFail extends BaseRecievePacket
 {
 
 	private static final String[] REASONS = {"None" ,

L2_GameServer/java/com/l2jserver/gameserver/network/loginserverpackets/PlayerAuthResponse.java

@@ -14,11 +14,13 @@
  */
 package com.l2jserver.gameserver.network.loginserverpackets;
 
+import com.l2jserver.util.network.BaseRecievePacket;
+
 /**
  * @author -Wooden-
  *
  */
-public class PlayerAuthResponse extends LoginServerBasePacket
+public class PlayerAuthResponse extends BaseRecievePacket
 {
 
 	private String _account;

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/AbstractServerBasePacket.java

@@ -24,13 +24,13 @@ public abstract class AbstractServerBasePacket extends L2GameServerPacket
 {
 
     /**
-     * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#runImpl()
+     * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#runImpl()
      */
     @Override
 	abstract public void runImpl();
 
     /**
-     * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+     * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
      */
     @Override
 	abstract protected void writeImpl();

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExCursedWeaponList.java

@@ -32,7 +32,7 @@ public class ExCursedWeaponList extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

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

@@ -35,7 +35,7 @@ public class ExCursedWeaponLocation extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExDuelAskStart.java

@@ -32,7 +32,7 @@ public class ExDuelAskStart extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExDuelStart.java

@@ -29,7 +29,7 @@ public class ExDuelStart extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java

@@ -31,7 +31,7 @@ public class ExDuelUpdateUserInfo extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExGetBossRecord.java

@@ -35,7 +35,7 @@ public class ExGetBossRecord extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java

@@ -31,7 +31,7 @@ public class ExMPCCShowPartyMemberInfo extends L2GameServerPacket
 		this._party = party;
 	}
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java

@@ -41,7 +41,7 @@ public class ExPutCommissionResultForVariationMake extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java

@@ -38,7 +38,7 @@ public class ExPutIntensiveResultForVariationMake extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java

@@ -32,7 +32,7 @@ public class ExPutItemResultForVariationCancel extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java

@@ -34,7 +34,7 @@ public class ExPutItemResultForVariationMake extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExRedSky.java

@@ -29,7 +29,7 @@ public class ExRedSky extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExRequestHackShield.java

@@ -24,7 +24,7 @@ public class ExRequestHackShield extends L2GameServerPacket
 	private static final String _S__FE_48_EXREQUESTHACKSHIELD = "[S] FE:49 ExRequestHackShield";
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExRestartClient.java

@@ -24,7 +24,7 @@ public class ExRestartClient extends L2GameServerPacket
 	private static final String _S__FE_47_EXRESTARTCLIENT = "[S] FE:48 ExRestartClient";
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExSearchOrc.java

@@ -24,7 +24,7 @@ public class ExSearchOrc extends L2GameServerPacket
 	private static final String _S__FE_44_EXORCMOVE = "[S] FE:45 ExSearchOrc";
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExSetCompassZoneCode.java

@@ -38,7 +38,7 @@ public class ExSetCompassZoneCode extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java

@@ -23,7 +23,7 @@ public class ExShowAdventurerGuideBook extends L2GameServerPacket
 	private static final String _S__FE_37_EXSHOWADVENTURERGUIDEBOOK = "[S] FE:38 ExShowAdventurerGuideBook";
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExShowVariationCancelWindow.java

@@ -24,7 +24,7 @@ public class ExShowVariationCancelWindow extends L2GameServerPacket
 	private static final String _S__FE_51_EXSHOWVARIATIONCANCELWINDOW = "[S] FE:52 ExShowVariationCancelWindow";
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExShowVariationMakeWindow.java

@@ -24,7 +24,7 @@ public class ExShowVariationMakeWindow extends L2GameServerPacket
 	private static final String _S__FE_50_EXSHOWVARIATIONMAKEWINDOW = "[S] FE:51 ExShowVariationMakeWindow";
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExUseSharedGroupItem.java

@@ -32,7 +32,7 @@ public class ExUseSharedGroupItem extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExVariationCancelResult.java

@@ -32,7 +32,7 @@ public class ExVariationCancelResult extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExVariationResult.java

@@ -34,7 +34,7 @@ public class ExVariationResult extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java

@@ -34,7 +34,7 @@ public class PledgeReceiveMemberInfo extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceivePowerInfo.java

@@ -34,7 +34,7 @@ public class PledgeReceivePowerInfo extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java

@@ -41,7 +41,7 @@ public class PledgeReceiveSubPledgeCreated extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveWarList.java

@@ -34,7 +34,7 @@ public class PledgeReceiveWarList extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PledgeSkillList.java

@@ -33,7 +33,7 @@ public class PledgeSkillList extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PledgeSkillListAdd.java

@@ -32,7 +32,7 @@ public class PledgeSkillListAdd extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PremiumState.java

@@ -31,7 +31,7 @@ public class PremiumState extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java

@@ -67,7 +67,7 @@ public final class RelationChanged extends L2GameServerPacket
 	}
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected final void writeImpl()

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java

@@ -24,7 +24,7 @@ public class ShowPCCafeCouponShowUI extends L2GameServerPacket
 	private static final String _S__FE_43_SHOWPCCAFECOUPONSHOWUI = "[S] FE:44 ShowPCCafeCouponShowUI";
 
 	/**
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
+	 * @see com.l2jserver.util.network.BaseSendablePacket.ServerBasePacket#writeImpl()
 	 */
 	@Override
 	protected void writeImpl()

L2_GameServer/java/com/l2jserver/loginserver/GameServerThread.java

@@ -45,8 +45,8 @@ import com.l2jserver.loginserver.loginserverpackets.InitLS;
 import com.l2jserver.loginserver.loginserverpackets.KickPlayer;
 import com.l2jserver.loginserver.loginserverpackets.LoginServerFail;
 import com.l2jserver.loginserver.loginserverpackets.PlayerAuthResponse;
-import com.l2jserver.loginserver.serverpackets.ServerBasePacket;
 import com.l2jserver.util.Util;
+import com.l2jserver.util.network.BaseSendablePacket;
 
 import javolution.util.FastSet;
 
@@ -622,7 +622,7 @@ public class GameServerThread extends Thread
 	 * @param sl
 	 * @throws IOException
 	 */
-	private void sendPacket(ServerBasePacket sl) throws IOException
+	private void sendPacket(BaseSendablePacket sl) throws IOException
 	{
 		byte[] data = sl.getContent();
 		NewCrypt.appendChecksum(data);

L2_GameServer/java/com/l2jserver/loginserver/gameserverpackets/BlowFishKey.java

@@ -20,14 +20,14 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
-import com.l2jserver.loginserver.clientpackets.ClientBasePacket;
+import com.l2jserver.util.network.BaseRecievePacket;
 
 
 /**
  * @author -Wooden-
  *
  */
-public class BlowFishKey extends ClientBasePacket
+public class BlowFishKey extends BaseRecievePacket
 {
 	byte[] _key;
 	protected static final Logger _log = Logger.getLogger(BlowFishKey.class.getName());

L2_GameServer/java/com/l2jserver/loginserver/gameserverpackets/ChangeAccessLevel.java

@@ -14,13 +14,13 @@
  */
 package com.l2jserver.loginserver.gameserverpackets;
 
-import com.l2jserver.loginserver.clientpackets.ClientBasePacket;
+import com.l2jserver.util.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
  *
  */
-public class ChangeAccessLevel extends ClientBasePacket
+public class ChangeAccessLevel extends BaseRecievePacket
 {
 
 	private int _level;

L2_GameServer/java/com/l2jserver/loginserver/gameserverpackets/GameServerAuth.java

@@ -16,7 +16,7 @@ package com.l2jserver.loginserver.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jserver.loginserver.clientpackets.ClientBasePacket;
+import com.l2jserver.util.network.BaseRecievePacket;
 
 
 /**
@@ -32,7 +32,7 @@ import com.l2jserver.loginserver.clientpackets.ClientBasePacket;
  * @author -Wooden-
  *
  */
-public class GameServerAuth extends ClientBasePacket
+public class GameServerAuth extends BaseRecievePacket
 {
 	protected static Logger _log = Logger.getLogger(GameServerAuth.class.getName());
 	private byte[] _hexId;

L2_GameServer/java/com/l2jserver/loginserver/gameserverpackets/PlayerAuthRequest.java

@@ -15,13 +15,13 @@
 package com.l2jserver.loginserver.gameserverpackets;
 
 import com.l2jserver.loginserver.SessionKey;
-import com.l2jserver.loginserver.clientpackets.ClientBasePacket;
+import com.l2jserver.util.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
  *
  */
-public class PlayerAuthRequest extends ClientBasePacket
+public class PlayerAuthRequest extends BaseRecievePacket
 {
 
 	private String _account;

L2_GameServer/java/com/l2jserver/loginserver/gameserverpackets/PlayerInGame.java

@@ -16,7 +16,7 @@ package com.l2jserver.loginserver.gameserverpackets;
 
 import java.util.List;
 
-import com.l2jserver.loginserver.clientpackets.ClientBasePacket;
+import com.l2jserver.util.network.BaseRecievePacket;
 
 import javolution.util.FastList;
 
@@ -24,7 +24,7 @@ import javolution.util.FastList;
  * @author -Wooden-
  *
  */
-public class PlayerInGame extends ClientBasePacket
+public class PlayerInGame extends BaseRecievePacket
 {
 	private List<String> _accounts;
 

L2_GameServer/java/com/l2jserver/loginserver/gameserverpackets/PlayerLogout.java

@@ -14,13 +14,13 @@
  */
 package com.l2jserver.loginserver.gameserverpackets;
 
-import com.l2jserver.loginserver.clientpackets.ClientBasePacket;
+import com.l2jserver.util.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
  *
  */
-public class PlayerLogout extends ClientBasePacket
+public class PlayerLogout extends BaseRecievePacket
 {
 
 	private String _account;

L2_GameServer/java/com/l2jserver/loginserver/gameserverpackets/PlayerTracert.java

@@ -14,13 +14,13 @@
  */
 package com.l2jserver.loginserver.gameserverpackets;
 
-import com.l2jserver.loginserver.clientpackets.ClientBasePacket;
+import com.l2jserver.util.network.BaseRecievePacket;
 
 /**
  * @author mrTJO
  *
  */
-public class PlayerTracert extends ClientBasePacket
+public class PlayerTracert extends BaseRecievePacket
 {
 	private String _account;
 	private String _pcIp;

L2_GameServer/java/com/l2jserver/loginserver/gameserverpackets/ServerStatus.java

@@ -18,14 +18,14 @@ import java.util.logging.Logger;
 
 import com.l2jserver.loginserver.GameServerTable;
 import com.l2jserver.loginserver.GameServerTable.GameServerInfo;
-import com.l2jserver.loginserver.clientpackets.ClientBasePacket;
+import com.l2jserver.util.network.BaseRecievePacket;
 
 
 /**
  * @author -Wooden-
  *
  */
-public class ServerStatus extends ClientBasePacket
+public class ServerStatus extends BaseRecievePacket
 {
 	protected static Logger _log = Logger.getLogger(ServerStatus.class.getName());
 

L2_GameServer/java/com/l2jserver/loginserver/loginserverpackets/AuthResponse.java

@@ -17,14 +17,14 @@ package com.l2jserver.loginserver.loginserverpackets;
 import java.io.IOException;
 
 import com.l2jserver.loginserver.GameServerTable;
-import com.l2jserver.loginserver.serverpackets.ServerBasePacket;
+import com.l2jserver.util.network.BaseSendablePacket;
 
 
 /**
  * @author -Wooden-
  *
  */
-public class AuthResponse extends ServerBasePacket
+public class AuthResponse extends BaseSendablePacket
 {
 
 	/**

L2_GameServer/java/com/l2jserver/loginserver/loginserverpackets/InitLS.java

@@ -15,13 +15,13 @@
 package com.l2jserver.loginserver.loginserverpackets;
 
 import com.l2jserver.loginserver.L2LoginServer;
-import com.l2jserver.loginserver.serverpackets.ServerBasePacket;
+import com.l2jserver.util.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
  *
  */
-public class InitLS extends ServerBasePacket
+public class InitLS extends BaseSendablePacket
 {
 	// ID 0x00
 	// format

L2_GameServer/java/com/l2jserver/loginserver/loginserverpackets/KickPlayer.java

@@ -16,14 +16,14 @@ package com.l2jserver.loginserver.loginserverpackets;
 
 import java.io.IOException;
 
-import com.l2jserver.loginserver.serverpackets.ServerBasePacket;
+import com.l2jserver.util.network.BaseSendablePacket;
 
 
 /**
  * @author -Wooden-
  *
  */
-public class KickPlayer extends ServerBasePacket
+public class KickPlayer extends BaseSendablePacket
 {
 	public KickPlayer(String account)
 	{

L2_GameServer/java/com/l2jserver/loginserver/loginserverpackets/LoginServerFail.java

@@ -14,13 +14,13 @@
  */
 package com.l2jserver.loginserver.loginserverpackets;
 
-import com.l2jserver.loginserver.serverpackets.ServerBasePacket;
+import com.l2jserver.util.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
  *
  */
-public class LoginServerFail extends ServerBasePacket
+public class LoginServerFail extends BaseSendablePacket
 {
 
 	/**

L2_GameServer/java/com/l2jserver/loginserver/loginserverpackets/PlayerAuthResponse.java

@@ -16,14 +16,14 @@ package com.l2jserver.loginserver.loginserverpackets;
 
 import java.io.IOException;
 
-import com.l2jserver.loginserver.serverpackets.ServerBasePacket;
+import com.l2jserver.util.network.BaseSendablePacket;
 
 
 /**
  * @author -Wooden-
  *
  */
-public class PlayerAuthResponse extends ServerBasePacket
+public class PlayerAuthResponse extends BaseSendablePacket
 {
 	public PlayerAuthResponse(String account, boolean response)
 	{

L2_GameServer/java/com/l2jserver/loginserver/clientpackets/ClientBasePacket.java → L2_GameServer/java/com/l2jserver/util/network/BaseRecievePacket.java

@@ -12,19 +12,19 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.loginserver.clientpackets;
+package com.l2jserver.util.network;
 
 /**
  * This class ...
  *
  * @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:12 $
  */
-public abstract class ClientBasePacket
+public abstract class BaseRecievePacket
 {
 	private byte[] _decrypt;
 	private int _off;
 
-	public ClientBasePacket(byte[] decrypt)
+	public BaseRecievePacket(byte[] decrypt)
 	{
 		_decrypt = decrypt;
 		_off = 1;		// skip packet type id
@@ -54,14 +54,14 @@ public abstract class ClientBasePacket
 
 	public double readF()
 	{
-		long result = _decrypt[_off++] &0xff;
-		result |= _decrypt[_off++] << 8 &0xff00;
-		result |= _decrypt[_off++] << 0x10 &0xff0000;
-		result |= _decrypt[_off++] << 0x18 &0xff000000;
-		result |= _decrypt[_off++] << 0x20 &0xff00000000l;
-		result |= _decrypt[_off++] << 0x28 &0xff0000000000l;
-		result |= _decrypt[_off++] << 0x30 &0xff000000000000l;
-		result |= _decrypt[_off++] << 0x38 &0xff00000000000000l;
+		long result = _decrypt[_off++] & 0xff;
+		result |= _decrypt[_off++] & 0xff << 8;
+		result |= _decrypt[_off++] & 0xff << 16;
+		result |= (_decrypt[_off++] & 0xffl) << 24l;
+		result |= (_decrypt[_off++] & 0xffl) << 32l;
+		result |= (_decrypt[_off++] & 0xffl) << 40l;
+		result |= (_decrypt[_off++] & 0xffl) << 48l;
+		result |= (_decrypt[_off++] & 0xffl) << 56l;
 		return Double.longBitsToDouble(result);
 	}
 
@@ -91,4 +91,17 @@ public abstract class ClientBasePacket
 		_off += length;
 		return result;
 	}
+	
+	public long readQ()
+	{
+		long result = _decrypt[_off++] & 0xff;
+		result |= _decrypt[_off++] & 0xff << 8;
+		result |= _decrypt[_off++] & 0xff << 16;
+		result |= (_decrypt[_off++] & 0xffl) << 24l;
+		result |= (_decrypt[_off++] & 0xffl) << 32l;
+		result |= (_decrypt[_off++] & 0xffl) << 40l;
+		result |= (_decrypt[_off++] & 0xffl) << 48l;
+		result |= (_decrypt[_off++] & 0xffl) << 56l;
+		return result;
+	}
 }

L2_GameServer/java/com/l2jserver/loginserver/serverpackets/ServerBasePacket.java → L2_GameServer/java/com/l2jserver/util/network/BaseSendablePacket.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.loginserver.serverpackets;
+package com.l2jserver.util.network;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -22,11 +22,11 @@ import java.io.IOException;
  *
  * @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:11 $
  */
-public abstract class ServerBasePacket
+public abstract class BaseSendablePacket
 {
 	ByteArrayOutputStream _bao;
 
-	protected ServerBasePacket()
+	protected BaseSendablePacket()
 	{
 		_bao = new ByteArrayOutputStream();
 	}
@@ -93,6 +93,18 @@ public abstract class ServerBasePacket
 			e.printStackTrace();
 		}
 	}
+	
+	protected void writeQ(long value)
+	{
+		_bao.write((int) (value & 0xff));
+		_bao.write((int) (value >> 8 & 0xff));
+		_bao.write((int) (value >> 16 & 0xff));
+		_bao.write((int) (value >> 24 & 0xff));
+		_bao.write((int) (value >> 32 & 0xff));
+		_bao.write((int) (value >> 40 & 0xff));
+		_bao.write((int) (value >> 48 & 0xff));
+		_bao.write((int) (value >> 56 & 0xff));
+	}
 
 	public int getLength()
 	{