From 8b31333e23fa5b4d01a95ccc4fde0cb0a8fe0518 Mon Sep 17 00:00:00 2001 From: Major- Date: Fri, 13 Feb 2015 16:46:04 +0000 Subject: [PATCH] Complete rename of 'PrivateMessageMessage' to 'PrivateChatMessage', rename 'TextUtil.uncompress' to 'TextUtil.decompress'. --- .../chat/private-messaging/messaging.rb | 2 +- .../game/message/impl/PrivateChatMessage.java | 67 +++++++++++++++++++ .../message/impl/PrivateMessageMessage.java | 67 ------------------- .../net/release/r317/ChatMessageDecoder.java | 2 +- .../r317/PrivateChatMessageDecoder.java | 38 +++++++++++ .../r317/PrivateMessageMessageDecoder.java | 38 ----------- .../apollo/net/release/r317/Release317.java | 2 +- .../net/release/r377/ChatMessageDecoder.java | 2 +- .../r377/PrivateChatMessageDecoder.java | 20 +++--- src/org/apollo/util/TextUtil.java | 2 +- 10 files changed, 120 insertions(+), 120 deletions(-) create mode 100644 src/org/apollo/game/message/impl/PrivateChatMessage.java delete mode 100644 src/org/apollo/game/message/impl/PrivateMessageMessage.java create mode 100644 src/org/apollo/net/release/r317/PrivateChatMessageDecoder.java delete mode 100644 src/org/apollo/net/release/r317/PrivateMessageMessageDecoder.java diff --git a/data/plugins/chat/private-messaging/messaging.rb b/data/plugins/chat/private-messaging/messaging.rb index 5773212d..1d91b94d 100644 --- a/data/plugins/chat/private-messaging/messaging.rb +++ b/data/plugins/chat/private-messaging/messaging.rb @@ -4,7 +4,7 @@ java_import 'org.apollo.game.message.impl.ForwardPrivateChatMessage' java_import 'org.apollo.game.model.World' java_import 'org.apollo.game.model.setting.PrivacyState' -on :message, :private_message do |ctx, player, message| +on :message, :private_chat do |ctx, player, message| friend = $world.get_player(message.username) friend.send(ForwardPrivateChatMessage.new(player.username, player.privilege_level, message.compressed_message)) if interaction_permitted(player, friend) end diff --git a/src/org/apollo/game/message/impl/PrivateChatMessage.java b/src/org/apollo/game/message/impl/PrivateChatMessage.java new file mode 100644 index 00000000..e672877d --- /dev/null +++ b/src/org/apollo/game/message/impl/PrivateChatMessage.java @@ -0,0 +1,67 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent by the client to send private chat to another player. + * + * @author Major + */ +public final class PrivateChatMessage extends Message { + + /** + * The chat string being sent. + */ + private final String chat; + + /** + * The compressed chat string. + */ + private final byte[] compressedChat; + + /** + * The username this message is being sent to. + */ + private final String username; + + /** + * Creates a new private chat message. + * + * @param username The username of the player the message is being sent to. + * @param chat The chat string. + * @param compressedChat The chat string, in a compressed form. + */ + public PrivateChatMessage(String username, String chat, byte[] compressedChat) { + this.username = username; + this.chat = chat; + this.compressedChat = compressedChat.clone(); + } + + /** + * Gets the chat string being sent. + * + * @return The chat string. + */ + public String getChat() { + return chat; + } + + /** + * Gets the compressed chat string. + * + * @return The compressed chat string. + */ + public byte[] getCompressedChat() { + return compressedChat.clone(); + } + + /** + * Gets the username of the player the chat string is being sent to. + * + * @return The username. + */ + public String getUsername() { + return username; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/PrivateMessageMessage.java b/src/org/apollo/game/message/impl/PrivateMessageMessage.java deleted file mode 100644 index eed897bc..00000000 --- a/src/org/apollo/game/message/impl/PrivateMessageMessage.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.apollo.game.message.impl; - -import org.apollo.game.message.Message; - -/** - * A {@link Message} sent by the client to send a private message to another player. - * - * @author Major - */ -public final class PrivateMessageMessage extends Message { - - /** - * The username this message is being sent to. - */ - private final String username; - - /** - * The message being sent. - */ - private final String message; - - /** - * The compressed message. - */ - private final byte[] compressedMessage; - - /** - * Creates a new private message message. - * - * @param username The username of the player the message is being sent to. - * @param message The message. - * @param compressedMessage The message, in a compressed form. - */ - public PrivateMessageMessage(String username, String message, byte[] compressedMessage) { - this.username = username; - this.message = message; - this.compressedMessage = compressedMessage; - } - - /** - * Gets the username of the player the message is being sent to. - * - * @return The username. - */ - public String getUsername() { - return username; - } - - /** - * Gets the message being sent. - * - * @return The message. - */ - public String getMessage() { - return message; - } - - /** - * Gets the compressed message. - * - * @return The compressed message. - */ - public byte[] getCompressedMessage() { - return compressedMessage; - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ChatMessageDecoder.java b/src/org/apollo/net/release/r317/ChatMessageDecoder.java index db7f64d7..33e500e5 100644 --- a/src/org/apollo/net/release/r317/ChatMessageDecoder.java +++ b/src/org/apollo/net/release/r317/ChatMessageDecoder.java @@ -26,7 +26,7 @@ public final class ChatMessageDecoder extends MessageDecoder { byte[] originalCompressed = new byte[length]; reader.getBytesReverse(DataTransformation.ADD, originalCompressed); - String uncompressed = TextUtil.uncompress(originalCompressed, length); + String uncompressed = TextUtil.decompress(originalCompressed, length); uncompressed = TextUtil.filterInvalidCharacters(uncompressed); uncompressed = TextUtil.capitalize(uncompressed); diff --git a/src/org/apollo/net/release/r317/PrivateChatMessageDecoder.java b/src/org/apollo/net/release/r317/PrivateChatMessageDecoder.java new file mode 100644 index 00000000..a1c18fc4 --- /dev/null +++ b/src/org/apollo/net/release/r317/PrivateChatMessageDecoder.java @@ -0,0 +1,38 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.PrivateChatMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketReader; +import org.apollo.net.release.MessageDecoder; +import org.apollo.util.NameUtil; +import org.apollo.util.TextUtil; + +/** + * A {@link MessageDecoder} for the {@link PrivateChatMessage}. + * + * @author Major + */ +public final class PrivateChatMessageDecoder extends MessageDecoder { + + @Override + public PrivateChatMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + + String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); + int length = packet.getLength() - Long.BYTES; + + byte[] originalCompressed = new byte[length]; + reader.getBytes(originalCompressed); + + String decompressed = TextUtil.decompress(originalCompressed, length); + decompressed = TextUtil.filterInvalidCharacters(decompressed); + decompressed = TextUtil.capitalize(decompressed); + + byte[] recompressed = new byte[length]; + TextUtil.compress(decompressed, recompressed); + + return new PrivateChatMessage(username, new String(decompressed), recompressed); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/PrivateMessageMessageDecoder.java b/src/org/apollo/net/release/r317/PrivateMessageMessageDecoder.java deleted file mode 100644 index 1c2e3373..00000000 --- a/src/org/apollo/net/release/r317/PrivateMessageMessageDecoder.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.message.impl.PrivateMessageMessage; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.MessageDecoder; -import org.apollo.util.NameUtil; -import org.apollo.util.TextUtil; - -/** - * A {@link MessageDecoder} for the {@link PrivateMessageMessage}. - * - * @author Major - */ -public final class PrivateMessageMessageDecoder extends MessageDecoder { - - @Override - public PrivateMessageMessage 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]; - reader.getBytes(originalCompressed); - - String uncompressed = TextUtil.uncompress(originalCompressed, length); - uncompressed = TextUtil.filterInvalidCharacters(uncompressed); - uncompressed = TextUtil.capitalize(uncompressed); - - byte[] recompressed = new byte[length]; - TextUtil.compress(uncompressed, recompressed); - - return new PrivateMessageMessage(username, new String(uncompressed), recompressed); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/Release317.java b/src/org/apollo/net/release/r317/Release317.java index b8a37cab..4d4a48ea 100644 --- a/src/org/apollo/net/release/r317/Release317.java +++ b/src/org/apollo/net/release/r317/Release317.java @@ -158,7 +158,7 @@ public final class Release317 extends Release { register(133, new AddIgnoreMessageDecoder()); register(215, new RemoveFriendMessageDecoder()); register(74, new RemoveIgnoreMessageDecoder()); - register(126, new PrivateMessageMessageDecoder()); + register(126, new PrivateChatMessageDecoder()); // register encoders register(IdAssignmentMessage.class, new IdAssignmentMessageEncoder()); diff --git a/src/org/apollo/net/release/r377/ChatMessageDecoder.java b/src/org/apollo/net/release/r377/ChatMessageDecoder.java index f92a7cdb..a1c24ae7 100644 --- a/src/org/apollo/net/release/r377/ChatMessageDecoder.java +++ b/src/org/apollo/net/release/r377/ChatMessageDecoder.java @@ -27,7 +27,7 @@ public final class ChatMessageDecoder extends MessageDecoder { byte[] originalCompressed = new byte[length]; reader.getBytes(originalCompressed); - String uncompressed = TextUtil.uncompress(originalCompressed, length); + String uncompressed = TextUtil.decompress(originalCompressed, length); uncompressed = TextUtil.filterInvalidCharacters(uncompressed); uncompressed = TextUtil.capitalize(uncompressed); diff --git a/src/org/apollo/net/release/r377/PrivateChatMessageDecoder.java b/src/org/apollo/net/release/r377/PrivateChatMessageDecoder.java index 66725af1..2f507f4f 100644 --- a/src/org/apollo/net/release/r377/PrivateChatMessageDecoder.java +++ b/src/org/apollo/net/release/r377/PrivateChatMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.net.release.r377; -import org.apollo.game.message.impl.PrivateMessageMessage; +import org.apollo.game.message.impl.PrivateChatMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; @@ -9,30 +9,30 @@ import org.apollo.util.NameUtil; import org.apollo.util.TextUtil; /** - * A {@link MessageDecoder} for the {@link PrivateMessageMessage}. + * A {@link MessageDecoder} for the {@link PrivateChatMessage}. * * @author Major */ -public final class PrivateChatMessageDecoder extends MessageDecoder { +public final class PrivateChatMessageDecoder extends MessageDecoder { @Override - public PrivateMessageMessage decode(GamePacket packet) { + public PrivateChatMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); - int length = packet.getLength() - 8; + int length = packet.getLength() - Long.BYTES; byte[] originalCompressed = new byte[length]; reader.getBytes(originalCompressed); - String uncompressed = TextUtil.uncompress(originalCompressed, length); - uncompressed = TextUtil.filterInvalidCharacters(uncompressed); - uncompressed = TextUtil.capitalize(uncompressed); + String decompressed = TextUtil.decompress(originalCompressed, length); + decompressed = TextUtil.filterInvalidCharacters(decompressed); + decompressed = TextUtil.capitalize(decompressed); byte[] recompressed = new byte[length]; - TextUtil.compress(uncompressed, recompressed); + TextUtil.compress(decompressed, recompressed); - return new PrivateMessageMessage(username, new String(uncompressed), recompressed); + return new PrivateChatMessage(username, new String(decompressed), recompressed); } } \ No newline at end of file diff --git a/src/org/apollo/util/TextUtil.java b/src/org/apollo/util/TextUtil.java index 8ea9e4ad..d401f5a1 100644 --- a/src/org/apollo/util/TextUtil.java +++ b/src/org/apollo/util/TextUtil.java @@ -120,7 +120,7 @@ public final class TextUtil { * @param len The length. * @return The uncompressed {@link String}. */ - public static String uncompress(byte[] in, int len) { + public static String decompress(byte[] in, int len) { byte[] out = new byte[4096]; int outPos = 0; int carry = -1;