Remove "Maple" prefix from packet handler names

src/main/java/client/MapleClient.java

@@ -27,7 +27,7 @@ import constants.game.GameConstants;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.timeout.IdleStateEvent;
-import net.MaplePacketHandler;
+import net.PacketHandler;
 import net.PacketProcessor;
 import net.netty.InvalidPacketHeaderException;
 import net.packet.InPacket;
@@ -190,7 +190,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
         }
 
         short opcode = packet.readShort();
-        final MaplePacketHandler handler = packetProcessor.getHandler(opcode);
+        final PacketHandler handler = packetProcessor.getHandler(opcode);
 
         if (YamlConfig.config.server.USE_DEBUG_SHOW_RCVD_PACKET && !LoggingUtil.isIgnoredRecvPacket(opcode)) {
             log.debug("Received packet id {}", opcode);

src/main/java/client/command/commands/gm3/PeCommand.java

@@ -27,7 +27,7 @@ import client.MapleCharacter;
 import client.MapleClient;
 import client.command.Command;
 import io.netty.buffer.Unpooled;
-import net.MaplePacketHandler;
+import net.PacketHandler;
 import net.PacketProcessor;
 import net.packet.ByteBufInPacket;
 import net.packet.InPacket;
@@ -64,7 +64,7 @@ public class PeCommand extends Command {
         byte[] packetContent = HexTool.getByteArrayFromHexString(packet);
         InPacket inPacket = new ByteBufInPacket(Unpooled.wrappedBuffer(packetContent));
         short packetId = inPacket.readShort();
-        final MaplePacketHandler packetHandler = PacketProcessor.getProcessor(0, c.getChannel()).getHandler(packetId);
+        final PacketHandler packetHandler = PacketProcessor.getProcessor(0, c.getChannel()).getHandler(packetId);
         if (packetHandler != null && packetHandler.validateState(c)) {
             try {
                 player.yellowMessage("Receiving: " + packet);

src/main/java/net/AbstractPacketHandler.java

@@ -24,7 +24,7 @@ package net;
 import client.MapleClient;
 import net.server.Server;
 
-public abstract class AbstractMaplePacketHandler implements MaplePacketHandler {
+public abstract class AbstractPacketHandler implements PacketHandler {
     @Override
     public boolean validateState(MapleClient c) {
         return c.isLoggedIn();

src/main/java/net/PacketHandler.java

@@ -24,7 +24,7 @@ package net;
 import client.MapleClient;
 import net.packet.InPacket;
 
-public interface MaplePacketHandler {
+public interface PacketHandler {
     void handlePacket(InPacket p, MapleClient c);
     boolean validateState(MapleClient c);
 }

src/main/java/net/PacketProcessor.java

@@ -35,7 +35,7 @@ import java.util.Map;
 public final class PacketProcessor {
 
     private final static Map<String, PacketProcessor> instances = new LinkedHashMap<>();
-    private MaplePacketHandler[] handlers;
+    private PacketHandler[] handlers;
 
     private PacketProcessor() {
         int maxRecvOp = 0;
@@ -44,7 +44,7 @@ public final class PacketProcessor {
                 maxRecvOp = op.getValue();
             }
         }
-        handlers = new MaplePacketHandler[maxRecvOp + 1];
+        handlers = new PacketHandler[maxRecvOp + 1];
     }
 
     public static PacketProcessor getLoginServerProcessor() {
@@ -55,18 +55,18 @@ public final class PacketProcessor {
         return getProcessor(world, channel);
     }
 
-    public MaplePacketHandler getHandler(short packetId) {
+    public PacketHandler getHandler(short packetId) {
         if (packetId > handlers.length) {
             return null;
         }
-        MaplePacketHandler handler = handlers[packetId];
+        PacketHandler handler = handlers[packetId];
         if (handler != null) {
             return handler;
         }
         return null;
     }
 
-    public void registerHandler(RecvOpcode code, MaplePacketHandler handler) {
+    public void registerHandler(RecvOpcode code, PacketHandler handler) {
         try {
             handlers[code.getValue()] = handler;
         } catch (ArrayIndexOutOfBoundsException e) {
@@ -87,7 +87,7 @@ public final class PacketProcessor {
     }
 
     public void reset(int channel) {
-        handlers = new MaplePacketHandler[handlers.length];
+        handlers = new PacketHandler[handlers.length];
 
         registerCommonHandlers();
 

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

@@ -28,7 +28,7 @@ import client.status.MonsterStatusEffect;
 import config.YamlConfig;
 import constants.game.GameConstants;
 import constants.skills.*;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.PlayerBuffValueHolder;
 import scripting.AbstractPlayerInteraction;
@@ -47,7 +47,7 @@ import java.awt.*;
 import java.util.List;
 import java.util.*;
 
-public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandler {
+public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
 
     public static class AttackInfo {
 

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

@@ -21,7 +21,7 @@
  */
 package net.server.channel.handlers;
 
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.AnimatedMapleMapObject;
 import server.movement.*;
@@ -31,7 +31,7 @@ import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
-public abstract class AbstractMovementPacketHandler extends AbstractMaplePacketHandler {
+public abstract class AbstractMovementPacketHandler extends AbstractPacketHandler {
 
     protected List<LifeMovementFragment> parseMovement(InPacket p) throws EmptyMovementException {
         List<LifeMovementFragment> res = new ArrayList<>();

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

@@ -26,7 +26,7 @@ import client.MapleClient;
 import client.MapleFamily;
 import client.MapleFamilyEntry;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.coordinator.world.MapleInviteCoordinator;
 import net.server.coordinator.world.MapleInviteCoordinator.InviteResult;
@@ -45,7 +45,7 @@ import java.sql.SQLException;
  * @author Jay Estrella
  * @author Ubaware
  */
-public final class AcceptFamilyHandler extends AbstractMaplePacketHandler {
+public final class AcceptFamilyHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -2,7 +2,7 @@ package net.server.channel.handlers;
 
 import client.MapleClient;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.packet.Packet;
 import tools.LogHelper;
@@ -12,7 +12,7 @@ import tools.PacketCreator;
  *
  * @author kevintjuh93
  */
-public class AdminChatHandler extends AbstractMaplePacketHandler {
+public class AdminChatHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -26,7 +26,7 @@ import client.MapleClient;
 import client.inventory.MapleInventory;
 import client.inventory.MapleInventoryType;
 import client.inventory.manipulator.MapleInventoryManipulator;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.MapleItemInformationProvider;
 import server.life.MapleLifeFactory;
@@ -40,7 +40,7 @@ import tools.Randomizer;
 import java.util.Arrays;
 import java.util.List;
 
-public final class AdminCommandHandler extends AbstractMaplePacketHandler {
+public final class AdminCommandHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -22,10 +22,10 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
-public final class AdminLogHandler extends AbstractMaplePacketHandler {
+public final class AdminLogHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import net.server.guild.GuildPackets;
@@ -36,7 +36,7 @@ import tools.PacketCreator;
  *
  * @author XoticStory, Ronan
  */
-public final class AllianceOperationHandler extends AbstractMaplePacketHandler {
+public final class AllianceOperationHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -26,10 +26,10 @@ import client.MapleClient;
 import client.SkillFactory;
 import constants.game.GameConstants;
 import constants.skills.Aran;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
-public class AranComboHandler extends AbstractMaplePacketHandler {
+public class AranComboHandler extends AbstractPacketHandler {
 
     @Override
     public void handlePacket(InPacket p, MapleClient c) {

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

@@ -21,14 +21,14 @@
  */
 package net.server.channel.handlers;
 
+import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.life.MapleMonster;
 import server.maps.MapleMap;
-import client.MapleCharacter;
 
-public final class AutoAggroHandler extends AbstractMaplePacketHandler {
+public final class AutoAggroHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,14 +23,14 @@ package net.server.channel.handlers;
 
 import client.MapleClient;
 import client.processor.stat.AssignAPProcessor;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 /**
  *
  * @author Generic, Ronan
  */
-public class AutoAssignHandler extends AbstractMaplePacketHandler {
+public class AutoAssignHandler extends AbstractPacketHandler {
     
     @Override
     public void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.guild.GuildPackets;
 import tools.DatabaseConnection;
@@ -33,7 +33,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-public final class BBSOperationHandler extends AbstractMaplePacketHandler {
+public final class BBSOperationHandler extends AbstractPacketHandler {
 
     private String correctLength(String in, int maxSize) {
         return in.length() > maxSize ? in.substring(0, maxSize) : in;

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

@@ -23,16 +23,17 @@ package net.server.channel.handlers;
 
 import client.MapleClient;
 import constants.skills.DarkKnight;
-import java.util.Collection;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.MapleSummon;
 
+import java.util.Collection;
+
 /**
  *
  * @author BubblesDev
  */
-public final class BeholderHandler extends AbstractMaplePacketHandler {//Summon Skills noobs
+public final class BeholderHandler extends AbstractPacketHandler {//Summon Skills noobs
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -24,7 +24,7 @@ package net.server.channel.handlers;
 import client.*;
 import client.BuddyList.BuddyAddResult;
 import client.BuddyList.BuddyOperation;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.world.World;
 import tools.DatabaseConnection;
@@ -37,7 +37,7 @@ import java.sql.SQLException;
 
 import static client.BuddyList.BuddyOperation.ADDED;
 
-public class BuddylistModifyHandler extends AbstractMaplePacketHandler {
+public class BuddylistModifyHandler extends AbstractPacketHandler {
     private static class CharacterIdNameBuddyCapacity extends CharacterNameAndId {
         private int buddyCapacity;
 

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

@@ -24,12 +24,12 @@ package net.server.channel.handlers;
 import client.MapleClient;
 import client.SkillFactory;
 import constants.skills.*;
-import net.AbstractMaplePacketHandler;
-import net.MaplePacketHandler;
+import net.AbstractPacketHandler;
+import net.PacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
 
-public final class CancelBuffHandler extends AbstractMaplePacketHandler implements MaplePacketHandler {
+public final class CancelBuffHandler extends AbstractPacketHandler implements PacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -21,12 +21,12 @@
  */
 package net.server.channel.handlers;
 
-import client.MapleClient;
 import client.MapleCharacter;
-import net.AbstractMaplePacketHandler;
+import client.MapleClient;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
-public final class CancelChairHandler extends AbstractMaplePacketHandler {
+public final class CancelChairHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -22,10 +22,10 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
-public final class CancelDebuffHandler extends AbstractMaplePacketHandler {//TIP: BAD STUFF LOL!
+public final class CancelDebuffHandler extends AbstractPacketHandler {//TIP: BAD STUFF LOL!
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -22,11 +22,11 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.MapleItemInformationProvider;
 
-public final class CancelItemEffectHandler extends AbstractMaplePacketHandler {
+public final class CancelItemEffectHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -31,7 +31,7 @@ import client.inventory.MapleInventoryType;
 import client.inventory.manipulator.MapleInventoryManipulator;
 import config.YamlConfig;
 import constants.inventory.ItemConstants;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import server.CashShop;
@@ -47,7 +47,7 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
-public final class CashOperationHandler extends AbstractMaplePacketHandler {
+public final class CashOperationHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -21,7 +21,7 @@ package net.server.channel.handlers;
 
 import client.MapleClient;
 import client.inventory.Item;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.CashShop;
 import tools.PacketCreator;
@@ -31,7 +31,7 @@ import tools.Pair;
  *
  * @author RonanLana
  */
-public class CashShopSurpriseHandler extends AbstractMaplePacketHandler {
+public class CashShopSurpriseHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         CashShop cs = c.getPlayer().getCashShop();

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

@@ -21,17 +21,17 @@
  */
 package net.server.channel.handlers;
 
-import net.AbstractMaplePacketHandler;
-import net.packet.InPacket;
 import client.MapleClient;
 import client.autoban.AutobanFactory;
+import net.AbstractPacketHandler;
+import net.packet.InPacket;
 import net.server.Server;
 
 /**
  *
  * @author Matze
  */
-public final class ChangeChannelHandler extends AbstractMaplePacketHandler {
+public final class ChangeChannelHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -25,7 +25,7 @@ import client.MapleCharacter;
 import client.MapleClient;
 import client.inventory.MapleInventoryType;
 import client.inventory.manipulator.MapleInventoryManipulator;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.MapleTrade;
 import server.maps.MapleMap;
@@ -38,7 +38,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Calendar;
 
-public final class ChangeMapHandler extends AbstractMaplePacketHandler {
+public final class ChangeMapHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -22,14 +22,14 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.MapleTrade;
 import server.MapleTrade.TradeResult;
 import server.maps.MaplePortal;
 import tools.PacketCreator;
 
-public final class ChangeMapSpecialHandler extends AbstractMaplePacketHandler {
+public final class ChangeMapSpecialHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
             p.readByte();

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

@@ -23,12 +23,12 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.MapleMapObject;
 import tools.PacketCreator;
 
-public final class CharInfoRequestHandler extends AbstractMaplePacketHandler {
+public final class CharInfoRequestHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -24,7 +24,7 @@ package net.server.channel.handlers;
 
 import client.MapleClient;
 import client.MapleJob;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import scripting.npc.NPCScriptManager;
 
@@ -32,7 +32,7 @@ import scripting.npc.NPCScriptManager;
  *
  * @author kevintjuh93
  */
-public class ClickGuideHandler extends AbstractMaplePacketHandler {
+public class ClickGuideHandler extends AbstractPacketHandler {
     @Override
     public void handlePacket(InPacket p, MapleClient c) {
         if (c.getPlayer().getJob().equals(MapleJob.NOBLESSE)) {

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

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
 
@@ -30,7 +30,7 @@ import tools.PacketCreator;
  *
  * @author Xterminator
  */
-public final class CloseChalkboardHandler extends AbstractMaplePacketHandler {
+public final class CloseChalkboardHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

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

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

@@ -27,7 +27,7 @@ import client.MapleCharacter;
 import client.MapleClient;
 import client.inventory.Item;
 import client.inventory.manipulator.MapleInventoryManipulator;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import server.CashShop;
@@ -49,7 +49,7 @@ import java.util.Map.Entry;
  * @author Penguins (Acrylic)
  * @author Ronan (HeavenMS)
  */
-public final class CouponCodeHandler extends AbstractMaplePacketHandler {
+public final class CouponCodeHandler extends AbstractPacketHandler {
     
     private static List<Pair<Integer, Pair<Integer, Integer>>> getNXCodeItems(MapleCharacter chr, Connection con, int codeid) throws SQLException {
         Map<Integer, Integer> couponItems = new HashMap<>();

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

@@ -24,13 +24,13 @@ package net.server.channel.handlers;
 import client.MapleBuffStat;
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.MapleMapObject;
 import server.maps.MapleSummon;
 import tools.PacketCreator;
 
-public final class DamageSummonHandler extends AbstractMaplePacketHandler {
+public final class DamageSummonHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         int oid = p.readInt();

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

@@ -19,16 +19,16 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
 import client.MapleCharacter;
-import net.AbstractMaplePacketHandler;
+import client.MapleClient;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.guild.MapleAlliance;
 
 /**
  * @author Ronan
  */
-public final class DenyAllianceRequestHandler extends AbstractMaplePacketHandler {
+public final class DenyAllianceRequestHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.guild.MapleGuild;
 
@@ -31,7 +31,7 @@ import net.server.guild.MapleGuild;
  *
  * @author Xterminator
  */
-public final class DenyGuildRequestHandler extends AbstractMaplePacketHandler {
+public final class DenyGuildRequestHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,14 +23,14 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.coordinator.world.MapleInviteCoordinator;
 import net.server.coordinator.world.MapleInviteCoordinator.InviteResult;
 import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
 import tools.PacketCreator;
 
-public final class DenyPartyRequestHandler extends AbstractMaplePacketHandler {
+public final class DenyPartyRequestHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,10 +23,10 @@ package net.server.channel.handlers;
 
 import client.MapleClient;
 import client.processor.stat.AssignAPProcessor;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
-public final class DistributeAPHandler extends AbstractMaplePacketHandler {
+public final class DistributeAPHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,10 +23,10 @@ package net.server.channel.handlers;
 
 import client.MapleClient;
 import client.processor.stat.AssignSPProcessor;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
-public final class DistributeSPHandler extends AbstractMaplePacketHandler {
+public final class DistributeSPHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         p.readInt();

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

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.MapleDoorObject;
 import server.maps.MapleMapObject;
@@ -33,7 +33,7 @@ import tools.PacketCreator;
  *
  * @author Matze
  */
-public final class DoorHandler extends AbstractMaplePacketHandler {
+public final class DoorHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         int ownerid = p.readInt();

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

@@ -24,11 +24,11 @@ package net.server.channel.handlers;
 import client.MapleClient;
 import client.processor.npc.DueyProcessor;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
 
-public final class DueyHandler extends AbstractMaplePacketHandler {
+public final class DueyHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import server.maps.MapleMiniDungeonInfo;
@@ -33,7 +33,7 @@ import tools.PacketCreator;
  *
  * @author Flav
  */
-public class EnterCashShopHandler extends AbstractMaplePacketHandler {
+public class EnterCashShopHandler extends AbstractPacketHandler {
     @Override
     public void handlePacket(InPacket p, MapleClient c) {
         try {

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

@@ -27,7 +27,7 @@ import client.inventory.Equip;
 import client.inventory.Item;
 import client.processor.action.BuybackProcessor;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import server.MTSItemInfo;
@@ -44,7 +44,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public final class EnterMTSHandler extends AbstractMaplePacketHandler {
+public final class EnterMTSHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         MapleCharacter chr = c.getPlayer();

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

@@ -21,13 +21,13 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleClient;
 import client.MapleCharacter;
+import client.MapleClient;
 import constants.inventory.ItemConstants;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
-public final class FaceExpressionHandler extends AbstractMaplePacketHandler {
+public final class FaceExpressionHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         MapleCharacter chr = c.getPlayer();

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

@@ -24,7 +24,7 @@ package net.server.channel.handlers;
 import client.MapleCharacter;
 import client.MapleClient;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.coordinator.world.MapleInviteCoordinator;
 import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
@@ -35,7 +35,7 @@ import tools.PacketCreator;
  * @author Jay Estrella
  * @author Ubaware
  */
-public final class FamilyAddHandler extends AbstractMaplePacketHandler {
+public final class FamilyAddHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) {

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

@@ -2,11 +2,11 @@ package net.server.channel.handlers;
 
 import client.MapleClient;
 import client.MapleFamily;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
 
-public class FamilyPreceptsHandler extends AbstractMaplePacketHandler {
+public class FamilyPreceptsHandler extends AbstractPacketHandler {
 
     @Override
     public void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,11 +23,11 @@ import client.MapleClient;
 import client.MapleFamily;
 import client.MapleFamilyEntry;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
 
-public class FamilySeparateHandler extends AbstractMaplePacketHandler {
+public class FamilySeparateHandler extends AbstractPacketHandler {
 
     @Override
     public void handlePacket(InPacket p, MapleClient c) {

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

@@ -5,7 +5,7 @@ import client.MapleClient;
 import client.MapleFamilyEntitlement;
 import client.MapleFamilyEntry;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.coordinator.world.MapleInviteCoordinator;
 import net.server.coordinator.world.MapleInviteCoordinator.InviteResult;
@@ -14,7 +14,7 @@ import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult;
 import server.maps.MapleMap;
 import tools.PacketCreator;
 
-public class FamilySummonResponseHandler extends AbstractMaplePacketHandler {
+public class FamilySummonResponseHandler extends AbstractPacketHandler {
 
     @Override
     public void handlePacket(InPacket p, MapleClient c) {

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

@@ -26,7 +26,7 @@ import client.MapleClient;
 import client.MapleFamilyEntitlement;
 import client.MapleFamilyEntry;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.coordinator.world.MapleInviteCoordinator;
 import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
@@ -39,7 +39,7 @@ import tools.PacketCreator;
  * @author Moogra
  * @author Ubaware
  */
-public final class FamilyUseHandler extends AbstractMaplePacketHandler {
+public final class FamilyUseHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) {

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

@@ -22,7 +22,7 @@ package net.server.channel.handlers;
 import client.MapleCharacter;
 import client.MapleClient;
 import constants.game.GameConstants;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.life.MapleMonster;
 import server.life.MapleMonsterInformationProvider;
@@ -30,7 +30,7 @@ import server.maps.MapleMap;
 import tools.FilePrinter;
 import tools.PacketCreator;
 
-public class FieldDamageMobHandler extends AbstractMaplePacketHandler {
+public class FieldDamageMobHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -24,14 +24,14 @@ package net.server.channel.handlers;
 import client.MapleCharacter;
 import client.MapleClient;
 import client.processor.npc.FredrickProcessor;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 /**
  *
  * @author kevintjuh93
  */
-public class FredrickHandler extends AbstractMaplePacketHandler {
+public class FredrickHandler extends AbstractPacketHandler {
 
     @Override
     public void handlePacket(InPacket p, MapleClient c) {

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

@@ -26,13 +26,13 @@ import client.MapleClient;
 import client.autoban.AutobanFactory;
 import client.command.CommandsExecutor;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.FilePrinter;
 import tools.LogHelper;
 import tools.PacketCreator;
 
-public final class GeneralChatHandler extends AbstractMaplePacketHandler {    
+public final class GeneralChatHandler extends AbstractPacketHandler {
 	@Override
         public final void handlePacket(InPacket p, MapleClient c) {
                 String s = p.readString();

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

@@ -25,12 +25,12 @@ import client.MapleCharacter;
 import client.MapleCharacter.FameStatus;
 import client.MapleClient;
 import client.autoban.AutobanFactory;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.FilePrinter;
 import tools.PacketCreator;
 
-public final class GiveFameHandler extends AbstractMaplePacketHandler {
+public final class GiveFameHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,7 +23,7 @@ import client.MapleCharacter;
 import client.MapleClient;
 import constants.skills.Gunslinger;
 import constants.skills.NightWalker;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.FilePrinter;
 import tools.PacketCreator;
@@ -33,7 +33,7 @@ import java.awt.*;
 /*
  * @author GabrielSin
  */
-public class GrenadeEffectHandler extends AbstractMaplePacketHandler {
+public class GrenadeEffectHandler extends AbstractPacketHandler {
  
     @Override
     public void handlePacket(InPacket p, MapleClient c) {

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

@@ -25,7 +25,7 @@ import client.MapleCharacter;
 import client.MapleClient;
 import config.YamlConfig;
 import constants.game.GameConstants;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType;
@@ -40,7 +40,7 @@ import tools.PacketCreator;
 import java.util.HashSet;
 import java.util.Set;
 
-public final class GuildOperationHandler extends AbstractMaplePacketHandler {
+public final class GuildOperationHandler extends AbstractPacketHandler {
     private boolean isGuildNameAcceptable(String name) {
         if (name.length() < 3 || name.length() > 12) {
             return false;

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

@@ -25,13 +25,13 @@ import client.MapleCharacter;
 import client.MapleClient;
 import client.autoban.AutobanFactory;
 import client.autoban.AutobanManager;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import server.maps.MapleMap;
 import tools.PacketCreator;
 
-public final class HealOvertimeHandler extends AbstractMaplePacketHandler {
+public final class HealOvertimeHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         MapleCharacter chr = c.getPlayer();

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

@@ -25,7 +25,7 @@ import client.MapleCharacter;
 import client.MapleClient;
 import client.inventory.ItemFactory;
 import constants.game.GameConstants;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.MapleMapObject;
 import server.maps.MapleMapObjectType;
@@ -41,7 +41,7 @@ import java.util.Arrays;
  *
  * @author XoticStory
  */
-public final class HiredMerchantRequest extends AbstractMaplePacketHandler {
+public final class HiredMerchantRequest extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         MapleCharacter chr = c.getPlayer();

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

@@ -22,14 +22,14 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 /**
  *
  * @author BubblesDev
  */
-public final class InnerPortalHandler extends AbstractMaplePacketHandler {
+public final class InnerPortalHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
     }

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

@@ -28,13 +28,13 @@ import client.inventory.MapleInventory;
 import client.inventory.MapleInventoryType;
 import client.inventory.manipulator.MapleInventoryManipulator;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import server.MapleItemInformationProvider;
 import tools.PacketCreator;
 
-public final class InventoryMergeHandler extends AbstractMaplePacketHandler {
+public final class InventoryMergeHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -25,7 +25,7 @@ import client.MapleCharacter;
 import client.MapleClient;
 import client.inventory.*;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import server.MapleItemInformationProvider;
@@ -259,7 +259,7 @@ class PairedQuicksort {
     }
 }
 
-public final class InventorySortHandler extends AbstractMaplePacketHandler {
+public final class InventorySortHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         MapleCharacter chr = c.getPlayer();

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

@@ -24,7 +24,7 @@ package net.server.channel.handlers;
 import client.MapleClient;
 import client.inventory.MapleInventoryType;
 import client.inventory.manipulator.MapleInventoryManipulator;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
 
@@ -32,7 +32,7 @@ import tools.PacketCreator;
  *
  * @author Matze
  */
-public final class ItemMoveHandler extends AbstractMaplePacketHandler {
+public final class ItemMoveHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         p.skip(4);

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

@@ -21,20 +21,21 @@
  */
 package net.server.channel.handlers;
 
-import net.AbstractMaplePacketHandler;
-import net.packet.InPacket;
-import server.maps.MapleMapObject;
 import client.MapleCharacter;
 import client.MapleClient;
-import java.awt.Point;
+import net.AbstractPacketHandler;
+import net.packet.InPacket;
+import server.maps.MapleMapObject;
 import tools.FilePrinter;
 
+import java.awt.*;
+
 /**
  *
  * @author Matze
  * @author Ronan
  */
-public final class ItemPickupHandler extends AbstractMaplePacketHandler {
+public final class ItemPickupHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(final InPacket p, final MapleClient c) {

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

@@ -26,7 +26,7 @@ import client.inventory.Item;
 import client.inventory.MapleInventoryType;
 import client.inventory.manipulator.MapleInventoryManipulator;
 import constants.inventory.ItemConstants;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import server.MapleItemInformationProvider;
@@ -41,7 +41,7 @@ import java.util.List;
  * @author Jay Estrella
  * @author kevintjuh93
  */
-public final class ItemRewardHandler extends AbstractMaplePacketHandler {
+public final class ItemRewardHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         byte slot = (byte) p.readShort();

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

@@ -21,16 +21,16 @@
  */
 package net.server.channel.handlers;
 
-import constants.game.GameConstants;
 import client.MapleClient;
-import client.keybind.MapleKeyBinding;
 import client.Skill;
 import client.SkillFactory;
 import client.inventory.MapleInventoryType;
-import net.AbstractMaplePacketHandler;
+import client.keybind.MapleKeyBinding;
+import constants.game.GameConstants;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
-public final class KeymapChangeHandler extends AbstractMaplePacketHandler {
+public final class KeymapChangeHandler extends AbstractPacketHandler {
 	@Override
 	public final void handlePacket(InPacket p, MapleClient c) {
                 if (p.available() >= 8) {

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

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

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

@@ -28,7 +28,7 @@ import client.inventory.Item;
 import client.inventory.MapleInventoryType;
 import client.inventory.manipulator.MapleInventoryManipulator;
 import constants.inventory.ItemConstants;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.packet.Packet;
 import net.server.Server;
@@ -47,7 +47,7 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
-public final class MTSHandler extends AbstractMaplePacketHandler {
+public final class MTSHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,14 +23,14 @@ package net.server.channel.handlers;
 
 import client.MapleClient;
 import client.processor.action.MakerProcessor;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 /**
  *
  * @author Jay Estrella, Ronan
  */
-public final class MakerSkillHandler extends AbstractMaplePacketHandler {
+public final class MakerSkillHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
 
@@ -32,7 +32,7 @@ import tools.PacketCreator;
  * @author Matze
  * @author Ronan - concurrency protection
  */
-public final class MesoDropHandler extends AbstractMaplePacketHandler {
+public final class MesoDropHandler extends AbstractPacketHandler {
         @Override
         public final void handlePacket(InPacket p, MapleClient c) {
             MapleCharacter player = c.getPlayer();

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

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.coordinator.world.MapleInviteCoordinator;
 import net.server.coordinator.world.MapleInviteCoordinator.InviteResult;
@@ -34,7 +34,7 @@ import net.server.world.MapleMessengerCharacter;
 import net.server.world.World;
 import tools.PacketCreator;
 
-public final class MessengerHandler extends AbstractMaplePacketHandler {
+public final class MessengerHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         if (c.tryacquireClient()) {

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

@@ -21,12 +21,12 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
-import server.life.MapleMonster;
 import server.life.MapleLifeFactory.BanishInfo;
-import net.AbstractMaplePacketHandler;
+import server.life.MapleMonster;
 
-public final class MobBanishPlayerHandler extends AbstractMaplePacketHandler {
+public final class MobBanishPlayerHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import scripting.event.EventInstanceManager;
 import server.life.MapleMonster;
@@ -35,7 +35,7 @@ import tools.Randomizer;
  * @author Xotic (XoticStory) & BubblesDev
  */
 
-public final class MobDamageMobFriendlyHandler extends AbstractMaplePacketHandler {
+public final class MobDamageMobFriendlyHandler extends AbstractPacketHandler {
         @Override
 	public final void handlePacket(InPacket p, MapleClient c) {
 		int attacker = p.readInt();

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

@@ -26,7 +26,7 @@ import client.MapleClient;
 import client.autoban.AutobanFactory;
 import client.status.MonsterStatus;
 import client.status.MonsterStatusEffect;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.life.MapleMonster;
 import server.life.MapleMonsterInformationProvider;
@@ -41,7 +41,7 @@ import java.util.Map;
  * @author Jay Estrella
  * @author Ronan
  */
-public final class MobDamageMobHandler extends AbstractMaplePacketHandler {
+public final class MobDamageMobHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         int from = p.readInt();

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

@@ -22,12 +22,12 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.life.MapleMonster;
 import tools.PacketCreator;
 
-public final class MonsterBombHandler extends AbstractMaplePacketHandler {
+public final class MonsterBombHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         int oid = p.readInt();

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

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

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

@@ -24,7 +24,7 @@ package net.server.channel.handlers;
 import client.MapleCharacter;
 import client.MapleClient;
 import client.MapleDisease;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.world.MapleParty;
 import net.server.world.MaplePartyCharacter;
@@ -44,7 +44,7 @@ import java.util.List;
     *@author Drago (Dragohe4rt)
 */
 
-public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler {
+public final class MonsterCarnivalHandler extends AbstractPacketHandler {
 
     @Override
     public void handlePacket(InPacket p, MapleClient c) {

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

@@ -25,7 +25,7 @@ import client.MapleCharacter;
 import client.MapleClient;
 import client.autoban.AutobanFactory;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import net.server.world.World;
@@ -33,7 +33,7 @@ import tools.FilePrinter;
 import tools.LogHelper;
 import tools.PacketCreator;
 
-public final class MultiChatHandler extends AbstractMaplePacketHandler {
+public final class MultiChatHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         MapleCharacter player = c.getPlayer();

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

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

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

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import scripting.npc.NPCScriptManager;
 import scripting.quest.QuestScriptManager;
@@ -31,7 +31,7 @@ import scripting.quest.QuestScriptManager;
  *
  * @author Matze
  */
-public final class NPCMoreTalkHandler extends AbstractMaplePacketHandler {
+public final class NPCMoreTalkHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         byte lastMsg = p.readByte(); // 00 (last msg type I think)

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

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

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

@@ -24,7 +24,7 @@ package net.server.channel.handlers;
 import client.MapleClient;
 import client.processor.npc.DueyProcessor;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import scripting.npc.NPCScriptManager;
 import server.life.MapleNPC;
@@ -33,7 +33,7 @@ import server.maps.MapleMapObject;
 import tools.FilePrinter;
 import tools.PacketCreator;
 
-public final class NPCTalkHandler extends AbstractMaplePacketHandler {
+public final class NPCTalkHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         if (!c.getPlayer().isAlive()) {

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

@@ -24,7 +24,7 @@ import client.MapleClient;
 import client.inventory.Item;
 import client.newyear.NewYearCardRecord;
 import constants.inventory.ItemConstants;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import tools.DatabaseConnection;
@@ -41,7 +41,7 @@ import java.sql.SQLException;
  * 
  * Header layout thanks to Eric 
  */
-public final class NewYearCardHandler extends AbstractMaplePacketHandler {
+public final class NewYearCardHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -22,7 +22,7 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.DatabaseConnection;
 import tools.PacketCreator;
@@ -32,7 +32,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-public final class NoteActionHandler extends AbstractMaplePacketHandler {
+public final class NoteActionHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         int action = p.readByte();

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

@@ -22,7 +22,7 @@ package net.server.channel.handlers;
 import client.MapleCharacter;
 import client.MapleClient;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
 
@@ -30,7 +30,7 @@ import tools.PacketCreator;
  *
  * @author Ubaware
  */
-public final class OpenFamilyHandler extends AbstractMaplePacketHandler {
+public final class OpenFamilyHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;

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

@@ -22,7 +22,7 @@ package net.server.channel.handlers;
 import client.MapleCharacter;
 import client.MapleClient;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
 
@@ -30,7 +30,7 @@ import tools.PacketCreator;
  *
  * @author Ubaware
  */
-public final class OpenFamilyPedigreeHandler extends AbstractMaplePacketHandler {
+public final class OpenFamilyPedigreeHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;

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

@@ -21,7 +21,7 @@ package net.server.channel.handlers;
 
 import client.MapleClient;
 import constants.game.GameConstants;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.MapleHiredMerchant;
 import server.maps.MaplePlayerShop;
@@ -30,7 +30,7 @@ import tools.PacketCreator;
 /*
  * @author Ronan
  */
-public final class OwlWarpHandler extends AbstractMaplePacketHandler {
+public final class OwlWarpHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -24,7 +24,7 @@ package net.server.channel.handlers;
 import client.MapleCharacter;
 import client.MapleClient;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.coordinator.world.MapleInviteCoordinator;
 import net.server.coordinator.world.MapleInviteCoordinator.InviteResult;
@@ -38,7 +38,7 @@ import tools.PacketCreator;
 
 import java.util.List;
 
-public final class PartyOperationHandler extends AbstractMaplePacketHandler {
+public final class PartyOperationHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

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

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

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.world.MapleParty;
 import net.server.world.World;
@@ -35,7 +35,7 @@ import tools.PacketCreator;
  * @author BubblesDev
  * @author Ronan
  */
-public class PartySearchStartHandler extends AbstractMaplePacketHandler {
+public class PartySearchStartHandler extends AbstractPacketHandler {
         @Override
 	public void handlePacket(InPacket p, MapleClient c) {
             int min = p.readInt();

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

@@ -22,10 +22,10 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
-public final class PartySearchUpdateHandler extends AbstractMaplePacketHandler {
+public final class PartySearchUpdateHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -24,12 +24,12 @@ package net.server.channel.handlers;
 import client.MapleCharacter;
 import client.MapleClient;
 import client.processor.action.PetAutopotProcessor;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.MapleItemInformationProvider;
 import server.MapleStatEffect;
 
-public final class PetAutoPotHandler extends AbstractMaplePacketHandler {
+public final class PetAutoPotHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -24,13 +24,13 @@ package net.server.channel.handlers;
 import client.MapleClient;
 import client.autoban.AutobanFactory;
 import config.YamlConfig;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.FilePrinter;
 import tools.LogHelper;
 import tools.PacketCreator;
 
-public final class PetChatHandler extends AbstractMaplePacketHandler {
+public final class PetChatHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -26,12 +26,12 @@ import client.MapleClient;
 import client.inventory.MaplePet;
 import client.inventory.PetCommand;
 import client.inventory.PetDataFactory;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import tools.PacketCreator;
 import tools.Randomizer;
 
-public final class PetCommandHandler extends AbstractMaplePacketHandler {
+public final class PetCommandHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -25,14 +25,14 @@ import client.MapleCharacter;
 import client.MapleClient;
 import client.autoban.AutobanFactory;
 import client.inventory.MaplePet;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 /**
  * @author BubblesDev
  * @author Ronan
  */
-public final class PetExcludeItemsHandler extends AbstractMaplePacketHandler {
+public final class PetExcludeItemsHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -29,12 +29,12 @@ import client.inventory.MapleInventory;
 import client.inventory.MapleInventoryType;
 import client.inventory.MaplePet;
 import client.inventory.manipulator.MapleInventoryManipulator;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.Server;
 import tools.PacketCreator;
 
-public final class PetFoodHandler extends AbstractMaplePacketHandler {
+public final class PetFoodHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -24,7 +24,7 @@ package net.server.channel.handlers;
 import client.MapleCharacter;
 import client.MapleClient;
 import client.inventory.MaplePet;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.maps.MapleMapItem;
 import server.maps.MapleMapObject;
@@ -36,7 +36,7 @@ import java.util.Set;
  * @author TheRamon
  * @author Ronan
  */
-public final class PetLootHandler extends AbstractMaplePacketHandler {
+public final class PetLootHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {
         MapleCharacter chr = c.getPlayer();

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

@@ -32,7 +32,7 @@ import client.inventory.manipulator.MapleKarmaManipulator;
 import config.YamlConfig;
 import constants.game.GameConstants;
 import constants.inventory.ItemConstants;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.MapleItemInformationProvider;
 import server.MapleTrade;
@@ -50,7 +50,7 @@ import java.util.Arrays;
  * @author Matze
  * @author Ronan - concurrency safety and reviewed minigames
  */
-public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
+public final class PlayerInteractionHandler extends AbstractPacketHandler {
     public enum Action {
         CREATE(0),
         INVITE(2),

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

@@ -26,7 +26,7 @@ import client.inventory.*;
 import client.keybind.MapleKeyBinding;
 import config.YamlConfig;
 import constants.game.GameConstants;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import net.server.PlayerBuffValueHolder;
 import net.server.Server;
@@ -57,7 +57,7 @@ import java.util.*;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
-public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
+public final class PlayerLoggedinHandler extends AbstractPacketHandler {
 
     private static final Set<Integer> attemptingLoginAccounts = new HashSet<>();
     

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

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 import client.MapleBuffStat;
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.life.MapleMonster;
 import server.maps.MapleMapObject;
@@ -37,7 +37,7 @@ import java.util.List;
  *
  * @author Ronan
  */
-public final class PlayerMapTransitionHandler extends AbstractMaplePacketHandler {
+public final class PlayerMapTransitionHandler extends AbstractPacketHandler {
     
     @Override
     public final void handlePacket(InPacket p, MapleClient c) {

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

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import scripting.quest.QuestScriptManager;
 import server.life.MapleNPC;
@@ -35,7 +35,7 @@ import java.awt.*;
  *
  * @author Matze
  */
-public final class QuestActionHandler extends AbstractMaplePacketHandler {
+public final class QuestActionHandler extends AbstractPacketHandler {
     
     // isNpcNearby thanks to GabrielSin
     private static boolean isNpcNearby(InPacket p, MapleCharacter player, MapleQuest quest, int npcId) {

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

@@ -2,14 +2,14 @@ package net.server.channel.handlers;
 
 import client.MapleClient;
 import client.keybind.MapleQuickslotBinding;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 /**
  *
  * @author Shavit
  */
-public class QuickslotKeyMappedModifiedHandler extends AbstractMaplePacketHandler
+public class QuickslotKeyMappedModifiedHandler extends AbstractPacketHandler
 {
     @Override
     public void handlePacket(InPacket p, MapleClient c)

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

@@ -2,7 +2,7 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import net.AbstractMaplePacketHandler;
+import net.AbstractPacketHandler;
 import net.packet.InPacket;
 import server.minigame.MapleRockPaperScissor;
 import tools.PacketCreator;
@@ -12,7 +12,7 @@ import tools.PacketCreator;
  * @Website http://Vertisy.ca/
  * @since Aug 15, 2016
  */
-public final class RPSActionHandler extends AbstractMaplePacketHandler{
+public final class RPSActionHandler extends AbstractPacketHandler {
 
 	@Override
 	public final void handlePacket(InPacket p, MapleClient c){