Rename and clean up MapleClient

src/main/java/net/AbstractPacketHandler.java

@@ -21,12 +21,12 @@
 */
 package net;
 
-import client.MapleClient;
+import client.Client;
 import net.server.Server;
 
 public abstract class AbstractPacketHandler implements PacketHandler {
     @Override
-    public boolean validateState(MapleClient c) {
+    public boolean validateState(Client c) {
         return c.isLoggedIn();
     }
     

src/main/java/net/PacketHandler.java

@@ -21,10 +21,10 @@
 */
 package net;
 
-import client.MapleClient;
+import client.Client;
 import net.packet.InPacket;
 
 public interface PacketHandler {
-    void handlePacket(InPacket p, MapleClient c);
-    boolean validateState(MapleClient c);
+    void handlePacket(InPacket p, Client c);
+    boolean validateState(Client c);
 }

src/main/java/net/netty/ChannelServerInitializer.java

@@ -1,6 +1,6 @@
 package net.netty;
 
-import client.MapleClient;
+import client.Client;
 import io.netty.channel.socket.SocketChannel;
 import net.PacketProcessor;
 import net.server.Server;
@@ -27,7 +27,7 @@ public class ChannelServerInitializer extends ServerChannelInitializer {
         PacketProcessor packetProcessor = PacketProcessor.getChannelServerProcessor(world, channel);
         final long clientSessionId = sessionId.getAndIncrement();
         final String remoteAddress = getRemoteAddress(socketChannel);
-        final MapleClient client = MapleClient.createChannelClient(clientSessionId, remoteAddress, packetProcessor, world, channel);
+        final Client client = Client.createChannelClient(clientSessionId, remoteAddress, packetProcessor, world, channel);
 
         if (Server.getInstance().getChannel(world, channel) == null) {
             SessionCoordinator.getInstance().closeSession(client, true);

src/main/java/net/netty/LoginServerInitializer.java

@@ -1,6 +1,6 @@
 package net.netty;
 
-import client.MapleClient;
+import client.Client;
 import io.netty.channel.socket.SocketChannel;
 import net.PacketProcessor;
 import net.server.coordinator.session.SessionCoordinator;
@@ -18,7 +18,7 @@ public class LoginServerInitializer extends ServerChannelInitializer {
         PacketProcessor packetProcessor = PacketProcessor.getLoginServerProcessor();
         final long clientSessionId = sessionId.getAndIncrement();
         final String remoteAddress = getRemoteAddress(socketChannel);
-        final MapleClient client = MapleClient.createLoginClient(clientSessionId, remoteAddress, packetProcessor, LoginServer.WORLD_ID, LoginServer.CHANNEL_ID);
+        final Client client = Client.createLoginClient(clientSessionId, remoteAddress, packetProcessor, LoginServer.WORLD_ID, LoginServer.CHANNEL_ID);
 
         if (!SessionCoordinator.getInstance().canStartLoginSession(client)) {
             socketChannel.close();

src/main/java/net/netty/ServerChannelInitializer.java

@@ -1,6 +1,6 @@
 package net.netty;
 
-import client.MapleClient;
+import client.Client;
 import config.YamlConfig;
 import constants.net.ServerConstants;
 import io.netty.buffer.Unpooled;
@@ -46,7 +46,7 @@ public abstract class ServerChannelInitializer extends ChannelInitializer<Socket
         return remoteAddress;
     }
 
-    void initPipeline(SocketChannel socketChannel, MapleClient client) {
+    void initPipeline(SocketChannel socketChannel, Client client) {
         final InitializationVector sendIv = InitializationVector.generateSend();
         final InitializationVector recvIv = InitializationVector.generateReceive();
         writeInitialUnencryptedHelloPacket(socketChannel, sendIv, recvIv);
@@ -58,14 +58,14 @@ public abstract class ServerChannelInitializer extends ChannelInitializer<Socket
     }
 
     private void setUpHandlers(ChannelPipeline pipeline, InitializationVector sendIv, InitializationVector recvIv,
-                               MapleClient client) {
+                               Client client) {
         pipeline.addLast("IdleStateHandler", new IdleStateHandler(0, 0, IDLE_TIME_SECONDS));
         pipeline.addLast("PacketCodec", new PacketCodec(ClientCyphers.of(sendIv, recvIv)));
-        pipeline.addLast("MapleClient", client);
+        pipeline.addLast("Client", client);
 
         if (LOG_PACKETS) {
-            pipeline.addBefore("MapleClient", "SendPacketLogger", sendPacketLogger);
-            pipeline.addBefore("MapleClient", "ReceivePacketLogger", receivePacketLogger);
+            pipeline.addBefore("Client", "SendPacketLogger", sendPacketLogger);
+            pipeline.addBefore("Client", "ReceivePacketLogger", receivePacketLogger);
         }
     }
 }

src/main/java/net/packet/logging/MapleLogger.java

@@ -21,7 +21,7 @@
 package net.packet.logging;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.opcodes.RecvOpcode;
 import tools.FilePrinter;
 import tools.HexTool;
@@ -40,7 +40,7 @@ public class MapleLogger {
     public static final Set<Integer> monitored = new HashSet<>();
     public static final Set<Integer> ignored = new HashSet<>();
 
-    public static void logRecv(MapleClient c, short packetId, byte[] packetContent) {
+    public static void logRecv(Client c, short packetId, byte[] packetContent) {
         Character chr = c.getPlayer();
         if (chr == null) {
             return;

src/main/java/net/server/PlayerStorage.java

@@ -22,7 +22,7 @@
 package net.server;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.server.audit.locks.MonitoredLockType;
 import net.server.audit.locks.MonitoredReadLock;
 import net.server.audit.locks.MonitoredReentrantReadWriteLock;
@@ -98,7 +98,7 @@ public class PlayerStorage {
 	}
         
         for(Character mc : chrList) {
-            MapleClient client = mc.getClient();
+            Client client = mc.getClient();
             if(client != null) {
                 client.forceDisconnect();
             }

src/main/java/net/server/Server.java

@@ -22,7 +22,7 @@
 package net.server;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleFamily;
 import client.SkillFactory;
 import client.command.CommandsExecutor;
@@ -105,13 +105,13 @@ public class Server {
     private final Map<String, Integer> transitioningChars = new HashMap<>();
     private List<Pair<Integer, String>> worldRecommendedList = new LinkedList<>();
     private final Map<Integer, MapleGuild> guilds = new HashMap<>(100);
-    private final Map<MapleClient, Long> inLoginState = new HashMap<>(100);
+    private final Map<Client, Long> inLoginState = new HashMap<>(100);
 
     private final PlayerBuffStorage buffStorage = new PlayerBuffStorage();
     private final Map<Integer, MapleAlliance> alliances = new HashMap<>(100);
     private final Map<Integer, NewYearCardRecord> newyears = new HashMap<>();
-    private final List<MapleClient> processDiseaseAnnouncePlayers = new LinkedList<>();
-    private final List<MapleClient> registeredDiseaseAnnouncePlayers = new LinkedList<>();
+    private final List<Client> processDiseaseAnnouncePlayers = new LinkedList<>();
+    private final List<Client> registeredDiseaseAnnouncePlayers = new LinkedList<>();
 
     private final List<List<Pair<String, Integer>>> playerRanking = new LinkedList<>();
 
@@ -281,7 +281,7 @@ public class Server {
         }
     }
 
-    public String[] getInetSocket(MapleClient client, int world, int channel) {
+    public String[] getInetSocket(Client client, int world, int channel) {
         String remoteIp = client.getRemoteAddress();
 
         String[] hostAddress = getIP(world, channel).split(":");
@@ -645,7 +645,7 @@ public class Server {
     }
 
     public void runAnnouncePlayerDiseasesSchedule() {
-        List<MapleClient> processDiseaseAnnounceClients;
+        List<Client> processDiseaseAnnounceClients;
         disLock.lock();
         try {
             processDiseaseAnnounceClients = new LinkedList<>(processDiseaseAnnouncePlayers);
@@ -655,7 +655,7 @@ public class Server {
         }
 
         while (!processDiseaseAnnounceClients.isEmpty()) {
-            MapleClient c = processDiseaseAnnounceClients.remove(0);
+            Client c = processDiseaseAnnounceClients.remove(0);
             Character player = c.getPlayer();
             if (player != null && player.isLoggedinWorld()) {
                 player.announceDiseases();
@@ -667,7 +667,7 @@ public class Server {
         try {
             // this is to force the system to wait for at least one complete tick before releasing disease info for the registered clients
             while (!registeredDiseaseAnnouncePlayers.isEmpty()) {
-                MapleClient c = registeredDiseaseAnnouncePlayers.remove(0);
+                Client c = registeredDiseaseAnnouncePlayers.remove(0);
                 processDiseaseAnnouncePlayers.add(c);
             }
         } finally {
@@ -675,7 +675,7 @@ public class Server {
         }
     }
 
-    public void registerAnnouncePlayerDiseases(MapleClient c) {
+    public void registerAnnouncePlayerDiseases(Client c) {
         disLock.lock();
         try {
             registeredDiseaseAnnouncePlayers.add(c);
@@ -1661,7 +1661,7 @@ public class Server {
         }
     }
 
-    public void loadAccountCharacters(MapleClient c) {
+    public void loadAccountCharacters(Client c) {
         Integer accId = c.getAccID();
         if (!isFirstAccountLogin(accId)) {
             Set<Integer> accWorlds = new HashSet<>();
@@ -1734,7 +1734,7 @@ public class Server {
         return gmLevel;
     }
 
-    public void loadAccountStorages(MapleClient c) {
+    public void loadAccountStorages(Client c) {
         int accountId = c.getAccID();
         Set<Integer> accWorlds = new HashSet<>();
         lgnWLock.lock();
@@ -1760,11 +1760,11 @@ public class Server {
         }
     }
 
-    private static String getRemoteHost(MapleClient client) {
+    private static String getRemoteHost(Client client) {
         return SessionCoordinator.getSessionRemoteHost(client);
     }
 
-    public void setCharacteridInTransition(MapleClient client, int charId) {
+    public void setCharacteridInTransition(Client client, int charId) {
         String remoteIp = getRemoteHost(client);
 
         lgnWLock.lock();
@@ -1775,7 +1775,7 @@ public class Server {
         }
     }
 
-    public boolean validateCharacteridInTransition(MapleClient client, int charId) {
+    public boolean validateCharacteridInTransition(Client client, int charId) {
         if (!YamlConfig.config.server.USE_IP_VALIDATION) {
             return true;
         }
@@ -1791,7 +1791,7 @@ public class Server {
         }
     }
 
-    public Integer freeCharacteridInTransition(MapleClient client) {
+    public Integer freeCharacteridInTransition(Client client) {
         if (!YamlConfig.config.server.USE_IP_VALIDATION) {
             return null;
         }
@@ -1806,7 +1806,7 @@ public class Server {
         }
     }
 
-    public boolean hasCharacteridInTransition(MapleClient client) {
+    public boolean hasCharacteridInTransition(Client client) {
         if (!YamlConfig.config.server.USE_IP_VALIDATION) {
             return true;
         }
@@ -1821,7 +1821,7 @@ public class Server {
         }
     }
 
-    public void registerLoginState(MapleClient c) {
+    public void registerLoginState(Client c) {
         srvLock.lock();
         try {
             inLoginState.put(c, System.currentTimeMillis() + 600000);
@@ -1830,7 +1830,7 @@ public class Server {
         }
     }
 
-    public void unregisterLoginState(MapleClient c) {
+    public void unregisterLoginState(Client c) {
         srvLock.lock();
         try {
             inLoginState.remove(c);
@@ -1840,26 +1840,26 @@ public class Server {
     }
 
     private void disconnectIdlesOnLoginState() {
-        List<MapleClient> toDisconnect = new LinkedList<>();
+        List<Client> toDisconnect = new LinkedList<>();
 
         srvLock.lock();
         try {
             long timeNow = System.currentTimeMillis();
 
-            for (Entry<MapleClient, Long> mc : inLoginState.entrySet()) {
+            for (Entry<Client, Long> mc : inLoginState.entrySet()) {
                 if (timeNow > mc.getValue()) {
                     toDisconnect.add(mc.getKey());
                 }
             }
 
-            for (MapleClient c : toDisconnect) {
+            for (Client c : toDisconnect) {
                 inLoginState.remove(c);
             }
         } finally {
             srvLock.unlock();
         }
 
-        for (MapleClient c : toDisconnect) {    // thanks Lei for pointing a deadlock issue with srvLock
+        for (Client c : toDisconnect) {    // thanks Lei for pointing a deadlock issue with srvLock
             if (c.isLoggedIn()) {
                 c.disconnect(false, false);
             } else {

src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleFamily;
 import client.MapleFamilyEntry;
 import config.YamlConfig;
@@ -48,7 +48,7 @@ import java.sql.SQLException;
 public final class AcceptFamilyHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
             return;
         }

src/main/java/net/server/channel/handlers/AdminChatHandler.java

@@ -1,6 +1,6 @@
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import config.YamlConfig;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -15,7 +15,7 @@ import tools.PacketCreator;
 public class AdminChatHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         if (!c.getPlayer().isGM()) {//if ( (signed int)CWvsContext::GetAdminLevel((void *)v294) > 2 )
             return;
         }

src/main/java/net/server/channel/handlers/AdminCommandHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.inventory.Inventory;
 import client.inventory.InventoryType;
 import client.inventory.manipulator.InventoryManipulator;
@@ -43,7 +43,7 @@ import java.util.List;
 public final class AdminCommandHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         if (!c.getPlayer().isGM()) {
             return;
         }

src/main/java/net/server/channel/handlers/AdminLogHandler.java

@@ -21,14 +21,14 @@
  */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 public final class AdminLogHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         //harhar
     }
 }

src/main/java/net/server/channel/handlers/AllianceOperationHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
@@ -39,7 +39,7 @@ import tools.PacketCreator;
 public final class AllianceOperationHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         MapleAlliance alliance = null;
         Character chr = c.getPlayer();
         

src/main/java/net/server/channel/handlers/AranComboHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.SkillFactory;
 import constants.game.GameConstants;
 import constants.skills.Aran;
@@ -32,7 +32,7 @@ import net.packet.InPacket;
 public class AranComboHandler extends AbstractPacketHandler {
 
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         final Character player = c.getPlayer();
         int skillLevel = player.getSkillLevel(SkillFactory.getSkill(Aran.COMBO_ABILITY));
         if (GameConstants.isAran(player.getJob().getId()) && (skillLevel > 0 || player.getJob().getId() == 2000)) {

src/main/java/net/server/channel/handlers/AutoAggroHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.life.MapleMonster;
@@ -31,7 +31,7 @@ import server.maps.MapleMap;
 public final class AutoAggroHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character player = c.getPlayer();
         if (player.isHidden()) return; // Don't auto aggro GM's in hide...
         

src/main/java/net/server/channel/handlers/AutoAssignHandler.java

@@ -21,7 +21,7 @@
  */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.processor.stat.AssignAPProcessor;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -33,7 +33,7 @@ import net.packet.InPacket;
 public class AutoAssignHandler extends AbstractPacketHandler {
     
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         AssignAPProcessor.APAutoAssignAction(p, c);
     }
 }

src/main/java/net/server/channel/handlers/BBSOperationHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.guild.GuildPackets;
@@ -40,7 +40,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
     }
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         if (c.getPlayer().getGuildId() < 1) {
             return;
         }
@@ -96,7 +96,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
         }
     }
 
-    private static void listBBSThreads(MapleClient c, int start) {
+    private static void listBBSThreads(Client c, int start) {
         try (Connection con = DatabaseConnection.getConnection();
              PreparedStatement ps = con.prepareStatement("SELECT * FROM bbs_threads WHERE guildid = ? ORDER BY localthreadid DESC",
                      ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY)) {
@@ -110,7 +110,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
         }
     }
 
-    private static void newBBSReply(MapleClient c, int localthreadid, String text) {
+    private static void newBBSReply(Client c, int localthreadid, String text) {
         if (c.getPlayer().getGuildId() <= 0) {
             return;
         }
@@ -148,7 +148,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
         }
     }
 
-    private static void editBBSThread(MapleClient client, String title, String text, int icon, int localthreadid) {
+    private static void editBBSThread(Client client, String title, String text, int icon, int localthreadid) {
         Character chr = client.getPlayer();
         if (chr.getGuildId() < 1) {
             return;
@@ -172,7 +172,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
         }
     }
 
-    private static void newBBSThread(MapleClient client, String title, String text, int icon, boolean bNotice) {
+    private static void newBBSThread(Client client, String title, String text, int icon, boolean bNotice) {
         Character chr = client.getPlayer();
         if (chr.getGuildId() <= 0) {
             return;
@@ -207,7 +207,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
 
     }
 
-    public static void deleteBBSThread(MapleClient client, int localthreadid) {
+    public static void deleteBBSThread(Client client, int localthreadid) {
         Character mc = client.getPlayer();
         if (mc.getGuildId() <= 0) {
             return;
@@ -247,7 +247,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
         }
     }
 
-    public static void deleteBBSReply(MapleClient client, int replyid) {
+    public static void deleteBBSReply(Client client, int replyid) {
         Character mc = client.getPlayer();
         if (mc.getGuildId() <= 0) {
             return;
@@ -288,11 +288,11 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
         }
     }
 
-    public static void displayThread(MapleClient client, int threadid) {
+    public static void displayThread(Client client, int threadid) {
         displayThread(client, threadid, true);
     }
 
-    public static void displayThread(MapleClient client, int threadid, boolean bIsThreadIdLocal) {
+    public static void displayThread(Client client, int threadid, boolean bIsThreadIdLocal) {
         Character mc = client.getPlayer();
         if (mc.getGuildId() <= 0) {
             return;

src/main/java/net/server/channel/handlers/BeholderHandler.java

@@ -21,7 +21,7 @@
  */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import constants.skills.DarkKnight;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -36,7 +36,7 @@ import java.util.Collection;
 public final class BeholderHandler extends AbstractPacketHandler {//Summon Skills noobs
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         //System.out.println(slea.toString());
         Collection<MapleSummon> summons = c.getPlayer().getSummonsValues();
         int oid = p.readInt();

src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java

@@ -52,7 +52,7 @@ public class BuddylistModifyHandler extends AbstractPacketHandler {
         }
     }
 
-    private void nextPendingRequest(MapleClient c) {
+    private void nextPendingRequest(Client c) {
         CharacterNameAndId pendingBuddyRequest = c.getPlayer().getBuddylist().pollPendingRequest();
         if (pendingBuddyRequest != null) {
             c.sendPacket(PacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName()));
@@ -77,7 +77,7 @@ public class BuddylistModifyHandler extends AbstractPacketHandler {
     }
 
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         int mode = p.readByte();
         Character player = c.getPlayer();
         BuddyList buddylist = player.getBuddylist();
@@ -202,7 +202,7 @@ public class BuddylistModifyHandler extends AbstractPacketHandler {
         }
     }
 
-    private void notifyRemoteChannel(MapleClient c, int remoteChannel, int otherCid, BuddyOperation operation) {
+    private void notifyRemoteChannel(Client c, int remoteChannel, int otherCid, BuddyOperation operation) {
         Character player = c.getPlayer();
         if (remoteChannel != -1) {
             c.getWorldServer().buddyChanged(otherCid, player.getId(), player.getName(), c.getChannel(), operation);

src/main/java/net/server/channel/handlers/CancelBuffHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.SkillFactory;
 import constants.skills.*;
 import net.AbstractPacketHandler;
@@ -32,7 +32,7 @@ import tools.PacketCreator;
 public final class CancelBuffHandler extends AbstractPacketHandler implements PacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int sourceid = p.readInt();
         
         switch (sourceid) {

src/main/java/net/server/channel/handlers/CancelChairHandler.java

@@ -22,14 +22,14 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 public final class CancelChairHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int id = p.readShort();
         Character mc = c.getPlayer();
         

src/main/java/net/server/channel/handlers/CancelDebuffHandler.java

@@ -21,14 +21,14 @@
  */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 public final class CancelDebuffHandler extends AbstractPacketHandler {//TIP: BAD STUFF LOL!
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         /*List<MapleDisease> diseases = c.getPlayer().getDiseases();
          List<MapleDisease> diseases_ = new ArrayList<MapleDisease>();
          for (MapleDisease disease : diseases) {

src/main/java/net/server/channel/handlers/CancelItemEffectHandler.java

@@ -21,7 +21,7 @@
  */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.MapleItemInformationProvider;
@@ -29,7 +29,7 @@ import server.MapleItemInformationProvider;
 public final class CancelItemEffectHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int itemId = -p.readInt();
         if (MapleItemInformationProvider.getInstance().noCancelMouse(itemId)) {
             return;

src/main/java/net/server/channel/handlers/CashOperationHandler.java

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleRing;
 import client.inventory.Equip;
 import client.inventory.Inventory;
@@ -50,7 +50,7 @@ import java.util.Map;
 public final class CashOperationHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
         CashShop cs = chr.getCashShop();
         
@@ -472,7 +472,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
         }
     }
 
-    public static boolean checkBirthday(MapleClient c, int idate) {
+    public static boolean checkBirthday(Client c, int idate) {
         int year = idate / 10000;
         int month = (idate - year * 10000) / 100;
         int day = idate - year * 10000 - month * 100;

src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java

@@ -19,7 +19,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.inventory.Item;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -33,7 +33,7 @@ import tools.Pair;
  */
 public class CashShopSurpriseHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         CashShop cs = c.getPlayer().getCashShop();
         
         if(cs.isOpened()) {

src/main/java/net/server/channel/handlers/ChangeChannelHandler.java

@@ -21,7 +21,7 @@
  */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.autoban.AutobanFactory;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -34,7 +34,7 @@ import net.server.Server;
 public final class ChangeChannelHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int channel = p.readByte() + 1;
         p.readInt();
         c.getPlayer().getAutobanManager().setTimestamp(6, Server.getInstance().getCurrentTimestamp(), 3);

src/main/java/net/server/channel/handlers/ChangeMapHandler.java

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.inventory.InventoryType;
 import client.inventory.manipulator.InventoryManipulator;
 import net.AbstractPacketHandler;
@@ -41,7 +41,7 @@ import java.util.Calendar;
 public final class ChangeMapHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
 
         if (chr.isChangingMaps() || chr.isBanned()) {

src/main/java/net/server/channel/handlers/ChangeMapSpecialHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.MapleTrade;
@@ -31,7 +31,7 @@ import tools.PacketCreator;
 
 public final class ChangeMapSpecialHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
             p.readByte();
             String startwp = p.readString();
             p.readShort();

src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.MapleMapObject;
@@ -31,7 +31,7 @@ import tools.PacketCreator;
 public final class CharInfoRequestHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         p.skip(4);
         int cid = p.readInt();
         MapleMapObject target = c.getPlayer().getMap().getMapObject(cid);

src/main/java/net/server/channel/handlers/ClickGuideHandler.java

@@ -22,7 +22,7 @@
 
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.MapleJob;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -34,7 +34,7 @@ import scripting.npc.NPCScriptManager;
  */
 public class ClickGuideHandler extends AbstractPacketHandler {
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         if (c.getPlayer().getJob().equals(MapleJob.NOBLESSE)) {
             NPCScriptManager.getInstance().start(c, 1101008, null);
         } else {

src/main/java/net/server/channel/handlers/CloseChalkboardHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
@@ -33,7 +33,7 @@ import tools.PacketCreator;
 public final class CloseChalkboardHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         c.getPlayer().setChalkboard(null);
         c.getPlayer().getMap().broadcastMessage(PacketCreator.useChalkboard(c.getPlayer(), true));
     }

src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java

@@ -38,7 +38,7 @@ import java.util.List;
 public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
         
         /*long timeElapsed = currentServerTime() - chr.getAutobanManager().getLastSpam(8);

src/main/java/net/server/channel/handlers/CoconutHandler.java

@@ -22,7 +22,7 @@
 
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.events.gm.MapleCoconut;
@@ -35,7 +35,7 @@ import tools.PacketCreator;
  * @author kevintjuh93
  */
 public final class CoconutHandler extends AbstractPacketHandler {
-	public final void handlePacket(InPacket p, MapleClient c) {
+	public final void handlePacket(InPacket p, Client c) {
 		/*CB 00 A6 00 06 01
 		 * A6 00 = coconut id
 		 * 06 01 = ?

src/main/java/net/server/channel/handlers/CouponCodeHandler.java

@@ -24,7 +24,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.inventory.Item;
 import client.inventory.manipulator.InventoryManipulator;
 import net.AbstractPacketHandler;
@@ -112,7 +112,7 @@ public final class CouponCodeHandler extends AbstractPacketHandler {
     }
     
     private static Pair<Integer, List<Pair<Integer, Pair<Integer, Integer>>>> getNXCodeResult(Character chr, String code) {
-        MapleClient c = chr.getClient();
+        Client c = chr.getClient();
         List<Pair<Integer, Pair<Integer, Integer>>> ret = new LinkedList<>();
         try {
             if (!c.attemptCsCoupon()) {
@@ -179,7 +179,7 @@ public final class CouponCodeHandler extends AbstractPacketHandler {
     }
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         p.skip(2);
         String code = p.readString();
         

src/main/java/net/server/channel/handlers/DamageSummonHandler.java

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 
 import client.BuffStat;
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.MapleMapObject;
@@ -32,7 +32,7 @@ import tools.PacketCreator;
 
 public final class DamageSummonHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int oid = p.readInt();
         p.skip(1);   // -1
         int damage = p.readInt();

src/main/java/net/server/channel/handlers/DenyAllianceRequestHandler.java

@@ -20,7 +20,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.guild.MapleAlliance;
@@ -31,7 +31,7 @@ import net.server.guild.MapleAlliance;
 public final class DenyAllianceRequestHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         p.readByte();
         String inviterName = p.readString();
         String guildName = p.readString();

src/main/java/net/server/channel/handlers/DenyGuildRequestHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.guild.MapleGuild;
@@ -34,7 +34,7 @@ import net.server.guild.MapleGuild;
 public final class DenyGuildRequestHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         p.readByte();
         Character cfrom = c.getWorldServer().getPlayerStorage().getCharacterByName(p.readString());
         if (cfrom != null) {

src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.coordinator.world.MapleInviteCoordinator;
@@ -33,7 +33,7 @@ import tools.PacketCreator;
 public final class DenyPartyRequestHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         p.readByte();
         String[] cname = p.readString().split("PS: ");
         

src/main/java/net/server/channel/handlers/DistributeAPHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.processor.stat.AssignAPProcessor;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -29,7 +29,7 @@ import net.packet.InPacket;
 public final class DistributeAPHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         p.readInt();
         int num = p.readInt();
         

src/main/java/net/server/channel/handlers/DistributeSPHandler.java

@@ -21,14 +21,14 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.processor.stat.AssignSPProcessor;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 public final class DistributeSPHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         p.readInt();
         int skillid = p.readInt();
         

src/main/java/net/server/channel/handlers/DoorHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.MapleDoorObject;
@@ -35,7 +35,7 @@ import tools.PacketCreator;
  */
 public final class DoorHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int ownerid = p.readInt();
         p.readByte(); // specifies if backwarp or not, 1 town to target, 0 target to town
         

src/main/java/net/server/channel/handlers/DueyHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.processor.npc.DueyProcessor;
 import config.YamlConfig;
 import net.AbstractPacketHandler;
@@ -31,7 +31,7 @@ import tools.PacketCreator;
 public final class DueyHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
     	if (!YamlConfig.config.server.USE_DUEY){
             c.sendPacket(PacketCreator.enableActions());
             return;

src/main/java/net/server/channel/handlers/EnterCashShopHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
@@ -35,7 +35,7 @@ import tools.PacketCreator;
  */
 public class EnterCashShopHandler extends AbstractPacketHandler {
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         try {
             Character mc = c.getPlayer();
 

src/main/java/net/server/channel/handlers/EnterMTSHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.inventory.Equip;
 import client.inventory.Item;
 import client.processor.action.BuybackProcessor;
@@ -46,7 +46,7 @@ import java.util.List;
 
 public final class EnterMTSHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
         
         if(!chr.isAlive() && YamlConfig.config.server.USE_BUYBACK_SYSTEM) {

src/main/java/net/server/channel/handlers/FaceExpressionHandler.java

@@ -22,14 +22,14 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import constants.inventory.ItemConstants;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 public final class FaceExpressionHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
         int emote = p.readInt();
         

src/main/java/net/server/channel/handlers/FamilyAddHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import config.YamlConfig;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -37,7 +37,7 @@ import tools.PacketCreator;
  */
 public final class FamilyAddHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
             return;
         }

src/main/java/net/server/channel/handlers/FamilyPreceptsHandler.java

@@ -1,6 +1,6 @@
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.MapleFamily;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -9,7 +9,7 @@ import tools.PacketCreator;
 public class FamilyPreceptsHandler extends AbstractPacketHandler {
 
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         MapleFamily family = c.getPlayer().getFamily();
         if(family == null) return;
         if(family.getLeader().getChr() != c.getPlayer()) return; //only the leader can set the precepts

src/main/java/net/server/channel/handlers/FamilySeparateHandler.java

@@ -19,7 +19,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.MapleFamily;
 import client.MapleFamilyEntry;
 import config.YamlConfig;
@@ -30,7 +30,7 @@ import tools.PacketCreator;
 public class FamilySeparateHandler extends AbstractPacketHandler {
 
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
         MapleFamily oldFamily = c.getPlayer().getFamily();
         if(oldFamily == null) return;

src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java

@@ -1,7 +1,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleFamilyEntitlement;
 import client.MapleFamilyEntry;
 import config.YamlConfig;
@@ -17,7 +17,7 @@ import tools.PacketCreator;
 public class FamilySummonResponseHandler extends AbstractPacketHandler {
 
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
         p.readString(); //family name
         boolean accept = p.readByte() != 0;

src/main/java/net/server/channel/handlers/FamilyUseHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleFamilyEntitlement;
 import client.MapleFamilyEntry;
 import config.YamlConfig;
@@ -41,7 +41,7 @@ import tools.PacketCreator;
  */
 public final class FamilyUseHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
             return;
         }

src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java

@@ -20,7 +20,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import constants.game.GameConstants;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -33,7 +33,7 @@ import tools.PacketCreator;
 public class FieldDamageMobHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int mobOid = p.readInt();    // packet structure found thanks to Darter (Rajan)
         int dmg = p.readInt();
         

src/main/java/net/server/channel/handlers/FredrickHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.processor.npc.FredrickProcessor;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -34,7 +34,7 @@ import net.packet.InPacket;
 public class FredrickHandler extends AbstractPacketHandler {
 
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
         byte operation = p.readByte();
 

src/main/java/net/server/channel/handlers/GeneralChatHandler.java

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.autoban.AutobanFactory;
 import client.command.CommandsExecutor;
 import config.YamlConfig;
@@ -34,7 +34,7 @@ import tools.PacketCreator;
 
 public final class GeneralChatHandler extends AbstractPacketHandler {
 	@Override
-        public final void handlePacket(InPacket p, MapleClient c) {
+        public final void handlePacket(InPacket p, Client c) {
                 String s = p.readString();
                 Character chr = c.getPlayer();
                 if(chr.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {

src/main/java/net/server/channel/handlers/GiveFameHandler.java

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 
 import client.Character;
 import client.Character.FameStatus;
-import client.MapleClient;
+import client.Client;
 import client.autoban.AutobanFactory;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -33,7 +33,7 @@ import tools.PacketCreator;
 public final class GiveFameHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character target = (Character) c.getPlayer().getMap().getMapObject(p.readInt());
         int mode = p.readByte();
         int famechange = 2 * mode - 1;

src/main/java/net/server/channel/handlers/GrenadeEffectHandler.java

@@ -20,7 +20,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import constants.skills.Gunslinger;
 import constants.skills.NightWalker;
 import net.AbstractPacketHandler;
@@ -36,7 +36,7 @@ import java.awt.*;
 public class GrenadeEffectHandler extends AbstractPacketHandler {
  
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
         Point position = new Point(p.readInt(), p.readInt());
         int keyDown = p.readInt();

src/main/java/net/server/channel/handlers/GuildOperationHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import config.YamlConfig;
 import constants.game.GameConstants;
 import net.AbstractPacketHandler;
@@ -54,7 +54,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
     }
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character mc = c.getPlayer();
         byte type = p.readByte();
         int allianceId = -1;

src/main/java/net/server/channel/handlers/HealOvertimeHandler.java

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.autoban.AutobanFactory;
 import client.autoban.AutobanManager;
 import net.AbstractPacketHandler;
@@ -33,7 +33,7 @@ import tools.PacketCreator;
 
 public final class HealOvertimeHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
         if(!chr.isLoggedinWorld()) return;
         

src/main/java/net/server/channel/handlers/HiredMerchantRequest.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.inventory.ItemFactory;
 import constants.game.GameConstants;
 import net.AbstractPacketHandler;
@@ -43,7 +43,7 @@ import java.util.Arrays;
  */
 public final class HiredMerchantRequest extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
         
         try {

src/main/java/net/server/channel/handlers/InnerPortalHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
@@ -31,6 +31,6 @@ import net.packet.InPacket;
  */
 public final class InnerPortalHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
     }
 }

src/main/java/net/server/channel/handlers/InventoryMergeHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.inventory.Inventory;
 import client.inventory.InventoryType;
 import client.inventory.Item;
@@ -37,7 +37,7 @@ import tools.PacketCreator;
 public final class InventoryMergeHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
         p.readInt();
         chr.getAutobanManager().setTimestamp(2, Server.getInstance().getCurrentTimestamp(), 4);

src/main/java/net/server/channel/handlers/InventorySortHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.inventory.*;
 import config.YamlConfig;
 import net.AbstractPacketHandler;
@@ -261,7 +261,7 @@ class PairedQuicksort {
 
 public final class InventorySortHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
         p.readInt();
         chr.getAutobanManager().setTimestamp(3, Server.getInstance().getCurrentTimestamp(), 4);

src/main/java/net/server/channel/handlers/ItemMoveHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.inventory.InventoryType;
 import client.inventory.manipulator.InventoryManipulator;
 import net.AbstractPacketHandler;
@@ -34,7 +34,7 @@ import tools.PacketCreator;
  */
 public final class ItemMoveHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         p.skip(4);
         if(c.getPlayer().getAutobanManager().getLastSpam(6) + 300 > currentServerTime()) {
             c.sendPacket(PacketCreator.enableActions());

src/main/java/net/server/channel/handlers/ItemPickupHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.MapleMapObject;
@@ -38,7 +38,7 @@ import java.awt.*;
 public final class ItemPickupHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(final InPacket p, final MapleClient c) {
+    public final void handlePacket(final InPacket p, final Client c) {
         p.readInt(); //Timestamp
         p.readByte();
         p.readPos(); //cpos

src/main/java/net/server/channel/handlers/ItemRewardHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.inventory.InventoryType;
 import client.inventory.Item;
 import client.inventory.manipulator.InventoryManipulator;
@@ -43,7 +43,7 @@ import java.util.List;
  */
 public final class ItemRewardHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         byte slot = (byte) p.readShort();
         int itemId = p.readInt(); // will load from xml I don't care.
         

src/main/java/net/server/channel/handlers/KeymapChangeHandler.java

@@ -21,7 +21,7 @@
  */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.Skill;
 import client.SkillFactory;
 import client.inventory.InventoryType;
@@ -32,7 +32,7 @@ import net.packet.InPacket;
 
 public final class KeymapChangeHandler extends AbstractPacketHandler {
 	@Override
-	public final void handlePacket(InPacket p, MapleClient c) {
+	public final void handlePacket(InPacket p, Client c) {
                 if (p.available() >= 8) {
 			int mode = p.readInt();
 			if(mode == 0) {

src/main/java/net/server/channel/handlers/LeftKnockbackHandler.java

@@ -22,7 +22,7 @@
 
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
@@ -32,7 +32,7 @@ import tools.PacketCreator;
  * @author kevintjuh93
  */
 public class LeftKnockbackHandler extends AbstractPacketHandler {
-        public void handlePacket(InPacket p, final MapleClient c) {
+        public void handlePacket(InPacket p, final Client c) {
             c.sendPacket(PacketCreator.leftKnockBack());
             c.sendPacket(PacketCreator.enableActions());
         }

src/main/java/net/server/channel/handlers/MTSHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.inventory.Equip;
 import client.inventory.InventoryType;
 import client.inventory.Item;
@@ -50,7 +50,7 @@ import java.util.List;
 public final class MTSHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         // TODO add karma-to-untradeable flag on sold items here
         
         if (!c.getPlayer().getCashShop().isOpened()) {

src/main/java/net/server/channel/handlers/MagicDamageHandler.java

@@ -36,7 +36,7 @@ import tools.PacketCreator;
 
 public final class MagicDamageHandler extends AbstractDealDamageHandler {
 	@Override
-	public final void handlePacket(InPacket p, MapleClient c) {
+	public final void handlePacket(InPacket p, Client c) {
 		Character chr = c.getPlayer();
 
 		/*long timeElapsed = currentServerTime() - chr.getAutobanManager().getLastSpam(8);

src/main/java/net/server/channel/handlers/MakerSkillHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.processor.action.MakerProcessor;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -33,7 +33,7 @@ import net.packet.InPacket;
 public final class MakerSkillHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         MakerProcessor.makerAction(p, c);
     }
 }

src/main/java/net/server/channel/handlers/MesoDropHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
@@ -34,7 +34,7 @@ import tools.PacketCreator;
  */
 public final class MesoDropHandler extends AbstractPacketHandler {
         @Override
-        public final void handlePacket(InPacket p, MapleClient c) {
+        public final void handlePacket(InPacket p, Client c) {
             Character player = c.getPlayer();
             if (!player.isAlive()) {
                 c.sendPacket(PacketCreator.enableActions());

src/main/java/net/server/channel/handlers/MessengerHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.coordinator.world.MapleInviteCoordinator;
@@ -36,7 +36,7 @@ import tools.PacketCreator;
 
 public final class MessengerHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         if (c.tryacquireClient()) {
             try {
                 String input;

src/main/java/net/server/channel/handlers/MobBanishPlayerHandler.java

@@ -20,7 +20,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.life.MapleLifeFactory.BanishInfo;
@@ -29,7 +29,7 @@ import server.life.MapleMonster;
 public final class MobBanishPlayerHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int mobid = p.readInt();     // mob banish handling detected thanks to MedicOP
         
         Character chr = c.getPlayer();

src/main/java/net/server/channel/handlers/MobDamageMobFriendlyHandler.java

@@ -21,7 +21,7 @@
  */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import scripting.event.EventInstanceManager;
@@ -37,7 +37,7 @@ import tools.Randomizer;
 
 public final class MobDamageMobFriendlyHandler extends AbstractPacketHandler {
         @Override
-	public final void handlePacket(InPacket p, MapleClient c) {
+	public final void handlePacket(InPacket p, Client c) {
 		int attacker = p.readInt();
 		p.readInt();
 		int damaged = p.readInt();

src/main/java/net/server/channel/handlers/MobDamageMobHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.autoban.AutobanFactory;
 import client.status.MonsterStatus;
 import client.status.MonsterStatusEffect;
@@ -43,7 +43,7 @@ import java.util.Map;
  */
 public final class MobDamageMobHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int from = p.readInt();
         p.readInt();
         int to = p.readInt();

src/main/java/net/server/channel/handlers/MonsterBombHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.life.MapleMonster;
@@ -29,7 +29,7 @@ import tools.PacketCreator;
 
 public final class MonsterBombHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int oid = p.readInt();
         MapleMonster monster = c.getPlayer().getMap().getMonsterByOid(oid);
         if (!c.getPlayer().isAlive() || monster == null) {

src/main/java/net/server/channel/handlers/MonsterBookCoverHandler.java

@@ -21,13 +21,13 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
 
 public final class MonsterBookCoverHandler extends AbstractPacketHandler {
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int id = p.readInt();
         if (id == 0 || id / 10000 == 238) {
             c.getPlayer().setMonsterBookCover(id);

src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.MapleDisease;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -47,7 +47,7 @@ import java.util.List;
 public final class MonsterCarnivalHandler extends AbstractPacketHandler {
 
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         if (c.tryacquireClient()) {
             try {
                 try {

src/main/java/net/server/channel/handlers/MoveDragonHandler.java

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.packet.InPacket;
 import server.maps.MapleDragon;
 import tools.PacketCreator;
@@ -33,7 +33,7 @@ import java.awt.*;
 
 public class MoveDragonHandler extends AbstractMovementPacketHandler {
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {
+    public void handlePacket(InPacket p, Client c) {
         final Character chr = c.getPlayer();
         final Point startPos = new Point(p.readShort(), p.readShort());
         final MapleDragon dragon = chr.getDragon();

src/main/java/net/server/channel/handlers/MoveLifeHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import config.YamlConfig;
 import net.packet.InPacket;
 import server.life.MapleMonster;
@@ -49,7 +49,7 @@ import java.util.List;
 public final class MoveLifeHandler extends AbstractMovementPacketHandler {
         
 	@Override
-	public final void handlePacket(InPacket p, MapleClient c) {
+	public final void handlePacket(InPacket p, Client c) {
                 Character player = c.getPlayer();
                 MapleMap map = player.getMap();
                 

src/main/java/net/server/channel/handlers/MovePetHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.packet.InPacket;
 import server.movement.LifeMovementFragment;
 import tools.PacketCreator;
@@ -32,7 +32,7 @@ import java.util.List;
 
 public final class MovePetHandler extends AbstractMovementPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int petId = p.readInt();
         p.readLong();
 //        Point startPos = StreamUtil.readShortPoint(slea);

src/main/java/net/server/channel/handlers/MovePlayerHandler.java

@@ -21,14 +21,14 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.packet.InPacket;
 import tools.PacketCreator;
 import tools.exceptions.EmptyMovementException;
 
 public final class MovePlayerHandler extends AbstractMovementPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         p.skip(9);
         try {   // thanks Sa for noticing empty movement sequences crashing players
             int movementDataStart = p.getPosition();

src/main/java/net/server/channel/handlers/MoveSummonHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.packet.InPacket;
 import server.maps.MapleSummon;
 import tools.PacketCreator;
@@ -33,7 +33,7 @@ import java.util.Collection;
 
 public final class MoveSummonHandler extends AbstractMovementPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int oid = p.readInt();
         Point startPos = new Point(p.readShort(), p.readShort());
         Character player = c.getPlayer();

src/main/java/net/server/channel/handlers/MultiChatHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.autoban.AutobanFactory;
 import config.YamlConfig;
 import net.AbstractPacketHandler;
@@ -35,7 +35,7 @@ import tools.PacketCreator;
 
 public final class MultiChatHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character player = c.getPlayer();
         if(player.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
                 return;

src/main/java/net/server/channel/handlers/NPCAnimationHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.opcodes.SendOpcode;
 import net.packet.InPacket;
@@ -29,7 +29,7 @@ import net.packet.OutPacket;
 
 public final class NPCAnimationHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         if (c.getPlayer().isChangingMaps()) {   // possible cause of error 38 in some map transition scenarios, thanks Arnah
             return;
         }

src/main/java/net/server/channel/handlers/NPCMoreTalkHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import scripting.npc.NPCScriptManager;
@@ -33,7 +33,7 @@ import scripting.quest.QuestScriptManager;
  */
 public final class NPCMoreTalkHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         byte lastMsg = p.readByte(); // 00 (last msg type I think)
         byte action = p.readByte(); // 00 = end chat, 01 == follow
         if (lastMsg == 2) {

src/main/java/net/server/channel/handlers/NPCShopHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.autoban.AutobanFactory;
 import constants.inventory.ItemConstants;
 import net.AbstractPacketHandler;
@@ -33,7 +33,7 @@ import tools.FilePrinter;
  * @author Matze
  */
 public final class NPCShopHandler extends AbstractPacketHandler {
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         byte bmode = p.readByte();
         if (bmode == 0) { // mode 0 = buy :)
             short slot = p.readShort();// slot

src/main/java/net/server/channel/handlers/NPCTalkHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.processor.npc.DueyProcessor;
 import config.YamlConfig;
 import net.AbstractPacketHandler;
@@ -35,7 +35,7 @@ import tools.PacketCreator;
 
 public final class NPCTalkHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         if (!c.getPlayer().isAlive()) {
             c.sendPacket(PacketCreator.enableActions());
             return;

src/main/java/net/server/channel/handlers/NewYearCardHandler.java

@@ -20,7 +20,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.inventory.Item;
 import client.newyear.NewYearCardRecord;
 import constants.inventory.ItemConstants;
@@ -44,7 +44,7 @@ import java.sql.SQLException;
 public final class NewYearCardHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         final Character player = c.getPlayer();
         byte reqMode = p.readByte();                 //[00] -> NewYearReq (0 = Send)
         

src/main/java/net/server/channel/handlers/NoteActionHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.DatabaseConnection;
@@ -34,7 +34,7 @@ import java.sql.SQLException;
 
 public final class NoteActionHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int action = p.readByte();
         if (action == 0 && c.getPlayer().getCashShop().getAvailableNotes() > 0) {
             String charname = p.readString();

src/main/java/net/server/channel/handlers/OpenFamilyHandler.java

@@ -20,7 +20,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import config.YamlConfig;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -32,7 +32,7 @@ import tools.PacketCreator;
  */
 public final class OpenFamilyHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
         Character chr = c.getPlayer();
         c.sendPacket(PacketCreator.getFamilyInfo(chr.getFamilyEntry()));

src/main/java/net/server/channel/handlers/OpenFamilyPedigreeHandler.java

@@ -20,7 +20,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import config.YamlConfig;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -32,7 +32,7 @@ import tools.PacketCreator;
  */
 public final class OpenFamilyPedigreeHandler extends AbstractPacketHandler {
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
         Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(p.readString());
         if(target != null && target.getFamily() != null) {

src/main/java/net/server/channel/handlers/OwlWarpHandler.java

@@ -19,7 +19,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import constants.game.GameConstants;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -33,7 +33,7 @@ import tools.PacketCreator;
 public final class OwlWarpHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int ownerid = p.readInt();
         int mapid = p.readInt();
         

src/main/java/net/server/channel/handlers/PartyOperationHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import config.YamlConfig;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -41,7 +41,7 @@ import java.util.List;
 public final class PartyOperationHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int operation = p.readByte();
         Character player = c.getPlayer();
         World world = c.getWorldServer();

src/main/java/net/server/channel/handlers/PartySearchRegisterHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
@@ -32,5 +32,5 @@ import net.packet.InPacket;
 public class PartySearchRegisterHandler extends AbstractPacketHandler {
     
     @Override
-    public void handlePacket(InPacket p, MapleClient c) {}
+    public void handlePacket(InPacket p, Client c) {}
 }

src/main/java/net/server/channel/handlers/PartySearchStartHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.world.MapleParty;
@@ -37,7 +37,7 @@ import tools.PacketCreator;
  */
 public class PartySearchStartHandler extends AbstractPacketHandler {
         @Override
-	public void handlePacket(InPacket p, MapleClient c) {
+	public void handlePacket(InPacket p, Client c) {
             int min = p.readInt();
             int max = p.readInt();
 

src/main/java/net/server/channel/handlers/PartySearchUpdateHandler.java

@@ -21,14 +21,14 @@
  */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 public final class PartySearchUpdateHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         c.getWorldServer().getPartySearchCoordinator().unregisterPartyLeader(c.getPlayer());
     }
 }

src/main/java/net/server/channel/handlers/PetAutoPotHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.processor.action.PetAutopotProcessor;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
@@ -32,7 +32,7 @@ import server.MapleStatEffect;
 public final class PetAutoPotHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         p.readByte();
         p.readLong();
         p.readInt();

src/main/java/net/server/channel/handlers/PetChatHandler.java

@@ -21,7 +21,7 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
+import client.Client;
 import client.autoban.AutobanFactory;
 import config.YamlConfig;
 import net.AbstractPacketHandler;
@@ -33,7 +33,7 @@ import tools.PacketCreator;
 public final class PetChatHandler extends AbstractPacketHandler {
     
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         int petId = p.readInt();
         p.readInt();
         p.readByte();

src/main/java/net/server/channel/handlers/PetCommandHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.inventory.Pet;
 import client.inventory.PetCommand;
 import client.inventory.PetDataFactory;
@@ -34,7 +34,7 @@ import tools.Randomizer;
 public final class PetCommandHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
         int petId = p.readInt();
         byte petIndex = chr.getPetIndex(petId);

src/main/java/net/server/channel/handlers/PetExcludeItemsHandler.java

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.Character;
-import client.MapleClient;
+import client.Client;
 import client.autoban.AutobanFactory;
 import client.inventory.Pet;
 import net.AbstractPacketHandler;
@@ -35,7 +35,7 @@ import net.packet.InPacket;
 public final class PetExcludeItemsHandler extends AbstractPacketHandler {
 
     @Override
-    public final void handlePacket(InPacket p, MapleClient c) {
+    public final void handlePacket(InPacket p, Client c) {
         final int petId = p.readInt();
         p.skip(4); // timestamp