From 33663e57605701544a2f8406cdde126b118bc6b7 Mon Sep 17 00:00:00 2001 From: thispixel Date: Mon, 16 Feb 2015 17:26:21 +0000 Subject: [PATCH] Npc action messages for 377 release. --- .../r377/FifthNpcActionMessageDecoder.java | 24 +++++++++++++++++++ .../r377/FirstNpcActionMessageDecoder.java | 17 ++++++------- .../r377/FourthNpcActionMessageDecoder.java | 23 ++++++++++++++++++ .../apollo/net/release/r377/Release377.java | 7 ++++-- .../r377/SecondNpcActionMessageDecoder.java | 11 ++++----- .../r377/ThirdNpcActionMessageDecoder.java | 6 ++--- 6 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 src/org/apollo/net/release/r377/FifthNpcActionMessageDecoder.java create mode 100644 src/org/apollo/net/release/r377/FourthNpcActionMessageDecoder.java diff --git a/src/org/apollo/net/release/r377/FifthNpcActionMessageDecoder.java b/src/org/apollo/net/release/r377/FifthNpcActionMessageDecoder.java new file mode 100644 index 00000000..8cc8c0b1 --- /dev/null +++ b/src/org/apollo/net/release/r377/FifthNpcActionMessageDecoder.java @@ -0,0 +1,24 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.FifthNpcActionMessage; +import org.apollo.net.codec.game.DataOrder; +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; + +/** + * A {@link org.apollo.net.release.MessageDecoder} for the {@link org.apollo.game.message.impl.FifthNpcActionMessage}. + * + * @author Stuart + */ +public final class FifthNpcActionMessageDecoder extends MessageDecoder { + + @Override + public FifthNpcActionMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); + return new FifthNpcActionMessage(index); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FirstNpcActionMessageDecoder.java b/src/org/apollo/net/release/r377/FirstNpcActionMessageDecoder.java index c2842fc1..089d91af 100644 --- a/src/org/apollo/net/release/r377/FirstNpcActionMessageDecoder.java +++ b/src/org/apollo/net/release/r377/FirstNpcActionMessageDecoder.java @@ -1,10 +1,7 @@ package org.apollo.net.release.r377; import org.apollo.game.message.impl.FirstNpcActionMessage; -import org.apollo.net.codec.game.DataTransformation; -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.codec.game.*; import org.apollo.net.release.MessageDecoder; /** @@ -14,11 +11,11 @@ import org.apollo.net.release.MessageDecoder; */ public final class FirstNpcActionMessageDecoder extends MessageDecoder { - @Override - public FirstNpcActionMessage decode(GamePacket packet) { - GamePacketReader reader = new GamePacketReader(packet); - int index = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FirstNpcActionMessage(index); - } + @Override + public FirstNpcActionMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); + return new FirstNpcActionMessage(index); + } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FourthNpcActionMessageDecoder.java b/src/org/apollo/net/release/r377/FourthNpcActionMessageDecoder.java new file mode 100644 index 00000000..af9fb49d --- /dev/null +++ b/src/org/apollo/net/release/r377/FourthNpcActionMessageDecoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.FourthNpcActionMessage; +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; + +/** + * A {@link org.apollo.net.release.MessageDecoder} for the {@link org.apollo.game.message.impl.FourthNpcActionMessage}. + * + * @author Stuart + */ +public final class FourthNpcActionMessageDecoder extends MessageDecoder { + + @Override + public FourthNpcActionMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + int index = (int) reader.getSigned(DataType.SHORT); + return new FourthNpcActionMessage(index); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/Release377.java b/src/org/apollo/net/release/r377/Release377.java index 9b368738..2cbdf829 100644 --- a/src/org/apollo/net/release/r377/Release377.java +++ b/src/org/apollo/net/release/r377/Release377.java @@ -137,9 +137,12 @@ public final class Release377 extends Release { register(40, spamMessageDecoder); register(244, spamMessageDecoder); - register(67, new FirstNpcActionMessageDecoder()); - register(112, new SecondNpcActionMessageDecoder()); + register(112, new FirstNpcActionMessageDecoder()); + register(67, new SecondNpcActionMessageDecoder()); register(13, new ThirdNpcActionMessageDecoder()); + register(42, new FourthNpcActionMessageDecoder()); + register(8, new FifthNpcActionMessageDecoder()); + register(71, new TakeTileItemMessageDecoder()); register(152, new ItemOnObjectMessageDecoder()); diff --git a/src/org/apollo/net/release/r377/SecondNpcActionMessageDecoder.java b/src/org/apollo/net/release/r377/SecondNpcActionMessageDecoder.java index 6874cf3b..58949385 100644 --- a/src/org/apollo/net/release/r377/SecondNpcActionMessageDecoder.java +++ b/src/org/apollo/net/release/r377/SecondNpcActionMessageDecoder.java @@ -1,10 +1,7 @@ package org.apollo.net.release.r377; import org.apollo.game.message.impl.SecondNpcActionMessage; -import org.apollo.net.codec.game.DataOrder; -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.codec.game.*; import org.apollo.net.release.MessageDecoder; /** @@ -16,9 +13,9 @@ public final class SecondNpcActionMessageDecoder extends MessageDecoder