diff --git a/src/main/java/client/MapleClient.java b/src/main/java/client/MapleClient.java index 6da968698e..6c2842fbd2 100644 --- a/src/main/java/client/MapleClient.java +++ b/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); diff --git a/src/main/java/client/command/commands/gm3/PeCommand.java b/src/main/java/client/command/commands/gm3/PeCommand.java index ae1ccd600c..e9a5e61de7 100644 --- a/src/main/java/client/command/commands/gm3/PeCommand.java +++ b/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); diff --git a/src/main/java/net/AbstractMaplePacketHandler.java b/src/main/java/net/AbstractPacketHandler.java similarity index 93% rename from src/main/java/net/AbstractMaplePacketHandler.java rename to src/main/java/net/AbstractPacketHandler.java index 6117b81174..bd93ca0f82 100644 --- a/src/main/java/net/AbstractMaplePacketHandler.java +++ b/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(); diff --git a/src/main/java/net/MaplePacketHandler.java b/src/main/java/net/PacketHandler.java similarity index 96% rename from src/main/java/net/MaplePacketHandler.java rename to src/main/java/net/PacketHandler.java index 119259bb86..82a5f4c1ec 100644 --- a/src/main/java/net/MaplePacketHandler.java +++ b/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); } diff --git a/src/main/java/net/PacketProcessor.java b/src/main/java/net/PacketProcessor.java index 487a5c2985..ad08c6d83c 100644 --- a/src/main/java/net/PacketProcessor.java +++ b/src/main/java/net/PacketProcessor.java @@ -35,7 +35,7 @@ import java.util.Map; public final class PacketProcessor { private final static Map 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(); diff --git a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java index a979406b8f..8dd0bdd8af 100644 --- a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java +++ b/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 { diff --git a/src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java b/src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java index 40f82e6f72..1fc583fcdd 100644 --- a/src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java +++ b/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 parseMovement(InPacket p) throws EmptyMovementException { List res = new ArrayList<>(); diff --git a/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java b/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java index cb12c611ed..49375afe5c 100644 --- a/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/AdminChatHandler.java b/src/main/java/net/server/channel/handlers/AdminChatHandler.java index 430b73c6e1..79917457a6 100644 --- a/src/main/java/net/server/channel/handlers/AdminChatHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/AdminCommandHandler.java b/src/main/java/net/server/channel/handlers/AdminCommandHandler.java index 300264dc3f..c57db236a9 100644 --- a/src/main/java/net/server/channel/handlers/AdminCommandHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/AdminLogHandler.java b/src/main/java/net/server/channel/handlers/AdminLogHandler.java index d1bb43d210..a78944cb91 100644 --- a/src/main/java/net/server/channel/handlers/AdminLogHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/AllianceOperationHandler.java b/src/main/java/net/server/channel/handlers/AllianceOperationHandler.java index bc41e0304a..4d0986cb49 100644 --- a/src/main/java/net/server/channel/handlers/AllianceOperationHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/AranComboHandler.java b/src/main/java/net/server/channel/handlers/AranComboHandler.java index 025462310f..7b61343bcb 100644 --- a/src/main/java/net/server/channel/handlers/AranComboHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/AutoAggroHandler.java b/src/main/java/net/server/channel/handlers/AutoAggroHandler.java index d672fdd9bf..b7363b6cf7 100644 --- a/src/main/java/net/server/channel/handlers/AutoAggroHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/AutoAssignHandler.java b/src/main/java/net/server/channel/handlers/AutoAssignHandler.java index 181e74f89c..ce55d3fdd2 100644 --- a/src/main/java/net/server/channel/handlers/AutoAssignHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/BBSOperationHandler.java b/src/main/java/net/server/channel/handlers/BBSOperationHandler.java index abecd65e68..f39ae039d6 100644 --- a/src/main/java/net/server/channel/handlers/BBSOperationHandler.java +++ b/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; diff --git a/src/main/java/net/server/channel/handlers/BeholderHandler.java b/src/main/java/net/server/channel/handlers/BeholderHandler.java index 22214e24fd..b6ebc290a2 100644 --- a/src/main/java/net/server/channel/handlers/BeholderHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java b/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java index e8e7ac563f..00ed9861c9 100644 --- a/src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java +++ b/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; diff --git a/src/main/java/net/server/channel/handlers/CancelBuffHandler.java b/src/main/java/net/server/channel/handlers/CancelBuffHandler.java index dc414831c7..5b3b65c183 100644 --- a/src/main/java/net/server/channel/handlers/CancelBuffHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/CancelChairHandler.java b/src/main/java/net/server/channel/handlers/CancelChairHandler.java index cb8a5103a1..0bfdc7aa13 100644 --- a/src/main/java/net/server/channel/handlers/CancelChairHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/CancelDebuffHandler.java b/src/main/java/net/server/channel/handlers/CancelDebuffHandler.java index 043480896e..9feb725c0c 100644 --- a/src/main/java/net/server/channel/handlers/CancelDebuffHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/CancelItemEffectHandler.java b/src/main/java/net/server/channel/handlers/CancelItemEffectHandler.java index 0204ed349f..dade4599ba 100644 --- a/src/main/java/net/server/channel/handlers/CancelItemEffectHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/CashOperationHandler.java b/src/main/java/net/server/channel/handlers/CashOperationHandler.java index 50b4abe8de..8eb518cc30 100644 --- a/src/main/java/net/server/channel/handlers/CashOperationHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java b/src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java index 6a8b3ec5a7..bb74bbccaa 100644 --- a/src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/ChangeChannelHandler.java b/src/main/java/net/server/channel/handlers/ChangeChannelHandler.java index 9bf5e5ccae..0bed6c64ac 100644 --- a/src/main/java/net/server/channel/handlers/ChangeChannelHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java b/src/main/java/net/server/channel/handlers/ChangeMapHandler.java index 77f9df85de..78001a0b36 100644 --- a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/ChangeMapSpecialHandler.java b/src/main/java/net/server/channel/handlers/ChangeMapSpecialHandler.java index 256e15f71b..6c8fe8aaba 100644 --- a/src/main/java/net/server/channel/handlers/ChangeMapSpecialHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java b/src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java index 937c7b10bd..aa686f6c6b 100644 --- a/src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/ClickGuideHandler.java b/src/main/java/net/server/channel/handlers/ClickGuideHandler.java index 9e2e7f57d2..38e665726e 100644 --- a/src/main/java/net/server/channel/handlers/ClickGuideHandler.java +++ b/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)) { diff --git a/src/main/java/net/server/channel/handlers/CloseChalkboardHandler.java b/src/main/java/net/server/channel/handlers/CloseChalkboardHandler.java index 7e532b246b..8ba60f51cf 100644 --- a/src/main/java/net/server/channel/handlers/CloseChalkboardHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/CoconutHandler.java b/src/main/java/net/server/channel/handlers/CoconutHandler.java index a79d55111d..9c9841a619 100644 --- a/src/main/java/net/server/channel/handlers/CoconutHandler.java +++ b/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 diff --git a/src/main/java/net/server/channel/handlers/CouponCodeHandler.java b/src/main/java/net/server/channel/handlers/CouponCodeHandler.java index 317adf64a8..66768ebc35 100644 --- a/src/main/java/net/server/channel/handlers/CouponCodeHandler.java +++ b/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>> getNXCodeItems(MapleCharacter chr, Connection con, int codeid) throws SQLException { Map couponItems = new HashMap<>(); diff --git a/src/main/java/net/server/channel/handlers/DamageSummonHandler.java b/src/main/java/net/server/channel/handlers/DamageSummonHandler.java index 8ecbdd2841..22c49277e7 100644 --- a/src/main/java/net/server/channel/handlers/DamageSummonHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/DenyAllianceRequestHandler.java b/src/main/java/net/server/channel/handlers/DenyAllianceRequestHandler.java index f6850be4a8..95d25b11a6 100644 --- a/src/main/java/net/server/channel/handlers/DenyAllianceRequestHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/DenyGuildRequestHandler.java b/src/main/java/net/server/channel/handlers/DenyGuildRequestHandler.java index 612b6abf94..c3ca46d543 100644 --- a/src/main/java/net/server/channel/handlers/DenyGuildRequestHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java b/src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java index f6784887c9..60aa4a2b56 100644 --- a/src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/DistributeAPHandler.java b/src/main/java/net/server/channel/handlers/DistributeAPHandler.java index 8f0f766b8c..03df853097 100644 --- a/src/main/java/net/server/channel/handlers/DistributeAPHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/DistributeSPHandler.java b/src/main/java/net/server/channel/handlers/DistributeSPHandler.java index ac324863bb..ef850419c9 100644 --- a/src/main/java/net/server/channel/handlers/DistributeSPHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/DoorHandler.java b/src/main/java/net/server/channel/handlers/DoorHandler.java index ccf5bc78d8..c5929618bc 100644 --- a/src/main/java/net/server/channel/handlers/DoorHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/DueyHandler.java b/src/main/java/net/server/channel/handlers/DueyHandler.java index a3be28c975..453de7f59b 100644 --- a/src/main/java/net/server/channel/handlers/DueyHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/EnterCashShopHandler.java b/src/main/java/net/server/channel/handlers/EnterCashShopHandler.java index 6c388f45e8..336ad72d7c 100644 --- a/src/main/java/net/server/channel/handlers/EnterCashShopHandler.java +++ b/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 { diff --git a/src/main/java/net/server/channel/handlers/EnterMTSHandler.java b/src/main/java/net/server/channel/handlers/EnterMTSHandler.java index 38a2a597de..a7159324e8 100644 --- a/src/main/java/net/server/channel/handlers/EnterMTSHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/FaceExpressionHandler.java b/src/main/java/net/server/channel/handlers/FaceExpressionHandler.java index 8d96b7a8b0..30dd86c1fe 100644 --- a/src/main/java/net/server/channel/handlers/FaceExpressionHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/FamilyAddHandler.java b/src/main/java/net/server/channel/handlers/FamilyAddHandler.java index d85ece4c3b..6afaaae013 100644 --- a/src/main/java/net/server/channel/handlers/FamilyAddHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/FamilyPreceptsHandler.java b/src/main/java/net/server/channel/handlers/FamilyPreceptsHandler.java index ee13da10f5..e573111da5 100644 --- a/src/main/java/net/server/channel/handlers/FamilyPreceptsHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/FamilySeparateHandler.java b/src/main/java/net/server/channel/handlers/FamilySeparateHandler.java index 36307a5ab1..9ea757dccc 100644 --- a/src/main/java/net/server/channel/handlers/FamilySeparateHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java b/src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java index d41a34e911..051a7c8a4b 100644 --- a/src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/FamilyUseHandler.java b/src/main/java/net/server/channel/handlers/FamilyUseHandler.java index d3a8288c64..6623e19c6e 100644 --- a/src/main/java/net/server/channel/handlers/FamilyUseHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java b/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java index dbb7be9b47..d9da06473a 100644 --- a/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/FredrickHandler.java b/src/main/java/net/server/channel/handlers/FredrickHandler.java index cb1e0fef0b..99a68c71e6 100644 --- a/src/main/java/net/server/channel/handlers/FredrickHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/GeneralChatHandler.java b/src/main/java/net/server/channel/handlers/GeneralChatHandler.java index 968ccb69c7..ef21d40c55 100644 --- a/src/main/java/net/server/channel/handlers/GeneralChatHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/GiveFameHandler.java b/src/main/java/net/server/channel/handlers/GiveFameHandler.java index 791f87c460..62e368f4c7 100644 --- a/src/main/java/net/server/channel/handlers/GiveFameHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/GrenadeEffectHandler.java b/src/main/java/net/server/channel/handlers/GrenadeEffectHandler.java index 71ddf86af2..2ceda1e3d4 100644 --- a/src/main/java/net/server/channel/handlers/GrenadeEffectHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/GuildOperationHandler.java b/src/main/java/net/server/channel/handlers/GuildOperationHandler.java index 11067ba282..3ed2908e8e 100644 --- a/src/main/java/net/server/channel/handlers/GuildOperationHandler.java +++ b/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; diff --git a/src/main/java/net/server/channel/handlers/HealOvertimeHandler.java b/src/main/java/net/server/channel/handlers/HealOvertimeHandler.java index f4f40112c7..07cdd0f781 100644 --- a/src/main/java/net/server/channel/handlers/HealOvertimeHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/HiredMerchantRequest.java b/src/main/java/net/server/channel/handlers/HiredMerchantRequest.java index 9bd6f9ec78..610cbe7ea0 100644 --- a/src/main/java/net/server/channel/handlers/HiredMerchantRequest.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/InnerPortalHandler.java b/src/main/java/net/server/channel/handlers/InnerPortalHandler.java index fd208d634b..942a0eaaec 100644 --- a/src/main/java/net/server/channel/handlers/InnerPortalHandler.java +++ b/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) { } diff --git a/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java b/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java index 4c7f44c530..671d3dc152 100644 --- a/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/InventorySortHandler.java b/src/main/java/net/server/channel/handlers/InventorySortHandler.java index ecddb9ec7c..5e9c1f7cd6 100644 --- a/src/main/java/net/server/channel/handlers/InventorySortHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/ItemMoveHandler.java b/src/main/java/net/server/channel/handlers/ItemMoveHandler.java index b14cfe13d1..e1e5fe9f0c 100644 --- a/src/main/java/net/server/channel/handlers/ItemMoveHandler.java +++ b/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); diff --git a/src/main/java/net/server/channel/handlers/ItemPickupHandler.java b/src/main/java/net/server/channel/handlers/ItemPickupHandler.java index 669ec3327d..49333cacd2 100644 --- a/src/main/java/net/server/channel/handlers/ItemPickupHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/ItemRewardHandler.java b/src/main/java/net/server/channel/handlers/ItemRewardHandler.java index f4917fe0ec..346116dab4 100644 --- a/src/main/java/net/server/channel/handlers/ItemRewardHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/KeymapChangeHandler.java b/src/main/java/net/server/channel/handlers/KeymapChangeHandler.java index 50b1e097a5..87ac61c051 100644 --- a/src/main/java/net/server/channel/handlers/KeymapChangeHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/LeftKnockbackHandler.java b/src/main/java/net/server/channel/handlers/LeftKnockbackHandler.java index 39faf88938..be6aa6e116 100644 --- a/src/main/java/net/server/channel/handlers/LeftKnockbackHandler.java +++ b/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()); diff --git a/src/main/java/net/server/channel/handlers/MTSHandler.java b/src/main/java/net/server/channel/handlers/MTSHandler.java index 74b7fcf7a7..d4168900b8 100644 --- a/src/main/java/net/server/channel/handlers/MTSHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/MakerSkillHandler.java b/src/main/java/net/server/channel/handlers/MakerSkillHandler.java index 9c8806e688..e37ae16426 100644 --- a/src/main/java/net/server/channel/handlers/MakerSkillHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/MesoDropHandler.java b/src/main/java/net/server/channel/handlers/MesoDropHandler.java index 34679b8f5d..3680525922 100644 --- a/src/main/java/net/server/channel/handlers/MesoDropHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/MessengerHandler.java b/src/main/java/net/server/channel/handlers/MessengerHandler.java index 107581d20d..528cee5744 100644 --- a/src/main/java/net/server/channel/handlers/MessengerHandler.java +++ b/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()) { diff --git a/src/main/java/net/server/channel/handlers/MobBanishPlayerHandler.java b/src/main/java/net/server/channel/handlers/MobBanishPlayerHandler.java index 603428c75f..c918c90eb9 100644 --- a/src/main/java/net/server/channel/handlers/MobBanishPlayerHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/MobDamageMobFriendlyHandler.java b/src/main/java/net/server/channel/handlers/MobDamageMobFriendlyHandler.java index ed3bb725bb..31e1d005b3 100644 --- a/src/main/java/net/server/channel/handlers/MobDamageMobFriendlyHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java b/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java index 244dd6857a..9c45a4bd27 100644 --- a/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/MonsterBombHandler.java b/src/main/java/net/server/channel/handlers/MonsterBombHandler.java index e11529f5f8..2a1725a3c3 100644 --- a/src/main/java/net/server/channel/handlers/MonsterBombHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/MonsterBookCoverHandler.java b/src/main/java/net/server/channel/handlers/MonsterBookCoverHandler.java index 30c2ad7d45..93b4993c78 100644 --- a/src/main/java/net/server/channel/handlers/MonsterBookCoverHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java b/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java index 5274cc4413..252d682007 100644 --- a/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/MultiChatHandler.java b/src/main/java/net/server/channel/handlers/MultiChatHandler.java index b7e65adfaa..51e227f5a8 100644 --- a/src/main/java/net/server/channel/handlers/MultiChatHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/NPCAnimationHandler.java b/src/main/java/net/server/channel/handlers/NPCAnimationHandler.java index c46b4d80c3..55adf92ae1 100644 --- a/src/main/java/net/server/channel/handlers/NPCAnimationHandler.java +++ b/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 diff --git a/src/main/java/net/server/channel/handlers/NPCMoreTalkHandler.java b/src/main/java/net/server/channel/handlers/NPCMoreTalkHandler.java index d4fbad56c3..2766d72d97 100644 --- a/src/main/java/net/server/channel/handlers/NPCMoreTalkHandler.java +++ b/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) diff --git a/src/main/java/net/server/channel/handlers/NPCShopHandler.java b/src/main/java/net/server/channel/handlers/NPCShopHandler.java index 5845ae1f76..fdafd6dc47 100644 --- a/src/main/java/net/server/channel/handlers/NPCShopHandler.java +++ b/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 :) diff --git a/src/main/java/net/server/channel/handlers/NPCTalkHandler.java b/src/main/java/net/server/channel/handlers/NPCTalkHandler.java index 1236e9b5f5..bbfe48cfa3 100644 --- a/src/main/java/net/server/channel/handlers/NPCTalkHandler.java +++ b/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()) { diff --git a/src/main/java/net/server/channel/handlers/NewYearCardHandler.java b/src/main/java/net/server/channel/handlers/NewYearCardHandler.java index 59e727e6ac..51ed959b5a 100644 --- a/src/main/java/net/server/channel/handlers/NewYearCardHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/NoteActionHandler.java b/src/main/java/net/server/channel/handlers/NoteActionHandler.java index 45823e232e..d1a3f8b875 100644 --- a/src/main/java/net/server/channel/handlers/NoteActionHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/OpenFamilyHandler.java b/src/main/java/net/server/channel/handlers/OpenFamilyHandler.java index 2544cb397f..4b9194ac00 100644 --- a/src/main/java/net/server/channel/handlers/OpenFamilyHandler.java +++ b/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; diff --git a/src/main/java/net/server/channel/handlers/OpenFamilyPedigreeHandler.java b/src/main/java/net/server/channel/handlers/OpenFamilyPedigreeHandler.java index 99feadeaba..9d264289fd 100644 --- a/src/main/java/net/server/channel/handlers/OpenFamilyPedigreeHandler.java +++ b/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; diff --git a/src/main/java/net/server/channel/handlers/OwlWarpHandler.java b/src/main/java/net/server/channel/handlers/OwlWarpHandler.java index 6600d7e921..cd847c71b3 100644 --- a/src/main/java/net/server/channel/handlers/OwlWarpHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/PartyOperationHandler.java b/src/main/java/net/server/channel/handlers/PartyOperationHandler.java index 9653b72883..b3e66b79b8 100644 --- a/src/main/java/net/server/channel/handlers/PartyOperationHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/PartySearchRegisterHandler.java b/src/main/java/net/server/channel/handlers/PartySearchRegisterHandler.java index 5807bec4ae..a1d3799199 100644 --- a/src/main/java/net/server/channel/handlers/PartySearchRegisterHandler.java +++ b/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) {} diff --git a/src/main/java/net/server/channel/handlers/PartySearchStartHandler.java b/src/main/java/net/server/channel/handlers/PartySearchStartHandler.java index f302295109..8dc7ffd81e 100644 --- a/src/main/java/net/server/channel/handlers/PartySearchStartHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/PartySearchUpdateHandler.java b/src/main/java/net/server/channel/handlers/PartySearchUpdateHandler.java index 42926cb956..6896b8ef6c 100644 --- a/src/main/java/net/server/channel/handlers/PartySearchUpdateHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/PetAutoPotHandler.java b/src/main/java/net/server/channel/handlers/PetAutoPotHandler.java index 7dbf99477a..4dc3b508e4 100644 --- a/src/main/java/net/server/channel/handlers/PetAutoPotHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/PetChatHandler.java b/src/main/java/net/server/channel/handlers/PetChatHandler.java index a155735432..98f6a8eb46 100644 --- a/src/main/java/net/server/channel/handlers/PetChatHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/PetCommandHandler.java b/src/main/java/net/server/channel/handlers/PetCommandHandler.java index 7ed148273a..b8dfd986e5 100644 --- a/src/main/java/net/server/channel/handlers/PetCommandHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/PetExcludeItemsHandler.java b/src/main/java/net/server/channel/handlers/PetExcludeItemsHandler.java index 64bb073e47..58384c67b7 100644 --- a/src/main/java/net/server/channel/handlers/PetExcludeItemsHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/PetFoodHandler.java b/src/main/java/net/server/channel/handlers/PetFoodHandler.java index 6c1594b901..a40f8369ed 100644 --- a/src/main/java/net/server/channel/handlers/PetFoodHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/PetLootHandler.java b/src/main/java/net/server/channel/handlers/PetLootHandler.java index c00637060b..8b03309ea8 100644 --- a/src/main/java/net/server/channel/handlers/PetLootHandler.java +++ b/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(); diff --git a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java b/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java index 65425b0880..2299b8b225 100644 --- a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java +++ b/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), diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index 7a82e12622..5aef0a9ca5 100644 --- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java +++ b/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 attemptingLoginAccounts = new HashSet<>(); diff --git a/src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java b/src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java index 2e6facb4c1..0d5078792a 100644 --- a/src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/QuestActionHandler.java b/src/main/java/net/server/channel/handlers/QuestActionHandler.java index 460961b8d3..aa665b7fc2 100644 --- a/src/main/java/net/server/channel/handlers/QuestActionHandler.java +++ b/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) { diff --git a/src/main/java/net/server/channel/handlers/QuickslotKeyMappedModifiedHandler.java b/src/main/java/net/server/channel/handlers/QuickslotKeyMappedModifiedHandler.java index 256417f65d..4958602dcf 100644 --- a/src/main/java/net/server/channel/handlers/QuickslotKeyMappedModifiedHandler.java +++ b/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) diff --git a/src/main/java/net/server/channel/handlers/RPSActionHandler.java b/src/main/java/net/server/channel/handlers/RPSActionHandler.java index f6d8c67086..4ca35e9680 100644 --- a/src/main/java/net/server/channel/handlers/RPSActionHandler.java +++ b/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){ diff --git a/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java b/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java index ff2cc381f5..9e58bf5261 100644 --- a/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java +++ b/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java @@ -6,7 +6,7 @@ import client.MapleQuestStatus; 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.MapleItemInformationProvider.QuestConsItem; @@ -20,7 +20,7 @@ import java.util.Map; * @author Xari * @author Ronan - added concurrency protection and quest progress limit */ -public class RaiseIncExpHandler extends AbstractMaplePacketHandler { +public class RaiseIncExpHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/RaiseUIStateHandler.java b/src/main/java/net/server/channel/handlers/RaiseUIStateHandler.java index e1898b696a..7ca375b59b 100644 --- a/src/main/java/net/server/channel/handlers/RaiseUIStateHandler.java +++ b/src/main/java/net/server/channel/handlers/RaiseUIStateHandler.java @@ -1,10 +1,10 @@ package net.server.channel.handlers; -import client.MapleCharacter.DelayedQuestUpdate; import client.MapleCharacter; +import client.MapleCharacter.DelayedQuestUpdate; import client.MapleClient; import client.MapleQuestStatus; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import scripting.quest.QuestScriptManager; import server.quest.MapleQuest; @@ -13,7 +13,7 @@ import server.quest.MapleQuest; * * @author Xari */ -public class RaiseUIStateHandler extends AbstractMaplePacketHandler { +public class RaiseUIStateHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/ReactorHitHandler.java b/src/main/java/net/server/channel/handlers/ReactorHitHandler.java index 91fdc2ac2b..8454ee77a2 100644 --- a/src/main/java/net/server/channel/handlers/ReactorHitHandler.java +++ b/src/main/java/net/server/channel/handlers/ReactorHitHandler.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.maps.MapleReactor; /** * @author Lerk */ -public final class ReactorHitHandler extends AbstractMaplePacketHandler { +public final class ReactorHitHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { //System.out.println(slea); //To see if there are any differences with packets diff --git a/src/main/java/net/server/channel/handlers/RemoteGachaponHandler.java b/src/main/java/net/server/channel/handlers/RemoteGachaponHandler.java index fc5fb2647f..f4f92551d0 100644 --- a/src/main/java/net/server/channel/handlers/RemoteGachaponHandler.java +++ b/src/main/java/net/server/channel/handlers/RemoteGachaponHandler.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 scripting.npc.NPCScriptManager; @@ -32,7 +32,7 @@ import scripting.npc.NPCScriptManager; * * @author Generic */ -public final class RemoteGachaponHandler extends AbstractMaplePacketHandler { +public final class RemoteGachaponHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { int ticket = p.readInt(); diff --git a/src/main/java/net/server/channel/handlers/RemoteStoreHandler.java b/src/main/java/net/server/channel/handlers/RemoteStoreHandler.java index cdf12ce72c..45dacb0767 100644 --- a/src/main/java/net/server/channel/handlers/RemoteStoreHandler.java +++ b/src/main/java/net/server/channel/handlers/RemoteStoreHandler.java @@ -24,7 +24,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.MapleHiredMerchant; import tools.PacketCreator; @@ -33,7 +33,7 @@ import tools.PacketCreator; * * @author kevintjuh93 - :3 */ -public class RemoteStoreHandler extends AbstractMaplePacketHandler { +public class RemoteStoreHandler extends AbstractPacketHandler { @Override public void handlePacket(InPacket p, MapleClient c) { MapleCharacter chr = c.getPlayer(); diff --git a/src/main/java/net/server/channel/handlers/ReportHandler.java b/src/main/java/net/server/channel/handlers/ReportHandler.java index 401a76ca12..bb572671a2 100644 --- a/src/main/java/net/server/channel/handlers/ReportHandler.java +++ b/src/main/java/net/server/channel/handlers/ReportHandler.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 tools.DatabaseConnection; @@ -39,7 +39,7 @@ import java.util.Calendar; * * @author BubblesDev */ -public final class ReportHandler extends AbstractMaplePacketHandler { +public final class ReportHandler extends AbstractPacketHandler { public final void handlePacket(InPacket p, MapleClient c) { int type = p.readByte(); //01 = Conversation claim 00 = illegal program String victim = p.readString(); diff --git a/src/main/java/net/server/channel/handlers/RingActionHandler.java b/src/main/java/net/server/channel/handlers/RingActionHandler.java index 38fce5153c..0e8faef6d1 100644 --- a/src/main/java/net/server/channel/handlers/RingActionHandler.java +++ b/src/main/java/net/server/channel/handlers/RingActionHandler.java @@ -29,7 +29,7 @@ import client.inventory.Item; import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.processor.npc.DueyProcessor; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.channel.Channel; import net.server.world.World; @@ -50,7 +50,7 @@ import java.sql.SQLException; * @author Ronan - major overhaul on Ring handling mechanics * @author Drago (Dragohe4rt) - on Wishlist */ -public final class RingActionHandler extends AbstractMaplePacketHandler { +public final class RingActionHandler extends AbstractPacketHandler { private static int getBoxId(int useItemId) { return useItemId == 2240000 ? 4031357 : (useItemId == 2240001 ? 4031359 : (useItemId == 2240002 ? 4031361 : (useItemId == 2240003 ? 4031363 : (1112300 + (useItemId - 2240004))))); } diff --git a/src/main/java/net/server/channel/handlers/ScriptedItemHandler.java b/src/main/java/net/server/channel/handlers/ScriptedItemHandler.java index 22cc91acfd..9aedb1ab37 100644 --- a/src/main/java/net/server/channel/handlers/ScriptedItemHandler.java +++ b/src/main/java/net/server/channel/handlers/ScriptedItemHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleClient; import client.inventory.Item; import constants.inventory.ItemConstants; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import scripting.item.ItemScriptManager; import server.MapleItemInformationProvider; @@ -34,7 +34,7 @@ import server.MapleItemInformationProvider.ScriptedItem; * * @author Jay Estrella */ -public final class ScriptedItemHandler extends AbstractMaplePacketHandler { +public final class ScriptedItemHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { p.readInt(); // trash stamp, thanks RMZero213 diff --git a/src/main/java/net/server/channel/handlers/ScrollHandler.java b/src/main/java/net/server/channel/handlers/ScrollHandler.java index 25b4f6f8c9..b1d439c528 100644 --- a/src/main/java/net/server/channel/handlers/ScrollHandler.java +++ b/src/main/java/net/server/channel/handlers/ScrollHandler.java @@ -29,7 +29,7 @@ import client.inventory.*; import client.inventory.Equip.ScrollResult; import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import server.MapleItemInformationProvider; import tools.PacketCreator; @@ -42,7 +42,7 @@ import java.util.Map; * @author Matze * @author Frz */ -public final class ScrollHandler extends AbstractMaplePacketHandler { +public final class ScrollHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/SkillBookHandler.java b/src/main/java/net/server/channel/handlers/SkillBookHandler.java index e73931e4c4..46fbe159c2 100644 --- a/src/main/java/net/server/channel/handlers/SkillBookHandler.java +++ b/src/main/java/net/server/channel/handlers/SkillBookHandler.java @@ -29,14 +29,14 @@ import client.inventory.Item; 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 tools.PacketCreator; import java.util.Map; -public final class SkillBookHandler extends AbstractMaplePacketHandler { +public final class SkillBookHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { if (!c.getPlayer().isAlive()) { diff --git a/src/main/java/net/server/channel/handlers/SkillEffectHandler.java b/src/main/java/net/server/channel/handlers/SkillEffectHandler.java index 9f40281af3..947130a000 100644 --- a/src/main/java/net/server/channel/handlers/SkillEffectHandler.java +++ b/src/main/java/net/server/channel/handlers/SkillEffectHandler.java @@ -23,11 +23,11 @@ package net.server.channel.handlers; import client.MapleClient; import constants.skills.*; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import tools.PacketCreator; -public final class SkillEffectHandler extends AbstractMaplePacketHandler { +public final class SkillEffectHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { int skillId = p.readInt(); diff --git a/src/main/java/net/server/channel/handlers/SkillMacroHandler.java b/src/main/java/net/server/channel/handlers/SkillMacroHandler.java index 6665a1c109..a2e3ff505b 100644 --- a/src/main/java/net/server/channel/handlers/SkillMacroHandler.java +++ b/src/main/java/net/server/channel/handlers/SkillMacroHandler.java @@ -25,10 +25,10 @@ import client.MapleCharacter; import client.MapleClient; import client.SkillMacro; import client.autoban.AutobanFactory; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; -public final class SkillMacroHandler extends AbstractMaplePacketHandler { +public final class SkillMacroHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/SnowballHandler.java b/src/main/java/net/server/channel/handlers/SnowballHandler.java index fb401d7579..ab0b99b05a 100644 --- a/src/main/java/net/server/channel/handlers/SnowballHandler.java +++ b/src/main/java/net/server/channel/handlers/SnowballHandler.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.events.gm.MapleSnowball; import server.maps.MapleMap; @@ -32,7 +32,7 @@ import server.maps.MapleMap; * * @author kevintjuh93 */ -public final class SnowballHandler extends AbstractMaplePacketHandler{ +public final class SnowballHandler extends AbstractPacketHandler { public void handlePacket(InPacket p, MapleClient c) { //D3 00 02 00 00 A5 01 diff --git a/src/main/java/net/server/channel/handlers/SpawnPetHandler.java b/src/main/java/net/server/channel/handlers/SpawnPetHandler.java index 1ee75d4ff1..c523508a1d 100644 --- a/src/main/java/net/server/channel/handlers/SpawnPetHandler.java +++ b/src/main/java/net/server/channel/handlers/SpawnPetHandler.java @@ -23,10 +23,10 @@ package net.server.channel.handlers; import client.MapleClient; import client.processor.action.SpawnPetProcessor; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; -public final class SpawnPetHandler extends AbstractMaplePacketHandler { +public final class SpawnPetHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java b/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java index 2a51169b91..753fae7729 100644 --- a/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java +++ b/src/main/java/net/server/channel/handlers/SpecialMoveHandler.java @@ -27,7 +27,7 @@ import client.Skill; import client.SkillFactory; import config.YamlConfig; import constants.skills.*; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import server.MapleStatEffect; @@ -36,7 +36,7 @@ import tools.PacketCreator; import java.awt.*; -public final class SpecialMoveHandler extends AbstractMaplePacketHandler { +public final class SpecialMoveHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/SpouseChatHandler.java b/src/main/java/net/server/channel/handlers/SpouseChatHandler.java index 0672b03361..c5b9bf93bd 100644 --- a/src/main/java/net/server/channel/handlers/SpouseChatHandler.java +++ b/src/main/java/net/server/channel/handlers/SpouseChatHandler.java @@ -24,12 +24,12 @@ 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.LogHelper; import tools.PacketCreator; -public final class SpouseChatHandler extends AbstractMaplePacketHandler { +public final class SpouseChatHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { p.readString();//recipient diff --git a/src/main/java/net/server/channel/handlers/StorageHandler.java b/src/main/java/net/server/channel/handlers/StorageHandler.java index 5ba5f3bcb9..f363f8dd1c 100644 --- a/src/main/java/net/server/channel/handlers/StorageHandler.java +++ b/src/main/java/net/server/channel/handlers/StorageHandler.java @@ -23,14 +23,14 @@ package net.server.channel.handlers; import client.MapleClient; import client.processor.npc.StorageProcessor; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; /** * * @author Matze */ -public final class StorageHandler extends AbstractMaplePacketHandler { +public final class StorageHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { StorageProcessor.storageAction(p, c); diff --git a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java index 03d725e207..a8ee3c0b2f 100644 --- a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java @@ -32,7 +32,7 @@ import config.YamlConfig; import constants.game.GameConstants; import constants.inventory.ItemConstants; import constants.skills.Aran; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import server.MapleStatEffect; import server.life.MapleLifeFactory.loseItem; @@ -48,7 +48,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public final class TakeDamageHandler extends AbstractMaplePacketHandler { +public final class TakeDamageHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/TouchReactorHandler.java b/src/main/java/net/server/channel/handlers/TouchReactorHandler.java index 5dff064559..0ae93353f4 100644 --- a/src/main/java/net/server/channel/handlers/TouchReactorHandler.java +++ b/src/main/java/net/server/channel/handlers/TouchReactorHandler.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.reactor.ReactorScriptManager; import server.maps.MapleReactor; @@ -31,7 +31,7 @@ import server.maps.MapleReactor; * * @author Generic */ -public final class TouchReactorHandler extends AbstractMaplePacketHandler { +public final class TouchReactorHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/TouchingCashShopHandler.java b/src/main/java/net/server/channel/handlers/TouchingCashShopHandler.java index b093d75189..67e6a943b9 100644 --- a/src/main/java/net/server/channel/handlers/TouchingCashShopHandler.java +++ b/src/main/java/net/server/channel/handlers/TouchingCashShopHandler.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 Terry Han (Acrylic) */ -public final class TouchingCashShopHandler extends AbstractMaplePacketHandler { +public final class TouchingCashShopHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { c.sendPacket(PacketCreator.showCash(c.getPlayer())); diff --git a/src/main/java/net/server/channel/handlers/TransferNameHandler.java b/src/main/java/net/server/channel/handlers/TransferNameHandler.java index 5723892ad7..b69e25b037 100644 --- a/src/main/java/net/server/channel/handlers/TransferNameHandler.java +++ b/src/main/java/net/server/channel/handlers/TransferNameHandler.java @@ -23,7 +23,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.DatabaseConnection; import tools.PacketCreator; @@ -36,7 +36,7 @@ import java.util.Calendar; * @author Ronan * @author Ubaware */ -public final class TransferNameHandler extends AbstractMaplePacketHandler { +public final class TransferNameHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/TransferNameResultHandler.java b/src/main/java/net/server/channel/handlers/TransferNameResultHandler.java index 850e38fc10..e39e93fab8 100644 --- a/src/main/java/net/server/channel/handlers/TransferNameResultHandler.java +++ b/src/main/java/net/server/channel/handlers/TransferNameResultHandler.java @@ -22,7 +22,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; @@ -30,7 +30,7 @@ import tools.PacketCreator; * * @author Ronan */ -public final class TransferNameResultHandler extends AbstractMaplePacketHandler { +public final class TransferNameResultHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/TransferWorldHandler.java b/src/main/java/net/server/channel/handlers/TransferWorldHandler.java index 6dfd77b8f7..2398186fc8 100644 --- a/src/main/java/net/server/channel/handlers/TransferWorldHandler.java +++ b/src/main/java/net/server/channel/handlers/TransferWorldHandler.java @@ -23,7 +23,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.Server; import tools.DatabaseConnection; @@ -36,7 +36,7 @@ import java.sql.*; * @author Ronan * @author Ubaware */ -public final class TransferWorldHandler extends AbstractMaplePacketHandler { +public final class TransferWorldHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/TrockAddMapHandler.java b/src/main/java/net/server/channel/handlers/TrockAddMapHandler.java index dcf2d78959..74c6e9a07d 100644 --- a/src/main/java/net/server/channel/handlers/TrockAddMapHandler.java +++ b/src/main/java/net/server/channel/handlers/TrockAddMapHandler.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.FieldLimit; import tools.PacketCreator; @@ -32,7 +32,7 @@ import tools.PacketCreator; * * @author kevintjuh93 */ -public final class TrockAddMapHandler extends AbstractMaplePacketHandler { +public final class TrockAddMapHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java index 3ff2fc3f7f..7db167a8d2 100644 --- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java @@ -33,7 +33,7 @@ import client.processor.stat.AssignSPProcessor; import config.YamlConfig; import constants.game.GameConstants; import constants.inventory.ItemConstants; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import server.MapleItemInformationProvider; @@ -49,7 +49,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -public final class UseCashItemHandler extends AbstractMaplePacketHandler { +public final class UseCashItemHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java b/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java index d914b57f11..bd9b5a3202 100644 --- a/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java @@ -27,7 +27,7 @@ import client.autoban.AutobanManager; 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; @@ -38,7 +38,7 @@ import tools.PacketCreator; * * @author kevintjuh93 */ -public final class UseCatchItemHandler extends AbstractMaplePacketHandler { +public final class UseCatchItemHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { MapleCharacter chr = c.getPlayer(); diff --git a/src/main/java/net/server/channel/handlers/UseChairHandler.java b/src/main/java/net/server/channel/handlers/UseChairHandler.java index 3f4ddb5f1b..0e6b6e5f66 100644 --- a/src/main/java/net/server/channel/handlers/UseChairHandler.java +++ b/src/main/java/net/server/channel/handlers/UseChairHandler.java @@ -24,10 +24,10 @@ package net.server.channel.handlers; import client.MapleClient; import client.inventory.MapleInventoryType; import constants.inventory.ItemConstants; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; -public final class UseChairHandler extends AbstractMaplePacketHandler { +public final class UseChairHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { int itemId = p.readInt(); diff --git a/src/main/java/net/server/channel/handlers/UseDeathItemHandler.java b/src/main/java/net/server/channel/handlers/UseDeathItemHandler.java index 6fc431902d..4144c04ffc 100644 --- a/src/main/java/net/server/channel/handlers/UseDeathItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseDeathItemHandler.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 UseDeathItemHandler extends AbstractMaplePacketHandler { +public final class UseDeathItemHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { int itemId = p.readInt(); diff --git a/src/main/java/net/server/channel/handlers/UseGachaExpHandler.java b/src/main/java/net/server/channel/handlers/UseGachaExpHandler.java index 4e93f71668..33b3b28d0e 100644 --- a/src/main/java/net/server/channel/handlers/UseGachaExpHandler.java +++ b/src/main/java/net/server/channel/handlers/UseGachaExpHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleClient; import client.autoban.AutobanFactory; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import tools.PacketCreator; @@ -34,7 +34,7 @@ import tools.PacketCreator; * * Modified by -- Ronan - concurrency protection */ -public class UseGachaExpHandler extends AbstractMaplePacketHandler { +public class UseGachaExpHandler extends AbstractPacketHandler { @Override public void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/UseHammerHandler.java b/src/main/java/net/server/channel/handlers/UseHammerHandler.java index 50df56ac2e..1c5fa2ed18 100644 --- a/src/main/java/net/server/channel/handlers/UseHammerHandler.java +++ b/src/main/java/net/server/channel/handlers/UseHammerHandler.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 Jay Estrella */ -public final class UseHammerHandler extends AbstractMaplePacketHandler { +public final class UseHammerHandler extends AbstractPacketHandler { public final void handlePacket(InPacket p, MapleClient c) { c.sendPacket(PacketCreator.sendHammerMessage()); } diff --git a/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java b/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java index 81a323694f..703b3de6c3 100644 --- a/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java +++ b/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java @@ -24,11 +24,11 @@ package net.server.channel.handlers; import client.MapleClient; import client.inventory.Item; import client.inventory.MapleInventoryType; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import tools.PacketCreator; -public final class UseItemEffectHandler extends AbstractMaplePacketHandler { +public final class UseItemEffectHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { Item toUse; diff --git a/src/main/java/net/server/channel/handlers/UseItemHandler.java b/src/main/java/net/server/channel/handlers/UseItemHandler.java index 9832a3b6e0..67ccb4817c 100644 --- a/src/main/java/net/server/channel/handlers/UseItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseItemHandler.java @@ -29,7 +29,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 server.MapleItemInformationProvider; import server.MapleStatEffect; @@ -38,7 +38,7 @@ import tools.PacketCreator; /** * @author Matze */ -public final class UseItemHandler extends AbstractMaplePacketHandler { +public final class UseItemHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { MapleCharacter chr = c.getPlayer(); diff --git a/src/main/java/net/server/channel/handlers/UseMapleLifeHandler.java b/src/main/java/net/server/channel/handlers/UseMapleLifeHandler.java index 4c701e2c5b..2c2939d10d 100644 --- a/src/main/java/net/server/channel/handlers/UseMapleLifeHandler.java +++ b/src/main/java/net/server/channel/handlers/UseMapleLifeHandler.java @@ -21,7 +21,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; @@ -29,7 +29,7 @@ import tools.PacketCreator; * * @author RonanLana */ -public class UseMapleLifeHandler extends AbstractMaplePacketHandler { +public class UseMapleLifeHandler extends AbstractPacketHandler { @Override public void handlePacket(InPacket p, MapleClient c) { MapleCharacter player = c.getPlayer(); diff --git a/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java b/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java index 4f5c4e6ae7..bf940ebc60 100644 --- a/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java +++ b/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java @@ -29,7 +29,7 @@ import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import constants.game.ExpTable; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import tools.PacketCreator; @@ -37,7 +37,7 @@ import tools.PacketCreator; * @author PurpleMadness * @author Ronan */ -public final class UseMountFoodHandler extends AbstractMaplePacketHandler { +public final class UseMountFoodHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { p.skip(4); diff --git a/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java b/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java index 4c333285a7..b7f9c11988 100644 --- a/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java +++ b/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.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 tools.PacketCreator; import tools.Pair; @@ -34,7 +34,7 @@ import java.util.PriorityQueue; /** * @author Ronan */ -public final class UseOwlOfMinervaHandler extends AbstractMaplePacketHandler { +public final class UseOwlOfMinervaHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/UseSolomonHandler.java b/src/main/java/net/server/channel/handlers/UseSolomonHandler.java index 57502d2d87..94afa50451 100644 --- a/src/main/java/net/server/channel/handlers/UseSolomonHandler.java +++ b/src/main/java/net/server/channel/handlers/UseSolomonHandler.java @@ -27,7 +27,7 @@ import client.inventory.Item; 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 tools.PacketCreator; @@ -38,7 +38,7 @@ import tools.PacketCreator; * * Modified by -- kevintjuh93, Ronan */ -public final class UseSolomonHandler extends AbstractMaplePacketHandler { +public final class UseSolomonHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java b/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java index a683db171e..33e47be57d 100644 --- a/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java +++ b/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java @@ -25,7 +25,7 @@ import client.MapleClient; import client.inventory.Item; 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; @@ -36,7 +36,7 @@ import tools.Randomizer; * * @author AngelSL */ -public final class UseSummonBagHandler extends AbstractMaplePacketHandler { +public final class UseSummonBagHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/UseWaterOfLifeHandler.java b/src/main/java/net/server/channel/handlers/UseWaterOfLifeHandler.java index 34b5707310..cefcbe8577 100644 --- a/src/main/java/net/server/channel/handlers/UseWaterOfLifeHandler.java +++ b/src/main/java/net/server/channel/handlers/UseWaterOfLifeHandler.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 UseWaterOfLifeHandler extends AbstractMaplePacketHandler { +public final class UseWaterOfLifeHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/WeddingHandler.java b/src/main/java/net/server/channel/handlers/WeddingHandler.java index 452fd5d7f1..2bb0b9a1c5 100644 --- a/src/main/java/net/server/channel/handlers/WeddingHandler.java +++ b/src/main/java/net/server/channel/handlers/WeddingHandler.java @@ -16,7 +16,7 @@ import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import server.MapleMarriage; import tools.PacketCreator; @@ -29,7 +29,7 @@ import java.util.List; * * @author Drago (Dragohe4rt) */ -public final class WeddingHandler extends AbstractMaplePacketHandler { +public final class WeddingHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/WeddingTalkHandler.java b/src/main/java/net/server/channel/handlers/WeddingTalkHandler.java index d511a7b7c3..1de7581e91 100644 --- a/src/main/java/net/server/channel/handlers/WeddingTalkHandler.java +++ b/src/main/java/net/server/channel/handlers/WeddingTalkHandler.java @@ -21,7 +21,7 @@ package net.server.channel.handlers; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import scripting.event.EventInstanceManager; import tools.PacketCreator; @@ -31,7 +31,7 @@ import tools.packets.WeddingPackets; * * @author Ronan */ -public final class WeddingTalkHandler extends AbstractMaplePacketHandler { +public final class WeddingTalkHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/WeddingTalkMoreHandler.java b/src/main/java/net/server/channel/handlers/WeddingTalkMoreHandler.java index 2610eca967..e1bca34c58 100644 --- a/src/main/java/net/server/channel/handlers/WeddingTalkMoreHandler.java +++ b/src/main/java/net/server/channel/handlers/WeddingTalkMoreHandler.java @@ -21,7 +21,7 @@ package net.server.channel.handlers; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import scripting.event.EventInstanceManager; import tools.PacketCreator; @@ -31,7 +31,7 @@ import tools.packets.WeddingPackets; * * @author Ronan */ -public final class WeddingTalkMoreHandler extends AbstractMaplePacketHandler { +public final class WeddingTalkMoreHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/channel/handlers/WhisperHandler.java b/src/main/java/net/server/channel/handlers/WhisperHandler.java index 1dbafd3000..2acb797110 100644 --- a/src/main/java/net/server/channel/handlers/WhisperHandler.java +++ b/src/main/java/net/server/channel/handlers/WhisperHandler.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 tools.FilePrinter; import tools.LogHelper; @@ -35,7 +35,7 @@ import tools.PacketCreator.WhisperFlag; /** * @author Chronos */ -public final class WhisperHandler extends AbstractMaplePacketHandler { +public final class WhisperHandler extends AbstractPacketHandler { // result types, not sure if there are proper names for these public static final byte RT_ITC = 0x00; diff --git a/src/main/java/net/server/handlers/CustomPacketHandler.java b/src/main/java/net/server/handlers/CustomPacketHandler.java index ab2e926809..534a1a61d1 100644 --- a/src/main/java/net/server/handlers/CustomPacketHandler.java +++ b/src/main/java/net/server/handlers/CustomPacketHandler.java @@ -22,11 +22,11 @@ package net.server.handlers; import client.MapleClient; -import net.MaplePacketHandler; +import net.PacketHandler; import net.packet.InPacket; import tools.PacketCreator; -public class CustomPacketHandler implements MaplePacketHandler { +public class CustomPacketHandler implements PacketHandler { @Override public void handlePacket(InPacket p, MapleClient c) { if (p.available() > 0 && c.getGMLevel() == 4) {//w/e diff --git a/src/main/java/net/server/handlers/KeepAliveHandler.java b/src/main/java/net/server/handlers/KeepAliveHandler.java index 7d354de2cc..853fca9e7e 100644 --- a/src/main/java/net/server/handlers/KeepAliveHandler.java +++ b/src/main/java/net/server/handlers/KeepAliveHandler.java @@ -22,10 +22,10 @@ package net.server.handlers; import client.MapleClient; -import net.MaplePacketHandler; +import net.PacketHandler; import net.packet.InPacket; -public class KeepAliveHandler implements MaplePacketHandler { +public class KeepAliveHandler implements PacketHandler { @Override public void handlePacket(InPacket p, MapleClient c) { c.pongReceived(); diff --git a/src/main/java/net/server/handlers/LoginRequiringNoOpHandler.java b/src/main/java/net/server/handlers/LoginRequiringNoOpHandler.java index faa369a5cd..9212509ce2 100644 --- a/src/main/java/net/server/handlers/LoginRequiringNoOpHandler.java +++ b/src/main/java/net/server/handlers/LoginRequiringNoOpHandler.java @@ -22,10 +22,10 @@ package net.server.handlers; import client.MapleClient; -import net.MaplePacketHandler; +import net.PacketHandler; import net.packet.InPacket; -public final class LoginRequiringNoOpHandler implements MaplePacketHandler { +public final class LoginRequiringNoOpHandler implements PacketHandler { private static LoginRequiringNoOpHandler instance = new LoginRequiringNoOpHandler(); public static LoginRequiringNoOpHandler getInstance() { diff --git a/src/main/java/net/server/handlers/login/AcceptToSHandler.java b/src/main/java/net/server/handlers/login/AcceptToSHandler.java index 21eff0b084..6ee849817b 100644 --- a/src/main/java/net/server/handlers/login/AcceptToSHandler.java +++ b/src/main/java/net/server/handlers/login/AcceptToSHandler.java @@ -1,7 +1,7 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import tools.PacketCreator; @@ -9,7 +9,7 @@ import tools.PacketCreator; * * @author kevintjuh93 */ -public final class AcceptToSHandler extends AbstractMaplePacketHandler { +public final class AcceptToSHandler extends AbstractPacketHandler { @Override public boolean validateState(MapleClient c) { diff --git a/src/main/java/net/server/handlers/login/AfterLoginHandler.java b/src/main/java/net/server/handlers/login/AfterLoginHandler.java index 6518dbd378..28a232e05c 100644 --- a/src/main/java/net/server/handlers/login/AfterLoginHandler.java +++ b/src/main/java/net/server/handlers/login/AfterLoginHandler.java @@ -22,12 +22,12 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.coordinator.session.SessionCoordinator; import tools.PacketCreator; -public final class AfterLoginHandler extends AbstractMaplePacketHandler { +public final class AfterLoginHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/handlers/login/CharSelectedHandler.java b/src/main/java/net/server/handlers/login/CharSelectedHandler.java index 597da67347..627b3cc896 100644 --- a/src/main/java/net/server/handlers/login/CharSelectedHandler.java +++ b/src/main/java/net/server/handlers/login/CharSelectedHandler.java @@ -22,7 +22,7 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.coordinator.session.Hwid; @@ -36,7 +36,7 @@ import tools.PacketCreator; import java.net.InetAddress; import java.net.UnknownHostException; -public final class CharSelectedHandler extends AbstractMaplePacketHandler { +public final class CharSelectedHandler extends AbstractPacketHandler { private static final Logger log = LoggerFactory.getLogger(CharSelectedHandler.class); private static int parseAntiMulticlientError(AntiMulticlientResult res) { diff --git a/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java b/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java index 355be8dc0f..a881111adc 100644 --- a/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java +++ b/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java @@ -1,7 +1,7 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.coordinator.session.Hwid; @@ -15,7 +15,7 @@ import tools.PacketCreator; import java.net.InetAddress; import java.net.UnknownHostException; -public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler { +public class CharSelectedWithPicHandler extends AbstractPacketHandler { private static final Logger log = LoggerFactory.getLogger(CharSelectedWithPicHandler.class); private static int parseAntiMulticlientError(AntiMulticlientResult res) { diff --git a/src/main/java/net/server/handlers/login/CharlistRequestHandler.java b/src/main/java/net/server/handlers/login/CharlistRequestHandler.java index 77122c6b98..3f05d9d285 100644 --- a/src/main/java/net/server/handlers/login/CharlistRequestHandler.java +++ b/src/main/java/net/server/handlers/login/CharlistRequestHandler.java @@ -22,14 +22,14 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.channel.Channel; import net.server.world.World; import tools.PacketCreator; -public final class CharlistRequestHandler extends AbstractMaplePacketHandler { +public final class CharlistRequestHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/handlers/login/CheckCharNameHandler.java b/src/main/java/net/server/handlers/login/CheckCharNameHandler.java index cb51e1614b..9222d6cb23 100644 --- a/src/main/java/net/server/handlers/login/CheckCharNameHandler.java +++ b/src/main/java/net/server/handlers/login/CheckCharNameHandler.java @@ -23,11 +23,11 @@ package net.server.handlers.login; import client.MapleCharacter; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import tools.PacketCreator; -public final class CheckCharNameHandler extends AbstractMaplePacketHandler { +public final class CheckCharNameHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/handlers/login/CreateCharHandler.java b/src/main/java/net/server/handlers/login/CreateCharHandler.java index 4d0ec82c56..964ffa2392 100644 --- a/src/main/java/net/server/handlers/login/CreateCharHandler.java +++ b/src/main/java/net/server/handlers/login/CreateCharHandler.java @@ -25,7 +25,7 @@ import client.MapleClient; import client.creator.novice.BeginnerCreator; import client.creator.novice.LegendCreator; import client.creator.novice.NoblesseCreator; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import tools.FilePrinter; import tools.PacketCreator; @@ -34,7 +34,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -public final class CreateCharHandler extends AbstractMaplePacketHandler { +public final class CreateCharHandler extends AbstractPacketHandler { private final static Set IDs = new HashSet<>(Arrays.asList(new Integer[]{ 1302000, 1312004, 1322005, 1442079,// weapons diff --git a/src/main/java/net/server/handlers/login/DeleteCharHandler.java b/src/main/java/net/server/handlers/login/DeleteCharHandler.java index 178fc66d48..70db1d94d0 100644 --- a/src/main/java/net/server/handlers/login/DeleteCharHandler.java +++ b/src/main/java/net/server/handlers/login/DeleteCharHandler.java @@ -23,7 +23,7 @@ package net.server.handlers.login; import client.MapleClient; import client.MapleFamily; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import tools.DatabaseConnection; @@ -35,7 +35,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -public final class DeleteCharHandler extends AbstractMaplePacketHandler { +public final class DeleteCharHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/handlers/login/GuestLoginHandler.java b/src/main/java/net/server/handlers/login/GuestLoginHandler.java index dc543fe344..0879080074 100644 --- a/src/main/java/net/server/handlers/login/GuestLoginHandler.java +++ b/src/main/java/net/server/handlers/login/GuestLoginHandler.java @@ -22,14 +22,14 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import tools.PacketCreator; /* * @author David */ -public final class GuestLoginHandler extends AbstractMaplePacketHandler { +public final class GuestLoginHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java index cd7110c64d..1fbc0bba69 100644 --- a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java +++ b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java @@ -24,7 +24,7 @@ package net.server.handlers.login; import client.DefaultDates; import client.MapleClient; import config.YamlConfig; -import net.MaplePacketHandler; +import net.PacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.coordinator.session.Hwid; @@ -40,7 +40,7 @@ import java.security.NoSuchAlgorithmException; import java.sql.*; import java.util.Calendar; -public final class LoginPasswordHandler implements MaplePacketHandler { +public final class LoginPasswordHandler implements PacketHandler { @Override public boolean validateState(MapleClient c) { diff --git a/src/main/java/net/server/handlers/login/RegisterPicHandler.java b/src/main/java/net/server/handlers/login/RegisterPicHandler.java index 61b52da062..cd1f6f5868 100644 --- a/src/main/java/net/server/handlers/login/RegisterPicHandler.java +++ b/src/main/java/net/server/handlers/login/RegisterPicHandler.java @@ -1,7 +1,7 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.coordinator.session.Hwid; @@ -15,7 +15,7 @@ import tools.PacketCreator; import java.net.InetAddress; import java.net.UnknownHostException; -public final class RegisterPicHandler extends AbstractMaplePacketHandler { +public final class RegisterPicHandler extends AbstractPacketHandler { private static final Logger log = LoggerFactory.getLogger(RegisterPicHandler.class); private static int parseAntiMulticlientError(AntiMulticlientResult res) { diff --git a/src/main/java/net/server/handlers/login/RegisterPinHandler.java b/src/main/java/net/server/handlers/login/RegisterPinHandler.java index d3252e08de..941c200796 100644 --- a/src/main/java/net/server/handlers/login/RegisterPinHandler.java +++ b/src/main/java/net/server/handlers/login/RegisterPinHandler.java @@ -22,7 +22,7 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.coordinator.session.SessionCoordinator; import tools.PacketCreator; @@ -30,7 +30,7 @@ import tools.PacketCreator; /* * @author Rob */ -public final class RegisterPinHandler extends AbstractMaplePacketHandler { +public final class RegisterPinHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { byte c2 = p.readByte(); diff --git a/src/main/java/net/server/handlers/login/RelogRequestHandler.java b/src/main/java/net/server/handlers/login/RelogRequestHandler.java index 1659fe4272..9493f89725 100644 --- a/src/main/java/net/server/handlers/login/RelogRequestHandler.java +++ b/src/main/java/net/server/handlers/login/RelogRequestHandler.java @@ -22,11 +22,11 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import tools.PacketCreator; -public final class RelogRequestHandler extends AbstractMaplePacketHandler { +public final class RelogRequestHandler extends AbstractPacketHandler { @Override public boolean validateState(MapleClient c) { return !c.isLoggedIn(); diff --git a/src/main/java/net/server/handlers/login/ServerStatusRequestHandler.java b/src/main/java/net/server/handlers/login/ServerStatusRequestHandler.java index d07861ca34..1e47ff2e62 100644 --- a/src/main/java/net/server/handlers/login/ServerStatusRequestHandler.java +++ b/src/main/java/net/server/handlers/login/ServerStatusRequestHandler.java @@ -22,13 +22,13 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.world.World; import tools.PacketCreator; -public final class ServerStatusRequestHandler extends AbstractMaplePacketHandler { +public final class ServerStatusRequestHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/handlers/login/ServerlistRequestHandler.java b/src/main/java/net/server/handlers/login/ServerlistRequestHandler.java index 2bac0b5198..1c875cae47 100644 --- a/src/main/java/net/server/handlers/login/ServerlistRequestHandler.java +++ b/src/main/java/net/server/handlers/login/ServerlistRequestHandler.java @@ -23,7 +23,7 @@ package net.server.handlers.login; import client.MapleClient; import constants.game.GameConstants; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.world.World; @@ -31,7 +31,7 @@ import tools.PacketCreator; import java.util.List; -public final class ServerlistRequestHandler extends AbstractMaplePacketHandler { +public final class ServerlistRequestHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { diff --git a/src/main/java/net/server/handlers/login/SetGenderHandler.java b/src/main/java/net/server/handlers/login/SetGenderHandler.java index ed07ab7476..b958a2fbfb 100644 --- a/src/main/java/net/server/handlers/login/SetGenderHandler.java +++ b/src/main/java/net/server/handlers/login/SetGenderHandler.java @@ -23,7 +23,7 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.coordinator.session.SessionCoordinator; @@ -33,7 +33,7 @@ import tools.PacketCreator; * * @author kevintjuh93 */ -public class SetGenderHandler extends AbstractMaplePacketHandler { +public class SetGenderHandler extends AbstractPacketHandler { @Override public void handlePacket(InPacket p, MapleClient c) { if (c.getGender() == 10) { //Packet shouldn't come if Gender isn't 10. diff --git a/src/main/java/net/server/handlers/login/ViewAllCharHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharHandler.java index cd07bcb66e..1ce2588cb0 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharHandler.java @@ -24,7 +24,7 @@ package net.server.handlers.login; import client.MapleCharacter; import client.MapleClient; import config.YamlConfig; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import tools.PacketCreator; @@ -32,7 +32,7 @@ import tools.Pair; import java.util.List; -public final class ViewAllCharHandler extends AbstractMaplePacketHandler { +public final class ViewAllCharHandler extends AbstractPacketHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { try { diff --git a/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java index 203736bc70..7b920acceb 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java @@ -1,7 +1,7 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.coordinator.session.Hwid; @@ -16,7 +16,7 @@ import tools.Randomizer; import java.net.InetAddress; import java.net.UnknownHostException; -public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHandler { +public final class ViewAllCharRegisterPicHandler extends AbstractPacketHandler { private static final Logger log = LoggerFactory.getLogger(ViewAllCharRegisterPicHandler.class); private static int parseAntiMulticlientError(AntiMulticlientResult res) { diff --git a/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java index 184370263a..eebd527abc 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java @@ -22,7 +22,7 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.coordinator.session.Hwid; @@ -37,7 +37,7 @@ import tools.Randomizer; import java.net.InetAddress; import java.net.UnknownHostException; -public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler { +public final class ViewAllCharSelectedHandler extends AbstractPacketHandler { private static final Logger log = LoggerFactory.getLogger(ViewAllCharSelectedHandler.class); private static int parseAntiMulticlientError(AntiMulticlientResult res) { diff --git a/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java index 79faa3734d..97b82f9a61 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java @@ -1,7 +1,7 @@ package net.server.handlers.login; import client.MapleClient; -import net.AbstractMaplePacketHandler; +import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; import net.server.coordinator.session.Hwid; @@ -16,7 +16,7 @@ import tools.Randomizer; import java.net.InetAddress; import java.net.UnknownHostException; -public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandler { +public class ViewAllCharSelectedWithPicHandler extends AbstractPacketHandler { private static final Logger log = LoggerFactory.getLogger(ViewAllCharSelectedWithPicHandler.class); private static int parseAntiMulticlientError(AntiMulticlientResult res) {