From 966a4012a081dbcf8f806fd2ab0d28791a900cc1 Mon Sep 17 00:00:00 2001 From: Major- Date: Wed, 12 Feb 2014 17:48:33 +0000 Subject: [PATCH] Rename SendPrivateMessageEvent to PrivateMessageEvent. --- ...vateMessageEvent.java => PrivateMessageEvent.java} | 4 ++-- ...ntDecoder.java => PrivateMessageEventDecoder.java} | 11 +++++------ src/org/apollo/net/release/r317/Release317.java | 2 +- ...ntDecoder.java => PrivateMessageEventDecoder.java} | 10 +++++----- src/org/apollo/net/release/r377/Release377.java | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) rename src/org/apollo/game/event/impl/{SendPrivateMessageEvent.java => PrivateMessageEvent.java} (88%) rename src/org/apollo/net/release/r317/{SendPrivateMessageEventDecoder.java => PrivateMessageEventDecoder.java} (70%) rename src/org/apollo/net/release/r377/{SendPrivateMessageEventDecoder.java => PrivateMessageEventDecoder.java} (70%) diff --git a/src/org/apollo/game/event/impl/SendPrivateMessageEvent.java b/src/org/apollo/game/event/impl/PrivateMessageEvent.java similarity index 88% rename from src/org/apollo/game/event/impl/SendPrivateMessageEvent.java rename to src/org/apollo/game/event/impl/PrivateMessageEvent.java index 52f67625..3e00d021 100644 --- a/src/org/apollo/game/event/impl/SendPrivateMessageEvent.java +++ b/src/org/apollo/game/event/impl/PrivateMessageEvent.java @@ -7,7 +7,7 @@ import org.apollo.game.event.Event; * * @author Major */ -public final class SendPrivateMessageEvent extends Event { +public final class PrivateMessageEvent extends Event { /** * The username this message is being sent to. @@ -31,7 +31,7 @@ public final class SendPrivateMessageEvent extends Event { * @param message The message. * @param compressedMessage The message, in a compressed form. */ - public SendPrivateMessageEvent(String username, String message, byte[] compressedMessage) { + public PrivateMessageEvent(String username, String message, byte[] compressedMessage) { this.username = username; this.message = message; this.compressedMessage = compressedMessage; diff --git a/src/org/apollo/net/release/r317/SendPrivateMessageEventDecoder.java b/src/org/apollo/net/release/r317/PrivateMessageEventDecoder.java similarity index 70% rename from src/org/apollo/net/release/r317/SendPrivateMessageEventDecoder.java rename to src/org/apollo/net/release/r317/PrivateMessageEventDecoder.java index 02d20285..026d6a65 100644 --- a/src/org/apollo/net/release/r317/SendPrivateMessageEventDecoder.java +++ b/src/org/apollo/net/release/r317/PrivateMessageEventDecoder.java @@ -1,6 +1,6 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.SendPrivateMessageEvent; +import org.apollo.game.event.impl.PrivateMessageEvent; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; @@ -9,18 +9,17 @@ import org.apollo.util.NameUtil; import org.apollo.util.TextUtil; /** - * An {@link EventDecoder} for the {@link SendPrivateMessageEvent}. + * An {@link EventDecoder} for the {@link PrivateMessageEvent}. * * @author Major */ -public final class SendPrivateMessageEventDecoder extends EventDecoder { +public final class PrivateMessageEventDecoder extends EventDecoder { @Override - public SendPrivateMessageEvent decode(GamePacket packet) { + public PrivateMessageEvent decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); - int length = packet.getLength() - 8; byte[] originalCompressed = new byte[length]; @@ -33,7 +32,7 @@ public final class SendPrivateMessageEventDecoder extends EventDecoder { +public final class PrivateMessageEventDecoder extends EventDecoder { @Override - public SendPrivateMessageEvent decode(GamePacket packet) { + public PrivateMessageEvent decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); @@ -32,7 +32,7 @@ public final class SendPrivateMessageEventDecoder extends EventDecoder