2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-05 08:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combine (First|Second|Third|Fourth|Fifth)XMessages into a single class.

Browse Source
This commit is contained in:
Major-
2015-08-28 18:16:24 +01:00
parent 6f5a910d70
commit f0910afb6f
94 changed files with 293 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/src/main/org/apollo/game/message/impl/FifthItemActionMessage.java
-21
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FifthItemOptionMessage.java
-21
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FifthNpcActionMessage.java
-20
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FifthPlayerActionMessage.java
-19
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FirstItemActionMessage.java
-21
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FirstItemOptionMessage.java
-21
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FirstNpcActionMessage.java
-19
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FirstObjectActionMessage.java
-22
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FirstPlayerActionMessage.java
-19
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FourthItemActionMessage.java
-21
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FourthItemOptionMessage.java
-21
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FourthNpcActionMessage.java
-20
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/FourthPlayerActionMessage.java
-19
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/ItemActionMessage.java
+1 -1
View File
@@ -11,7 +11,7 @@ import java.util.OptionalInt;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
public abstract class ItemActionMessage extends InventoryItemMessage { public final class ItemActionMessage extends InventoryItemMessage {
/** /**
* Creates the ItemActionMessage. * Creates the ItemActionMessage.
game/src/main/org/apollo/game/message/impl/ItemOptionMessage.java
+1 -1
View File
@@ -9,7 +9,7 @@ import java.util.OptionalInt;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
public abstract class ItemOptionMessage extends InventoryItemMessage { public final class ItemOptionMessage extends InventoryItemMessage {
/** /**
* Creates the ItemOptionMessage. * Creates the ItemOptionMessage.
game/src/main/org/apollo/game/message/impl/MagicOnMobMessage.java
+1 -1
View File
@@ -21,7 +21,7 @@ public abstract class MagicOnMobMessage extends Message {
private final int index; private final int index;
/** /**
* The spell if used. * The spell id used.
*/ */
private final int spellId; private final int spellId;
game/src/main/org/apollo/game/message/impl/NpcActionMessage.java
+1 -1
View File
@@ -9,7 +9,7 @@ import org.apollo.net.message.Message;
* *
* @author Major * @author Major
*/ */
public abstract class NpcActionMessage extends Message { public final class NpcActionMessage extends Message {
/** /**
* The option number. * The option number.
game/src/main/org/apollo/game/message/impl/ObjectActionMessage.java
+3 -2
View File
@@ -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 * 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). * the option verified).
* *
* @author Graham * @author Graham
*/ */
public abstract class ObjectActionMessage extends Message { public final class ObjectActionMessage extends Message {
/** /**
* The object's id. * The object's id.
game/src/main/org/apollo/game/message/impl/PlayerActionMessage.java
+17 -16
View File
@@ -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 * 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). * the option verified).
* *
* @author Major * @author Major
*/ */
public abstract class PlayerActionMessage extends Message { public final class PlayerActionMessage extends Message {
/**
* The option number.
*/
private final int option;
/** /**
* The index of the clicked player. * The index of the clicked player.
*/ */
private final int index; private final int index;
/**
* The option number.
*/
private final int option;
/** /**
* Creates a player action message. * Creates a player action message.
* *
@@ -32,15 +33,6 @@ public abstract class PlayerActionMessage extends Message {
this.index = index; 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. * Gets the index of the clicked player.
* *
@@ -50,4 +42,13 @@ public abstract class PlayerActionMessage extends Message {
return index; return index;
} }
/**
* Gets the menu action number (i.e. the action message 'option') clicked.
*
* @return The option number.
*/
public int getOption() {
return option;
}
} }
game/src/main/org/apollo/game/message/impl/SecondItemActionMessage.java
-21
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/SecondItemOptionMessage.java
-21
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/SecondNpcActionMessage.java
-19
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/SecondObjectActionMessage.java
-22
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/SecondPlayerActionMessage.java
-19
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/ThirdItemActionMessage.java
-21
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/ThirdItemOptionMessage.java
-21
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/ThirdNpcActionMessage.java
-19
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/ThirdObjectActionMessage.java
-22
View File
@@ -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);
}
}
game/src/main/org/apollo/game/message/impl/ThirdPlayerActionMessage.java
-19
View File
@@ -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);
}
}
game/src/main/org/apollo/game/release/r317/DisplayTabInterfaceMessageEncoder.java
+1 -1
View File
@@ -12,7 +12,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class DisplayTabInterfaceMessageEncoder extends MessageEncoder<DisplayTabInterfaceMessage> { public final class DisplayTabInterfaceMessageEncoder extends MessageEncoder<DisplayTabInterfaceMessage> {
@Override @Override
public GamePacket encode(DisplayTabInterfaceMessage message) { public GamePacket encode(DisplayTabInterfaceMessage message) {
game/src/main/org/apollo/game/release/r317/FifthItemActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,19 +9,19 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FifthItemActionMessage}. * A {@link MessageDecoder} for the fifth {@link ItemActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class FifthItemActionMessageDecoder extends MessageDecoder<FifthItemActionMessage> { public final class FifthItemActionMessageDecoder extends MessageDecoder<ItemActionMessage> {
@Override @Override
public FifthItemActionMessage decode(GamePacket packet) { public ItemActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new FifthItemActionMessage(interfaceId, id, slot); return new ItemActionMessage(5, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r317/FifthItemOptionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,21 +8,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FifthItemOptionMessage}. * A {@link MessageDecoder} for the fifth {@link ItemOptionMessage}.
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class FifthItemOptionMessageDecoder extends MessageDecoder<FifthItemOptionMessage> { public final class FifthItemOptionMessageDecoder extends MessageDecoder<ItemOptionMessage> {
@Override @Override
public FifthItemOptionMessage decode(GamePacket packet) { public ItemOptionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int interfaceId = (int) reader.getUnsigned(DataType.SHORT);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
return new FifthItemOptionMessage(interfaceId, id, slot); return new ItemOptionMessage(5, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r317/FifthNpcActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,18 +8,18 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FifthNpcActionMessage}. * A {@link MessageDecoder} for the fifth {@link NpcActionMessage}.
* *
* @author Stuart * @author Stuart
* @author Major * @author Major
*/ */
public final class FifthNpcActionMessageDecoder extends MessageDecoder<FifthNpcActionMessage> { public final class FifthNpcActionMessageDecoder extends MessageDecoder<NpcActionMessage> {
@Override @Override
public FifthNpcActionMessage decode(GamePacket packet) { public NpcActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new FifthNpcActionMessage(index); return new NpcActionMessage(5, index);
} }
} }
game/src/main/org/apollo/game/release/r317/FifthPlayerActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FifthPlayerActionMessage}. * A {@link MessageDecoder} for the fifth {@link PlayerActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class FifthPlayerActionMessageDecoder extends MessageDecoder<FifthPlayerActionMessage> { public final class FifthPlayerActionMessageDecoder extends MessageDecoder<PlayerActionMessage> {
@Override @Override
public FifthPlayerActionMessage decode(GamePacket packet) { public PlayerActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new FifthPlayerActionMessage(index); return new PlayerActionMessage(5, index);
} }
} }
game/src/main/org/apollo/game/release/r317/FirstItemActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,19 +8,19 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FirstItemActionMessage}. * A {@link MessageDecoder} for the first {@link ItemActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class FirstItemActionMessageDecoder extends MessageDecoder<FirstItemActionMessage> { public final class FirstItemActionMessageDecoder extends MessageDecoder<ItemActionMessage> {
@Override @Override
public FirstItemActionMessage decode(GamePacket packet) { public ItemActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int slot = (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); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
return new FirstItemActionMessage(interfaceId, id, slot); return new ItemActionMessage(1, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r317/FirstItemOptionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FirstItemOptionMessage}. * A {@link MessageDecoder} for the first {@link ItemOptionMessage}.
* *
* @author Graham * @author Graham
*/ */
final class FirstItemOptionMessageDecoder extends MessageDecoder<FirstItemOptionMessage> { public final class FirstItemOptionMessageDecoder extends MessageDecoder<ItemOptionMessage> {
@Override @Override
public FirstItemOptionMessage decode(GamePacket packet) { public ItemOptionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int interfaceId = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int id = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE);
return new FirstItemOptionMessage(interfaceId, id, slot); return new ItemOptionMessage(1, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r317/FirstNpcActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FirstNpcActionMessage}. * A {@link MessageDecoder} for the first {@link NpcActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class FirstNpcActionMessageDecoder extends MessageDecoder<FirstNpcActionMessage> { public final class FirstNpcActionMessageDecoder extends MessageDecoder<NpcActionMessage> {
@Override @Override
public FirstNpcActionMessage decode(GamePacket packet) { public NpcActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE);
return new FirstNpcActionMessage(index); return new NpcActionMessage(1, index);
} }
} }
game/src/main/org/apollo/game/release/r317/FirstObjectActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.game.model.Position;
import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
@@ -10,19 +10,19 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FirstObjectActionMessage}. * A {@link MessageDecoder} for the first {@link ObjectActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class FirstObjectActionMessageDecoder extends MessageDecoder<FirstObjectActionMessage> { public final class FirstObjectActionMessageDecoder extends MessageDecoder<ObjectActionMessage> {
@Override @Override
public FirstObjectActionMessage decode(GamePacket packet) { public ObjectActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
int id = (int) reader.getUnsigned(DataType.SHORT); int id = (int) reader.getUnsigned(DataType.SHORT);
int y = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); 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));
} }
} }
game/src/main/org/apollo/game/release/r317/FirstPlayerActionMessageDecoder.java
+5 -5
View File
@@ -1,23 +1,23 @@
package org.apollo.game.release.r317; 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.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FirstPlayerActionMessage}. * A {@link MessageDecoder} for the first {@link PlayerActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class FirstPlayerActionMessageDecoder extends MessageDecoder<FirstPlayerActionMessage> { public final class FirstPlayerActionMessageDecoder extends MessageDecoder<PlayerActionMessage> {
@Override @Override
public FirstPlayerActionMessage decode(GamePacket packet) { public PlayerActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT); int index = (int) reader.getUnsigned(DataType.SHORT);
return new FirstPlayerActionMessage(index); return new PlayerActionMessage(1, index);
} }
} }
game/src/main/org/apollo/game/release/r317/FourthItemActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,19 +8,19 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FourthItemActionMessage}. * A {@link MessageDecoder} for the fourth {@link ItemActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class FourthItemActionMessageDecoder extends MessageDecoder<FourthItemActionMessage> { public final class FourthItemActionMessageDecoder extends MessageDecoder<ItemActionMessage> {
@Override @Override
public FourthItemActionMessage decode(GamePacket packet) { public ItemActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int interfaceId = (int) reader.getUnsigned(DataType.SHORT);
int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
return new FourthItemActionMessage(interfaceId, id, slot); return new ItemActionMessage(4, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r317/FourthItemOptionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FourthItemOptionMessage}. * A {@link MessageDecoder} for the fourth {@link ItemOptionMessage}.
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class FourthItemOptionMessageDecoder extends MessageDecoder<FourthItemOptionMessage> { public final class FourthItemOptionMessageDecoder extends MessageDecoder<ItemOptionMessage> {
@Override @Override
public FourthItemOptionMessage decode(GamePacket packet) { public ItemOptionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int interfaceId = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
int slot = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); int slot = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE);
int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
return new FourthItemOptionMessage(interfaceId, id, slot); return new ItemOptionMessage(4, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r317/FourthNpcActionMessageDecoder.java
+5 -5
View File
@@ -1,24 +1,24 @@
package org.apollo.game.release.r317; 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.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FourthNpcActionMessage}. * A {@link MessageDecoder} for the fourth {@link NpcActionMessage}.
* *
* @author Stuart * @author Stuart
* @author Major * @author Major
*/ */
public final class FourthNpcActionMessageDecoder extends MessageDecoder<FourthNpcActionMessage> { public final class FourthNpcActionMessageDecoder extends MessageDecoder<NpcActionMessage> {
@Override @Override
public FourthNpcActionMessage decode(GamePacket packet) { public NpcActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT); int index = (int) reader.getUnsigned(DataType.SHORT);
return new FourthNpcActionMessage(index); return new NpcActionMessage(4, index);
} }
} }
game/src/main/org/apollo/game/release/r317/FourthPlayerActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FourthPlayerActionMessage}. * A {@link MessageDecoder} for the fourth {@link PlayerActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class FourthPlayerActionMessageDecoder extends MessageDecoder<FourthPlayerActionMessage> { public final class FourthPlayerActionMessageDecoder extends MessageDecoder<PlayerActionMessage> {
@Override @Override
public FourthPlayerActionMessage decode(GamePacket packet) { public PlayerActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new FourthPlayerActionMessage(index); return new PlayerActionMessage(4, index);
} }
} }
game/src/main/org/apollo/game/release/r317/ItemOnItemMessageDecoder.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.apollo.net.release.MessageDecoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class ItemOnItemMessageDecoder extends MessageDecoder<ItemOnItemMessage> { public final class ItemOnItemMessageDecoder extends MessageDecoder<ItemOnItemMessage> {
@Override @Override
public ItemOnItemMessage decode(GamePacket packet) { public ItemOnItemMessage decode(GamePacket packet) {
game/src/main/org/apollo/game/release/r317/MagicOnItemMessageDecoder.java
+1 -1
View File
@@ -12,7 +12,7 @@ import org.apollo.net.release.MessageDecoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class MagicOnItemMessageDecoder extends MessageDecoder<MagicOnItemMessage> { public final class MagicOnItemMessageDecoder extends MessageDecoder<MagicOnItemMessage> {
@Override @Override
public MagicOnItemMessage decode(GamePacket packet) { public MagicOnItemMessage decode(GamePacket packet) {
game/src/main/org/apollo/game/release/r317/SecondItemActionMessageDecoder.java
+7 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,19 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link SecondItemActionMessage}. * A {@link MessageDecoder} for the second {@link ItemActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class SecondItemActionMessageDecoder extends MessageDecoder<SecondItemActionMessage> { public final class SecondItemActionMessageDecoder extends MessageDecoder<ItemActionMessage> {
@Override @Override
public SecondItemActionMessage decode(GamePacket packet) { public ItemActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
int id = (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); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new SecondItemActionMessage(interfaceId, id, slot);
return new ItemActionMessage(2, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r317/SecondItemOptionMessageDecoder.java
+7 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,19 +8,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link SecondItemOptionMessage}. * A {@link MessageDecoder} for the {@link ItemOptionMessage}.
* *
* @author Graham * @author Graham
*/ */
final class SecondItemOptionMessageDecoder extends MessageDecoder<SecondItemOptionMessage> { public final class SecondItemOptionMessageDecoder extends MessageDecoder<ItemOptionMessage> {
@Override @Override
public SecondItemOptionMessage decode(GamePacket packet) { public ItemOptionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int id = (int) reader.getUnsigned(DataType.SHORT); int id = (int) reader.getUnsigned(DataType.SHORT);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int interfaceId = (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);
} }
} }
game/src/main/org/apollo/game/release/r317/SecondNpcActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link SecondNpcActionMessage}. * A {@link MessageDecoder} for the second {@link NpcActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class SecondNpcActionMessageDecoder extends MessageDecoder<SecondNpcActionMessage> { public final class SecondNpcActionMessageDecoder extends MessageDecoder<NpcActionMessage> {
@Override @Override
public SecondNpcActionMessage decode(GamePacket packet) { public NpcActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getSigned(DataType.SHORT, DataTransformation.ADD); int index = (int) reader.getSigned(DataType.SHORT, DataTransformation.ADD);
return new SecondNpcActionMessage(index); return new NpcActionMessage(2, index);
} }
} }
game/src/main/org/apollo/game/release/r317/SecondObjectActionMessageDecoder.java
+7 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.game.model.Position;
import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
@@ -10,19 +10,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link SecondObjectActionMessage}. * A {@link MessageDecoder} for the second {@link ObjectActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class SecondObjectActionMessageDecoder extends MessageDecoder<SecondObjectActionMessage> { public final class SecondObjectActionMessageDecoder extends MessageDecoder<ObjectActionMessage> {
@Override @Override
public SecondObjectActionMessage decode(GamePacket packet) { public ObjectActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
int y = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int y = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int x = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); 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));
} }
} }
game/src/main/org/apollo/game/release/r317/SecondPlayerActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link SecondPlayerActionMessage}. * A {@link MessageDecoder} for the second {@link PlayerActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class SecondPlayerActionMessageDecoder extends MessageDecoder<SecondPlayerActionMessage> { public final class SecondPlayerActionMessageDecoder extends MessageDecoder<PlayerActionMessage> {
@Override @Override
public SecondPlayerActionMessage decode(GamePacket packet) { public PlayerActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new SecondPlayerActionMessage(index); return new PlayerActionMessage(2, index);
} }
} }
game/src/main/org/apollo/game/release/r317/SetUpdatedRegionMessageEncoder.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class SetUpdatedRegionMessageEncoder extends MessageEncoder<SetUpdatedRegionMessage> { public final class SetUpdatedRegionMessageEncoder extends MessageEncoder<SetUpdatedRegionMessage> {
@Override @Override
public GamePacket encode(SetUpdatedRegionMessage message) { public GamePacket encode(SetUpdatedRegionMessage message) {
game/src/main/org/apollo/game/release/r317/SetWidgetItemModelMessageEncoder.java
+1 -1
View File
@@ -12,7 +12,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class SetWidgetItemModelMessageEncoder extends MessageEncoder<SetWidgetItemModelMessage> { public final class SetWidgetItemModelMessageEncoder extends MessageEncoder<SetWidgetItemModelMessage> {
@Override @Override
public GamePacket encode(SetWidgetItemModelMessage message) { public GamePacket encode(SetWidgetItemModelMessage message) {
game/src/main/org/apollo/game/release/r317/SetWidgetModelAnimationMessageEncoder.java
+1 -1
View File
@@ -11,7 +11,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class SetWidgetModelAnimationMessageEncoder extends MessageEncoder<SetWidgetModelAnimationMessage> { public final class SetWidgetModelAnimationMessageEncoder extends MessageEncoder<SetWidgetModelAnimationMessage> {
@Override @Override
public GamePacket encode(SetWidgetModelAnimationMessage message) { public GamePacket encode(SetWidgetModelAnimationMessage message) {
game/src/main/org/apollo/game/release/r317/SetWidgetNpcModelMessageEncoder.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class SetWidgetNpcModelMessageEncoder extends MessageEncoder<SetWidgetNpcModelMessage> { public final class SetWidgetNpcModelMessageEncoder extends MessageEncoder<SetWidgetNpcModelMessage> {
@Override @Override
public GamePacket encode(SetWidgetNpcModelMessage message) { public GamePacket encode(SetWidgetNpcModelMessage message) {
game/src/main/org/apollo/game/release/r317/SetWidgetPlayerModelMessageEncoder.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class SetWidgetPlayerModelMessageEncoder extends MessageEncoder<SetWidgetPlayerModelMessage> { public final class SetWidgetPlayerModelMessageEncoder extends MessageEncoder<SetWidgetPlayerModelMessage> {
@Override @Override
public GamePacket encode(SetWidgetPlayerModelMessage message) { public GamePacket encode(SetWidgetPlayerModelMessage message) {
game/src/main/org/apollo/game/release/r317/SetWidgetVisibilityMessageEncoder.java
+1 -1
View File
@@ -11,7 +11,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Major * @author Major
*/ */
final class SetWidgetVisibilityMessageEncoder extends MessageEncoder<SetWidgetVisibilityMessage> { public final class SetWidgetVisibilityMessageEncoder extends MessageEncoder<SetWidgetVisibilityMessage> {
@Override @Override
public GamePacket encode(SetWidgetVisibilityMessage message) { public GamePacket encode(SetWidgetVisibilityMessage message) {
game/src/main/org/apollo/game/release/r317/ThirdItemActionMessageDecoder.java
+7 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,19 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link ThirdItemActionMessage}. * A {@link MessageDecoder} for the third {@link ItemActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class ThirdItemActionMessageDecoder extends MessageDecoder<ThirdItemActionMessage> { public final class ThirdItemActionMessageDecoder extends MessageDecoder<ItemActionMessage> {
@Override @Override
public ThirdItemActionMessage decode(GamePacket packet) { public ItemActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int slot = (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);
} }
} }
game/src/main/org/apollo/game/release/r317/ThirdItemOptionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link ThirdItemOptionMessage}. * A {@link MessageDecoder} for the third {@link ItemOptionMessage}.
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class ThirdItemOptionMessageDecoder extends MessageDecoder<ThirdItemOptionMessage> { public final class ThirdItemOptionMessageDecoder extends MessageDecoder<ItemOptionMessage> {
@Override @Override
public ThirdItemOptionMessage decode(GamePacket packet) { public ItemOptionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int slot = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
int interfaceId = (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);
} }
} }
game/src/main/org/apollo/game/release/r317/ThirdNpcActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,17 +9,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link ThirdNpcActionMessage}. * A {@link MessageDecoder} for the third {@link NpcActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class ThirdNpcActionMessageDecoder extends MessageDecoder<ThirdNpcActionMessage> { public final class ThirdNpcActionMessageDecoder extends MessageDecoder<NpcActionMessage> {
@Override @Override
public ThirdNpcActionMessage decode(GamePacket packet) { public NpcActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
return new ThirdNpcActionMessage(index); return new NpcActionMessage(3, index);
} }
} }
game/src/main/org/apollo/game/release/r317/ThirdObjectActionMessageDecoder.java
+7 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.game.model.Position;
import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
@@ -10,19 +10,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link ThirdObjectActionMessage}. * A {@link MessageDecoder} for the third {@link ObjectActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class ThirdObjectActionMessageDecoder extends MessageDecoder<ThirdObjectActionMessage> { public final class ThirdObjectActionMessageDecoder extends MessageDecoder<ObjectActionMessage> {
@Override @Override
public ThirdObjectActionMessage decode(GamePacket packet) { public ObjectActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int y = (int) reader.getUnsigned(DataType.SHORT); int y = (int) reader.getUnsigned(DataType.SHORT);
int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); 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));
} }
} }
game/src/main/org/apollo/game/release/r317/ThirdPlayerActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r317; 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.DataOrder;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link ThirdPlayerActionMessage}. * A {@link MessageDecoder} for the third {@link PlayerActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class ThirdPlayerActionMessageDecoder extends MessageDecoder<ThirdPlayerActionMessage> { public final class ThirdPlayerActionMessageDecoder extends MessageDecoder<PlayerActionMessage> {
@Override @Override
public ThirdPlayerActionMessage decode(GamePacket packet) { public PlayerActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new ThirdPlayerActionMessage(index); return new PlayerActionMessage(3, index);
} }
} }
game/src/main/org/apollo/game/release/r377/ConfigMessageEncoder.java
+1 -1
View File
@@ -14,7 +14,7 @@ import org.apollo.net.release.MessageEncoder;
* @author Chris Fletcher * @author Chris Fletcher
* @author Major * @author Major
*/ */
final class ConfigMessageEncoder extends MessageEncoder<ConfigMessage> { public final class ConfigMessageEncoder extends MessageEncoder<ConfigMessage> {
@Override @Override
public GamePacket encode(ConfigMessage message) { public GamePacket encode(ConfigMessage message) {
game/src/main/org/apollo/game/release/r377/DialogueContinueMessageDecoder.java
+1 -1
View File
@@ -11,7 +11,7 @@ import org.apollo.net.release.MessageDecoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class DialogueContinueMessageDecoder extends MessageDecoder<DialogueContinueMessage> { public final class DialogueContinueMessageDecoder extends MessageDecoder<DialogueContinueMessage> {
@Override @Override
public DialogueContinueMessage decode(GamePacket packet) { public DialogueContinueMessage decode(GamePacket packet) {
game/src/main/org/apollo/game/release/r377/DisplayTabInterfaceMessageEncoder.java
+1 -1
View File
@@ -12,7 +12,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class DisplayTabInterfaceMessageEncoder extends MessageEncoder<DisplayTabInterfaceMessage> { public final class DisplayTabInterfaceMessageEncoder extends MessageEncoder<DisplayTabInterfaceMessage> {
@Override @Override
public GamePacket encode(DisplayTabInterfaceMessage message) { public GamePacket encode(DisplayTabInterfaceMessage message) {
game/src/main/org/apollo/game/release/r377/FifthItemActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,19 +9,19 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FifthItemActionMessage}. * A {@link MessageDecoder} for the fifth {@link ItemActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class FifthItemActionMessageDecoder extends MessageDecoder<FifthItemActionMessage> { public final class FifthItemActionMessageDecoder extends MessageDecoder<ItemActionMessage> {
@Override @Override
public FifthItemActionMessage decode(GamePacket packet) { public ItemActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
int id = (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); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new FifthItemActionMessage(interfaceId, id, slot); return new ItemActionMessage(5, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r377/FifthItemOptionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FifthItemOptionMessage}. * A {@link MessageDecoder} for the fifth {@link ItemOptionMessage}.
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class FifthItemOptionMessageDecoder extends MessageDecoder<FifthItemOptionMessage> { public final class FifthItemOptionMessageDecoder extends MessageDecoder<ItemOptionMessage> {
@Override @Override
public FifthItemOptionMessage decode(GamePacket packet) { public ItemOptionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int id = (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, 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);
} }
} }
game/src/main/org/apollo/game/release/r377/FifthNpcActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FifthNpcActionMessage}. * A {@link MessageDecoder} for the fifth {@link NpcActionMessage}.
* *
* @author Stuart * @author Stuart
*/ */
public final class FifthNpcActionMessageDecoder extends MessageDecoder<FifthNpcActionMessage> { public final class FifthNpcActionMessageDecoder extends MessageDecoder<NpcActionMessage> {
@Override @Override
public FifthNpcActionMessage decode(GamePacket packet) { public NpcActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new FifthNpcActionMessage(index); return new NpcActionMessage(5, index);
} }
} }
game/src/main/org/apollo/game/release/r377/FifthPlayerActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FifthPlayerActionMessage}. * A {@link MessageDecoder} for the fifth {@link PlayerActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class FifthPlayerActionMessageDecoder extends MessageDecoder<FifthPlayerActionMessage> { public final class FifthPlayerActionMessageDecoder extends MessageDecoder<PlayerActionMessage> {
@Override @Override
public FifthPlayerActionMessage decode(GamePacket packet) { public PlayerActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int index = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
return new FifthPlayerActionMessage(index); return new PlayerActionMessage(5, index);
} }
} }
game/src/main/org/apollo/game/release/r377/FirstItemActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,19 +8,19 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FirstItemActionMessage}. * A {@link MessageDecoder} for the first {@link ItemActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class FirstItemActionMessageDecoder extends MessageDecoder<FirstItemActionMessage> { public final class FirstItemActionMessageDecoder extends MessageDecoder<ItemActionMessage> {
@Override @Override
public FirstItemActionMessage decode(GamePacket packet) { public ItemActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int interfaceId = (int) reader.getUnsigned(DataType.SHORT);
int slot = (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);
} }
} }
game/src/main/org/apollo/game/release/r377/FirstItemOptionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FirstItemOptionMessage}. * A {@link MessageDecoder} for the first {@link ItemOptionMessage}.
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class FirstItemOptionMessageDecoder extends MessageDecoder<FirstItemOptionMessage> { public final class FirstItemOptionMessageDecoder extends MessageDecoder<ItemOptionMessage> {
@Override @Override
public FirstItemOptionMessage decode(GamePacket packet) { public ItemOptionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int id = (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);
} }
} }
game/src/main/org/apollo/game/release/r377/FirstNpcActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* The {@link MessageDecoder} for the {@link FirstNpcActionMessage}. * The {@link MessageDecoder} for the first {@link NpcActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class FirstNpcActionMessageDecoder extends MessageDecoder<FirstNpcActionMessage> { public final class FirstNpcActionMessageDecoder extends MessageDecoder<NpcActionMessage> {
@Override @Override
public FirstNpcActionMessage decode(GamePacket packet) { public NpcActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE);
return new FirstNpcActionMessage(index); return new NpcActionMessage(1, index);
} }
} }
game/src/main/org/apollo/game/release/r377/FirstObjectActionMessageDecoder.java
+7 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.game.model.Position;
import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
@@ -10,19 +10,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FirstObjectActionMessage}. * A {@link MessageDecoder} for the first {@link ObjectActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class FirstObjectActionMessageDecoder extends MessageDecoder<FirstObjectActionMessage> { public final class FirstObjectActionMessageDecoder extends MessageDecoder<ObjectActionMessage> {
@Override @Override
public FirstObjectActionMessage decode(GamePacket packet) { public ObjectActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int x = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int x = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int y = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int y = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int id = (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));
} }
} }
game/src/main/org/apollo/game/release/r377/FirstPlayerActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,17 +9,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FirstPlayerActionMessage}. * A {@link MessageDecoder} for the first {@link PlayerActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class FirstPlayerActionMessageDecoder extends MessageDecoder<FirstPlayerActionMessage> { public final class FirstPlayerActionMessageDecoder extends MessageDecoder<PlayerActionMessage> {
@Override @Override
public FirstPlayerActionMessage decode(GamePacket packet) { public PlayerActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
return new FirstPlayerActionMessage(index); return new PlayerActionMessage(1, index);
} }
} }
game/src/main/org/apollo/game/release/r377/FourthItemActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,19 +9,19 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FourthItemActionMessage}. * A {@link MessageDecoder} for the fourth {@link ItemActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class FourthItemActionMessageDecoder extends MessageDecoder<FourthItemActionMessage> { public final class FourthItemActionMessageDecoder extends MessageDecoder<ItemActionMessage> {
@Override @Override
public FourthItemActionMessage decode(GamePacket packet) { public ItemActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int id = (int) reader.getUnsigned(DataType.SHORT); int id = (int) reader.getUnsigned(DataType.SHORT);
return new FourthItemActionMessage(interfaceId, id, slot); return new ItemActionMessage(4, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r377/FourthItemOptionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FourthItemOptionMessage}. * A {@link MessageDecoder} for the fourth {@link ItemOptionMessage}.
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class FourthItemOptionMessageDecoder extends MessageDecoder<FourthItemOptionMessage> { public final class FourthItemOptionMessageDecoder extends MessageDecoder<ItemOptionMessage> {
@Override @Override
public FourthItemOptionMessage decode(GamePacket packet) { public ItemOptionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int interfaceId = (int) reader.getUnsigned(DataType.SHORT);
return new FourthItemOptionMessage(interfaceId, id, slot); return new ItemOptionMessage(4, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r377/FourthNpcActionMessageDecoder.java
+5 -5
View File
@@ -1,23 +1,23 @@
package org.apollo.game.release.r377; 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.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
import org.apollo.net.codec.game.GamePacketReader; import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FourthNpcActionMessage}. * A {@link MessageDecoder} for the fourth {@link NpcActionMessage}.
* *
* @author Stuart * @author Stuart
*/ */
public final class FourthNpcActionMessageDecoder extends MessageDecoder<FourthNpcActionMessage> { public final class FourthNpcActionMessageDecoder extends MessageDecoder<NpcActionMessage> {
@Override @Override
public FourthNpcActionMessage decode(GamePacket packet) { public NpcActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT); int index = (int) reader.getUnsigned(DataType.SHORT);
return new FourthNpcActionMessage(index); return new NpcActionMessage(4, index);
} }
} }
game/src/main/org/apollo/game/release/r377/FourthPlayerActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link FourthPlayerActionMessage}. * A {@link MessageDecoder} for the fourth {@link PlayerActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class FourthPlayerActionMessageDecoder extends MessageDecoder<FourthPlayerActionMessage> { public final class FourthPlayerActionMessageDecoder extends MessageDecoder<PlayerActionMessage> {
@Override @Override
public FourthPlayerActionMessage decode(GamePacket packet) { public PlayerActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new FourthPlayerActionMessage(index); return new PlayerActionMessage(4, index);
} }
} }
game/src/main/org/apollo/game/release/r377/ItemOnItemMessageDecoder.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.apollo.net.release.MessageDecoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class ItemOnItemMessageDecoder extends MessageDecoder<ItemOnItemMessage> { public final class ItemOnItemMessageDecoder extends MessageDecoder<ItemOnItemMessage> {
@Override @Override
public ItemOnItemMessage decode(GamePacket packet) { public ItemOnItemMessage decode(GamePacket packet) {
game/src/main/org/apollo/game/release/r377/MagicOnItemMessageDecoder.java
+1 -1
View File
@@ -12,7 +12,7 @@ import org.apollo.net.release.MessageDecoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class MagicOnItemMessageDecoder extends MessageDecoder<MagicOnItemMessage> { public final class MagicOnItemMessageDecoder extends MessageDecoder<MagicOnItemMessage> {
@Override @Override
public MagicOnItemMessage decode(GamePacket packet) { public MagicOnItemMessage decode(GamePacket packet) {
game/src/main/org/apollo/game/release/r377/SecondItemActionMessageDecoder.java
+7 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,19 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link SecondItemActionMessage}. * A {@link MessageDecoder} for the second {@link ItemActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class SecondItemActionMessageDecoder extends MessageDecoder<SecondItemActionMessage> { public final class SecondItemActionMessageDecoder extends MessageDecoder<ItemActionMessage> {
@Override @Override
public SecondItemActionMessage decode(GamePacket packet) { public ItemActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int interfaceId = (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);
} }
} }
game/src/main/org/apollo/game/release/r377/SecondItemOptionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link SecondItemOptionMessage}. * A {@link MessageDecoder} for the second {@link ItemOptionMessage}.
* *
* @author Graham * @author Graham
*/ */
final class SecondItemOptionMessageDecoder extends MessageDecoder<SecondItemOptionMessage> { public final class SecondItemOptionMessageDecoder extends MessageDecoder<ItemOptionMessage> {
@Override @Override
public SecondItemOptionMessage decode(GamePacket packet) { public ItemOptionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int id = (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); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
return new SecondItemOptionMessage(interfaceId, id, slot); return new ItemOptionMessage(2, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r377/SecondNpcActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* The {@link MessageDecoder} for the {@link SecondNpcActionMessage}. * The {@link MessageDecoder} for the {@link NpcActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class SecondNpcActionMessageDecoder extends MessageDecoder<SecondNpcActionMessage> { public final class SecondNpcActionMessageDecoder extends MessageDecoder<NpcActionMessage> {
@Override @Override
public SecondNpcActionMessage decode(GamePacket packet) { public NpcActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getSigned(DataType.SHORT, DataTransformation.ADD); int index = (int) reader.getSigned(DataType.SHORT, DataTransformation.ADD);
return new SecondNpcActionMessage(index); return new NpcActionMessage(2, index);
} }
} }
game/src/main/org/apollo/game/release/r377/SecondObjectActionMessageDecoder.java
+7 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.game.model.Position;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,19 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link SecondObjectActionMessage}. * A {@link MessageDecoder} for the second {@link ObjectActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class SecondObjectActionMessageDecoder extends MessageDecoder<SecondObjectActionMessage> { public final class SecondObjectActionMessageDecoder extends MessageDecoder<ObjectActionMessage> {
@Override @Override
public SecondObjectActionMessage decode(GamePacket packet) { public ObjectActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int id = (int) reader.getUnsigned(DataType.SHORT); int id = (int) reader.getUnsigned(DataType.SHORT);
int x = (int) reader.getUnsigned(DataType.SHORT); int x = (int) reader.getUnsigned(DataType.SHORT);
int y = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); 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));
} }
} }
game/src/main/org/apollo/game/release/r377/SecondPlayerActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link SecondPlayerActionMessage}. * A {@link MessageDecoder} for the second {@link PlayerActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class SecondPlayerActionMessageDecoder extends MessageDecoder<SecondPlayerActionMessage> { public final class SecondPlayerActionMessageDecoder extends MessageDecoder<PlayerActionMessage> {
@Override @Override
public SecondPlayerActionMessage decode(GamePacket packet) { public PlayerActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int index = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
return new SecondPlayerActionMessage(index); return new PlayerActionMessage(2, index);
} }
} }
game/src/main/org/apollo/game/release/r377/SetWidgetItemModelMessageEncoder.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class SetWidgetItemModelMessageEncoder extends MessageEncoder<SetWidgetItemModelMessage> { public final class SetWidgetItemModelMessageEncoder extends MessageEncoder<SetWidgetItemModelMessage> {
@Override @Override
public GamePacket encode(SetWidgetItemModelMessage message) { public GamePacket encode(SetWidgetItemModelMessage message) {
game/src/main/org/apollo/game/release/r377/SetWidgetModelAnimationMessageEncoder.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class SetWidgetModelAnimationMessageEncoder extends MessageEncoder<SetWidgetModelAnimationMessage> { public final class SetWidgetModelAnimationMessageEncoder extends MessageEncoder<SetWidgetModelAnimationMessage> {
@Override @Override
public GamePacket encode(SetWidgetModelAnimationMessage message) { public GamePacket encode(SetWidgetModelAnimationMessage message) {
game/src/main/org/apollo/game/release/r377/SetWidgetNpcModelMessageEncoder.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class SetWidgetNpcModelMessageEncoder extends MessageEncoder<SetWidgetNpcModelMessage> { public final class SetWidgetNpcModelMessageEncoder extends MessageEncoder<SetWidgetNpcModelMessage> {
@Override @Override
public GamePacket encode(SetWidgetNpcModelMessage message) { public GamePacket encode(SetWidgetNpcModelMessage message) {
game/src/main/org/apollo/game/release/r377/SetWidgetPlayerModelMessageEncoder.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class SetWidgetPlayerModelMessageEncoder extends MessageEncoder<SetWidgetPlayerModelMessage> { public final class SetWidgetPlayerModelMessageEncoder extends MessageEncoder<SetWidgetPlayerModelMessage> {
@Override @Override
public GamePacket encode(SetWidgetPlayerModelMessage message) { public GamePacket encode(SetWidgetPlayerModelMessage message) {
game/src/main/org/apollo/game/release/r377/SetWidgetVisibilityMessageEncoder.java
+1 -1
View File
@@ -11,7 +11,7 @@ import org.apollo.net.release.MessageEncoder;
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class SetWidgetVisibilityMessageEncoder extends MessageEncoder<SetWidgetVisibilityMessage> { public final class SetWidgetVisibilityMessageEncoder extends MessageEncoder<SetWidgetVisibilityMessage> {
@Override @Override
public GamePacket encode(SetWidgetVisibilityMessage message) { public GamePacket encode(SetWidgetVisibilityMessage message) {
game/src/main/org/apollo/game/release/r377/ThirdItemActionMessageDecoder.java
+7 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,19 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link ThirdItemActionMessage}. * A {@link MessageDecoder} for the third {@link ItemActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class ThirdItemActionMessageDecoder extends MessageDecoder<ThirdItemActionMessage> { public final class ThirdItemActionMessageDecoder extends MessageDecoder<ItemActionMessage> {
@Override @Override
public ThirdItemActionMessage decode(GamePacket packet) { public ItemActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int interfaceId = (int) reader.getUnsigned(DataType.SHORT);
return new ThirdItemActionMessage(interfaceId, id, slot);
return new ItemActionMessage(3, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r377/ThirdItemOptionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,21 +9,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link ThirdItemOptionMessage}. * A {@link MessageDecoder} for the third {@link ItemOptionMessage}.
* *
* @author Chris Fletcher * @author Chris Fletcher
*/ */
final class ThirdItemOptionMessageDecoder extends MessageDecoder<ThirdItemOptionMessage> { public final class ThirdItemOptionMessageDecoder extends MessageDecoder<ItemOptionMessage> {
@Override @Override
public ThirdItemOptionMessage decode(GamePacket packet) { public ItemOptionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
int id = (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); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new ThirdItemOptionMessage(interfaceId, id, slot); return new ItemOptionMessage(3, interfaceId, id, slot);
} }
} }
game/src/main/org/apollo/game/release/r377/ThirdNpcActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
@@ -9,17 +9,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* The {@link MessageDecoder} for the {@link ThirdNpcActionMessage}. * The {@link MessageDecoder} for the third {@link NpcActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class ThirdNpcActionMessageDecoder extends MessageDecoder<ThirdNpcActionMessage> { public final class ThirdNpcActionMessageDecoder extends MessageDecoder<NpcActionMessage> {
@Override @Override
public ThirdNpcActionMessage decode(GamePacket packet) { public NpcActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
return new ThirdNpcActionMessage(index); return new NpcActionMessage(3, index);
} }
} }
game/src/main/org/apollo/game/release/r377/ThirdObjectActionMessageDecoder.java
+7 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.game.model.Position;
import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataOrder;
import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataTransformation;
@@ -10,19 +10,21 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link ThirdObjectActionMessage}. * A {@link MessageDecoder} for the third {@link ObjectActionMessage}.
* *
* @author Graham * @author Graham
*/ */
public final class ThirdObjectActionMessageDecoder extends MessageDecoder<ThirdObjectActionMessage> { public final class ThirdObjectActionMessageDecoder extends MessageDecoder<ObjectActionMessage> {
@Override @Override
public ThirdObjectActionMessage decode(GamePacket packet) { public ObjectActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int y = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int y = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD);
int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); 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));
} }
} }
game/src/main/org/apollo/game/release/r377/ThirdPlayerActionMessageDecoder.java
+5 -5
View File
@@ -1,6 +1,6 @@
package org.apollo.game.release.r377; 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.DataOrder;
import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacket;
@@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketReader;
import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.MessageDecoder;
/** /**
* A {@link MessageDecoder} for the {@link ThirdPlayerActionMessage}. * A {@link MessageDecoder} for the third {@link PlayerActionMessage}.
* *
* @author Major * @author Major
*/ */
public final class ThirdPlayerActionMessageDecoder extends MessageDecoder<ThirdPlayerActionMessage> { public final class ThirdPlayerActionMessageDecoder extends MessageDecoder<PlayerActionMessage> {
@Override @Override
public ThirdPlayerActionMessage decode(GamePacket packet) { public PlayerActionMessage decode(GamePacket packet) {
GamePacketReader reader = new GamePacketReader(packet); GamePacketReader reader = new GamePacketReader(packet);
int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE);
return new ThirdPlayerActionMessage(index); return new PlayerActionMessage(3, index);
} }
} }