diff --git a/game/src/main/org/apollo/game/message/impl/FifthItemActionMessage.java b/game/src/main/org/apollo/game/message/impl/FifthItemActionMessage.java deleted file mode 100644 index 846b5da7..00000000 --- a/game/src/main/org/apollo/game/message/impl/FifthItemActionMessage.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The fifth {@link ItemActionMessage}. - * - * @author Graham - */ -public final class FifthItemActionMessage extends ItemActionMessage { - - /** - * Creates the fifth item action message. - * - * @param interfaceId The interface id. - * @param id The item id. - * @param slot The item slot. - */ - public FifthItemActionMessage(int interfaceId, int id, int slot) { - super(5, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FifthItemOptionMessage.java b/game/src/main/org/apollo/game/message/impl/FifthItemOptionMessage.java deleted file mode 100644 index 2f61d064..00000000 --- a/game/src/main/org/apollo/game/message/impl/FifthItemOptionMessage.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The fifth {@link ItemOptionMessage}. - * - * @author Chris Fletcher - */ -public final class FifthItemOptionMessage extends ItemOptionMessage { - - /** - * Creates the fifth item option message. - * - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public FifthItemOptionMessage(int interfaceId, int id, int slot) { - super(5, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FifthNpcActionMessage.java b/game/src/main/org/apollo/game/message/impl/FifthNpcActionMessage.java deleted file mode 100644 index 509b3208..00000000 --- a/game/src/main/org/apollo/game/message/impl/FifthNpcActionMessage.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The fifth {@link NpcActionMessage}. - * - * @author Major - * @author Stuart - */ -public final class FifthNpcActionMessage extends NpcActionMessage { - - /** - * Creates the FifthNpcActionMessage. - * - * @param index The index of the Npc. - */ - public FifthNpcActionMessage(int index) { - super(5, index); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FifthPlayerActionMessage.java b/game/src/main/org/apollo/game/message/impl/FifthPlayerActionMessage.java deleted file mode 100644 index 8b0ddfa2..00000000 --- a/game/src/main/org/apollo/game/message/impl/FifthPlayerActionMessage.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The fifth {@link PlayerActionMessage}. - * - * @author Major - */ -public final class FifthPlayerActionMessage extends PlayerActionMessage { - - /** - * Creates a fifth player action message. - * - * @param playerIndex The index of the clicked player. - */ - public FifthPlayerActionMessage(int playerIndex) { - super(5, playerIndex); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FirstItemActionMessage.java b/game/src/main/org/apollo/game/message/impl/FirstItemActionMessage.java deleted file mode 100644 index 649bd4ab..00000000 --- a/game/src/main/org/apollo/game/message/impl/FirstItemActionMessage.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The first {@link ItemActionMessage}. - * - * @author Graham - */ -public final class FirstItemActionMessage extends ItemActionMessage { - - /** - * Creates the first item action message. - * - * @param interfaceId The interface id. - * @param id The item id. - * @param slot The item slot. - */ - public FirstItemActionMessage(int interfaceId, int id, int slot) { - super(1, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FirstItemOptionMessage.java b/game/src/main/org/apollo/game/message/impl/FirstItemOptionMessage.java deleted file mode 100644 index 31f005eb..00000000 --- a/game/src/main/org/apollo/game/message/impl/FirstItemOptionMessage.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The first {@link ItemOptionMessage}. - * - * @author Chris Fletcher - */ -public final class FirstItemOptionMessage extends ItemOptionMessage { - - /** - * Creates the first item option message. - * - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public FirstItemOptionMessage(int interfaceId, int id, int slot) { - super(1, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FirstNpcActionMessage.java b/game/src/main/org/apollo/game/message/impl/FirstNpcActionMessage.java deleted file mode 100644 index ec334660..00000000 --- a/game/src/main/org/apollo/game/message/impl/FirstNpcActionMessage.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The first {@link NpcActionMessage}. - * - * @author Major - */ -public final class FirstNpcActionMessage extends NpcActionMessage { - - /** - * Creates a new first npc action message. - * - * @param index The index of the npc. - */ - public FirstNpcActionMessage(int index) { - super(1, index); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FirstObjectActionMessage.java b/game/src/main/org/apollo/game/message/impl/FirstObjectActionMessage.java deleted file mode 100644 index 7b408837..00000000 --- a/game/src/main/org/apollo/game/message/impl/FirstObjectActionMessage.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apollo.game.message.impl; - -import org.apollo.game.model.Position; - -/** - * The first {@link ObjectActionMessage}. - * - * @author Graham - */ -public final class FirstObjectActionMessage extends ObjectActionMessage { - - /** - * Creates the first object action message. - * - * @param id The id. - * @param position The position. - */ - public FirstObjectActionMessage(int id, Position position) { - super(1, id, position); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FirstPlayerActionMessage.java b/game/src/main/org/apollo/game/message/impl/FirstPlayerActionMessage.java deleted file mode 100644 index 2aeade66..00000000 --- a/game/src/main/org/apollo/game/message/impl/FirstPlayerActionMessage.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The first {@link PlayerActionMessage}. - * - * @author Major - */ -public final class FirstPlayerActionMessage extends PlayerActionMessage { - - /** - * Creates a first player action message. - * - * @param playerIndex The index of the clicked player. - */ - public FirstPlayerActionMessage(int playerIndex) { - super(1, playerIndex); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FourthItemActionMessage.java b/game/src/main/org/apollo/game/message/impl/FourthItemActionMessage.java deleted file mode 100644 index 19b31a9e..00000000 --- a/game/src/main/org/apollo/game/message/impl/FourthItemActionMessage.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The fourth {@link ItemActionMessage}. - * - * @author Graham - */ -public final class FourthItemActionMessage extends ItemActionMessage { - - /** - * Creates the fourth item action message. - * - * @param interfaceId The interface id. - * @param id The item id. - * @param slot The item slot. - */ - public FourthItemActionMessage(int interfaceId, int id, int slot) { - super(4, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FourthItemOptionMessage.java b/game/src/main/org/apollo/game/message/impl/FourthItemOptionMessage.java deleted file mode 100644 index 4143efd4..00000000 --- a/game/src/main/org/apollo/game/message/impl/FourthItemOptionMessage.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The fourth {@link ItemOptionMessage}. - * - * @author Chris Fletcher - */ -public final class FourthItemOptionMessage extends ItemOptionMessage { - - /** - * Creates the fourth item option message. - * - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public FourthItemOptionMessage(int interfaceId, int id, int slot) { - super(4, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FourthNpcActionMessage.java b/game/src/main/org/apollo/game/message/impl/FourthNpcActionMessage.java deleted file mode 100644 index 7471dc38..00000000 --- a/game/src/main/org/apollo/game/message/impl/FourthNpcActionMessage.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The fourth {@link NpcActionMessage}. - * - * @author Major - * @author Stuart - */ -public final class FourthNpcActionMessage extends NpcActionMessage { - - /** - * Creates the FourthNpcActionMessage. - * - * @param index The index of the Npc. - */ - public FourthNpcActionMessage(int index) { - super(4, index); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/FourthPlayerActionMessage.java b/game/src/main/org/apollo/game/message/impl/FourthPlayerActionMessage.java deleted file mode 100644 index 576bc6b5..00000000 --- a/game/src/main/org/apollo/game/message/impl/FourthPlayerActionMessage.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The fourth {@link PlayerActionMessage}. - * - * @author Major - */ -public final class FourthPlayerActionMessage extends PlayerActionMessage { - - /** - * Creates a fourth player action message. - * - * @param playerIndex The index of the clicked player. - */ - public FourthPlayerActionMessage(int playerIndex) { - super(4, playerIndex); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/ItemActionMessage.java b/game/src/main/org/apollo/game/message/impl/ItemActionMessage.java index 7f0cf430..6fd9996a 100644 --- a/game/src/main/org/apollo/game/message/impl/ItemActionMessage.java +++ b/game/src/main/org/apollo/game/message/impl/ItemActionMessage.java @@ -11,7 +11,7 @@ import java.util.OptionalInt; * * @author Chris Fletcher */ -public abstract class ItemActionMessage extends InventoryItemMessage { +public final class ItemActionMessage extends InventoryItemMessage { /** * Creates the ItemActionMessage. diff --git a/game/src/main/org/apollo/game/message/impl/ItemOptionMessage.java b/game/src/main/org/apollo/game/message/impl/ItemOptionMessage.java index 2de16f25..370451f5 100644 --- a/game/src/main/org/apollo/game/message/impl/ItemOptionMessage.java +++ b/game/src/main/org/apollo/game/message/impl/ItemOptionMessage.java @@ -9,7 +9,7 @@ import java.util.OptionalInt; * * @author Chris Fletcher */ -public abstract class ItemOptionMessage extends InventoryItemMessage { +public final class ItemOptionMessage extends InventoryItemMessage { /** * Creates the ItemOptionMessage. diff --git a/game/src/main/org/apollo/game/message/impl/MagicOnMobMessage.java b/game/src/main/org/apollo/game/message/impl/MagicOnMobMessage.java index 9d171af6..f408f9b3 100644 --- a/game/src/main/org/apollo/game/message/impl/MagicOnMobMessage.java +++ b/game/src/main/org/apollo/game/message/impl/MagicOnMobMessage.java @@ -21,7 +21,7 @@ public abstract class MagicOnMobMessage extends Message { private final int index; /** - * The spell if used. + * The spell id used. */ private final int spellId; diff --git a/game/src/main/org/apollo/game/message/impl/NpcActionMessage.java b/game/src/main/org/apollo/game/message/impl/NpcActionMessage.java index e548b93d..0ab27b0f 100644 --- a/game/src/main/org/apollo/game/message/impl/NpcActionMessage.java +++ b/game/src/main/org/apollo/game/message/impl/NpcActionMessage.java @@ -9,7 +9,7 @@ import org.apollo.net.message.Message; * * @author Major */ -public abstract class NpcActionMessage extends Message { +public final class NpcActionMessage extends Message { /** * The option number. diff --git a/game/src/main/org/apollo/game/message/impl/ObjectActionMessage.java b/game/src/main/org/apollo/game/message/impl/ObjectActionMessage.java index 8e912d7c..e408f202 100644 --- a/game/src/main/org/apollo/game/message/impl/ObjectActionMessage.java +++ b/game/src/main/org/apollo/game/message/impl/ObjectActionMessage.java @@ -5,12 +5,13 @@ import org.apollo.net.message.Message; /** * A {@link Message} sent by the client that represents some sort of action on an object. Note that the actual message - * sent by the client is one of the five object action messages, but this is the message that should be intercepted (and + * sent by the client is one of the five object action messages, but this is the message that should be intercepted + * (and * the option verified). * * @author Graham */ -public abstract class ObjectActionMessage extends Message { +public final class ObjectActionMessage extends Message { /** * The object's id. diff --git a/game/src/main/org/apollo/game/message/impl/PlayerActionMessage.java b/game/src/main/org/apollo/game/message/impl/PlayerActionMessage.java index c1f4fdfa..ee88bc83 100644 --- a/game/src/main/org/apollo/game/message/impl/PlayerActionMessage.java +++ b/game/src/main/org/apollo/game/message/impl/PlayerActionMessage.java @@ -4,23 +4,24 @@ import org.apollo.net.message.Message; /** * A {@link Message} sent by the client representing the clicking of a player menu action. Note that the actual message - * sent by the client is one of the five player action messages, but this is the message that should be intercepted (and + * sent by the client is one of the five player action messages, but this is the message that should be intercepted + * (and * the option verified). * * @author Major */ -public abstract class PlayerActionMessage extends Message { - - /** - * The option number. - */ - private final int option; +public final class PlayerActionMessage extends Message { /** * The index of the clicked player. */ private final int index; + /** + * The option number. + */ + private final int option; + /** * Creates a player action message. * @@ -32,15 +33,6 @@ public abstract class PlayerActionMessage extends Message { this.index = index; } - /** - * Gets the menu action number (i.e. the action message 'option') clicked. - * - * @return The option number. - */ - public int getOption() { - return option; - } - /** * Gets the index of the clicked player. * @@ -50,4 +42,13 @@ public abstract class PlayerActionMessage extends Message { return index; } + /** + * Gets the menu action number (i.e. the action message 'option') clicked. + * + * @return The option number. + */ + public int getOption() { + return option; + } + } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/SecondItemActionMessage.java b/game/src/main/org/apollo/game/message/impl/SecondItemActionMessage.java deleted file mode 100644 index b12dfad9..00000000 --- a/game/src/main/org/apollo/game/message/impl/SecondItemActionMessage.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The second {@link ItemActionMessage}. - * - * @author Graham - */ -public final class SecondItemActionMessage extends ItemActionMessage { - - /** - * Creates the second item action message. - * - * @param interfaceId The interface id. - * @param id The item id. - * @param slot The item slot. - */ - public SecondItemActionMessage(int interfaceId, int id, int slot) { - super(2, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/SecondItemOptionMessage.java b/game/src/main/org/apollo/game/message/impl/SecondItemOptionMessage.java deleted file mode 100644 index 2722ac92..00000000 --- a/game/src/main/org/apollo/game/message/impl/SecondItemOptionMessage.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The second {@link ItemOptionMessage}. - * - * @author Chris Fletcher - */ -public final class SecondItemOptionMessage extends ItemOptionMessage { - - /** - * Creates the second item option message. - * - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public SecondItemOptionMessage(int interfaceId, int id, int slot) { - super(2, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/SecondNpcActionMessage.java b/game/src/main/org/apollo/game/message/impl/SecondNpcActionMessage.java deleted file mode 100644 index d64a11e0..00000000 --- a/game/src/main/org/apollo/game/message/impl/SecondNpcActionMessage.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The second {@link NpcActionMessage}. - * - * @author Major - */ -public final class SecondNpcActionMessage extends NpcActionMessage { - - /** - * Creates a new second npc action message. - * - * @param index The index of the npc. - */ - public SecondNpcActionMessage(int index) { - super(2, index); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/SecondObjectActionMessage.java b/game/src/main/org/apollo/game/message/impl/SecondObjectActionMessage.java deleted file mode 100644 index c9f2b80e..00000000 --- a/game/src/main/org/apollo/game/message/impl/SecondObjectActionMessage.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apollo.game.message.impl; - -import org.apollo.game.model.Position; - -/** - * The second {@link ObjectActionMessage}. - * - * @author Graham - */ -public final class SecondObjectActionMessage extends ObjectActionMessage { - - /** - * Creates the second object action message. - * - * @param id The id. - * @param position The position. - */ - public SecondObjectActionMessage(int id, Position position) { - super(2, id, position); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/SecondPlayerActionMessage.java b/game/src/main/org/apollo/game/message/impl/SecondPlayerActionMessage.java deleted file mode 100644 index 04fbf115..00000000 --- a/game/src/main/org/apollo/game/message/impl/SecondPlayerActionMessage.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The second {@link PlayerActionMessage}. - * - * @author Major - */ -public final class SecondPlayerActionMessage extends PlayerActionMessage { - - /** - * Creates a second player action message. - * - * @param playerIndex The index of the clicked player. - */ - public SecondPlayerActionMessage(int playerIndex) { - super(2, playerIndex); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/ThirdItemActionMessage.java b/game/src/main/org/apollo/game/message/impl/ThirdItemActionMessage.java deleted file mode 100644 index 1c48fa2a..00000000 --- a/game/src/main/org/apollo/game/message/impl/ThirdItemActionMessage.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The third {@link ItemActionMessage}. - * - * @author Graham - */ -public final class ThirdItemActionMessage extends ItemActionMessage { - - /** - * Creates the third item action message. - * - * @param interfaceId The interface id. - * @param id The item id. - * @param slot The item slot. - */ - public ThirdItemActionMessage(int interfaceId, int id, int slot) { - super(3, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/ThirdItemOptionMessage.java b/game/src/main/org/apollo/game/message/impl/ThirdItemOptionMessage.java deleted file mode 100644 index fc1b1a67..00000000 --- a/game/src/main/org/apollo/game/message/impl/ThirdItemOptionMessage.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The third {@link ItemOptionMessage}. - * - * @author Chris Fletcher - */ -public final class ThirdItemOptionMessage extends ItemOptionMessage { - - /** - * Creates the third item option message. - * - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public ThirdItemOptionMessage(int interfaceId, int id, int slot) { - super(3, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/ThirdNpcActionMessage.java b/game/src/main/org/apollo/game/message/impl/ThirdNpcActionMessage.java deleted file mode 100644 index 2cdf2ac0..00000000 --- a/game/src/main/org/apollo/game/message/impl/ThirdNpcActionMessage.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The third {@link NpcActionMessage}. - * - * @author Major - */ -public final class ThirdNpcActionMessage extends NpcActionMessage { - - /** - * Creates a new third npc action message. - * - * @param index The index of the npc. - */ - public ThirdNpcActionMessage(int index) { - super(3, index); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/ThirdObjectActionMessage.java b/game/src/main/org/apollo/game/message/impl/ThirdObjectActionMessage.java deleted file mode 100644 index 0f012e57..00000000 --- a/game/src/main/org/apollo/game/message/impl/ThirdObjectActionMessage.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apollo.game.message.impl; - -import org.apollo.game.model.Position; - -/** - * The third {@link ObjectActionMessage}. - * - * @author Graham - */ -public final class ThirdObjectActionMessage extends ObjectActionMessage { - - /** - * Creates the third object action message. - * - * @param id The id. - * @param position The position. - */ - public ThirdObjectActionMessage(int id, Position position) { - super(3, id, position); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/message/impl/ThirdPlayerActionMessage.java b/game/src/main/org/apollo/game/message/impl/ThirdPlayerActionMessage.java deleted file mode 100644 index b19608bb..00000000 --- a/game/src/main/org/apollo/game/message/impl/ThirdPlayerActionMessage.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.message.impl; - -/** - * The third {@link PlayerActionMessage}. - * - * @author Major - */ -public final class ThirdPlayerActionMessage extends PlayerActionMessage { - - /** - * Creates a third player action message. - * - * @param playerIndex The index of the clicked player. - */ - public ThirdPlayerActionMessage(int playerIndex) { - super(3, playerIndex); - } - -} \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/DisplayTabInterfaceMessageEncoder.java b/game/src/main/org/apollo/game/release/r317/DisplayTabInterfaceMessageEncoder.java index 0223c3ed..e1366dd2 100644 --- a/game/src/main/org/apollo/game/release/r317/DisplayTabInterfaceMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r317/DisplayTabInterfaceMessageEncoder.java @@ -12,7 +12,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class DisplayTabInterfaceMessageEncoder extends MessageEncoder { +public final class DisplayTabInterfaceMessageEncoder extends MessageEncoder { @Override public GamePacket encode(DisplayTabInterfaceMessage message) { diff --git a/game/src/main/org/apollo/game/release/r317/FifthItemActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FifthItemActionMessageDecoder.java index 5992d4ed..a27d2d31 100644 --- a/game/src/main/org/apollo/game/release/r317/FifthItemActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FifthItemActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FifthItemActionMessage; +import org.apollo.game.message.impl.ItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,19 +9,19 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FifthItemActionMessage}. + * A {@link MessageDecoder} for the fifth {@link ItemActionMessage}. * * @author Graham */ -public final class FifthItemActionMessageDecoder extends MessageDecoder { +public final class FifthItemActionMessageDecoder extends MessageDecoder { @Override - public FifthItemActionMessage decode(GamePacket packet) { + public ItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FifthItemActionMessage(interfaceId, id, slot); + return new ItemActionMessage(5, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/FifthItemOptionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FifthItemOptionMessageDecoder.java index 5ad25e47..04ff2f6e 100644 --- a/game/src/main/org/apollo/game/release/r317/FifthItemOptionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FifthItemOptionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FifthItemOptionMessage; +import org.apollo.game.message.impl.ItemOptionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,21 +8,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FifthItemOptionMessage}. + * A {@link MessageDecoder} for the fifth {@link ItemOptionMessage}. * * @author Chris Fletcher */ -final class FifthItemOptionMessageDecoder extends MessageDecoder { +public final class FifthItemOptionMessageDecoder extends MessageDecoder { @Override - public FifthItemOptionMessage decode(GamePacket packet) { + public ItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FifthItemOptionMessage(interfaceId, id, slot); + return new ItemOptionMessage(5, interfaceId, id, slot); } } diff --git a/game/src/main/org/apollo/game/release/r317/FifthNpcActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FifthNpcActionMessageDecoder.java index 4785d3de..bc813629 100644 --- a/game/src/main/org/apollo/game/release/r317/FifthNpcActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FifthNpcActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FifthNpcActionMessage; +import org.apollo.game.message.impl.NpcActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,18 +8,18 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FifthNpcActionMessage}. + * A {@link MessageDecoder} for the fifth {@link NpcActionMessage}. * * @author Stuart * @author Major */ -public final class FifthNpcActionMessageDecoder extends MessageDecoder { +public final class FifthNpcActionMessageDecoder extends MessageDecoder { @Override - public FifthNpcActionMessage decode(GamePacket packet) { + public NpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FifthNpcActionMessage(index); + return new NpcActionMessage(5, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/FifthPlayerActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FifthPlayerActionMessageDecoder.java index bc91b6ba..d7a37ae0 100644 --- a/game/src/main/org/apollo/game/release/r317/FifthPlayerActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FifthPlayerActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FifthPlayerActionMessage; +import org.apollo.game.message.impl.PlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FifthPlayerActionMessage}. + * A {@link MessageDecoder} for the fifth {@link PlayerActionMessage}. * * @author Major */ -public final class FifthPlayerActionMessageDecoder extends MessageDecoder { +public final class FifthPlayerActionMessageDecoder extends MessageDecoder { @Override - public FifthPlayerActionMessage decode(GamePacket packet) { + public PlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FifthPlayerActionMessage(index); + return new PlayerActionMessage(5, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/FirstItemActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FirstItemActionMessageDecoder.java index ead242b6..7e38c74f 100644 --- a/game/src/main/org/apollo/game/release/r317/FirstItemActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FirstItemActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FirstItemActionMessage; +import org.apollo.game.message.impl.ItemActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,19 +8,19 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FirstItemActionMessage}. + * A {@link MessageDecoder} for the first {@link ItemActionMessage}. * * @author Graham */ -public final class FirstItemActionMessageDecoder extends MessageDecoder { +public final class FirstItemActionMessageDecoder extends MessageDecoder { @Override - public FirstItemActionMessage decode(GamePacket packet) { + public ItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FirstItemActionMessage(interfaceId, id, slot); + return new ItemActionMessage(1, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/FirstItemOptionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FirstItemOptionMessageDecoder.java index b5014008..5f8c4c46 100644 --- a/game/src/main/org/apollo/game/release/r317/FirstItemOptionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FirstItemOptionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FirstItemOptionMessage; +import org.apollo.game.message.impl.ItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FirstItemOptionMessage}. + * A {@link MessageDecoder} for the first {@link ItemOptionMessage}. * * @author Graham */ -final class FirstItemOptionMessageDecoder extends MessageDecoder { +public final class FirstItemOptionMessageDecoder extends MessageDecoder { @Override - public FirstItemOptionMessage decode(GamePacket packet) { + public ItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); - return new FirstItemOptionMessage(interfaceId, id, slot); + return new ItemOptionMessage(1, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/FirstNpcActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FirstNpcActionMessageDecoder.java index ab6d56a8..c42f916f 100644 --- a/game/src/main/org/apollo/game/release/r317/FirstNpcActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FirstNpcActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FirstNpcActionMessage; +import org.apollo.game.message.impl.NpcActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FirstNpcActionMessage}. + * A {@link MessageDecoder} for the first {@link NpcActionMessage}. * * @author Major */ -public final class FirstNpcActionMessageDecoder extends MessageDecoder { +public final class FirstNpcActionMessageDecoder extends MessageDecoder { @Override - public FirstNpcActionMessage decode(GamePacket packet) { + public NpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); - return new FirstNpcActionMessage(index); + return new NpcActionMessage(1, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/FirstObjectActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FirstObjectActionMessageDecoder.java index 94ce03e8..b71feb1f 100644 --- a/game/src/main/org/apollo/game/release/r317/FirstObjectActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FirstObjectActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FirstObjectActionMessage; +import org.apollo.game.message.impl.ObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; @@ -10,19 +10,19 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FirstObjectActionMessage}. + * A {@link MessageDecoder} for the first {@link ObjectActionMessage}. * * @author Graham */ -public final class FirstObjectActionMessageDecoder extends MessageDecoder { +public final class FirstObjectActionMessageDecoder extends MessageDecoder { @Override - public FirstObjectActionMessage decode(GamePacket packet) { + public ObjectActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT); int y = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FirstObjectActionMessage(id, new Position(x, y)); + return new ObjectActionMessage(1, id, new Position(x, y)); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/FirstPlayerActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FirstPlayerActionMessageDecoder.java index 1609fc93..feb96591 100644 --- a/game/src/main/org/apollo/game/release/r317/FirstPlayerActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FirstPlayerActionMessageDecoder.java @@ -1,23 +1,23 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FirstPlayerActionMessage; +import org.apollo.game.message.impl.PlayerActionMessage; 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 MessageDecoder} for the {@link FirstPlayerActionMessage}. + * A {@link MessageDecoder} for the first {@link PlayerActionMessage}. * * @author Major */ -public final class FirstPlayerActionMessageDecoder extends MessageDecoder { +public final class FirstPlayerActionMessageDecoder extends MessageDecoder { @Override - public FirstPlayerActionMessage decode(GamePacket packet) { + public PlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT); - return new FirstPlayerActionMessage(index); + return new PlayerActionMessage(1, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/FourthItemActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FourthItemActionMessageDecoder.java index de933f86..10630a3d 100644 --- a/game/src/main/org/apollo/game/release/r317/FourthItemActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FourthItemActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FourthItemActionMessage; +import org.apollo.game.message.impl.ItemActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,19 +8,19 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FourthItemActionMessage}. + * A {@link MessageDecoder} for the fourth {@link ItemActionMessage}. * * @author Graham */ -public final class FourthItemActionMessageDecoder extends MessageDecoder { +public final class FourthItemActionMessageDecoder extends MessageDecoder { @Override - public FourthItemActionMessage decode(GamePacket packet) { + public ItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FourthItemActionMessage(interfaceId, id, slot); + return new ItemActionMessage(4, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/FourthItemOptionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FourthItemOptionMessageDecoder.java index 3416fe97..6d21c806 100644 --- a/game/src/main/org/apollo/game/release/r317/FourthItemOptionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FourthItemOptionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FourthItemOptionMessage; +import org.apollo.game.message.impl.ItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FourthItemOptionMessage}. + * A {@link MessageDecoder} for the fourth {@link ItemOptionMessage}. * * @author Chris Fletcher */ -final class FourthItemOptionMessageDecoder extends MessageDecoder { +public final class FourthItemOptionMessageDecoder extends MessageDecoder { @Override - public FourthItemOptionMessage decode(GamePacket packet) { + public ItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FourthItemOptionMessage(interfaceId, id, slot); + return new ItemOptionMessage(4, interfaceId, id, slot); } } diff --git a/game/src/main/org/apollo/game/release/r317/FourthNpcActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FourthNpcActionMessageDecoder.java index 75ae45a0..de9226d6 100644 --- a/game/src/main/org/apollo/game/release/r317/FourthNpcActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FourthNpcActionMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FourthNpcActionMessage; +import org.apollo.game.message.impl.NpcActionMessage; 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 MessageDecoder} for the {@link FourthNpcActionMessage}. + * A {@link MessageDecoder} for the fourth {@link NpcActionMessage}. * * @author Stuart * @author Major */ -public final class FourthNpcActionMessageDecoder extends MessageDecoder { +public final class FourthNpcActionMessageDecoder extends MessageDecoder { @Override - public FourthNpcActionMessage decode(GamePacket packet) { + public NpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT); - return new FourthNpcActionMessage(index); + return new NpcActionMessage(4, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/FourthPlayerActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/FourthPlayerActionMessageDecoder.java index 50ea66e6..0d5a86e4 100644 --- a/game/src/main/org/apollo/game/release/r317/FourthPlayerActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/FourthPlayerActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.FourthPlayerActionMessage; +import org.apollo.game.message.impl.PlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FourthPlayerActionMessage}. + * A {@link MessageDecoder} for the fourth {@link PlayerActionMessage}. * * @author Major */ -public final class FourthPlayerActionMessageDecoder extends MessageDecoder { +public final class FourthPlayerActionMessageDecoder extends MessageDecoder { @Override - public FourthPlayerActionMessage decode(GamePacket packet) { + public PlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FourthPlayerActionMessage(index); + return new PlayerActionMessage(4, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/ItemOnItemMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/ItemOnItemMessageDecoder.java index e6d9ad3d..e2f34d1a 100644 --- a/game/src/main/org/apollo/game/release/r317/ItemOnItemMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/ItemOnItemMessageDecoder.java @@ -13,7 +13,7 @@ import org.apollo.net.release.MessageDecoder; * * @author Chris Fletcher */ -final class ItemOnItemMessageDecoder extends MessageDecoder { +public final class ItemOnItemMessageDecoder extends MessageDecoder { @Override public ItemOnItemMessage decode(GamePacket packet) { diff --git a/game/src/main/org/apollo/game/release/r317/MagicOnItemMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/MagicOnItemMessageDecoder.java index 5e24e6fd..677a81db 100644 --- a/game/src/main/org/apollo/game/release/r317/MagicOnItemMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/MagicOnItemMessageDecoder.java @@ -12,7 +12,7 @@ import org.apollo.net.release.MessageDecoder; * * @author Chris Fletcher */ -final class MagicOnItemMessageDecoder extends MessageDecoder { +public final class MagicOnItemMessageDecoder extends MessageDecoder { @Override public MagicOnItemMessage decode(GamePacket packet) { diff --git a/game/src/main/org/apollo/game/release/r317/SecondItemActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/SecondItemActionMessageDecoder.java index b614de23..a5df384e 100644 --- a/game/src/main/org/apollo/game/release/r317/SecondItemActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/SecondItemActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.SecondItemActionMessage; +import org.apollo.game.message.impl.ItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,19 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link SecondItemActionMessage}. + * A {@link MessageDecoder} for the second {@link ItemActionMessage}. * * @author Graham */ -public final class SecondItemActionMessageDecoder extends MessageDecoder { +public final class SecondItemActionMessageDecoder extends MessageDecoder { @Override - public SecondItemActionMessage decode(GamePacket packet) { + public ItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); + int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new SecondItemActionMessage(interfaceId, id, slot); + + return new ItemActionMessage(2, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/SecondItemOptionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/SecondItemOptionMessageDecoder.java index ff5d9d8c..3d13490c 100644 --- a/game/src/main/org/apollo/game/release/r317/SecondItemOptionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/SecondItemOptionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.SecondItemOptionMessage; +import org.apollo.game.message.impl.ItemOptionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,19 +8,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link SecondItemOptionMessage}. + * A {@link MessageDecoder} for the {@link ItemOptionMessage}. * * @author Graham */ -final class SecondItemOptionMessageDecoder extends MessageDecoder { +public final class SecondItemOptionMessageDecoder extends MessageDecoder { @Override - public SecondItemOptionMessage decode(GamePacket packet) { + public ItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); + int id = (int) reader.getUnsigned(DataType.SHORT); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new SecondItemOptionMessage(interfaceId, id, slot); + + return new ItemOptionMessage(2, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/SecondNpcActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/SecondNpcActionMessageDecoder.java index 8dfd1b17..c1f5d23d 100644 --- a/game/src/main/org/apollo/game/release/r317/SecondNpcActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/SecondNpcActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.SecondNpcActionMessage; +import org.apollo.game.message.impl.NpcActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link SecondNpcActionMessage}. + * A {@link MessageDecoder} for the second {@link NpcActionMessage}. * * @author Major */ -public final class SecondNpcActionMessageDecoder extends MessageDecoder { +public final class SecondNpcActionMessageDecoder extends MessageDecoder { @Override - public SecondNpcActionMessage decode(GamePacket packet) { + public NpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getSigned(DataType.SHORT, DataTransformation.ADD); - return new SecondNpcActionMessage(index); + return new NpcActionMessage(2, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/SecondObjectActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/SecondObjectActionMessageDecoder.java index c4a2ec37..e5e8f2fb 100644 --- a/game/src/main/org/apollo/game/release/r317/SecondObjectActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/SecondObjectActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.SecondObjectActionMessage; +import org.apollo.game.message.impl.ObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; @@ -10,19 +10,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link SecondObjectActionMessage}. + * A {@link MessageDecoder} for the second {@link ObjectActionMessage}. * * @author Graham */ -public final class SecondObjectActionMessageDecoder extends MessageDecoder { +public final class SecondObjectActionMessageDecoder extends MessageDecoder { @Override - public SecondObjectActionMessage decode(GamePacket packet) { + public ObjectActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); + int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int y = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int x = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new SecondObjectActionMessage(id, new Position(x, y)); + + return new ObjectActionMessage(2, id, new Position(x, y)); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/SecondPlayerActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/SecondPlayerActionMessageDecoder.java index a23dbc7e..32c08130 100644 --- a/game/src/main/org/apollo/game/release/r317/SecondPlayerActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/SecondPlayerActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.SecondPlayerActionMessage; +import org.apollo.game.message.impl.PlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link SecondPlayerActionMessage}. + * A {@link MessageDecoder} for the second {@link PlayerActionMessage}. * * @author Major */ -public final class SecondPlayerActionMessageDecoder extends MessageDecoder { +public final class SecondPlayerActionMessageDecoder extends MessageDecoder { @Override - public SecondPlayerActionMessage decode(GamePacket packet) { + public PlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new SecondPlayerActionMessage(index); + return new PlayerActionMessage(2, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/SetUpdatedRegionMessageEncoder.java b/game/src/main/org/apollo/game/release/r317/SetUpdatedRegionMessageEncoder.java index 81995cba..e490c713 100644 --- a/game/src/main/org/apollo/game/release/r317/SetUpdatedRegionMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r317/SetUpdatedRegionMessageEncoder.java @@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class SetUpdatedRegionMessageEncoder extends MessageEncoder { +public final class SetUpdatedRegionMessageEncoder extends MessageEncoder { @Override public GamePacket encode(SetUpdatedRegionMessage message) { diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetItemModelMessageEncoder.java b/game/src/main/org/apollo/game/release/r317/SetWidgetItemModelMessageEncoder.java index cb050b84..e353a297 100644 --- a/game/src/main/org/apollo/game/release/r317/SetWidgetItemModelMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r317/SetWidgetItemModelMessageEncoder.java @@ -12,7 +12,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class SetWidgetItemModelMessageEncoder extends MessageEncoder { +public final class SetWidgetItemModelMessageEncoder extends MessageEncoder { @Override public GamePacket encode(SetWidgetItemModelMessage message) { diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetModelAnimationMessageEncoder.java b/game/src/main/org/apollo/game/release/r317/SetWidgetModelAnimationMessageEncoder.java index 75f63284..5c61b450 100644 --- a/game/src/main/org/apollo/game/release/r317/SetWidgetModelAnimationMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r317/SetWidgetModelAnimationMessageEncoder.java @@ -11,7 +11,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class SetWidgetModelAnimationMessageEncoder extends MessageEncoder { +public final class SetWidgetModelAnimationMessageEncoder extends MessageEncoder { @Override public GamePacket encode(SetWidgetModelAnimationMessage message) { diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetNpcModelMessageEncoder.java b/game/src/main/org/apollo/game/release/r317/SetWidgetNpcModelMessageEncoder.java index b49013e2..be4d8ee7 100644 --- a/game/src/main/org/apollo/game/release/r317/SetWidgetNpcModelMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r317/SetWidgetNpcModelMessageEncoder.java @@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class SetWidgetNpcModelMessageEncoder extends MessageEncoder { +public final class SetWidgetNpcModelMessageEncoder extends MessageEncoder { @Override public GamePacket encode(SetWidgetNpcModelMessage message) { diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetPlayerModelMessageEncoder.java b/game/src/main/org/apollo/game/release/r317/SetWidgetPlayerModelMessageEncoder.java index 31b1fa3c..3f273f60 100644 --- a/game/src/main/org/apollo/game/release/r317/SetWidgetPlayerModelMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r317/SetWidgetPlayerModelMessageEncoder.java @@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class SetWidgetPlayerModelMessageEncoder extends MessageEncoder { +public final class SetWidgetPlayerModelMessageEncoder extends MessageEncoder { @Override public GamePacket encode(SetWidgetPlayerModelMessage message) { diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetVisibilityMessageEncoder.java b/game/src/main/org/apollo/game/release/r317/SetWidgetVisibilityMessageEncoder.java index 39dc9844..c29117cd 100644 --- a/game/src/main/org/apollo/game/release/r317/SetWidgetVisibilityMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r317/SetWidgetVisibilityMessageEncoder.java @@ -11,7 +11,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Major */ -final class SetWidgetVisibilityMessageEncoder extends MessageEncoder { +public final class SetWidgetVisibilityMessageEncoder extends MessageEncoder { @Override public GamePacket encode(SetWidgetVisibilityMessage message) { diff --git a/game/src/main/org/apollo/game/release/r317/ThirdItemActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/ThirdItemActionMessageDecoder.java index 907b5e34..89976f8b 100644 --- a/game/src/main/org/apollo/game/release/r317/ThirdItemActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/ThirdItemActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.ThirdItemActionMessage; +import org.apollo.game.message.impl.ItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,19 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link ThirdItemActionMessage}. + * A {@link MessageDecoder} for the third {@link ItemActionMessage}. * * @author Graham */ -public final class ThirdItemActionMessageDecoder extends MessageDecoder { +public final class ThirdItemActionMessageDecoder extends MessageDecoder { @Override - public ThirdItemActionMessage decode(GamePacket packet) { + public ItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); + int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new ThirdItemActionMessage(interfaceId, id, slot); + + return new ItemActionMessage(3, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/ThirdItemOptionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/ThirdItemOptionMessageDecoder.java index 35aa8713..e14c7c41 100644 --- a/game/src/main/org/apollo/game/release/r317/ThirdItemOptionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/ThirdItemOptionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.ThirdItemOptionMessage; +import org.apollo.game.message.impl.ItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link ThirdItemOptionMessage}. + * A {@link MessageDecoder} for the third {@link ItemOptionMessage}. * * @author Chris Fletcher */ -final class ThirdItemOptionMessageDecoder extends MessageDecoder { +public final class ThirdItemOptionMessageDecoder extends MessageDecoder { @Override - public ThirdItemOptionMessage decode(GamePacket packet) { + public ItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new ThirdItemOptionMessage(interfaceId, id, slot); + return new ItemOptionMessage(3, interfaceId, id, slot); } } diff --git a/game/src/main/org/apollo/game/release/r317/ThirdNpcActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/ThirdNpcActionMessageDecoder.java index ec88661e..f98441d0 100644 --- a/game/src/main/org/apollo/game/release/r317/ThirdNpcActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/ThirdNpcActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.ThirdNpcActionMessage; +import org.apollo.game.message.impl.NpcActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,17 +9,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link ThirdNpcActionMessage}. + * A {@link MessageDecoder} for the third {@link NpcActionMessage}. * * @author Major */ -public final class ThirdNpcActionMessageDecoder extends MessageDecoder { +public final class ThirdNpcActionMessageDecoder extends MessageDecoder { @Override - public ThirdNpcActionMessage decode(GamePacket packet) { + public NpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new ThirdNpcActionMessage(index); + return new NpcActionMessage(3, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/ThirdObjectActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/ThirdObjectActionMessageDecoder.java index 8c49d79f..f4622700 100644 --- a/game/src/main/org/apollo/game/release/r317/ThirdObjectActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/ThirdObjectActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.ThirdObjectActionMessage; +import org.apollo.game.message.impl.ObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; @@ -10,19 +10,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link ThirdObjectActionMessage}. + * A {@link MessageDecoder} for the third {@link ObjectActionMessage}. * * @author Graham */ -public final class ThirdObjectActionMessageDecoder extends MessageDecoder { +public final class ThirdObjectActionMessageDecoder extends MessageDecoder { @Override - public ThirdObjectActionMessage decode(GamePacket packet) { + public ObjectActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); + int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int y = (int) reader.getUnsigned(DataType.SHORT); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new ThirdObjectActionMessage(id, new Position(x, y)); + + return new ObjectActionMessage(3, id, new Position(x, y)); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r317/ThirdPlayerActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r317/ThirdPlayerActionMessageDecoder.java index 9b085296..f50e64b5 100644 --- a/game/src/main/org/apollo/game/release/r317/ThirdPlayerActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r317/ThirdPlayerActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r317; -import org.apollo.game.message.impl.ThirdPlayerActionMessage; +import org.apollo.game.message.impl.PlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link ThirdPlayerActionMessage}. + * A {@link MessageDecoder} for the third {@link PlayerActionMessage}. * * @author Major */ -public final class ThirdPlayerActionMessageDecoder extends MessageDecoder { +public final class ThirdPlayerActionMessageDecoder extends MessageDecoder { @Override - public ThirdPlayerActionMessage decode(GamePacket packet) { + public PlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new ThirdPlayerActionMessage(index); + return new PlayerActionMessage(3, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/ConfigMessageEncoder.java b/game/src/main/org/apollo/game/release/r377/ConfigMessageEncoder.java index 86a429b2..03cd3a49 100644 --- a/game/src/main/org/apollo/game/release/r377/ConfigMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r377/ConfigMessageEncoder.java @@ -14,7 +14,7 @@ import org.apollo.net.release.MessageEncoder; * @author Chris Fletcher * @author Major */ -final class ConfigMessageEncoder extends MessageEncoder { +public final class ConfigMessageEncoder extends MessageEncoder { @Override public GamePacket encode(ConfigMessage message) { diff --git a/game/src/main/org/apollo/game/release/r377/DialogueContinueMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/DialogueContinueMessageDecoder.java index c9830aca..070aded9 100644 --- a/game/src/main/org/apollo/game/release/r377/DialogueContinueMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/DialogueContinueMessageDecoder.java @@ -11,7 +11,7 @@ import org.apollo.net.release.MessageDecoder; * * @author Chris Fletcher */ -final class DialogueContinueMessageDecoder extends MessageDecoder { +public final class DialogueContinueMessageDecoder extends MessageDecoder { @Override public DialogueContinueMessage decode(GamePacket packet) { diff --git a/game/src/main/org/apollo/game/release/r377/DisplayTabInterfaceMessageEncoder.java b/game/src/main/org/apollo/game/release/r377/DisplayTabInterfaceMessageEncoder.java index fcfff910..b61ab2a8 100644 --- a/game/src/main/org/apollo/game/release/r377/DisplayTabInterfaceMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r377/DisplayTabInterfaceMessageEncoder.java @@ -12,7 +12,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class DisplayTabInterfaceMessageEncoder extends MessageEncoder { +public final class DisplayTabInterfaceMessageEncoder extends MessageEncoder { @Override public GamePacket encode(DisplayTabInterfaceMessage message) { diff --git a/game/src/main/org/apollo/game/release/r377/FifthItemActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FifthItemActionMessageDecoder.java index 17398b84..244ebf0f 100644 --- a/game/src/main/org/apollo/game/release/r377/FifthItemActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FifthItemActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FifthItemActionMessage; +import org.apollo.game.message.impl.ItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,19 +9,19 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FifthItemActionMessage}. + * A {@link MessageDecoder} for the fifth {@link ItemActionMessage}. * * @author Graham */ -public final class FifthItemActionMessageDecoder extends MessageDecoder { +public final class FifthItemActionMessageDecoder extends MessageDecoder { @Override - public FifthItemActionMessage decode(GamePacket packet) { + public ItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FifthItemActionMessage(interfaceId, id, slot); + return new ItemActionMessage(5, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FifthItemOptionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FifthItemOptionMessageDecoder.java index b8679c58..bf4a16ac 100644 --- a/game/src/main/org/apollo/game/release/r377/FifthItemOptionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FifthItemOptionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FifthItemOptionMessage; +import org.apollo.game.message.impl.ItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FifthItemOptionMessage}. + * A {@link MessageDecoder} for the fifth {@link ItemOptionMessage}. * * @author Chris Fletcher */ -final class FifthItemOptionMessageDecoder extends MessageDecoder { +public final class FifthItemOptionMessageDecoder extends MessageDecoder { @Override - public FifthItemOptionMessage decode(GamePacket packet) { + public ItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new FifthItemOptionMessage(interfaceId, id, slot); + return new ItemOptionMessage(5, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FifthNpcActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FifthNpcActionMessageDecoder.java index f214b10d..9801804d 100644 --- a/game/src/main/org/apollo/game/release/r377/FifthNpcActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FifthNpcActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FifthNpcActionMessage; +import org.apollo.game.message.impl.NpcActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FifthNpcActionMessage}. + * A {@link MessageDecoder} for the fifth {@link NpcActionMessage}. * * @author Stuart */ -public final class FifthNpcActionMessageDecoder extends MessageDecoder { +public final class FifthNpcActionMessageDecoder extends MessageDecoder { @Override - public FifthNpcActionMessage decode(GamePacket packet) { + public NpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FifthNpcActionMessage(index); + return new NpcActionMessage(5, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FifthPlayerActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FifthPlayerActionMessageDecoder.java index eee6396a..2a5f76ad 100644 --- a/game/src/main/org/apollo/game/release/r377/FifthPlayerActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FifthPlayerActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FifthPlayerActionMessage; +import org.apollo.game.message.impl.PlayerActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FifthPlayerActionMessage}. + * A {@link MessageDecoder} for the fifth {@link PlayerActionMessage}. * * @author Major */ -public final class FifthPlayerActionMessageDecoder extends MessageDecoder { +public final class FifthPlayerActionMessageDecoder extends MessageDecoder { @Override - public FifthPlayerActionMessage decode(GamePacket packet) { + public PlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FifthPlayerActionMessage(index); + return new PlayerActionMessage(5, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FirstItemActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FirstItemActionMessageDecoder.java index 4ed2d2be..e01cec99 100644 --- a/game/src/main/org/apollo/game/release/r377/FirstItemActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FirstItemActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FirstItemActionMessage; +import org.apollo.game.message.impl.ItemActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,19 +8,19 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FirstItemActionMessage}. + * A {@link MessageDecoder} for the first {@link ItemActionMessage}. * * @author Graham */ -public final class FirstItemActionMessageDecoder extends MessageDecoder { +public final class FirstItemActionMessageDecoder extends MessageDecoder { @Override - public FirstItemActionMessage decode(GamePacket packet) { + public ItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int slot = (int) reader.getUnsigned(DataType.SHORT); - return new FirstItemActionMessage(interfaceId, id, slot); + return new ItemActionMessage(1, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FirstItemOptionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FirstItemOptionMessageDecoder.java index 857d16c4..ff918012 100644 --- a/game/src/main/org/apollo/game/release/r377/FirstItemOptionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FirstItemOptionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FirstItemOptionMessage; +import org.apollo.game.message.impl.ItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FirstItemOptionMessage}. + * A {@link MessageDecoder} for the first {@link ItemOptionMessage}. * * @author Chris Fletcher */ -final class FirstItemOptionMessageDecoder extends MessageDecoder { +public final class FirstItemOptionMessageDecoder extends MessageDecoder { @Override - public FirstItemOptionMessage decode(GamePacket packet) { + public ItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FirstItemOptionMessage(interfaceId, id, slot); + return new ItemOptionMessage(1, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FirstNpcActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FirstNpcActionMessageDecoder.java index c860e99a..a7c3c607 100644 --- a/game/src/main/org/apollo/game/release/r377/FirstNpcActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FirstNpcActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FirstNpcActionMessage; +import org.apollo.game.message.impl.NpcActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * The {@link MessageDecoder} for the {@link FirstNpcActionMessage}. + * The {@link MessageDecoder} for the first {@link NpcActionMessage}. * * @author Major */ -public final class FirstNpcActionMessageDecoder extends MessageDecoder { +public final class FirstNpcActionMessageDecoder extends MessageDecoder { @Override - public FirstNpcActionMessage decode(GamePacket packet) { + public NpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); - return new FirstNpcActionMessage(index); + return new NpcActionMessage(1, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FirstObjectActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FirstObjectActionMessageDecoder.java index 86b56cd0..17236190 100644 --- a/game/src/main/org/apollo/game/release/r377/FirstObjectActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FirstObjectActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FirstObjectActionMessage; +import org.apollo.game.message.impl.ObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; @@ -10,19 +10,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FirstObjectActionMessage}. + * A {@link MessageDecoder} for the first {@link ObjectActionMessage}. * * @author Graham */ -public final class FirstObjectActionMessageDecoder extends MessageDecoder { +public final class FirstObjectActionMessageDecoder extends MessageDecoder { @Override - public FirstObjectActionMessage decode(GamePacket packet) { + public ObjectActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); + int x = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int y = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FirstObjectActionMessage(id, new Position(x, y)); + + return new ObjectActionMessage(1, id, new Position(x, y)); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FirstPlayerActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FirstPlayerActionMessageDecoder.java index c7805f7c..4d18a15b 100644 --- a/game/src/main/org/apollo/game/release/r377/FirstPlayerActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FirstPlayerActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FirstPlayerActionMessage; +import org.apollo.game.message.impl.PlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,17 +9,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FirstPlayerActionMessage}. + * A {@link MessageDecoder} for the first {@link PlayerActionMessage}. * * @author Major */ -public final class FirstPlayerActionMessageDecoder extends MessageDecoder { +public final class FirstPlayerActionMessageDecoder extends MessageDecoder { @Override - public FirstPlayerActionMessage decode(GamePacket packet) { + public PlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new FirstPlayerActionMessage(index); + return new PlayerActionMessage(1, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FourthItemActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FourthItemActionMessageDecoder.java index 66f98dd0..9f95c642 100644 --- a/game/src/main/org/apollo/game/release/r377/FourthItemActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FourthItemActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FourthItemActionMessage; +import org.apollo.game.message.impl.ItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,19 +9,19 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FourthItemActionMessage}. + * A {@link MessageDecoder} for the fourth {@link ItemActionMessage}. * * @author Graham */ -public final class FourthItemActionMessageDecoder extends MessageDecoder { +public final class FourthItemActionMessageDecoder extends MessageDecoder { @Override - public FourthItemActionMessage decode(GamePacket packet) { + public ItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT); - return new FourthItemActionMessage(interfaceId, id, slot); + return new ItemActionMessage(4, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FourthItemOptionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FourthItemOptionMessageDecoder.java index 2c6399a3..f6fa9ef4 100644 --- a/game/src/main/org/apollo/game/release/r377/FourthItemOptionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FourthItemOptionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FourthItemOptionMessage; +import org.apollo.game.message.impl.ItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FourthItemOptionMessage}. + * A {@link MessageDecoder} for the fourth {@link ItemOptionMessage}. * * @author Chris Fletcher */ -final class FourthItemOptionMessageDecoder extends MessageDecoder { +public final class FourthItemOptionMessageDecoder extends MessageDecoder { @Override - public FourthItemOptionMessage decode(GamePacket packet) { + public ItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); - return new FourthItemOptionMessage(interfaceId, id, slot); + return new ItemOptionMessage(4, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FourthNpcActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FourthNpcActionMessageDecoder.java index 2bbe4638..b3885337 100644 --- a/game/src/main/org/apollo/game/release/r377/FourthNpcActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FourthNpcActionMessageDecoder.java @@ -1,23 +1,23 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FourthNpcActionMessage; +import org.apollo.game.message.impl.NpcActionMessage; 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 MessageDecoder} for the {@link FourthNpcActionMessage}. + * A {@link MessageDecoder} for the fourth {@link NpcActionMessage}. * * @author Stuart */ -public final class FourthNpcActionMessageDecoder extends MessageDecoder { +public final class FourthNpcActionMessageDecoder extends MessageDecoder { @Override - public FourthNpcActionMessage decode(GamePacket packet) { + public NpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT); - return new FourthNpcActionMessage(index); + return new NpcActionMessage(4, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/FourthPlayerActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/FourthPlayerActionMessageDecoder.java index cc26f505..4f21919c 100644 --- a/game/src/main/org/apollo/game/release/r377/FourthPlayerActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/FourthPlayerActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.FourthPlayerActionMessage; +import org.apollo.game.message.impl.PlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link FourthPlayerActionMessage}. + * A {@link MessageDecoder} for the fourth {@link PlayerActionMessage}. * * @author Major */ -public final class FourthPlayerActionMessageDecoder extends MessageDecoder { +public final class FourthPlayerActionMessageDecoder extends MessageDecoder { @Override - public FourthPlayerActionMessage decode(GamePacket packet) { + public PlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FourthPlayerActionMessage(index); + return new PlayerActionMessage(4, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/ItemOnItemMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/ItemOnItemMessageDecoder.java index 7ae875e8..6deba8b5 100644 --- a/game/src/main/org/apollo/game/release/r377/ItemOnItemMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/ItemOnItemMessageDecoder.java @@ -13,7 +13,7 @@ import org.apollo.net.release.MessageDecoder; * * @author Chris Fletcher */ -final class ItemOnItemMessageDecoder extends MessageDecoder { +public final class ItemOnItemMessageDecoder extends MessageDecoder { @Override public ItemOnItemMessage decode(GamePacket packet) { diff --git a/game/src/main/org/apollo/game/release/r377/MagicOnItemMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/MagicOnItemMessageDecoder.java index 93d7a34e..d8aeb87d 100644 --- a/game/src/main/org/apollo/game/release/r377/MagicOnItemMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/MagicOnItemMessageDecoder.java @@ -12,7 +12,7 @@ import org.apollo.net.release.MessageDecoder; * * @author Chris Fletcher */ -final class MagicOnItemMessageDecoder extends MessageDecoder { +public final class MagicOnItemMessageDecoder extends MessageDecoder { @Override public MagicOnItemMessage decode(GamePacket packet) { diff --git a/game/src/main/org/apollo/game/release/r377/SecondItemActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/SecondItemActionMessageDecoder.java index a84915f8..a6ea32ff 100644 --- a/game/src/main/org/apollo/game/release/r377/SecondItemActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/SecondItemActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.SecondItemActionMessage; +import org.apollo.game.message.impl.ItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,19 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link SecondItemActionMessage}. + * A {@link MessageDecoder} for the second {@link ItemActionMessage}. * * @author Graham */ -public final class SecondItemActionMessageDecoder extends MessageDecoder { +public final class SecondItemActionMessageDecoder extends MessageDecoder { @Override - public SecondItemActionMessage decode(GamePacket packet) { + public ItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); + int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new SecondItemActionMessage(interfaceId, id, slot); + + return new ItemActionMessage(2, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/SecondItemOptionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/SecondItemOptionMessageDecoder.java index 7bb0a7b3..d344c101 100644 --- a/game/src/main/org/apollo/game/release/r377/SecondItemOptionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/SecondItemOptionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.SecondItemOptionMessage; +import org.apollo.game.message.impl.ItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link SecondItemOptionMessage}. + * A {@link MessageDecoder} for the second {@link ItemOptionMessage}. * * @author Graham */ -final class SecondItemOptionMessageDecoder extends MessageDecoder { +public final class SecondItemOptionMessageDecoder extends MessageDecoder { @Override - public SecondItemOptionMessage decode(GamePacket packet) { + public ItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new SecondItemOptionMessage(interfaceId, id, slot); + return new ItemOptionMessage(2, interfaceId, id, slot); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/SecondNpcActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/SecondNpcActionMessageDecoder.java index 5e524398..0ea202b0 100644 --- a/game/src/main/org/apollo/game/release/r377/SecondNpcActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/SecondNpcActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.SecondNpcActionMessage; +import org.apollo.game.message.impl.NpcActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * The {@link MessageDecoder} for the {@link SecondNpcActionMessage}. + * The {@link MessageDecoder} for the {@link NpcActionMessage}. * * @author Major */ -public final class SecondNpcActionMessageDecoder extends MessageDecoder { +public final class SecondNpcActionMessageDecoder extends MessageDecoder { @Override - public SecondNpcActionMessage decode(GamePacket packet) { + public NpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getSigned(DataType.SHORT, DataTransformation.ADD); - return new SecondNpcActionMessage(index); + return new NpcActionMessage(2, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/SecondObjectActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/SecondObjectActionMessageDecoder.java index 0bb8c349..ef8faf8d 100644 --- a/game/src/main/org/apollo/game/release/r377/SecondObjectActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/SecondObjectActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.SecondObjectActionMessage; +import org.apollo.game.message.impl.ObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,19 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link SecondObjectActionMessage}. + * A {@link MessageDecoder} for the second {@link ObjectActionMessage}. * * @author Graham */ -public final class SecondObjectActionMessageDecoder extends MessageDecoder { +public final class SecondObjectActionMessageDecoder extends MessageDecoder { @Override - public SecondObjectActionMessage decode(GamePacket packet) { + public ObjectActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); + int id = (int) reader.getUnsigned(DataType.SHORT); int x = (int) reader.getUnsigned(DataType.SHORT); int y = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new SecondObjectActionMessage(id, new Position(x, y)); + + return new ObjectActionMessage(2, id, new Position(x, y)); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/SecondPlayerActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/SecondPlayerActionMessageDecoder.java index dab88ccd..65aad4bb 100644 --- a/game/src/main/org/apollo/game/release/r377/SecondPlayerActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/SecondPlayerActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.SecondPlayerActionMessage; +import org.apollo.game.message.impl.PlayerActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link SecondPlayerActionMessage}. + * A {@link MessageDecoder} for the second {@link PlayerActionMessage}. * * @author Major */ -public final class SecondPlayerActionMessageDecoder extends MessageDecoder { +public final class SecondPlayerActionMessageDecoder extends MessageDecoder { @Override - public SecondPlayerActionMessage decode(GamePacket packet) { + public PlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new SecondPlayerActionMessage(index); + return new PlayerActionMessage(2, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetItemModelMessageEncoder.java b/game/src/main/org/apollo/game/release/r377/SetWidgetItemModelMessageEncoder.java index 60990cdc..ea9a1f00 100644 --- a/game/src/main/org/apollo/game/release/r377/SetWidgetItemModelMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r377/SetWidgetItemModelMessageEncoder.java @@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class SetWidgetItemModelMessageEncoder extends MessageEncoder { +public final class SetWidgetItemModelMessageEncoder extends MessageEncoder { @Override public GamePacket encode(SetWidgetItemModelMessage message) { diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetModelAnimationMessageEncoder.java b/game/src/main/org/apollo/game/release/r377/SetWidgetModelAnimationMessageEncoder.java index b209768f..030636f3 100644 --- a/game/src/main/org/apollo/game/release/r377/SetWidgetModelAnimationMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r377/SetWidgetModelAnimationMessageEncoder.java @@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class SetWidgetModelAnimationMessageEncoder extends MessageEncoder { +public final class SetWidgetModelAnimationMessageEncoder extends MessageEncoder { @Override public GamePacket encode(SetWidgetModelAnimationMessage message) { diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetNpcModelMessageEncoder.java b/game/src/main/org/apollo/game/release/r377/SetWidgetNpcModelMessageEncoder.java index ec5ff0a4..c705314b 100644 --- a/game/src/main/org/apollo/game/release/r377/SetWidgetNpcModelMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r377/SetWidgetNpcModelMessageEncoder.java @@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class SetWidgetNpcModelMessageEncoder extends MessageEncoder { +public final class SetWidgetNpcModelMessageEncoder extends MessageEncoder { @Override public GamePacket encode(SetWidgetNpcModelMessage message) { diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetPlayerModelMessageEncoder.java b/game/src/main/org/apollo/game/release/r377/SetWidgetPlayerModelMessageEncoder.java index 338450d9..07da7893 100644 --- a/game/src/main/org/apollo/game/release/r377/SetWidgetPlayerModelMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r377/SetWidgetPlayerModelMessageEncoder.java @@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class SetWidgetPlayerModelMessageEncoder extends MessageEncoder { +public final class SetWidgetPlayerModelMessageEncoder extends MessageEncoder { @Override public GamePacket encode(SetWidgetPlayerModelMessage message) { diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetVisibilityMessageEncoder.java b/game/src/main/org/apollo/game/release/r377/SetWidgetVisibilityMessageEncoder.java index 4dcdefa8..2e706260 100644 --- a/game/src/main/org/apollo/game/release/r377/SetWidgetVisibilityMessageEncoder.java +++ b/game/src/main/org/apollo/game/release/r377/SetWidgetVisibilityMessageEncoder.java @@ -11,7 +11,7 @@ import org.apollo.net.release.MessageEncoder; * * @author Chris Fletcher */ -final class SetWidgetVisibilityMessageEncoder extends MessageEncoder { +public final class SetWidgetVisibilityMessageEncoder extends MessageEncoder { @Override public GamePacket encode(SetWidgetVisibilityMessage message) { diff --git a/game/src/main/org/apollo/game/release/r377/ThirdItemActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/ThirdItemActionMessageDecoder.java index 48478db0..315c40d6 100644 --- a/game/src/main/org/apollo/game/release/r377/ThirdItemActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/ThirdItemActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.ThirdItemActionMessage; +import org.apollo.game.message.impl.ItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,19 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link ThirdItemActionMessage}. + * A {@link MessageDecoder} for the third {@link ItemActionMessage}. * * @author Graham */ -public final class ThirdItemActionMessageDecoder extends MessageDecoder { +public final class ThirdItemActionMessageDecoder extends MessageDecoder { @Override - public ThirdItemActionMessage decode(GamePacket packet) { + public ItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); + int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); - return new ThirdItemActionMessage(interfaceId, id, slot); + + return new ItemActionMessage(3, interfaceId, id, slot); } } diff --git a/game/src/main/org/apollo/game/release/r377/ThirdItemOptionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/ThirdItemOptionMessageDecoder.java index 70cbe00a..e61c9ee2 100644 --- a/game/src/main/org/apollo/game/release/r377/ThirdItemOptionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/ThirdItemOptionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.ThirdItemOptionMessage; +import org.apollo.game.message.impl.ItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link ThirdItemOptionMessage}. + * A {@link MessageDecoder} for the third {@link ItemOptionMessage}. * * @author Chris Fletcher */ -final class ThirdItemOptionMessageDecoder extends MessageDecoder { +public final class ThirdItemOptionMessageDecoder extends MessageDecoder { @Override - public ThirdItemOptionMessage decode(GamePacket packet) { + public ItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new ThirdItemOptionMessage(interfaceId, id, slot); + return new ItemOptionMessage(3, interfaceId, id, slot); } } diff --git a/game/src/main/org/apollo/game/release/r377/ThirdNpcActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/ThirdNpcActionMessageDecoder.java index 3e8692c7..42ae9dd6 100644 --- a/game/src/main/org/apollo/game/release/r377/ThirdNpcActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/ThirdNpcActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.ThirdNpcActionMessage; +import org.apollo.game.message.impl.NpcActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; @@ -9,17 +9,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * The {@link MessageDecoder} for the {@link ThirdNpcActionMessage}. + * The {@link MessageDecoder} for the third {@link NpcActionMessage}. * * @author Major */ -public final class ThirdNpcActionMessageDecoder extends MessageDecoder { +public final class ThirdNpcActionMessageDecoder extends MessageDecoder { @Override - public ThirdNpcActionMessage decode(GamePacket packet) { + public NpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new ThirdNpcActionMessage(index); + return new NpcActionMessage(3, index); } } \ No newline at end of file diff --git a/game/src/main/org/apollo/game/release/r377/ThirdObjectActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/ThirdObjectActionMessageDecoder.java index 84fe8b01..63a05a3f 100644 --- a/game/src/main/org/apollo/game/release/r377/ThirdObjectActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/ThirdObjectActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.ThirdObjectActionMessage; +import org.apollo.game.message.impl.ObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; @@ -10,19 +10,21 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link ThirdObjectActionMessage}. + * A {@link MessageDecoder} for the third {@link ObjectActionMessage}. * * @author Graham */ -public final class ThirdObjectActionMessageDecoder extends MessageDecoder { +public final class ThirdObjectActionMessageDecoder extends MessageDecoder { @Override - public ThirdObjectActionMessage decode(GamePacket packet) { + public ObjectActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); + int y = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new ThirdObjectActionMessage(id, new Position(x, y)); + + return new ObjectActionMessage(3, id, new Position(x, y)); } } diff --git a/game/src/main/org/apollo/game/release/r377/ThirdPlayerActionMessageDecoder.java b/game/src/main/org/apollo/game/release/r377/ThirdPlayerActionMessageDecoder.java index eedbb0b8..cceb1fb9 100644 --- a/game/src/main/org/apollo/game/release/r377/ThirdPlayerActionMessageDecoder.java +++ b/game/src/main/org/apollo/game/release/r377/ThirdPlayerActionMessageDecoder.java @@ -1,6 +1,6 @@ package org.apollo.game.release.r377; -import org.apollo.game.message.impl.ThirdPlayerActionMessage; +import org.apollo.game.message.impl.PlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.release.MessageDecoder; /** - * A {@link MessageDecoder} for the {@link ThirdPlayerActionMessage}. + * A {@link MessageDecoder} for the third {@link PlayerActionMessage}. * * @author Major */ -public final class ThirdPlayerActionMessageDecoder extends MessageDecoder { +public final class ThirdPlayerActionMessageDecoder extends MessageDecoder { @Override - public ThirdPlayerActionMessage decode(GamePacket packet) { + public PlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new ThirdPlayerActionMessage(index); + return new PlayerActionMessage(3, index); } } \ No newline at end of file