diff --git a/src/main/java/com/l2jserver/game/net/Lineage2Connection.java b/src/main/java/com/l2jserver/game/net/Lineage2Connection.java index 8c0622bad..6a7929c7b 100644 --- a/src/main/java/com/l2jserver/game/net/Lineage2Connection.java +++ b/src/main/java/com/l2jserver/game/net/Lineage2Connection.java @@ -27,8 +27,8 @@ import com.l2jserver.game.net.codec.Lineage2Encrypter; import com.l2jserver.game.net.codec.Lineage2PacketReader; import com.l2jserver.game.net.codec.Lineage2PacketWriter; import com.l2jserver.game.net.packet.ServerPacket; -import com.l2jserver.game.net.packet.server.ActionFailedPacket; -import com.l2jserver.game.net.packet.server.SystemMessagePacket; +import com.l2jserver.game.net.packet.server.SM_ACTION_FAILED; +import com.l2jserver.game.net.packet.server.SM_SYSTEM_MESSAGE; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.template.ItemTemplate; import com.l2jserver.model.world.Item; @@ -255,7 +255,7 @@ public class Lineage2Connection { * has been written. */ public ChannelFuture sendMessage(String message) { - return write(new SystemMessagePacket(SystemMessage.S1) + return write(new SM_SYSTEM_MESSAGE(SystemMessage.S1) .addString(message)); } @@ -278,15 +278,15 @@ public class Lineage2Connection { * the {@link SystemMessage} * @param args * the arguments of the message, they will be automatically - * detected and inserted. See {@link SystemMessagePacket} for + * detected and inserted. See {@link SM_SYSTEM_MESSAGE} for * more about supported formats. * @return the {@link ChannelFuture} that will be notified once the packet * has been written. - * @see SystemMessagePacket + * @see SM_SYSTEM_MESSAGE */ public ChannelFuture sendSystemMessage(SystemMessage message, Object... args) { - final SystemMessagePacket packet = new SystemMessagePacket(message); + final SM_SYSTEM_MESSAGE packet = new SM_SYSTEM_MESSAGE(message); for (final Object obj : args) { if (obj instanceof String) packet.addString((String) obj); @@ -299,7 +299,7 @@ public class Lineage2Connection { } /** - * Sends a {@link ActionFailedPacket} to the client. + * Sends a {@link SM_ACTION_FAILED} to the client. *

* This is an convenience method for

* conn.write(ActionFailedPacket.SHARED_INSTANCE);
@@ -308,7 +308,7 @@ public class Lineage2Connection { * has been written. */ public ChannelFuture sendActionFailed() { - return write(ActionFailedPacket.SHARED_INSTANCE); + return write(SM_ACTION_FAILED.SHARED_INSTANCE); } /** diff --git a/src/main/java/com/l2jserver/game/net/SystemMessage.java b/src/main/java/com/l2jserver/game/net/SystemMessage.java index 106690993..db5778c0c 100644 --- a/src/main/java/com/l2jserver/game/net/SystemMessage.java +++ b/src/main/java/com/l2jserver/game/net/SystemMessage.java @@ -16,7 +16,7 @@ */ package com.l2jserver.game.net; -import com.l2jserver.game.net.packet.server.SystemMessagePacket; +import com.l2jserver.game.net.packet.server.SM_SYSTEM_MESSAGE; /** * @author Rogiel @@ -15207,10 +15207,10 @@ public enum SystemMessage { THOMAS_D_TURKEY_DISAPPEARED(6505); public final int id; - public final SystemMessagePacket packet; + public final SM_SYSTEM_MESSAGE packet; SystemMessage(int id) { this.id = id; - this.packet = new SystemMessagePacket(this); + this.packet = new SM_SYSTEM_MESSAGE(this); } } diff --git a/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java b/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java index 54c3af2ca..a15ae8841 100644 --- a/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java +++ b/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java @@ -27,29 +27,29 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.ClientPacket; -import com.l2jserver.game.net.packet.client.AdminCommandPacket; -import com.l2jserver.game.net.packet.client.AuthLoginPacket; -import com.l2jserver.game.net.packet.client.CharacterActionPacket; -import com.l2jserver.game.net.packet.client.CharacterAppearingPacket; -import com.l2jserver.game.net.packet.client.CharacterAttackRequestPacket; -import com.l2jserver.game.net.packet.client.CharacterChatMessagePacket; -import com.l2jserver.game.net.packet.client.CharacterCreatePacket; -import com.l2jserver.game.net.packet.client.CharacterRequestActionUse; -import com.l2jserver.game.net.packet.client.CharacterRequestBypass; -import com.l2jserver.game.net.packet.client.CharacterRequestInventoryPacket; -import com.l2jserver.game.net.packet.client.CharacterRequestMovePacket; -import com.l2jserver.game.net.packet.client.CharacterRequestOpenMap; -import com.l2jserver.game.net.packet.client.CharacterSelectPacket; -import com.l2jserver.game.net.packet.client.CharacterValidatePositionPacket; -import com.l2jserver.game.net.packet.client.EnterWorld; -import com.l2jserver.game.net.packet.client.LogoutPacket; -import com.l2jserver.game.net.packet.client.ProtocolVersionPacket; -import com.l2jserver.game.net.packet.client.RequestAllFortressInfoPacket; -import com.l2jserver.game.net.packet.client.RequestCharacterTemplatesPacket; -import com.l2jserver.game.net.packet.client.RequestGotoLobbyPacket; -import com.l2jserver.game.net.packet.client.RequestKeyMappingPacket; -import com.l2jserver.game.net.packet.client.RequestManorListPacket; -import com.l2jserver.game.net.packet.client.RequestRestartPacket; +import com.l2jserver.game.net.packet.client.CM_ADMIN_COMMAND; +import com.l2jserver.game.net.packet.client.CM_AUTH_LOGIN; +import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION; +import com.l2jserver.game.net.packet.client.CM_CHAR_APPEARING; +import com.l2jserver.game.net.packet.client.CM_CHAR_ATTACK; +import com.l2jserver.game.net.packet.client.CM_CHAT; +import com.l2jserver.game.net.packet.client.CM_CHAR_CREATE; +import com.l2jserver.game.net.packet.client.CM_ACTION_USE; +import com.l2jserver.game.net.packet.client.CM_BYPASS; +import com.l2jserver.game.net.packet.client.CM_CHAR_REQ_INVENTORY; +import com.l2jserver.game.net.packet.client.CM_CHAR_MOVE; +import com.l2jserver.game.net.packet.client.CM_CHAR_OPEN_MAP; +import com.l2jserver.game.net.packet.client.CM_CHAR_SELECT; +import com.l2jserver.game.net.packet.client.CM_CHAR_POSITION; +import com.l2jserver.game.net.packet.client.CM_ENTER_WORLD; +import com.l2jserver.game.net.packet.client.CM_LOGOUT; +import com.l2jserver.game.net.packet.client.CM_PROTOCOL_VERSION; +import com.l2jserver.game.net.packet.client.CM_REQUEST_ALL_FORTRESS_INFO; +import com.l2jserver.game.net.packet.client.CM_REQUEST_CHAR_TEMPLATE; +import com.l2jserver.game.net.packet.client.CM_GOTO_LOBBY; +import com.l2jserver.game.net.packet.client.CM_REQUEST_KEY_MAPPING; +import com.l2jserver.game.net.packet.client.CM_REQUEST_MANOR_LIST; +import com.l2jserver.game.net.packet.client.CM_RESTART; /** * This decoder reads an frame and decodes the packet in it. Each packet has an @@ -129,61 +129,61 @@ public class Lineage2PacketReader extends OneToOneDecoder { private Class getPacketClass(ChannelBuffer buffer) { final short opcode = buffer.readUnsignedByte(); switch (opcode) { - case LogoutPacket.OPCODE: - return LogoutPacket.class; - case ProtocolVersionPacket.OPCODE: - return ProtocolVersionPacket.class; - case AuthLoginPacket.OPCODE: - return AuthLoginPacket.class; - case CharacterCreatePacket.OPCODE: - return CharacterCreatePacket.class; - case RequestCharacterTemplatesPacket.OPCODE: - return RequestCharacterTemplatesPacket.class; + case CM_LOGOUT.OPCODE: + return CM_LOGOUT.class; + case CM_PROTOCOL_VERSION.OPCODE: + return CM_PROTOCOL_VERSION.class; + case CM_AUTH_LOGIN.OPCODE: + return CM_AUTH_LOGIN.class; + case CM_CHAR_CREATE.OPCODE: + return CM_CHAR_CREATE.class; + case CM_REQUEST_CHAR_TEMPLATE.OPCODE: + return CM_REQUEST_CHAR_TEMPLATE.class; case 0xd0: // COMPOSED final int opcode2 = buffer.readUnsignedShort(); switch (opcode2) { - case RequestGotoLobbyPacket.OPCODE2: - return RequestGotoLobbyPacket.class; - case RequestKeyMappingPacket.OPCODE2: - return RequestKeyMappingPacket.class; - case RequestManorListPacket.OPCODE2: - return RequestManorListPacket.class; - case RequestAllFortressInfoPacket.OPCODE2: - return RequestAllFortressInfoPacket.class; + case CM_GOTO_LOBBY.OPCODE2: + return CM_GOTO_LOBBY.class; + case CM_REQUEST_KEY_MAPPING.OPCODE2: + return CM_REQUEST_KEY_MAPPING.class; + case CM_REQUEST_MANOR_LIST.OPCODE2: + return CM_REQUEST_MANOR_LIST.class; + case CM_REQUEST_ALL_FORTRESS_INFO.OPCODE2: + return CM_REQUEST_ALL_FORTRESS_INFO.class; default: logger.warn("Unknown opcode2 for 0xd0: 0x{}", Integer.toHexString(opcode2)); break; } break; - case CharacterSelectPacket.OPCODE: - return CharacterSelectPacket.class; - case CharacterRequestMovePacket.OPCODE: - return CharacterRequestMovePacket.class; - case RequestRestartPacket.OPCODE: - return RequestRestartPacket.class; - case CharacterChatMessagePacket.OPCODE: - return CharacterChatMessagePacket.class; - case CharacterValidatePositionPacket.OPCODE: - return CharacterValidatePositionPacket.class; - case EnterWorld.OPCODE: - return EnterWorld.class; - case CharacterActionPacket.OPCODE: - return CharacterActionPacket.class; - case CharacterRequestInventoryPacket.OPCODE: - return CharacterRequestInventoryPacket.class; - case AdminCommandPacket.OPCODE: - return AdminCommandPacket.class; - case CharacterRequestBypass.OPCODE: - return CharacterRequestBypass.class; - case CharacterAppearingPacket.OPCODE: - return CharacterAppearingPacket.class; - case CharacterRequestActionUse.OPCODE: - return CharacterRequestActionUse.class; - case CharacterRequestOpenMap.OPCODE: - return CharacterRequestOpenMap.class; - case CharacterAttackRequestPacket.OPCODE: - return CharacterAttackRequestPacket.class; + case CM_CHAR_SELECT.OPCODE: + return CM_CHAR_SELECT.class; + case CM_CHAR_MOVE.OPCODE: + return CM_CHAR_MOVE.class; + case CM_RESTART.OPCODE: + return CM_RESTART.class; + case CM_CHAT.OPCODE: + return CM_CHAT.class; + case CM_CHAR_POSITION.OPCODE: + return CM_CHAR_POSITION.class; + case CM_ENTER_WORLD.OPCODE: + return CM_ENTER_WORLD.class; + case CM_CHAR_ACTION.OPCODE: + return CM_CHAR_ACTION.class; + case CM_CHAR_REQ_INVENTORY.OPCODE: + return CM_CHAR_REQ_INVENTORY.class; + case CM_ADMIN_COMMAND.OPCODE: + return CM_ADMIN_COMMAND.class; + case CM_BYPASS.OPCODE: + return CM_BYPASS.class; + case CM_CHAR_APPEARING.OPCODE: + return CM_CHAR_APPEARING.class; + case CM_ACTION_USE.OPCODE: + return CM_ACTION_USE.class; + case CM_CHAR_OPEN_MAP.OPCODE: + return CM_CHAR_OPEN_MAP.class; + case CM_CHAR_ATTACK.OPCODE: + return CM_CHAR_ATTACK.class; default: logger.warn("Unknown opcode: 0x{}", Integer.toHexString(opcode)); break; diff --git a/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java b/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java index 9104ae1fa..9009a16ca 100644 --- a/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java +++ b/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java @@ -28,7 +28,7 @@ import org.jboss.netty.channel.SimpleChannelHandler; import com.google.common.base.Throwables; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.ClientPacket; -import com.l2jserver.game.net.packet.server.NPCHtmlMessagePacket; +import com.l2jserver.game.net.packet.server.SM_HTML; import com.l2jserver.service.game.world.WorldService; import com.l2jserver.service.network.NettyNetworkService; import com.l2jserver.util.html.markup.HtmlTemplate; @@ -118,7 +118,7 @@ public class Lineage2PacketHandler extends SimpleChannelHandler { body.text(exception); } }; - connection.write(new NPCHtmlMessagePacket(null, template)); + connection.write(new SM_HTML(null, template)); connection.sendActionFailed(); // order client not to wait any packet final String[] lines = Throwables.getStackTraceAsString(e).split("\n"); diff --git a/src/main/java/com/l2jserver/game/net/packet/ClientPacketModule.java b/src/main/java/com/l2jserver/game/net/packet/ClientPacketModule.java index 18fe6b945..9dd6cf7a6 100644 --- a/src/main/java/com/l2jserver/game/net/packet/ClientPacketModule.java +++ b/src/main/java/com/l2jserver/game/net/packet/ClientPacketModule.java @@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet; import com.google.inject.AbstractModule; import com.google.inject.Module; -import com.l2jserver.game.net.packet.client.ProtocolVersionPacket; +import com.l2jserver.game.net.packet.client.CM_PROTOCOL_VERSION; /** * Google Guice {@link Module} for client packets @@ -28,6 +28,6 @@ import com.l2jserver.game.net.packet.client.ProtocolVersionPacket; public class ClientPacketModule extends AbstractModule { @Override protected void configure() { - bind(ProtocolVersionPacket.class); + bind(CM_PROTOCOL_VERSION.class); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/ServerPacketModule.java b/src/main/java/com/l2jserver/game/net/packet/ServerPacketModule.java index 47a69a6f0..85a8da9e1 100644 --- a/src/main/java/com/l2jserver/game/net/packet/ServerPacketModule.java +++ b/src/main/java/com/l2jserver/game/net/packet/ServerPacketModule.java @@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet; import com.google.inject.AbstractModule; import com.google.inject.Module; -import com.l2jserver.game.net.packet.client.ProtocolVersionPacket; +import com.l2jserver.game.net.packet.client.CM_PROTOCOL_VERSION; /** * Google Guice {@link Module} for server packets @@ -28,6 +28,6 @@ import com.l2jserver.game.net.packet.client.ProtocolVersionPacket; public class ServerPacketModule extends AbstractModule { @Override protected void configure() { - bind(ProtocolVersionPacket.class); + bind(CM_PROTOCOL_VERSION.class); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestActionUse.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java similarity index 95% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestActionUse.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java index dccaf9b32..504de23e3 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestActionUse.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java @@ -32,7 +32,7 @@ import com.l2jserver.service.game.character.CharacterService; * * @author Rogiel */ -public class CharacterRequestActionUse extends AbstractClientPacket { +public class CM_ACTION_USE extends AbstractClientPacket { /** * The packet OPCODE */ @@ -86,7 +86,7 @@ public class CharacterRequestActionUse extends AbstractClientPacket { private boolean shiftPressed; @Inject - public CharacterRequestActionUse(CharacterService charService) { + public CM_ACTION_USE(CharacterService charService) { this.charService = charService; } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/AdminCommandPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java similarity index 95% rename from src/main/java/com/l2jserver/game/net/packet/client/AdminCommandPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java index a6c94dce1..b306dd2e3 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/AdminCommandPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java @@ -34,7 +34,7 @@ import com.l2jserver.util.geometry.Coordinate; * * @author Rogiel */ -public class AdminCommandPacket extends AbstractClientPacket { +public class CM_ADMIN_COMMAND extends AbstractClientPacket { /** * The packet OPCODE */ @@ -52,7 +52,7 @@ public class AdminCommandPacket extends AbstractClientPacket { private String command; @Inject - public AdminCommandPacket(/* AdministratorService adminService, */ + public CM_ADMIN_COMMAND(/* AdministratorService adminService, */ SpawnService spawnService) { // this.adminService = adminService; this.spawnService = spawnService; diff --git a/src/main/java/com/l2jserver/game/net/packet/client/AuthLoginPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java similarity index 92% rename from src/main/java/com/l2jserver/game/net/packet/client/AuthLoginPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java index 3c246eee3..cbdbf27a5 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/AuthLoginPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java @@ -25,7 +25,7 @@ import com.l2jserver.db.dao.CharacterDAO; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.Lineage2Session; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.CharacterSelectionListPacket; +import com.l2jserver.game.net.packet.server.SM_CHAR_LIST; import com.l2jserver.model.id.AccountID; import com.l2jserver.model.id.provider.AccountIDProvider; import com.l2jserver.model.world.L2Character; @@ -38,7 +38,7 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class AuthLoginPacket extends AbstractClientPacket { +public class CM_AUTH_LOGIN extends AbstractClientPacket { /** * The packet OPCODE */ @@ -64,7 +64,7 @@ public class AuthLoginPacket extends AbstractClientPacket { private int loginKey2; @Inject - public AuthLoginPacket(CharacterDAO characterDao, + public CM_AUTH_LOGIN(CharacterDAO characterDao, AccountIDProvider accountIdFactory) { this.characterDao = characterDao; this.accountIdFactory = accountIdFactory; @@ -86,7 +86,7 @@ public class AuthLoginPacket extends AbstractClientPacket { loginKey1, loginKey2)); final List chars = characterDao.selectByAccount(accountId); - conn.write(CharacterSelectionListPacket.fromL2Session( + conn.write(SM_CHAR_LIST.fromL2Session( conn.getSession(), chars.toArray(new L2Character[chars.size()]))); } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestBypass.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java similarity index 95% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestBypass.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java index 1dbc07dd8..953652bac 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestBypass.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java @@ -37,7 +37,7 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class CharacterRequestBypass extends AbstractClientPacket { +public class CM_BYPASS extends AbstractClientPacket { /** * The packet OPCODE */ @@ -58,7 +58,7 @@ public class CharacterRequestBypass extends AbstractClientPacket { private String command; @Inject - public CharacterRequestBypass(ObjectIDResolver idResolver, + public CM_BYPASS(ObjectIDResolver idResolver, NPCService npcService) { this.idResolver = idResolver; this.npcService = npcService; diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterActionPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java similarity index 95% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterActionPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java index 93e7344a9..a89ebaab4 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterActionPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java @@ -35,7 +35,7 @@ import com.l2jserver.util.geometry.Coordinate; * * @author Rogiel */ -public class CharacterActionPacket extends AbstractClientPacket { +public class CM_CHAR_ACTION extends AbstractClientPacket { /** * The packet OPCODE */ @@ -71,7 +71,7 @@ public class CharacterActionPacket extends AbstractClientPacket { } @Inject - public CharacterActionPacket(ObjectIDResolver idResolver, + public CM_CHAR_ACTION(ObjectIDResolver idResolver, NPCService npcService) { this.idResolver = idResolver; this.npcService = npcService; diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterAppearingPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java similarity index 93% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterAppearingPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java index 896296cbc..1734a0a82 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterAppearingPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java @@ -30,7 +30,7 @@ import com.l2jserver.service.game.spawn.SpawnService; * * @author Rogiel */ -public class CharacterAppearingPacket extends AbstractClientPacket { +public class CM_CHAR_APPEARING extends AbstractClientPacket { /** * The packet OPCODE */ @@ -42,7 +42,7 @@ public class CharacterAppearingPacket extends AbstractClientPacket { private final SpawnService spawnService; @Inject - public CharacterAppearingPacket(SpawnService spawnService) { + public CM_CHAR_APPEARING(SpawnService spawnService) { this.spawnService = spawnService; } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterAttackRequestPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java similarity index 93% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterAttackRequestPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java index 27637f8ef..b4dc7f314 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterAttackRequestPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; import com.google.inject.Inject; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.ActionFailedPacket; +import com.l2jserver.game.net.packet.server.SM_ACTION_FAILED; import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.id.object.ActorID; import com.l2jserver.model.id.object.provider.ObjectIDResolver; @@ -41,7 +41,7 @@ import com.l2jserver.util.geometry.Coordinate; * * @author Rogiel */ -public class CharacterAttackRequestPacket extends AbstractClientPacket { +public class CM_CHAR_ATTACK extends AbstractClientPacket { /** * The packet OPCODE */ @@ -101,7 +101,7 @@ public class CharacterAttackRequestPacket extends AbstractClientPacket { } @Inject - public CharacterAttackRequestPacket(CharacterService charService, + public CM_CHAR_ATTACK(CharacterService charService, ObjectIDResolver idResolver) { this.charService = charService; this.idResolver = idResolver; @@ -121,7 +121,7 @@ public class CharacterAttackRequestPacket extends AbstractClientPacket { // since this is an erasure type, this is safe. final ObjectID id = idResolver.resolve(objectId); if (!(id instanceof ActorID)) { - conn.write(ActionFailedPacket.SHARED_INSTANCE); + conn.write(SM_ACTION_FAILED.SHARED_INSTANCE); log.warn("Player {} is trying to attack {}, which is not an actor", character, id); return; diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterCreatePacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java similarity index 92% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterCreatePacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java index f79989333..30fc12b8c 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterCreatePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java @@ -24,8 +24,8 @@ import com.google.inject.Inject; import com.l2jserver.db.dao.CharacterDAO; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.CharacterCreateFailPacket; -import com.l2jserver.game.net.packet.server.CharacterCreateOkPacket; +import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL; +import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_OK; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.template.CharacterTemplateID; @@ -46,7 +46,7 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class CharacterCreatePacket extends AbstractClientPacket { +public class CM_CHAR_CREATE extends AbstractClientPacket { /** * The packet OPCODE */ @@ -56,7 +56,7 @@ public class CharacterCreatePacket extends AbstractClientPacket { * The logger */ private static final Logger log = LoggerFactory - .getLogger(CharacterCreatePacket.class); + .getLogger(CM_CHAR_CREATE.class); // services and daos /** @@ -135,7 +135,7 @@ public class CharacterCreatePacket extends AbstractClientPacket { private CharacterFace face; @Inject - public CharacterCreatePacket(CharacterDAO characterDao, + public CM_CHAR_CREATE(CharacterDAO characterDao, CharacterIDProvider characterIdFactory, CharacterTemplateIDProvider characterTemplateIdFactory) { this.characterDao = characterDao; @@ -168,8 +168,8 @@ public class CharacterCreatePacket extends AbstractClientPacket { new Object[] { race, sex, characterClass }); if ((name.length() < 1) || (name.length() > 16)) { log.debug("Character name length invalid: {}. Aborting.", name); - conn.write(new CharacterCreateFailPacket( - CharacterCreateFailPacket.Reason.REASON_16_ENG_CHARS)); + conn.write(new SM_CHAR_CREATE_FAIL( + SM_CHAR_CREATE_FAIL.Reason.REASON_16_ENG_CHARS)); return; } // TODO check alphanumeric name @@ -178,16 +178,16 @@ public class CharacterCreatePacket extends AbstractClientPacket { log.debug("Character appearance invalid. Aborting."); // if some of those attributes is null, something wrong happened. // Maybe we don't support the value sent! - conn.write(new CharacterCreateFailPacket( - CharacterCreateFailPacket.Reason.REASON_CREATION_FAILED)); + conn.write(new SM_CHAR_CREATE_FAIL( + SM_CHAR_CREATE_FAIL.Reason.REASON_CREATION_FAILED)); return; } // existence check final L2Character existenceCheck = characterDao.selectByName(name); if (existenceCheck != null) { log.debug("Character name already exists: {}. Aborting.", name); - conn.write(new CharacterCreateFailPacket( - CharacterCreateFailPacket.Reason.REASON_NAME_ALREADY_EXISTS)); + conn.write(new SM_CHAR_CREATE_FAIL( + SM_CHAR_CREATE_FAIL.Reason.REASON_NAME_ALREADY_EXISTS)); return; } @@ -206,8 +206,8 @@ public class CharacterCreatePacket extends AbstractClientPacket { "Values sent by client and from template does not match: {}", template); // some of the values didn't match, canceling creation - conn.write(new CharacterCreateFailPacket( - CharacterCreateFailPacket.Reason.REASON_CREATION_FAILED)); + conn.write(new SM_CHAR_CREATE_FAIL( + SM_CHAR_CREATE_FAIL.Reason.REASON_CREATION_FAILED)); return; } @@ -230,7 +230,7 @@ public class CharacterCreatePacket extends AbstractClientPacket { if (characterDao.save(character)) { log.debug("Character saved to database"); - conn.write(CharacterCreateOkPacket.INSTANCE); + conn.write(SM_CHAR_CREATE_OK.INSTANCE); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestMovePacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java similarity index 91% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestMovePacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java index 1478bb418..9070e2dc6 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestMovePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; import com.google.inject.Inject; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.CharacterStopMovePacket; +import com.l2jserver.game.net.packet.server.SM_STOP; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.game.character.CharacterService; import com.l2jserver.util.geometry.Coordinate; @@ -33,7 +33,7 @@ import com.l2jserver.util.geometry.Coordinate; * * @author Rogiel */ -public class CharacterRequestMovePacket extends AbstractClientPacket { +public class CM_CHAR_MOVE extends AbstractClientPacket { /** * The packet OPCODE */ @@ -71,7 +71,7 @@ public class CharacterRequestMovePacket extends AbstractClientPacket { } @Inject - public CharacterRequestMovePacket(CharacterService charService) { + public CM_CHAR_MOVE(CharacterService charService) { this.charService = charService; } @@ -92,7 +92,7 @@ public class CharacterRequestMovePacket extends AbstractClientPacket { public void process(final Lineage2Connection conn) { if (target.equals(origin)) { log.debug("Target is same as origin. Stopping character."); - conn.write(new CharacterStopMovePacket(conn.getCharacter())); + conn.write(new SM_STOP(conn.getCharacter())); return; } if (target.getDistance(origin) >= 98010000) { diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestOpenMap.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java similarity index 87% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestOpenMap.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java index 7c00bc9eb..d0c4db7a2 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestOpenMap.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java @@ -20,14 +20,14 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.CharacterOpenMap; +import com.l2jserver.game.net.packet.server.SM_CHAR_OPEN_MAP; /** * Executes an bypass command * * @author Rogiel */ -public class CharacterRequestOpenMap extends AbstractClientPacket { +public class CM_CHAR_OPEN_MAP extends AbstractClientPacket { /** * The packet OPCODE */ @@ -39,6 +39,6 @@ public class CharacterRequestOpenMap extends AbstractClientPacket { @Override public void process(final Lineage2Connection conn) { - conn.write(new CharacterOpenMap(1665)); + conn.write(new SM_CHAR_OPEN_MAP(1665)); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterValidatePositionPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java similarity index 92% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterValidatePositionPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java index e11fbcceb..cdc16842e 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterValidatePositionPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java @@ -29,7 +29,7 @@ import com.l2jserver.util.geometry.Point3D; * * @author Rogiel */ -public class CharacterValidatePositionPacket extends AbstractClientPacket { +public class CM_CHAR_POSITION extends AbstractClientPacket { /** * The packet OPCODE */ @@ -45,7 +45,7 @@ public class CharacterValidatePositionPacket extends AbstractClientPacket { private int extra; // vehicle id @Inject - public CharacterValidatePositionPacket(CharacterService charService) { + public CM_CHAR_POSITION(CharacterService charService) { this.charService = charService; } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestInventoryPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java similarity index 86% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestInventoryPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java index 28bdcf256..e1cd0c450 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestInventoryPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java @@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.CharacterInventoryPacket; +import com.l2jserver.game.net.packet.server.SM_CHAR_INVENTORY; import com.l2jserver.model.world.L2Character; /** @@ -29,7 +29,7 @@ import com.l2jserver.model.world.L2Character; * * @author Rogiel */ -public class CharacterRequestInventoryPacket extends AbstractClientPacket { +public class CM_CHAR_REQ_INVENTORY extends AbstractClientPacket { /** * The packet OPCODE */ @@ -42,6 +42,6 @@ public class CharacterRequestInventoryPacket extends AbstractClientPacket { @Override public void process(final Lineage2Connection conn) { final L2Character character = conn.getCharacter(); - conn.write(new CharacterInventoryPacket(character.getInventory())); + conn.write(new SM_CHAR_INVENTORY(character.getInventory())); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterSelectPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java similarity index 88% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterSelectPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java index db2537404..60d93b562 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterSelectPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import com.l2jserver.db.dao.CharacterDAO; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.CharacterSelectedPacket; +import com.l2jserver.game.net.packet.server.SM_CHAR_SELECTED; import com.l2jserver.model.world.L2Character; /** @@ -32,7 +32,7 @@ import com.l2jserver.model.world.L2Character; * * @author Rogiel */ -public class CharacterSelectPacket extends AbstractClientPacket { +public class CM_CHAR_SELECT extends AbstractClientPacket { /** * The packet OPCODE */ @@ -51,7 +51,7 @@ public class CharacterSelectPacket extends AbstractClientPacket { private int slot; @Inject - public CharacterSelectPacket(CharacterDAO characterDao) { + public CM_CHAR_SELECT(CharacterDAO characterDao) { this.characterDao = characterDao; } @@ -69,6 +69,6 @@ public class CharacterSelectPacket extends AbstractClientPacket { final L2Character character = chars.get(slot); conn.setCharacterID(character.getID()); - conn.write(new CharacterSelectedPacket(chars.get(slot))); + conn.write(new SM_CHAR_SELECTED(chars.get(slot))); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterChatMessagePacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java similarity index 92% rename from src/main/java/com/l2jserver/game/net/packet/client/CharacterChatMessagePacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java index d83269bcf..3b85e8c9b 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterChatMessagePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java @@ -22,7 +22,7 @@ import com.google.inject.Inject; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.SystemMessage; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.ActionFailedPacket; +import com.l2jserver.game.net.packet.server.SM_ACTION_FAILED; import com.l2jserver.service.game.chat.CannotChatToSelfChatServiceException; import com.l2jserver.service.game.chat.ChatBanActiveChatServiceException; import com.l2jserver.service.game.chat.ChatMessageDestination; @@ -37,7 +37,7 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class CharacterChatMessagePacket extends AbstractClientPacket { +public class CM_CHAT extends AbstractClientPacket { /** * The packet OPCODE */ @@ -55,7 +55,7 @@ public class CharacterChatMessagePacket extends AbstractClientPacket { private String target; @Inject - public CharacterChatMessagePacket(ChatService chatService) { + public CM_CHAT(ChatService chatService) { this.chatService = chatService; } @@ -72,7 +72,7 @@ public class CharacterChatMessagePacket extends AbstractClientPacket { @Override public void process(final Lineage2Connection conn) { if (message.length() == 0 || destination == null) { - conn.write(ActionFailedPacket.SHARED_INSTANCE); + conn.write(SM_ACTION_FAILED.SHARED_INSTANCE); conn.close(); } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/EnterWorld.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java similarity index 93% rename from src/main/java/com/l2jserver/game/net/packet/client/EnterWorld.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java index f60c2d152..02b958d7e 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/EnterWorld.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java @@ -34,13 +34,13 @@ import com.l2jserver.service.game.spawn.SpawnPointNotFoundServiceException; * * @author Rogiel */ -public class EnterWorld extends AbstractClientPacket { +public class CM_ENTER_WORLD extends AbstractClientPacket { /** * The packet OPCODE */ public static final int OPCODE = 0x11; - private final Logger log = LoggerFactory.getLogger(EnterWorld.class); + private final Logger log = LoggerFactory.getLogger(CM_ENTER_WORLD.class); /** * The {@link CharacterService} @@ -48,7 +48,7 @@ public class EnterWorld extends AbstractClientPacket { private final CharacterService characterService; @Inject - public EnterWorld(CharacterService characterService) { + public CM_ENTER_WORLD(CharacterService characterService) { this.characterService = characterService; } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/RequestGotoLobbyPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java similarity index 87% rename from src/main/java/com/l2jserver/game/net/packet/client/RequestGotoLobbyPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java index f480825b2..c79bb8fa7 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/RequestGotoLobbyPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import com.l2jserver.db.dao.CharacterDAO; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.CharacterSelectionListPacket; +import com.l2jserver.game.net.packet.server.SM_CHAR_LIST; import com.l2jserver.model.world.L2Character; /** @@ -33,7 +33,7 @@ import com.l2jserver.model.world.L2Character; * * @author Rogiel */ -public class RequestGotoLobbyPacket extends AbstractClientPacket { +public class CM_GOTO_LOBBY extends AbstractClientPacket { /** * The packet OPCODE1 */ @@ -49,7 +49,7 @@ public class RequestGotoLobbyPacket extends AbstractClientPacket { private final CharacterDAO characterDao; @Inject - public RequestGotoLobbyPacket(CharacterDAO characterDao) { + public CM_GOTO_LOBBY(CharacterDAO characterDao) { this.characterDao = characterDao; } @@ -61,7 +61,7 @@ public class RequestGotoLobbyPacket extends AbstractClientPacket { public void process(final Lineage2Connection conn) { final List chars = characterDao.selectByAccount(conn .getSession().getAccountID()); - conn.write(CharacterSelectionListPacket.fromL2Session( + conn.write(SM_CHAR_LIST.fromL2Session( conn.getSession(), chars.toArray(new L2Character[0]))); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/LogoutPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java similarity index 94% rename from src/main/java/com/l2jserver/game/net/packet/client/LogoutPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java index cd8797ca2..1a14f0ff0 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/LogoutPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java @@ -29,7 +29,7 @@ import com.l2jserver.game.net.packet.AbstractClientPacket; * * @author Rogiel */ -public class LogoutPacket extends AbstractClientPacket { +public class CM_LOGOUT extends AbstractClientPacket { /** * The packet OPCODE */ @@ -39,7 +39,7 @@ public class LogoutPacket extends AbstractClientPacket { * The logger */ private static final Logger log = LoggerFactory - .getLogger(LogoutPacket.class); + .getLogger(CM_LOGOUT.class); @Override public void read(Lineage2Connection conn, ChannelBuffer buffer) { diff --git a/src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java similarity index 91% rename from src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java index 7d9164686..044c33dee 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java @@ -28,7 +28,7 @@ import com.l2jserver.game.ProtocolVersion; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.Lineage2CryptographyKey; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.KeyPacket; +import com.l2jserver.game.net.packet.server.SM_KEY; import com.l2jserver.service.network.keygen.BlowfishKeygenService; /** @@ -39,7 +39,7 @@ import com.l2jserver.service.network.keygen.BlowfishKeygenService; * * @author Rogiel */ -public class ProtocolVersionPacket extends AbstractClientPacket { +public class CM_PROTOCOL_VERSION extends AbstractClientPacket { /** * The packet OPCODE */ @@ -49,7 +49,7 @@ public class ProtocolVersionPacket extends AbstractClientPacket { * The logger */ private final Logger log = LoggerFactory - .getLogger(ProtocolVersionPacket.class); + .getLogger(CM_PROTOCOL_VERSION.class); // services /** @@ -65,7 +65,7 @@ public class ProtocolVersionPacket extends AbstractClientPacket { private ProtocolVersion version; @Inject - public ProtocolVersionPacket(BlowfishKeygenService keygen) { + public CM_PROTOCOL_VERSION(BlowfishKeygenService keygen) { this.keygen = keygen; } @@ -91,7 +91,7 @@ public class ProtocolVersionPacket extends AbstractClientPacket { log.info("Incorrect protocol version: {0}. Only {1} is supported.", version, L2JConstant.SUPPORTED_PROTOCOL); // notify wrong protocol and close connection - conn.write(new KeyPacket(inKey, false)).addListener( + conn.write(new SM_KEY(inKey, false)).addListener( new ChannelFutureListener() { @Override public void operationComplete(ChannelFuture future) @@ -103,7 +103,7 @@ public class ProtocolVersionPacket extends AbstractClientPacket { return; } // activate encrypter once packet has been sent. - conn.write(new KeyPacket(inKey, true)).addListener( + conn.write(new SM_KEY(inKey, true)).addListener( new ChannelFutureListener() { @Override public void operationComplete(ChannelFuture future) diff --git a/src/main/java/com/l2jserver/game/net/packet/client/RequestAllFortressInfoPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_ALL_FORTRESS_INFO.java similarity index 89% rename from src/main/java/com/l2jserver/game/net/packet/client/RequestAllFortressInfoPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_ALL_FORTRESS_INFO.java index 34f34065f..5cbd3a0f2 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/RequestAllFortressInfoPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_ALL_FORTRESS_INFO.java @@ -20,14 +20,14 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.FortInfoPacket; +import com.l2jserver.game.net.packet.server.SM_FORT_INFO; /** * The client is requesting the manor list. * * @author Rogiel */ -public class RequestAllFortressInfoPacket extends AbstractClientPacket { +public class CM_REQUEST_ALL_FORTRESS_INFO extends AbstractClientPacket { /** * The packet OPCODE1 */ @@ -43,6 +43,6 @@ public class RequestAllFortressInfoPacket extends AbstractClientPacket { @Override public void process(final Lineage2Connection conn) { - conn.write(new FortInfoPacket()); + conn.write(new SM_FORT_INFO()); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/RequestCharacterTemplatesPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java similarity index 89% rename from src/main/java/com/l2jserver/game/net/packet/client/RequestCharacterTemplatesPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java index c657bb905..4bc13f54f 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/RequestCharacterTemplatesPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; import com.google.inject.Inject; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.CharacterTemplatePacket; +import com.l2jserver.game.net.packet.server.SM_CHAR_TEMPLATE; import com.l2jserver.model.id.template.CharacterTemplateID; import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider; import com.l2jserver.model.template.CharacterTemplate; @@ -36,7 +36,7 @@ import com.l2jserver.model.world.character.CharacterClass; * * @author Rogiel */ -public class RequestCharacterTemplatesPacket extends AbstractClientPacket { +public class CM_REQUEST_CHAR_TEMPLATE extends AbstractClientPacket { /** * The packet OPCODE */ @@ -57,7 +57,7 @@ public class RequestCharacterTemplatesPacket extends AbstractClientPacket { * The logger */ private static final Logger log = LoggerFactory - .getLogger(RequestCharacterTemplatesPacket.class); + .getLogger(CM_REQUEST_CHAR_TEMPLATE.class); /** * The {@link CharacterTemplateID} factory @@ -65,7 +65,7 @@ public class RequestCharacterTemplatesPacket extends AbstractClientPacket { private final CharacterTemplateIDProvider idFactory; @Inject - public RequestCharacterTemplatesPacket(CharacterTemplateIDProvider idFactory) { + public CM_REQUEST_CHAR_TEMPLATE(CharacterTemplateIDProvider idFactory) { this.idFactory = idFactory; } @@ -83,6 +83,6 @@ public class RequestCharacterTemplatesPacket extends AbstractClientPacket { final CharacterTemplateID id = idFactory.createID(charClass.id); templates[i++] = id.getTemplate(); } - conn.write(new CharacterTemplatePacket(templates)); + conn.write(new SM_CHAR_TEMPLATE(templates)); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/RequestKeyMappingPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_KEY_MAPPING.java similarity index 95% rename from src/main/java/com/l2jserver/game/net/packet/client/RequestKeyMappingPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_KEY_MAPPING.java index 619b1789b..b64791c5b 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/RequestKeyMappingPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_KEY_MAPPING.java @@ -26,7 +26,7 @@ import com.l2jserver.game.net.packet.AbstractClientPacket; * * @author Rogiel */ -public class RequestKeyMappingPacket extends AbstractClientPacket { +public class CM_REQUEST_KEY_MAPPING extends AbstractClientPacket { /** * The packet OPCODE1 */ diff --git a/src/main/java/com/l2jserver/game/net/packet/client/RequestManorListPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_MANOR_LIST.java similarity index 87% rename from src/main/java/com/l2jserver/game/net/packet/client/RequestManorListPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_MANOR_LIST.java index 48bb384be..1b384e5b6 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/RequestManorListPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_MANOR_LIST.java @@ -20,14 +20,14 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.ManorListPacket; +import com.l2jserver.game.net.packet.server.SM_MANOR_LIST; /** * The client is requesting the manor list. * * @author Rogiel */ -public class RequestManorListPacket extends AbstractClientPacket { +public class CM_REQUEST_MANOR_LIST extends AbstractClientPacket { /** * The packet OPCODE1 */ @@ -43,7 +43,7 @@ public class RequestManorListPacket extends AbstractClientPacket { @Override public void process(final Lineage2Connection conn) { - conn.write(new ManorListPacket("gludio", "dion", "giran", "oren", + conn.write(new SM_MANOR_LIST("gludio", "dion", "giran", "oren", "aden", "innadril", "goddard", "rune", "schuttgart")); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/RequestShortcutRegistry.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_SHORTCUT_REGISTRY.java similarity index 93% rename from src/main/java/com/l2jserver/game/net/packet/client/RequestShortcutRegistry.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_SHORTCUT_REGISTRY.java index 82511a0e5..29d251bc3 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/RequestShortcutRegistry.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_SHORTCUT_REGISTRY.java @@ -29,7 +29,7 @@ import com.l2jserver.game.net.packet.AbstractClientPacket; * * @author Rogiel */ -public class RequestShortcutRegistry extends AbstractClientPacket { +public class CM_REQUEST_SHORTCUT_REGISTRY extends AbstractClientPacket { /** * The packet OPCODE1 */ @@ -43,7 +43,7 @@ public class RequestShortcutRegistry extends AbstractClientPacket { * The logger */ private static final Logger log = LoggerFactory - .getLogger(RequestShortcutRegistry.class); + .getLogger(CM_REQUEST_SHORTCUT_REGISTRY.class); /** * The shortcut type diff --git a/src/main/java/com/l2jserver/game/net/packet/client/RequestRestartPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java similarity index 88% rename from src/main/java/com/l2jserver/game/net/packet/client/RequestRestartPacket.java rename to src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java index d9e2f9c75..6aaf739c1 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/RequestRestartPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java @@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractClientPacket; -import com.l2jserver.game.net.packet.server.RestartResponsePacket; +import com.l2jserver.game.net.packet.server.SM_CHAR_RESTART; /** * Requests the list of characters to be displayed in the lobby. The list of @@ -28,7 +28,7 @@ import com.l2jserver.game.net.packet.server.RestartResponsePacket; * * @author Rogiel */ -public class RequestRestartPacket extends AbstractClientPacket { +public class CM_RESTART extends AbstractClientPacket { /** * The packet OPCODE */ @@ -41,6 +41,6 @@ public class RequestRestartPacket extends AbstractClientPacket { @Override public void process(final Lineage2Connection conn) { conn.setCharacterID(null); - conn.write(RestartResponsePacket.ok()); + conn.write(SM_CHAR_RESTART.ok()); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/ActionFailedPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java similarity index 84% rename from src/main/java/com/l2jserver/game/net/packet/server/ActionFailedPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java index 3cae21060..90c4a4c39 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/ActionFailedPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java @@ -26,21 +26,21 @@ import com.l2jserver.game.net.packet.AbstractServerPacket; * * @author Rogiel */ -public class ActionFailedPacket extends AbstractServerPacket { +public class SM_ACTION_FAILED extends AbstractServerPacket { /** * The packet OPCODE */ public static final int OPCODE = 0x1f; /** - * The {@link ActionFailedPacket} shared instance + * The {@link SM_ACTION_FAILED} shared instance */ - public static final ActionFailedPacket SHARED_INSTANCE = new ActionFailedPacket(); + public static final SM_ACTION_FAILED SHARED_INSTANCE = new SM_ACTION_FAILED(); /** * Creates a new instance */ - public ActionFailedPacket() { + public SM_ACTION_FAILED() { super(OPCODE); } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/ActorUpdatePositionPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java similarity index 89% rename from src/main/java/com/l2jserver/game/net/packet/server/ActorUpdatePositionPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java index f48abecd4..0d3081ba6 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/ActorUpdatePositionPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java @@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractServerPacket; -import com.l2jserver.game.net.packet.server.CharacterCreateFailPacket.Reason; +import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL.Reason; import com.l2jserver.model.world.Actor; /** @@ -30,7 +30,7 @@ import com.l2jserver.model.world.Actor; * @author Rogiel * @see Reason */ -public class ActorUpdatePositionPacket extends AbstractServerPacket { +public class SM_ACTOR_POSITION extends AbstractServerPacket { /** * The packet OPCODE */ @@ -41,7 +41,7 @@ public class ActorUpdatePositionPacket extends AbstractServerPacket { */ private final Actor actor; - public ActorUpdatePositionPacket(Actor actor) { + public SM_ACTOR_POSITION(Actor actor) { super(OPCODE); this.actor = actor; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/ActorAttackPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_ATTACK.java similarity index 93% rename from src/main/java/com/l2jserver/game/net/packet/server/ActorAttackPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_ATTACK.java index 71fa4a1fc..c4cf795a3 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/ActorAttackPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_ATTACK.java @@ -33,7 +33,7 @@ import com.l2jserver.util.factory.CollectionFactory; * @author Rogiel * @see AttackHit */ -public class ActorAttackPacket extends AbstractServerPacket { +public class SM_ATTACK extends AbstractServerPacket { /** * The packet OPCODE */ @@ -48,7 +48,7 @@ public class ActorAttackPacket extends AbstractServerPacket { */ private final List hits = CollectionFactory.newList(); - public ActorAttackPacket(Actor attacker, AttackHit... hits) { + public SM_ATTACK(Actor attacker, AttackHit... hits) { super(OPCODE); this.attacker = attacker; Collections.addAll(this.hits, hits); @@ -86,7 +86,7 @@ public class ActorAttackPacket extends AbstractServerPacket { buffer.writeInt(first.getTarget().getPoint().getZ()); } - public ActorAttackPacket add(AttackHit hit) { + public SM_ATTACK add(AttackHit hit) { hits.add(hit); return this; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterCreateFailPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java similarity index 95% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterCreateFailPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java index 9611d2723..414d80e80 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterCreateFailPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java @@ -27,7 +27,7 @@ import com.l2jserver.game.net.packet.AbstractServerPacket; * @author Rogiel * @see Reason */ -public class CharacterCreateFailPacket extends AbstractServerPacket { +public class SM_CHAR_CREATE_FAIL extends AbstractServerPacket { /** * The packet OPCODE */ @@ -88,7 +88,7 @@ public class CharacterCreateFailPacket extends AbstractServerPacket { } } - public CharacterCreateFailPacket(Reason reason) { + public SM_CHAR_CREATE_FAIL(Reason reason) { super(OPCODE); this.reason = reason; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterCreateOkPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java similarity index 87% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterCreateOkPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java index b53797581..38c532790 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterCreateOkPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java @@ -26,7 +26,7 @@ import com.l2jserver.game.net.packet.AbstractServerPacket; * * @author Rogiel */ -public class CharacterCreateOkPacket extends AbstractServerPacket { +public class SM_CHAR_CREATE_OK extends AbstractServerPacket { /** * The packet OPCODE */ @@ -35,9 +35,9 @@ public class CharacterCreateOkPacket extends AbstractServerPacket { /** * The packet shared instance */ - public static final CharacterCreateOkPacket INSTANCE = new CharacterCreateOkPacket(); + public static final SM_CHAR_CREATE_OK INSTANCE = new SM_CHAR_CREATE_OK(); - public CharacterCreateOkPacket() { + public SM_CHAR_CREATE_OK() { super(OPCODE); } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterInformationPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java similarity index 99% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterInformationPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java index 5f01289bd..042dcaa56 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterInformationPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java @@ -58,7 +58,7 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class CharacterInformationPacket extends AbstractServerPacket { +public class SM_CHAR_INFO extends AbstractServerPacket { /** * The packet OPCODE */ @@ -69,7 +69,7 @@ public class CharacterInformationPacket extends AbstractServerPacket { */ private L2Character character; - public CharacterInformationPacket(L2Character character) { + public SM_CHAR_INFO(L2Character character) { super(OPCODE); this.character = character; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterInformationBroadcastPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java similarity index 98% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterInformationBroadcastPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java index 4d836699a..71295bf5d 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterInformationBroadcastPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java @@ -53,7 +53,7 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class CharacterInformationBroadcastPacket extends AbstractServerPacket { +public class SM_CHAR_INFO_BROADCAST extends AbstractServerPacket { /** * The packet OPCODE */ @@ -61,7 +61,7 @@ public class CharacterInformationBroadcastPacket extends AbstractServerPacket { private final L2Character character; - public CharacterInformationBroadcastPacket(L2Character character) { + public SM_CHAR_INFO_BROADCAST(L2Character character) { super(OPCODE); this.character = character; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterInformationExtraPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java similarity index 91% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterInformationExtraPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java index 567545f2d..bd914270b 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterInformationExtraPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java @@ -27,7 +27,7 @@ import com.l2jserver.model.world.L2Character; * * @author Rogiel */ -public class CharacterInformationExtraPacket extends AbstractServerPacket { +public class SM_CHAR_INFO_EXTRA extends AbstractServerPacket { /** * The packet OPCODE */ @@ -38,7 +38,7 @@ public class CharacterInformationExtraPacket extends AbstractServerPacket { */ private L2Character character; - public CharacterInformationExtraPacket(L2Character character) { + public SM_CHAR_INFO_EXTRA(L2Character character) { super(OPCODE); this.character = character; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterInventoryPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java similarity index 95% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterInventoryPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java index 3cb3fe7ad..5a9198515 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterInventoryPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java @@ -29,7 +29,7 @@ import com.l2jserver.model.world.character.CharacterInventory.InventoryLocation; * * @author Rogiel */ -public class CharacterInventoryPacket extends AbstractServerPacket { +public class SM_CHAR_INVENTORY extends AbstractServerPacket { /** * The packet OPCODE */ @@ -44,7 +44,7 @@ public class CharacterInventoryPacket extends AbstractServerPacket { */ private boolean showWindow = false; - public CharacterInventoryPacket(CharacterInventory inventory) { + public SM_CHAR_INVENTORY(CharacterInventory inventory) { super(OPCODE); this.inventory = inventory; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java similarity index 97% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java index 22c6d60cd..48185b7b9 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java @@ -57,7 +57,7 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class CharacterSelectionListPacket extends AbstractServerPacket { +public class SM_CHAR_LIST extends AbstractServerPacket { /** * The packet OPCODE */ @@ -77,7 +77,7 @@ public class CharacterSelectionListPacket extends AbstractServerPacket { */ private final L2Character[] characters; - public CharacterSelectionListPacket(String loginName, int sessionId, + public SM_CHAR_LIST(String loginName, int sessionId, int lastCharacterId, L2Character... characters) { super(OPCODE); this.loginName = loginName; @@ -86,9 +86,9 @@ public class CharacterSelectionListPacket extends AbstractServerPacket { this.characters = characters; } - public static CharacterSelectionListPacket fromL2Session( + public static SM_CHAR_LIST fromL2Session( Lineage2Session session, L2Character... characters) { - return new CharacterSelectionListPacket(session.getAccountID().getID(), + return new SM_CHAR_LIST(session.getAccountID().getID(), session.getPlayKey2(), -1, characters); } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterOpenMap.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java similarity index 93% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterOpenMap.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java index 418b324f6..4e0fe5859 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterOpenMap.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java @@ -26,7 +26,7 @@ import com.l2jserver.game.net.packet.AbstractServerPacket; * * @author Rogiel */ -public class CharacterOpenMap extends AbstractServerPacket { +public class SM_CHAR_OPEN_MAP extends AbstractServerPacket { /** * The packet OPCODE */ @@ -37,7 +37,7 @@ public class CharacterOpenMap extends AbstractServerPacket { */ private final int mapID; - public CharacterOpenMap(int mapID) { + public SM_CHAR_OPEN_MAP(int mapID) { super(OPCODE); this.mapID = mapID; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/RestartResponsePacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java similarity index 82% rename from src/main/java/com/l2jserver/game/net/packet/server/RestartResponsePacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java index c871887c9..639db6103 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/RestartResponsePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java @@ -26,7 +26,7 @@ import com.l2jserver.game.net.packet.AbstractServerPacket; * * @author Rogiel */ -public class RestartResponsePacket extends AbstractServerPacket { +public class SM_CHAR_RESTART extends AbstractServerPacket { /** * The packet OPCODE */ @@ -37,17 +37,17 @@ public class RestartResponsePacket extends AbstractServerPacket { */ private boolean state; - public RestartResponsePacket(boolean state) { + public SM_CHAR_RESTART(boolean state) { super(OPCODE); this.state = state; } - public static RestartResponsePacket ok() { - return new RestartResponsePacket(true); + public static SM_CHAR_RESTART ok() { + return new SM_CHAR_RESTART(true); } - public static RestartResponsePacket denied() { - return new RestartResponsePacket(false); + public static SM_CHAR_RESTART denied() { + return new SM_CHAR_RESTART(false); } @Override diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectedPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java similarity index 93% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectedPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java index 1b15c8b7c..a084965d7 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectedPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java @@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractServerPacket; -import com.l2jserver.game.net.packet.server.CharacterCreateFailPacket.Reason; +import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL.Reason; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.ActorExperience; import com.l2jserver.util.BufferUtils; @@ -32,7 +32,7 @@ import com.l2jserver.util.BufferUtils; * @author Rogiel * @see Reason */ -public class CharacterSelectedPacket extends AbstractServerPacket { +public class SM_CHAR_SELECTED extends AbstractServerPacket { /** * The packet OPCODE */ @@ -43,7 +43,7 @@ public class CharacterSelectedPacket extends AbstractServerPacket { */ private final L2Character character; - public CharacterSelectedPacket(L2Character character) { + public SM_CHAR_SELECTED(L2Character character) { super(OPCODE); this.character = character; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterTemplatePacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java similarity index 94% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterTemplatePacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java index 7ebd29809..fef385ca0 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterTemplatePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java @@ -27,7 +27,7 @@ import com.l2jserver.model.template.CharacterTemplate; * * @author Rogiel */ -public class CharacterTemplatePacket extends AbstractServerPacket { +public class SM_CHAR_TEMPLATE extends AbstractServerPacket { /** * The packet OPCODE */ @@ -38,7 +38,7 @@ public class CharacterTemplatePacket extends AbstractServerPacket { */ private CharacterTemplate[] templates; - public CharacterTemplatePacket(CharacterTemplate... templates) { + public SM_CHAR_TEMPLATE(CharacterTemplate... templates) { super(OPCODE); this.templates = templates; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/ActorChatMessagePacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java similarity index 90% rename from src/main/java/com/l2jserver/game/net/packet/server/ActorChatMessagePacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java index e52de9d1e..d67aec116 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/ActorChatMessagePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java @@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractServerPacket; -import com.l2jserver.game.net.packet.server.CharacterCreateFailPacket.Reason; +import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL.Reason; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.game.chat.ChatMessageDestination; @@ -33,7 +33,7 @@ import com.l2jserver.util.BufferUtils; * @author Rogiel * @see Reason */ -public class ActorChatMessagePacket extends AbstractServerPacket { +public class SM_CHAT extends AbstractServerPacket { /** * The packet OPCODE */ @@ -56,7 +56,7 @@ public class ActorChatMessagePacket extends AbstractServerPacket { */ private int messageID = 0; - public ActorChatMessagePacket(Actor character, + public SM_CHAT(Actor character, ChatMessageDestination destination, String message) { super(OPCODE); this.actor = character; @@ -64,7 +64,7 @@ public class ActorChatMessagePacket extends AbstractServerPacket { this.message = message; } - public ActorChatMessagePacket(Actor actor, + public SM_CHAT(Actor actor, ChatMessageDestination destination, int messageID) { super(OPCODE); this.actor = actor; diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterEnterWorldPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_ENTER_WORLD.java similarity index 95% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterEnterWorldPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_ENTER_WORLD.java index 39183f1db..7697941dc 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterEnterWorldPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_ENTER_WORLD.java @@ -29,7 +29,7 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class CharacterEnterWorldPacket extends AbstractServerPacket { +public class SM_ENTER_WORLD extends AbstractServerPacket { /** * The packet OPCODE */ @@ -52,7 +52,7 @@ public class CharacterEnterWorldPacket extends AbstractServerPacket { * @param sessionId * the session id */ - public CharacterEnterWorldPacket(L2Character character, int sessionId) { + public SM_ENTER_WORLD(L2Character character, int sessionId) { super(OPCODE); this.character = character; this.sessionId = sessionId; diff --git a/src/main/java/com/l2jserver/game/net/packet/server/FortInfoPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java similarity index 94% rename from src/main/java/com/l2jserver/game/net/packet/server/FortInfoPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java index 9f6b141a6..a94114fd7 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/FortInfoPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java @@ -27,13 +27,13 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class FortInfoPacket extends AbstractServerPacket { +public class SM_FORT_INFO extends AbstractServerPacket { /** * The packet OPCODE */ public static final int OPCODE = 0xfe; - public FortInfoPacket() { + public SM_FORT_INFO() { super(OPCODE); } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/GameGuardQueryPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java similarity index 93% rename from src/main/java/com/l2jserver/game/net/packet/server/GameGuardQueryPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java index c3de25e01..7e38476dc 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/GameGuardQueryPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java @@ -27,13 +27,13 @@ import com.l2jserver.game.net.packet.AbstractServerPacket; * * @author Rogiel */ -public class GameGuardQueryPacket extends AbstractServerPacket { +public class SM_GG_QUERY extends AbstractServerPacket { /** * The packet OPCODE */ public static final int OPCODE = 0x74; - public GameGuardQueryPacket() { + public SM_GG_QUERY() { super(OPCODE); } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/NPCHtmlMessagePacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java similarity index 88% rename from src/main/java/com/l2jserver/game/net/packet/server/NPCHtmlMessagePacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java index 513aafbd5..0b455cb59 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/NPCHtmlMessagePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java @@ -30,7 +30,7 @@ import com.l2jserver.util.html.markup.HtmlTemplate; * * @author Rogiel */ -public class NPCHtmlMessagePacket extends AbstractServerPacket { +public class SM_HTML extends AbstractServerPacket { /** * The packet OPCODE */ @@ -45,19 +45,19 @@ public class NPCHtmlMessagePacket extends AbstractServerPacket { */ private final String html; - public NPCHtmlMessagePacket(NPC npc, String html) { + public SM_HTML(NPC npc, String html) { super(OPCODE); this.npc = npc; this.html = html; } - public NPCHtmlMessagePacket(NPC npc, Html html) { + public SM_HTML(NPC npc, Html html) { super(OPCODE); this.npc = npc; this.html = html.toHtml(); } - public NPCHtmlMessagePacket(NPC npc, HtmlTemplate template) { + public SM_HTML(NPC npc, HtmlTemplate template) { super(OPCODE); this.npc = npc; this.html = template.toHtmlString(); diff --git a/src/main/java/com/l2jserver/game/net/packet/server/KeyPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java similarity index 83% rename from src/main/java/com/l2jserver/game/net/packet/server/KeyPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java index ec4181a06..5ab2f3343 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/KeyPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java @@ -30,7 +30,7 @@ import com.l2jserver.game.net.packet.AbstractServerPacket; * * @author Rogiel */ -public class KeyPacket extends AbstractServerPacket { +public class SM_KEY extends AbstractServerPacket { /** * The packet OPCODE */ @@ -45,32 +45,32 @@ public class KeyPacket extends AbstractServerPacket { */ private boolean status; - public KeyPacket(Lineage2CryptographyKey key, boolean status) { + public SM_KEY(Lineage2CryptographyKey key, boolean status) { super(OPCODE); this.key = Arrays.copyOfRange(key.key, 0, 8); this.status = status; } /** - * Creates a new {@link KeyPacket} with key and valid protocol. + * Creates a new {@link SM_KEY} with key and valid protocol. * * @param key * the key * @return the new instance */ - public static KeyPacket valid(Lineage2CryptographyKey key) { - return new KeyPacket(key, true); + public static SM_KEY valid(Lineage2CryptographyKey key) { + return new SM_KEY(key, true); } /** - * Creates a new {@link KeyPacket} with key and invalid protocol. + * Creates a new {@link SM_KEY} with key and invalid protocol. * * @param key * the key * @return the new instance */ - public static KeyPacket invalid(Lineage2CryptographyKey key) { - return new KeyPacket(key, false); + public static SM_KEY invalid(Lineage2CryptographyKey key) { + return new SM_KEY(key, false); } @Override diff --git a/src/main/java/com/l2jserver/game/net/packet/server/ManorListPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java similarity index 93% rename from src/main/java/com/l2jserver/game/net/packet/server/ManorListPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java index 91e721e10..88a9f8041 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/ManorListPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java @@ -27,7 +27,7 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class ManorListPacket extends AbstractServerPacket { +public class SM_MANOR_LIST extends AbstractServerPacket { /** * The packet OPCODE */ @@ -38,7 +38,7 @@ public class ManorListPacket extends AbstractServerPacket { */ private String[] manors; - public ManorListPacket(String... manors) { + public SM_MANOR_LIST(String... manors) { super(OPCODE); this.manors = manors; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/ActorMovementPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE.java similarity index 93% rename from src/main/java/com/l2jserver/game/net/packet/server/ActorMovementPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE.java index cdc63ee81..2343da89a 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/ActorMovementPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE.java @@ -30,7 +30,7 @@ import com.l2jserver.util.geometry.Coordinate; * * @author Rogiel O */ -public class ActorMovementPacket extends AbstractServerPacket { +public class SM_MOVE extends AbstractServerPacket { /** * The packet OPCODE */ @@ -45,7 +45,7 @@ public class ActorMovementPacket extends AbstractServerPacket { */ private Coordinate target; - public ActorMovementPacket(Actor actor, Coordinate target) { + public SM_MOVE(Actor actor, Coordinate target) { super(OPCODE); this.actor = actor; this.target = target; diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterMovementTypePacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE_TYPE.java similarity index 87% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterMovementTypePacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE_TYPE.java index cc59f6505..09907a965 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterMovementTypePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE_TYPE.java @@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractServerPacket; -import com.l2jserver.game.net.packet.server.CharacterCreateFailPacket.Reason; +import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL.Reason; import com.l2jserver.model.world.L2Character; /** @@ -29,7 +29,7 @@ import com.l2jserver.model.world.L2Character; * @author Rogiel * @see Reason */ -public class CharacterMovementTypePacket extends AbstractServerPacket { +public class SM_MOVE_TYPE extends AbstractServerPacket { /** * The packet OPCODE */ @@ -40,7 +40,7 @@ public class CharacterMovementTypePacket extends AbstractServerPacket { */ private final L2Character character; - public CharacterMovementTypePacket(L2Character character) { + public SM_MOVE_TYPE(L2Character character) { super(OPCODE); this.character = character; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/NPCInformationPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java similarity index 97% rename from src/main/java/com/l2jserver/game/net/packet/server/NPCInformationPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java index a77ace642..5cf636e65 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/NPCInformationPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java @@ -29,7 +29,7 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class NPCInformationPacket extends AbstractServerPacket { +public class SM_NPC_INFO extends AbstractServerPacket { /** * The packet OPCODE */ @@ -37,7 +37,7 @@ public class NPCInformationPacket extends AbstractServerPacket { private final NPC npc; - public NPCInformationPacket(NPC npc) { + public SM_NPC_INFO(NPC npc) { super(OPCODE); this.npc = npc; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/ObjectRemove.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java similarity index 92% rename from src/main/java/com/l2jserver/game/net/packet/server/ObjectRemove.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java index 5f6022867..7d089f50e 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/ObjectRemove.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java @@ -28,7 +28,7 @@ import com.l2jserver.model.world.PositionableObject; * * @author Rogiel */ -public class ObjectRemove extends AbstractServerPacket { +public class SM_OBJECT_REMOVE extends AbstractServerPacket { /** * The packet OPCODE */ @@ -39,7 +39,7 @@ public class ObjectRemove extends AbstractServerPacket { */ private final PositionableObject object; - public ObjectRemove(PositionableObject object) { + public SM_OBJECT_REMOVE(PositionableObject object) { super(OPCODE); this.object = object; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/ServerObjectPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java similarity index 95% rename from src/main/java/com/l2jserver/game/net/packet/server/ServerObjectPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java index 09319570d..83137a05f 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/ServerObjectPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java @@ -30,7 +30,7 @@ import com.l2jserver.util.BufferUtils; * * @author Rogiel */ -public class ServerObjectPacket extends AbstractServerPacket { +public class SM_SERVER_OBJECT extends AbstractServerPacket { /** * The packet OPCODE */ @@ -38,7 +38,7 @@ public class ServerObjectPacket extends AbstractServerPacket { private final NPC npc; - public ServerObjectPacket(NPC npc) { + public SM_SERVER_OBJECT(NPC npc) { super(OPCODE); this.npc = npc; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/ActorStatusUpdatePacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_STATUS_UPDATE.java similarity index 90% rename from src/main/java/com/l2jserver/game/net/packet/server/ActorStatusUpdatePacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_STATUS_UPDATE.java index 98d7dc4fd..52871985d 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/ActorStatusUpdatePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_STATUS_UPDATE.java @@ -23,7 +23,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractServerPacket; -import com.l2jserver.game.net.packet.server.CharacterCreateFailPacket.Reason; +import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL.Reason; import com.l2jserver.model.world.Actor; import com.l2jserver.util.factory.CollectionFactory; @@ -34,7 +34,7 @@ import com.l2jserver.util.factory.CollectionFactory; * @author Rogiel * @see Reason */ -public class ActorStatusUpdatePacket extends AbstractServerPacket { +public class SM_STATUS_UPDATE extends AbstractServerPacket { /** * The packet OPCODE */ @@ -69,7 +69,7 @@ public class ActorStatusUpdatePacket extends AbstractServerPacket { private final Map update = CollectionFactory.newMap(); private final Actor actor; - public ActorStatusUpdatePacket(Actor actor) { + public SM_STATUS_UPDATE(Actor actor) { super(OPCODE); this.actor = actor; } @@ -85,7 +85,7 @@ public class ActorStatusUpdatePacket extends AbstractServerPacket { } } - public ActorStatusUpdatePacket add(Stat stat, int value) { + public SM_STATUS_UPDATE add(Stat stat, int value) { update.put(stat, value); return this; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterStopMovePacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_STOP.java similarity index 92% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterStopMovePacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_STOP.java index ad3dc2e8d..a1543b471 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterStopMovePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_STOP.java @@ -27,7 +27,7 @@ import com.l2jserver.model.world.L2Character; * * @author Rogiel */ -public class CharacterStopMovePacket extends AbstractServerPacket { +public class SM_STOP extends AbstractServerPacket { /** * The packet OPCODE */ @@ -35,7 +35,7 @@ public class CharacterStopMovePacket extends AbstractServerPacket { private L2Character character; - public CharacterStopMovePacket(L2Character character) { + public SM_STOP(L2Character character) { super(OPCODE); this.character = character; } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/SystemMessagePacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java similarity index 86% rename from src/main/java/com/l2jserver/game/net/packet/server/SystemMessagePacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java index bf147b0bb..6318efe7c 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/SystemMessagePacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java @@ -38,7 +38,7 @@ import com.l2jserver.util.factory.CollectionFactory; * * @author Rogiel */ -public class SystemMessagePacket extends AbstractServerPacket { +public class SM_SYSTEM_MESSAGE extends AbstractServerPacket { /** * The packet OPCODE */ @@ -76,7 +76,7 @@ public class SystemMessagePacket extends AbstractServerPacket { /** * Creates a new instance */ - public SystemMessagePacket(SystemMessage message) { + public SM_SYSTEM_MESSAGE(SystemMessage message) { super(OPCODE); this.id = message.id; } @@ -90,7 +90,7 @@ public class SystemMessagePacket extends AbstractServerPacket { } } - public final SystemMessagePacket addString(final String text) { + public final SM_SYSTEM_MESSAGE addString(final String text) { params.add(new SystemMessagePacketParameter() { @Override public void write(Lineage2Connection conn, ChannelBuffer buffer) { @@ -111,7 +111,7 @@ public class SystemMessagePacket extends AbstractServerPacket { * @param number * @return */ - public final SystemMessagePacket addFort(final Fort fort) { + public final SM_SYSTEM_MESSAGE addFort(final Fort fort) { params.add(new SystemMessagePacketParameter() { @Override public void write(Lineage2Connection conn, ChannelBuffer buffer) { @@ -122,7 +122,7 @@ public class SystemMessagePacket extends AbstractServerPacket { return this; } - public final SystemMessagePacket addNumber(final int number) { + public final SM_SYSTEM_MESSAGE addNumber(final int number) { params.add(new SystemMessagePacketParameter() { @Override public void write(Lineage2Connection conn, ChannelBuffer buffer) { @@ -133,7 +133,7 @@ public class SystemMessagePacket extends AbstractServerPacket { return this; } - public final SystemMessagePacket addItemCount(final long number) { + public final SM_SYSTEM_MESSAGE addItemCount(final long number) { params.add(new SystemMessagePacketParameter() { @Override public void write(Lineage2Connection conn, ChannelBuffer buffer) { @@ -144,7 +144,7 @@ public class SystemMessagePacket extends AbstractServerPacket { return this; } - public final SystemMessagePacket addActorName(final Actor actor) { + public final SM_SYSTEM_MESSAGE addActorName(final Actor actor) { // params.add(new SystemMessagePacketParameter() { // @Override // public void write(Lineage2Connection conn, ChannelBuffer buffer) { @@ -156,7 +156,7 @@ public class SystemMessagePacket extends AbstractServerPacket { return this; } - public final SystemMessagePacket addItem(final ItemTemplate item) { + public final SM_SYSTEM_MESSAGE addItem(final ItemTemplate item) { params.add(new SystemMessagePacketParameter() { @Override public void write(Lineage2Connection conn, ChannelBuffer buffer) { @@ -167,11 +167,11 @@ public class SystemMessagePacket extends AbstractServerPacket { return this; } - public final SystemMessagePacket addItem(final Item item) { + public final SM_SYSTEM_MESSAGE addItem(final Item item) { return addItem(item.getTemplateID().getTemplate()); } - public final SystemMessagePacket addZoneName(final int x, final int y, + public final SM_SYSTEM_MESSAGE addZoneName(final int x, final int y, final int z) { params.add(new SystemMessagePacketParameter() { @Override @@ -185,7 +185,7 @@ public class SystemMessagePacket extends AbstractServerPacket { return this; } - public final SystemMessagePacket addSkill(final SkillTemplate skill, + public final SM_SYSTEM_MESSAGE addSkill(final SkillTemplate skill, final int level) { params.add(new SystemMessagePacketParameter() { @Override @@ -198,7 +198,7 @@ public class SystemMessagePacket extends AbstractServerPacket { return this; } - public final SystemMessagePacket addSkill(final Skill skill) { + public final SM_SYSTEM_MESSAGE addSkill(final Skill skill) { return addSkill(skill.getSkillTemplate(), skill.getLevel()); } @@ -208,7 +208,7 @@ public class SystemMessagePacket extends AbstractServerPacket { * @param type * @return */ - public final SystemMessagePacket addElemntal(final int type) { + public final SM_SYSTEM_MESSAGE addElemntal(final int type) { params.add(new SystemMessagePacketParameter() { @Override public void write(Lineage2Connection conn, ChannelBuffer buffer) { @@ -225,7 +225,7 @@ public class SystemMessagePacket extends AbstractServerPacket { * @param type * @return */ - public final SystemMessagePacket addSystemString(final int type) { + public final SM_SYSTEM_MESSAGE addSystemString(final int type) { params.add(new SystemMessagePacketParameter() { @Override public void write(Lineage2Connection conn, ChannelBuffer buffer) { @@ -243,7 +243,7 @@ public class SystemMessagePacket extends AbstractServerPacket { * id of instance * @return */ - public final SystemMessagePacket addInstanceName(final int type) { + public final SM_SYSTEM_MESSAGE addInstanceName(final int type) { params.add(new SystemMessagePacketParameter() { @Override public void write(Lineage2Connection conn, ChannelBuffer buffer) { diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterTargetSelectedPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_TARGET.java similarity index 85% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterTargetSelectedPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_TARGET.java index c3de83852..ce4112543 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterTargetSelectedPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_TARGET.java @@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractServerPacket; -import com.l2jserver.game.net.packet.server.CharacterCreateFailPacket.Reason; +import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL.Reason; import com.l2jserver.model.world.Actor; /** @@ -30,7 +30,7 @@ import com.l2jserver.model.world.Actor; * @author Rogiel * @see Reason */ -public class CharacterTargetSelectedPacket extends AbstractServerPacket { +public class SM_TARGET extends AbstractServerPacket { /** * The packet OPCODE */ @@ -42,13 +42,13 @@ public class CharacterTargetSelectedPacket extends AbstractServerPacket { private final Actor object; private int color; - public CharacterTargetSelectedPacket(Actor object, int color) { + public SM_TARGET(Actor object, int color) { super(OPCODE); this.object = object; this.color = color; } - public CharacterTargetSelectedPacket(Actor object) { + public SM_TARGET(Actor object) { this(object, 0); } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterTeleportPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_TELEPORT.java similarity index 89% rename from src/main/java/com/l2jserver/game/net/packet/server/CharacterTeleportPacket.java rename to src/main/java/com/l2jserver/game/net/packet/server/SM_TELEPORT.java index 3ea075c7b..54fc902dd 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterTeleportPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_TELEPORT.java @@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.AbstractServerPacket; -import com.l2jserver.game.net.packet.server.CharacterCreateFailPacket.Reason; +import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL.Reason; import com.l2jserver.model.world.L2Character; import com.l2jserver.util.geometry.Point3D; @@ -31,7 +31,7 @@ import com.l2jserver.util.geometry.Point3D; * @author Rogiel * @see Reason */ -public class CharacterTeleportPacket extends AbstractServerPacket { +public class SM_TELEPORT extends AbstractServerPacket { /** * The packet OPCODE */ @@ -46,7 +46,7 @@ public class CharacterTeleportPacket extends AbstractServerPacket { */ private final Point3D point; - public CharacterTeleportPacket(L2Character character, Point3D point) { + public SM_TELEPORT(L2Character character, Point3D point) { super(OPCODE); this.character = character; this.point = point; diff --git a/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java b/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java index 078f7cd10..4724ef367 100644 --- a/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java +++ b/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java @@ -22,7 +22,7 @@ import org.htmlparser.Parser; import org.htmlparser.util.ParserException; import com.l2jserver.game.net.Lineage2Connection; -import com.l2jserver.game.net.packet.server.NPCHtmlMessagePacket; +import com.l2jserver.game.net.packet.server.SM_HTML; import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.NPC; @@ -62,7 +62,7 @@ public class BaseNPCController implements NPCController { body.text("Arguments: " + Arrays.toString(args)); } }.register("name", character.getName()); - conn.write(new NPCHtmlMessagePacket(npc, template)); + conn.write(new SM_HTML(npc, template)); conn.sendActionFailed(); } @@ -89,7 +89,7 @@ public class BaseNPCController implements NPCController { final String html = getHTML(npc, id); if (html == null) return false; - conn.write(new NPCHtmlMessagePacket(npc, html)); + conn.write(new SM_HTML(npc, html)); conn.sendActionFailed(); return true; } diff --git a/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java b/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java index 13a4d9152..4b3695ba9 100644 --- a/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java +++ b/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java @@ -18,8 +18,8 @@ package com.l2jserver.model.world.npc.controller; import com.google.inject.Inject; import com.l2jserver.game.net.Lineage2Connection; -import com.l2jserver.game.net.packet.server.ActorStatusUpdatePacket; -import com.l2jserver.game.net.packet.server.ActorStatusUpdatePacket.Stat; +import com.l2jserver.game.net.packet.server.SM_STATUS_UPDATE; +import com.l2jserver.game.net.packet.server.SM_STATUS_UPDATE.Stat; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.NPC; import com.l2jserver.service.game.character.CharacterService; @@ -41,7 +41,7 @@ public class MonsterController extends BaseNPCController { public void action(NPC npc, Lineage2Connection conn, L2Character character, String... args) throws L2Exception { // send hp update - conn.write(new ActorStatusUpdatePacket(npc).add(Stat.MAX_HP, + conn.write(new SM_STATUS_UPDATE(npc).add(Stat.MAX_HP, (int) npc.getTemplate().getMaximumHP()).add(Stat.HP, (int) npc.getHP())); } diff --git a/src/main/java/com/l2jserver/model/world/npc/controller/NotImplementedNPCController.java b/src/main/java/com/l2jserver/model/world/npc/controller/NotImplementedNPCController.java index 5d9e36577..04a2ee550 100644 --- a/src/main/java/com/l2jserver/model/world/npc/controller/NotImplementedNPCController.java +++ b/src/main/java/com/l2jserver/model/world/npc/controller/NotImplementedNPCController.java @@ -19,7 +19,7 @@ package com.l2jserver.model.world.npc.controller; import java.util.Arrays; import com.l2jserver.game.net.Lineage2Connection; -import com.l2jserver.game.net.packet.server.NPCHtmlMessagePacket; +import com.l2jserver.game.net.packet.server.SM_HTML; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.NPC; import com.l2jserver.util.exception.L2Exception; @@ -46,7 +46,7 @@ public class NotImplementedNPCController extends BaseNPCController { body.text("Arguments: " + Arrays.toString(args)); } }.register("name", character.getName()); - conn.write(new NPCHtmlMessagePacket(npc, template)); + conn.write(new SM_HTML(npc, template)); conn.sendActionFailed(); } } diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java b/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java index bed83b639..7c3529ce5 100644 --- a/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java @@ -21,17 +21,17 @@ import com.google.inject.Inject; import com.l2jserver.db.dao.ItemDAO; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.SystemMessage; -import com.l2jserver.game.net.packet.server.ActorChatMessagePacket; -import com.l2jserver.game.net.packet.server.ActorMovementPacket; -import com.l2jserver.game.net.packet.server.CharacterInformationBroadcastPacket; -import com.l2jserver.game.net.packet.server.CharacterInformationExtraPacket; -import com.l2jserver.game.net.packet.server.CharacterInformationPacket; -import com.l2jserver.game.net.packet.server.CharacterInventoryPacket; -import com.l2jserver.game.net.packet.server.CharacterMovementTypePacket; -import com.l2jserver.game.net.packet.server.CharacterTargetSelectedPacket; -import com.l2jserver.game.net.packet.server.GameGuardQueryPacket; -import com.l2jserver.game.net.packet.server.NPCInformationPacket; -import com.l2jserver.game.net.packet.server.ObjectRemove; +import com.l2jserver.game.net.packet.server.SM_CHAT; +import com.l2jserver.game.net.packet.server.SM_MOVE; +import com.l2jserver.game.net.packet.server.SM_CHAR_INFO_BROADCAST; +import com.l2jserver.game.net.packet.server.SM_CHAR_INFO_EXTRA; +import com.l2jserver.game.net.packet.server.SM_CHAR_INFO; +import com.l2jserver.game.net.packet.server.SM_CHAR_INVENTORY; +import com.l2jserver.game.net.packet.server.SM_MOVE_TYPE; +import com.l2jserver.game.net.packet.server.SM_TARGET; +import com.l2jserver.game.net.packet.server.SM_GG_QUERY; +import com.l2jserver.game.net.packet.server.SM_NPC_INFO; +import com.l2jserver.game.net.packet.server.SM_OBJECT_REMOVE; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.world.Actor; @@ -153,7 +153,7 @@ public class CharacterServiceImpl extends AbstractService implements @Override public void onMessage(ChatChannel channel, CharacterID source, String message) { - conn.write(new ActorChatMessagePacket(source.getObject(), + conn.write(new SM_CHAT(source.getObject(), ChatMessageDestination.ALL, message)); } }; @@ -161,7 +161,7 @@ public class CharacterServiceImpl extends AbstractService implements @Override public void onMessage(ChatChannel channel, CharacterID source, String message) { - conn.write(new ActorChatMessagePacket(source.getObject(), + conn.write(new SM_CHAT(source.getObject(), ChatMessageDestination.TRADE, message)); } }; @@ -171,36 +171,35 @@ public class CharacterServiceImpl extends AbstractService implements // dispatched, once a event arrives will be possible to check check if // the given event will be broadcasted or not // TODO this should not be here, it should be in world service or a - // newly - // created broadcast service. + // newly created broadcast service. final WorldListener neighboorListener = new FilteredWorldListener( new KnownListFilter(character)) { @Override protected boolean dispatch(WorldEvent e, PositionableObject object) { if (e instanceof NPCSpawnEvent) { - conn.write(new NPCInformationPacket((NPC) object)); + conn.write(new SM_NPC_INFO((NPC) object)); } else if (e instanceof CharacterMoveEvent) { final CharacterMoveEvent evt = (CharacterMoveEvent) e; - conn.write(new ActorMovementPacket((L2Character) object, - evt.getPoint().getCoordinate())); + conn.write(new SM_MOVE((L2Character) object, evt.getPoint() + .getCoordinate())); } else if (e instanceof PlayerTeleportedEvent || e instanceof CharacterEnterWorldEvent) { if (object instanceof NPC) { - conn.write(new NPCInformationPacket((NPC) object)); + conn.write(new SM_NPC_INFO((NPC) object)); } else if (object instanceof L2Character) { - conn.write(new CharacterInformationBroadcastPacket( + conn.write(new SM_CHAR_INFO_BROADCAST( (L2Character) object)); } } else if (e instanceof PlayerTeleportingEvent || e instanceof CharacterLeaveWorldEvent) { // object is not out of sight - conn.write(new ObjectRemove(object)); + conn.write(new SM_OBJECT_REMOVE(object)); } else if (e instanceof CharacterWalkingEvent) { - conn.write(new CharacterMovementTypePacket( - ((CharacterWalkingEvent) e).getCharacter())); + conn.write(new SM_MOVE_TYPE(((CharacterWalkingEvent) e) + .getCharacter())); } else if (e instanceof CharacterRunningEvent) { - conn.write(new CharacterMovementTypePacket( - ((CharacterRunningEvent) e).getCharacter())); + conn.write(new SM_MOVE_TYPE(((CharacterRunningEvent) e) + .getCharacter())); } // keep listener alive return true; @@ -218,9 +217,9 @@ public class CharacterServiceImpl extends AbstractService implements .iterable(new KnownListUpdateFilter(character, evt .getPoint()))) { if (o instanceof NPC) { - conn.write(new NPCInformationPacket((NPC) o)); + conn.write(new SM_NPC_INFO((NPC) o)); } else if (o instanceof L2Character) { - conn.write(new CharacterInformationBroadcastPacket( + conn.write(new SM_CHAR_INFO_BROADCAST( (L2Character) o)); } } @@ -262,11 +261,11 @@ public class CharacterServiceImpl extends AbstractService implements chatService.getTradeChannel().addChatChannelListener(tradeChatListener); // send this user information - conn.write(new CharacterInformationPacket(character)); - conn.write(new CharacterInformationExtraPacket(character)); + conn.write(new SM_CHAR_INFO(character)); + conn.write(new SM_CHAR_INFO_EXTRA(character)); // TODO game guard enforcing - conn.write(new GameGuardQueryPacket()); - conn.write(new CharacterInventoryPacket(character.getInventory())); + conn.write(new SM_GG_QUERY()); + conn.write(new SM_CHAR_INVENTORY(character.getInventory())); conn.sendSystemMessage(SystemMessage.WELCOME_TO_LINEAGE); conn.sendMessage("This an an development version for l2jserver 2.0"); @@ -296,10 +295,9 @@ public class CharacterServiceImpl extends AbstractService implements for (final WorldObject o : worldService.iterable(new KnownListFilter( character))) { if (o instanceof NPC) { - conn.write(new NPCInformationPacket((NPC) o)); + conn.write(new SM_NPC_INFO((NPC) o)); } else if (o instanceof L2Character) { - conn.write(new CharacterInformationBroadcastPacket( - (L2Character) o)); + conn.write(new SM_CHAR_INFO_BROADCAST((L2Character) o)); } } } @@ -341,8 +339,8 @@ public class CharacterServiceImpl extends AbstractService implements character.setTargetID(target.getID()); eventDispatcher.dispatch(new CharacterTargetSelectedEvent( character, target)); - conn.write(new CharacterTargetSelectedPacket(target, character - .getLevel() - target.getLevel())); + conn.write(new SM_TARGET(target, character.getLevel() + - target.getLevel())); } else { // this indicates an inconsistency: reset target and throws an // exception @@ -411,7 +409,7 @@ public class CharacterServiceImpl extends AbstractService implements // for now, let's just write the packet, we don't have much validation // to be done yet. With character validation packet, another packet of // these will be broadcasted. - conn.write(new ActorMovementPacket(character, coordinate)); + conn.write(new SM_MOVE(character, coordinate)); // we don't dispatch events here, they will be dispatched by // with the same packet referred up here. } @@ -456,7 +454,7 @@ public class CharacterServiceImpl extends AbstractService implements character.setMoveType(CharacterMoveType.WALK); eventDispatcher.dispatch(new CharacterWalkingEvent(character)); - conn.write(new CharacterMovementTypePacket(character)); + conn.write(new SM_MOVE_TYPE(character)); } @Override @@ -472,6 +470,6 @@ public class CharacterServiceImpl extends AbstractService implements character.setMoveType(CharacterMoveType.RUN); eventDispatcher.dispatch(new CharacterRunningEvent(character)); - conn.write(new CharacterMovementTypePacket(character)); + conn.write(new SM_MOVE_TYPE(character)); } } diff --git a/src/main/java/com/l2jserver/service/game/npc/NPCService.java b/src/main/java/com/l2jserver/service/game/npc/NPCService.java index 68e627f3b..58352ed71 100644 --- a/src/main/java/com/l2jserver/service/game/npc/NPCService.java +++ b/src/main/java/com/l2jserver/service/game/npc/NPCService.java @@ -19,7 +19,7 @@ package com.l2jserver.service.game.npc; import java.util.Collection; import com.l2jserver.game.net.Lineage2Connection; -import com.l2jserver.game.net.packet.client.CharacterActionPacket.CharacterAction; +import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction; import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.NPC; diff --git a/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java b/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java index 6faabbdb3..f102e64db 100644 --- a/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java @@ -26,8 +26,8 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.l2jserver.db.dao.NPCDAO; import com.l2jserver.game.net.Lineage2Connection; -import com.l2jserver.game.net.packet.client.CharacterActionPacket.CharacterAction; -import com.l2jserver.game.net.packet.server.ActorAttackPacket; +import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction; +import com.l2jserver.game.net.packet.server.SM_ATTACK; import com.l2jserver.model.server.AttackHit; import com.l2jserver.model.server.AttackHit.AttackHitFlag; import com.l2jserver.model.world.L2Character; @@ -183,7 +183,7 @@ public class NPCServiceImpl extends AbstractService implements NPCService { Preconditions.checkNotNull(conn, "conn"); Preconditions.checkNotNull(attacker, "attacker"); - conn.write(new ActorAttackPacket(conn.getCharacter(), new AttackHit( + conn.write(new SM_ATTACK(conn.getCharacter(), new AttackHit( conn.getCharacter(), npc, AttackHitFlag.MISS, AttackHitFlag.SOULSHOT))); } diff --git a/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java b/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java index 16101bf22..7cda6f488 100644 --- a/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java @@ -19,9 +19,9 @@ package com.l2jserver.service.game.spawn; import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.l2jserver.game.net.Lineage2Connection; -import com.l2jserver.game.net.packet.server.CharacterInformationExtraPacket; -import com.l2jserver.game.net.packet.server.CharacterInformationPacket; -import com.l2jserver.game.net.packet.server.CharacterTeleportPacket; +import com.l2jserver.game.net.packet.server.SM_CHAR_INFO_EXTRA; +import com.l2jserver.game.net.packet.server.SM_CHAR_INFO; +import com.l2jserver.game.net.packet.server.SM_TELEPORT; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.L2Character.CharacterState; @@ -119,7 +119,7 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService { if (conn == null) // TODO throw an exception here return; - conn.write(new CharacterTeleportPacket(conn.getCharacter(), + conn.write(new SM_TELEPORT(conn.getCharacter(), coordinate.toPoint())); ((L2Character) player).setState(CharacterState.TELEPORTING); ((L2Character) player).setTargetLocation(coordinate.toPoint()); @@ -150,8 +150,8 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService { character.setTargetLocation(null); - conn.write(new CharacterInformationPacket(character)); - conn.write(new CharacterInformationExtraPacket(character)); + conn.write(new SM_CHAR_INFO(character)); + conn.write(new SM_CHAR_INFO_EXTRA(character)); } @Override