diff --git a/src/protocol/swg/AttributeListMessage.java b/src/protocol/swg/AttributeListMessage.java index 55721a52..85713582 100644 --- a/src/protocol/swg/AttributeListMessage.java +++ b/src/protocol/swg/AttributeListMessage.java @@ -26,6 +26,7 @@ import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.buffer.SimpleBufferAllocator; +import resources.common.Opcodes; import engine.resources.objects.SWGObject; public class AttributeListMessage extends SWGMessage { @@ -50,7 +51,7 @@ public class AttributeListMessage extends SWGMessage { result.setAutoExpand(true); result.putShort((short) 5); - result.putInt(0xF3F12F2A); + result.putInt(Opcodes.AttributeListMessage); result.putLong(target.getObjectID()); result.putShort((short) 0); diff --git a/src/protocol/swg/CmdStartScene.java b/src/protocol/swg/CmdStartScene.java index 52d1eb36..918b0f4f 100644 --- a/src/protocol/swg/CmdStartScene.java +++ b/src/protocol/swg/CmdStartScene.java @@ -25,6 +25,8 @@ import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; +import resources.common.Opcodes; + public class CmdStartScene extends SWGMessage { private byte ignoreLayoutFiles; @@ -60,7 +62,7 @@ public class CmdStartScene extends SWGMessage { IoBuffer result = IoBuffer.allocate(47 + terrainFile.length() + sharedRaceTemplate.length()).order(ByteOrder.LITTLE_ENDIAN); result.putShort((short)9); - result.putInt(0x3AE6DFAE); + result.putInt(Opcodes.CmdStartScene); result.put((byte)ignoreLayoutFiles); result.putLong(characterId); result.put(getAsciiString(terrainFile)); diff --git a/src/protocol/swg/CommPlayerMessage.java b/src/protocol/swg/CommPlayerMessage.java index 9acde60c..3d0675f1 100644 --- a/src/protocol/swg/CommPlayerMessage.java +++ b/src/protocol/swg/CommPlayerMessage.java @@ -26,6 +26,7 @@ import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; import engine.resources.common.CRC; +import resources.common.Opcodes; import resources.common.OutOfBand; public class CommPlayerMessage extends SWGMessage { @@ -51,7 +52,7 @@ public class CommPlayerMessage extends SWGMessage { buffer.setAutoExpand(true); buffer.putShort((short) 2); - buffer.putInt(0x594AD258); + buffer.putInt(Opcodes.CommPlayerMessage); buffer.put((byte) 0); // aurebesh borders on comm, space version? Can cause crashes buffer.putLong(objectId); buffer.put(outOfBand.serialize().array()); diff --git a/src/protocol/swg/CreateCharacterSuccess.java b/src/protocol/swg/CreateCharacterSuccess.java index 36490295..61be583f 100644 --- a/src/protocol/swg/CreateCharacterSuccess.java +++ b/src/protocol/swg/CreateCharacterSuccess.java @@ -25,6 +25,8 @@ import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; +import resources.common.Opcodes; + public class CreateCharacterSuccess extends SWGMessage { @@ -45,7 +47,7 @@ public class CreateCharacterSuccess extends SWGMessage { IoBuffer result = IoBuffer.allocate(14).order(ByteOrder.LITTLE_ENDIAN); result.putShort((short) 2); - result.putInt(0x1DB575CC); + result.putInt(Opcodes.CreateCharacterSuccess); result.putLong(charId); result.flip(); return result; diff --git a/src/protocol/swg/ErrorMessage.java b/src/protocol/swg/ErrorMessage.java index 652e1b6f..507561b9 100644 --- a/src/protocol/swg/ErrorMessage.java +++ b/src/protocol/swg/ErrorMessage.java @@ -23,6 +23,8 @@ package protocol.swg; import org.apache.mina.core.buffer.IoBuffer; +import resources.common.Opcodes; + public class ErrorMessage extends SWGMessage { @@ -42,7 +44,7 @@ public class ErrorMessage extends SWGMessage { IoBuffer result = IoBuffer.allocate(11 + errorType.length() + errorMessage.length()); result.putShort((short)3); - result.putInt(0xB5ABF91A); + result.putInt(Opcodes.ErrorMessage); result.put(getAsciiString(errorType)); result.put(getAsciiString(errorMessage)); result.put((byte)0); diff --git a/src/protocol/swg/GuildResponseMessage.java b/src/protocol/swg/GuildResponseMessage.java index f98e6713..7b718121 100644 --- a/src/protocol/swg/GuildResponseMessage.java +++ b/src/protocol/swg/GuildResponseMessage.java @@ -22,8 +22,8 @@ package protocol.swg; import java.nio.ByteOrder; - import org.apache.mina.core.buffer.IoBuffer; +import resources.common.Opcodes; public class GuildResponseMessage extends SWGMessage { @@ -46,7 +46,7 @@ public class GuildResponseMessage extends SWGMessage { IoBuffer buffer = IoBuffer.allocate(18 + guildName.length()).order(ByteOrder.LITTLE_ENDIAN); buffer.putShort((short) 4); - buffer.putInt(0x32263F20); + buffer.putInt(Opcodes.GuildResponseMessage); buffer.putLong(player); buffer.put(getAsciiString(guildName)); diff --git a/src/protocol/swg/LaunchBrowserMessage.java b/src/protocol/swg/LaunchBrowserMessage.java index 7c3efb62..67266674 100644 --- a/src/protocol/swg/LaunchBrowserMessage.java +++ b/src/protocol/swg/LaunchBrowserMessage.java @@ -22,12 +22,8 @@ package protocol.swg; import java.nio.ByteOrder; -import java.util.Vector; - import org.apache.mina.core.buffer.IoBuffer; - import resources.common.Opcodes; -import services.sui.SUIWindowComponent; public class LaunchBrowserMessage extends SWGMessage{ private String URL; diff --git a/src/protocol/swg/LoginServerId.java b/src/protocol/swg/LoginServerId.java index ca01ae90..3203ba37 100644 --- a/src/protocol/swg/LoginServerId.java +++ b/src/protocol/swg/LoginServerId.java @@ -25,6 +25,8 @@ import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; +import resources.common.Opcodes; + public class LoginServerId extends SWGMessage { @@ -42,7 +44,7 @@ public class LoginServerId extends SWGMessage { IoBuffer buffer = IoBuffer.allocate(10).order(ByteOrder.LITTLE_ENDIAN); buffer.putShort((short)2); - buffer.putInt(0x58C07F21); + buffer.putInt(Opcodes.LoginServerId); buffer.putInt(loginServerID); buffer.flip(); diff --git a/src/protocol/swg/LogoutMessage.java b/src/protocol/swg/LogoutMessage.java index 3f835aa6..23803097 100644 --- a/src/protocol/swg/LogoutMessage.java +++ b/src/protocol/swg/LogoutMessage.java @@ -25,6 +25,8 @@ import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; +import resources.common.Opcodes; + public class LogoutMessage extends SWGMessage{ @@ -36,7 +38,7 @@ public class LogoutMessage extends SWGMessage{ IoBuffer result = IoBuffer.allocate(6).order(ByteOrder.LITTLE_ENDIAN); result.putShort((short) 2); - result.putInt(0x42FD19DD); + result.putInt(Opcodes.LogoutMessage); return result; } diff --git a/src/protocol/swg/ObjControllerMessage.java b/src/protocol/swg/ObjControllerMessage.java index cb1ff04b..ff025def 100644 --- a/src/protocol/swg/ObjControllerMessage.java +++ b/src/protocol/swg/ObjControllerMessage.java @@ -27,11 +27,13 @@ import org.apache.mina.core.buffer.IoBuffer; + import protocol.swg.objectControllerObjects.CommandEnqueue; import protocol.swg.objectControllerObjects.DataTransform; import protocol.swg.objectControllerObjects.DataTransformWithParent; import protocol.swg.objectControllerObjects.ObjControllerObject; import protocol.swg.objectControllerObjects.UnknownObjController; +import resources.common.Opcodes; public class ObjControllerMessage extends SWGMessage { @@ -97,7 +99,7 @@ public class ObjControllerMessage extends SWGMessage { IoBuffer buffer = IoBuffer.allocate(10).order(ByteOrder.LITTLE_ENDIAN); buffer.setAutoExpand(true); buffer.putShort((short)5); - buffer.putInt(0x80CE5E46); + buffer.putInt(Opcodes.ObjControllerMessage); buffer.putInt(update); buffer.put(objControllerObject.serialize()); //System.out.println("OBJMSG: " + StringUtilities.bytesToHex(buffer.flip().array())); diff --git a/src/protocol/swg/PlayerMoneyResponse.java b/src/protocol/swg/PlayerMoneyResponse.java index 0438dd02..be302d9f 100644 --- a/src/protocol/swg/PlayerMoneyResponse.java +++ b/src/protocol/swg/PlayerMoneyResponse.java @@ -25,6 +25,8 @@ import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; +import resources.common.Opcodes; + public class PlayerMoneyResponse extends SWGMessage { int cash; @@ -45,7 +47,7 @@ public class PlayerMoneyResponse extends SWGMessage { IoBuffer buffer = IoBuffer.allocate(14).order(ByteOrder.LITTLE_ENDIAN); buffer.putShort((short) 3); - buffer.putInt(0x367E737E); + buffer.putInt(Opcodes.PlayerMoneyResponse); buffer.putInt(bank); buffer.putInt(cash); diff --git a/src/resources/common/Opcodes.java b/src/resources/common/Opcodes.java index baf83745..245aa8a6 100644 --- a/src/resources/common/Opcodes.java +++ b/src/resources/common/Opcodes.java @@ -41,12 +41,14 @@ public class Opcodes { public static final int CommoditiesResourceTypeListRequest = 0xCB1AE82D; public static final int NewbieTutorialResponse = 0xCA88FBAD; public static final int CmdSceneReady = 0x43FD1C22; + public static final int CommPlayerMessage = 0x594AD258; public static final int ConnectPlayerMessage = 0x2E365218; public static final int ClientCreateCharacter = 0xB97F3074; public static final int ClientIdMsg = 0xD5899226; public static final int ClientRandomNameRequest = 0xD6D1B6D1; public static final int ClientVerifyAndLockNameRequest = 0x9eb04b9f; public static final int DeleteCharacterMessage = 0xE87AD031; + public static final int ErrorMessage = 0xB5ABF91A; public static final int GetMapLocationsMessage = 0x1A7AB839; public static final int IsVendorOwnerMessage = CRC.StringtoCRC("IsVendorOwnerMessage"); public static final int LagRequest = 0x31805EE0; @@ -91,5 +93,12 @@ public class Opcodes { public static final int BidAuctionMessage = CRC.StringtoCRC("BidAuctionMessage"); public static final int RetrieveAuctionItemMessage = CRC.StringtoCRC("RetrieveAuctionItemMessage"); public static final int LaunchBrowserMessage = CRC.StringtoCRC("LaunchBrowserMessage"); + public static final int LoginServerId = 0x58C07F21; + public static final int LogoutMessage = 0x42FD19DD; + public static final int AttributeListMessage = 0xF3F12F2A; + public static final int GuildResponseMessage = 0x32263F20; + public static final int CreateCharacterSuccess = 0x1DB575CC; + public static final int PlayerMoneyResponse = 0x367E737E; + public static final int CmdStartScene = 0x3AE6DFAE; } diff --git a/src/services/BrowserService.java b/src/services/BrowserService.java index 45715167..1d649bde 100644 --- a/src/services/BrowserService.java +++ b/src/services/BrowserService.java @@ -22,7 +22,6 @@ package services; import java.util.Map; - import protocol.swg.LaunchBrowserMessage; import resources.objects.creature.CreatureObject; import main.NGECore;