Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Project cleanup pre merge.

Browse Source
This commit is contained in:
MagicBot
2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/msg/group/AppointGroupLeaderMsg.java
+90 -94
View File
@@ -18,112 +18,108 @@ import engine.net.client.msg.ClientNetMsg;
public class AppointGroupLeaderMsg extends ClientNetMsg {
private int targetType;
private int targetID;
private int response;
private String message;
private int targetType;
private int targetID;
private int response;
private String message;
/**
* This is the general purpose constructor.
*/
public AppointGroupLeaderMsg() {
super(Protocol.GROUPLEADERAPPOINT);
this.message = "You are already the group leader";
/**
* This is the general purpose constructor.
*/
public AppointGroupLeaderMsg() {
super(Protocol.GROUPLEADERAPPOINT);
this.message = "You are already the group leader";
}
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the
* ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public AppointGroupLeaderMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.GROUPLEADERAPPOINT, origin, reader);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the
* ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public AppointGroupLeaderMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.GROUPLEADERAPPOINT, origin, reader);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.targetType);
writer.putInt(this.targetID);
writer.putInt(this.response);
if (this.response == 1)
writer.putString(this.message);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.targetType);
writer.putInt(this.targetID);
writer.putInt(this.response);
if (this.response == 1)
writer.putString(this.message);
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.targetType = reader.getInt();
this.targetID = reader.getInt();
this.response = reader.getInt();
if (this.response == 1)
this.message = reader.getString();
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.targetType = reader.getInt();
this.targetID = reader.getInt();
this.response = reader.getInt();
if (this.response == 1)
this.message = reader.getString();
}
/**
* @return the targetType
*/
public int getTargetType() {
return targetType;
}
/**
* @return the targetType
*/
public int getTargetType() {
return targetType;
}
/**
* @param targetType
* the targetType to set
*/
public void setTargetType(int targetType) {
this.targetType = targetType;
}
/**
* @param targetType the targetType to set
*/
public void setTargetType(int targetType) {
this.targetType = targetType;
}
/**
* @return the targetID
*/
public int getTargetID() {
return targetID;
}
/**
* @return the targetID
*/
public int getTargetID() {
return targetID;
}
/**
* @param targetID
* the targetID to set
*/
public void setTargetID(int targetID) {
this.targetID = targetID;
}
/**
* @param targetID the targetID to set
*/
public void setTargetID(int targetID) {
this.targetID = targetID;
}
/**
* @return the response
*/
public int getResponse() {
return response;
}
/**
* @return the response
*/
public int getResponse() {
return response;
}
/**
* @param response
* the response to set
*/
public void setResponse(int response) {
this.response = response;
}
/**
* @param response the response to set
*/
public void setResponse(int response) {
this.response = response;
}
/**
* @return the message
*/
public String getMessage() {
return message;
}
/**
* @return the message
*/
public String getMessage() {
return message;
}
/**
* @param message
* the message to set
*/
public void setMessage(String message) {
this.message = message;
}
/**
* @param message the message to set
*/
public void setMessage(String message) {
this.message = message;
}
}
src/engine/net/client/msg/group/DisbandGroupMsg.java
+39 -41
View File
@@ -18,52 +18,50 @@ import engine.net.client.msg.ClientNetMsg;
public class DisbandGroupMsg extends ClientNetMsg {
private int unknown01;
private int unknown01;
/**
* This is the general purpose constructor.
*/
public DisbandGroupMsg() {
super(Protocol.GROUPDISBAND);
}
/**
* This is the general purpose constructor.
*/
public DisbandGroupMsg() {
super(Protocol.GROUPDISBAND);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the ByteBuffer into a message. If a BufferUnderflow occurs (based on reading past the limit) then this constructor Throws that Exception to the caller.
*/
public DisbandGroupMsg(AbstractConnection origin, ByteBufferReader reader)
{
super(Protocol.GROUPDISBAND, origin, reader);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the ByteBuffer into a message. If a BufferUnderflow occurs (based on reading past the limit) then this constructor Throws that Exception to the caller.
*/
public DisbandGroupMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.GROUPDISBAND, origin, reader);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.unknown01);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.unknown01);
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.unknown01 = reader.getInt();
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.unknown01 = reader.getInt();
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @param unknown01
* the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
/**
* @param unknown01 the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
}
src/engine/net/client/msg/group/FormationFollowMsg.java
+75 -79
View File
@@ -18,95 +18,91 @@ import engine.net.client.msg.ClientNetMsg;
public class FormationFollowMsg extends ClientNetMsg {
private boolean follow;
private int formation;
private int unknown01;
private boolean follow;
private int formation;
private int unknown01;
/**
* This is the general purpose constructor.
*/
public FormationFollowMsg() {
super(Protocol.GROUPFOLLOW);
}
/**
* This is the general purpose constructor.
*/
public FormationFollowMsg() {
super(Protocol.GROUPFOLLOW);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the ByteBuffer into a message. If a BufferUnderflow occurs (based on reading past the limit) then this constructor Throws that Exception to the caller.
*/
public FormationFollowMsg(AbstractConnection origin, ByteBufferReader reader)
{
super(Protocol.GROUPFOLLOW, origin, reader);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the ByteBuffer into a message. If a BufferUnderflow occurs (based on reading past the limit) then this constructor Throws that Exception to the caller.
*/
public FormationFollowMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.GROUPFOLLOW, origin, reader);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
if (this.follow) {
writer.putInt(1);
writer.putInt(0);
} else {
writer.putInt(0);
writer.putInt(1);
}
writer.putInt(this.formation);
writer.putInt(this.unknown01);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
if (this.follow) {
writer.putInt(1);
writer.putInt(0);
} else {
writer.putInt(0);
writer.putInt(1);
}
writer.putInt(this.formation);
writer.putInt(this.unknown01);
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.follow = reader.getInt() == 1;
reader.getInt();
this.formation = reader.getInt();
this.unknown01 = reader.getInt();
}
reader.getInt();
this.formation = reader.getInt();
this.unknown01 = reader.getInt();
}
/**
* @return the follow
*/
public boolean isFollow() {
return follow;
}
/**
* @return the follow
*/
public boolean isFollow() {
return follow;
}
/**
* @param follow
* the follow to set
*/
public void setFollow(boolean follow) {
this.follow = follow;
}
/**
* @param follow the follow to set
*/
public void setFollow(boolean follow) {
this.follow = follow;
}
/**
* @return the formation
*/
public int getFormation() {
return formation;
}
/**
* @return the formation
*/
public int getFormation() {
return formation;
}
/**
* @param formation
* the formation to set
*/
public void setFormation(int formation) {
this.formation = formation;
}
/**
* @param formation the formation to set
*/
public void setFormation(int formation) {
this.formation = formation;
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @param unknown01
* the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
/**
* @param unknown01 the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
}
src/engine/net/client/msg/group/GroupInviteMsg.java
+165 -174
View File
@@ -18,203 +18,194 @@ import engine.net.client.msg.ClientNetMsg;
public class GroupInviteMsg extends ClientNetMsg {
private int sourceType;
private int sourceID;
private int targetType;
private int targetID;
private int groupType;
private int groupID;
private int unknown01;
private int invited;
private String name;
private int sourceType;
private int sourceID;
private int targetType;
private int targetID;
private int groupType;
private int groupID;
private int unknown01;
private int invited;
private String name;
/**
* This is the general purpose constructor.
*/
public GroupInviteMsg() {
super(Protocol.INVITEGROUP);
this.name = "";
}
/**
* This is the general purpose constructor.
*/
public GroupInviteMsg() {
super(Protocol.INVITEGROUP);
this.name = "";
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the
* ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public GroupInviteMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.INVITEGROUP, origin, reader);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the
* ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public GroupInviteMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.INVITEGROUP, origin, reader);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.sourceType);
writer.putInt(this.sourceID);
writer.putInt(this.targetType);
writer.putInt(this.targetID);
writer.putInt(this.groupType);
writer.putInt(this.groupID);
writer.putInt(this.unknown01);
writer.putInt(this.invited);
if (this.invited == 1)
writer.putString(this.name);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.sourceType);
writer.putInt(this.sourceID);
writer.putInt(this.targetType);
writer.putInt(this.targetID);
writer.putInt(this.groupType);
writer.putInt(this.groupID);
writer.putInt(this.unknown01);
writer.putInt(this.invited);
if (this.invited == 1)
writer.putString(this.name);
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.sourceType = reader.getInt();
this.sourceID = reader.getInt();
this.targetType = reader.getInt();
this.targetID = reader.getInt();
this.groupType = reader.getInt();
this.groupID = reader.getInt();
this.unknown01 = reader.getInt();
this.invited = reader.getInt();
if (this.invited == 1)
this.name = reader.getString();
this.sourceType = reader.getInt();
this.sourceID = reader.getInt();
this.targetType = reader.getInt();
this.targetID = reader.getInt();
this.groupType = reader.getInt();
this.groupID = reader.getInt();
this.unknown01 = reader.getInt();
this.invited = reader.getInt();
if (this.invited == 1)
this.name = reader.getString();
}
}
/**
* @return the sourceType
*/
public int getSourceType() {
return sourceType;
}
/**
* @return the sourceType
*/
public int getSourceType() {
return sourceType;
}
/**
* @param sourceType
* the sourceType to set
*/
public void setSourceType(int sourceType) {
this.sourceType = sourceType;
}
/**
* @param sourceType the sourceType to set
*/
public void setSourceType(int sourceType) {
this.sourceType = sourceType;
}
/**
* @return the sourceID
*/
public int getSourceID() {
return sourceID;
}
/**
* @return the sourceID
*/
public int getSourceID() {
return sourceID;
}
/**
* @param sourceID
* the sourceID to set
*/
public void setSourceID(int sourceID) {
this.sourceID = sourceID;
}
/**
* @param sourceID the sourceID to set
*/
public void setSourceID(int sourceID) {
this.sourceID = sourceID;
}
/**
* @return the targetType
*/
public int getTargetType() {
return targetType;
}
/**
* @return the targetType
*/
public int getTargetType() {
return targetType;
}
/**
* @param targetType
* the targetType to set
*/
public void setTargetType(int targetType) {
this.targetType = targetType;
}
/**
* @param targetType the targetType to set
*/
public void setTargetType(int targetType) {
this.targetType = targetType;
}
/**
* @return the targetID
*/
public int getTargetID() {
return targetID;
}
/**
* @return the targetID
*/
public int getTargetID() {
return targetID;
}
/**
* @param targetID
* the targetID to set
*/
public void setTargetID(int targetID) {
this.targetID = targetID;
}
/**
* @param targetID the targetID to set
*/
public void setTargetID(int targetID) {
this.targetID = targetID;
}
/**
* @return the groupType
*/
public int getGroupType() {
return groupType;
}
/**
* @return the groupType
*/
public int getGroupType() {
return groupType;
}
/**
* @param groupType
* the groupType to set
*/
public void setGroupType(int groupType) {
this.groupType = groupType;
}
/**
* @param groupType the groupType to set
*/
public void setGroupType(int groupType) {
this.groupType = groupType;
}
/**
* @return the groupID
*/
public int getGroupID() {
return groupID;
}
/**
* @return the groupID
*/
public int getGroupID() {
return groupID;
}
/**
* @param groupID
* the groupID to set
*/
public void setGroupID(int groupID) {
this.groupID = groupID;
}
/**
* @param groupID the groupID to set
*/
public void setGroupID(int groupID) {
this.groupID = groupID;
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @param unknown01
* the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
/**
* @param unknown01 the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
/**
* @return the invited
*/
public int getInvited() {
return invited;
}
/**
* @return the invited
*/
public int getInvited() {
return invited;
}
/**
* @param invited
* the invited to set
*/
public void setInvited(int invited) {
this.invited = invited;
}
/**
* @param invited the invited to set
*/
public void setInvited(int invited) {
this.invited = invited;
}
/**
* @return the name
*/
public String getName() {
return name;
}
/**
* @return the name
*/
public String getName() {
return name;
}
/**
* @param name
* the name to set
*/
public void setName(String name) {
this.name = name;
}
/**
* @param name the name to set
*/
public void setName(String name) {
this.name = name;
}
}
src/engine/net/client/msg/group/GroupInviteResponseMsg.java
+84 -89
View File
@@ -18,106 +18,101 @@ import engine.net.client.msg.ClientNetMsg;
public class GroupInviteResponseMsg extends ClientNetMsg {
private int groupType;
private int groupID;
private int unknown01;
private int unknown02;
private int groupType;
private int groupID;
private int unknown01;
private int unknown02;
/**
* This is the general purpose constructor.
*/
public GroupInviteResponseMsg() {
super(Protocol.JOINGROUP);
}
/**
* This is the general purpose constructor.
*/
public GroupInviteResponseMsg() {
super(Protocol.JOINGROUP);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the ByteBuffer into a message. If a BufferUnderflow occurs (based on reading past the limit) then this constructor Throws that Exception to the caller.
*/
public GroupInviteResponseMsg(AbstractConnection origin, ByteBufferReader reader)
{
super(Protocol.JOINGROUP, origin, reader);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the ByteBuffer into a message. If a BufferUnderflow occurs (based on reading past the limit) then this constructor Throws that Exception to the caller.
*/
public GroupInviteResponseMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.JOINGROUP, origin, reader);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.groupType);
writer.putInt(this.groupID);
writer.putInt(this.unknown01);
writer.putInt(this.unknown02);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.groupType);
writer.putInt(this.groupID);
writer.putInt(this.unknown01);
writer.putInt(this.unknown02);
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.groupType = reader.getInt();
this.groupID = reader.getInt();
this.unknown01 = reader.getInt();
this.unknown02 = reader.getInt();
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.groupType = reader.getInt();
this.groupID = reader.getInt();
this.unknown01 = reader.getInt();
this.unknown02 = reader.getInt();
}
/**
* @return the groupType
*/
public int getGroupType() {
return groupType;
}
/**
* @return the groupType
*/
public int getGroupType() {
return groupType;
}
/**
* @param groupType
* the groupType to set
*/
public void setGroupType(int groupType) {
this.groupType = groupType;
}
/**
* @param groupType the groupType to set
*/
public void setGroupType(int groupType) {
this.groupType = groupType;
}
/**
* @return the groupID
*/
public int getGroupID() {
return groupID;
}
/**
* @return the groupID
*/
public int getGroupID() {
return groupID;
}
/**
* @param groupID
* the groupID to set
*/
public void setGroupID(int groupID) {
this.groupID = groupID;
}
/**
* @param groupID the groupID to set
*/
public void setGroupID(int groupID) {
this.groupID = groupID;
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @param unknown01
* the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
/**
* @param unknown01 the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
/**
* @return the unknown02
*/
public int getUnknown02() {
return unknown02;
}
/**
* @return the unknown02
*/
public int getUnknown02() {
return unknown02;
}
/**
* @param unknown02
* the unknown02 to set
*/
public void setUnknown02(int unknown02) {
this.unknown02 = unknown02;
}
/**
* @param unknown02 the unknown02 to set
*/
public void setUnknown02(int unknown02) {
this.unknown02 = unknown02;
}
}
src/engine/net/client/msg/group/GroupUpdateMsg.java
+20 -19
View File
@@ -58,10 +58,20 @@ public class GroupUpdateMsg extends ClientNetMsg {
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public GroupUpdateMsg(AbstractConnection origin, ByteBufferReader reader) {
public GroupUpdateMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.UPDATEGROUP, origin, reader);
}
private static void _serializeFour(ByteBufferWriter writer) {
// 4 sends a party dissolved window
for (int i = 0; i < 3; i++) {
writer.putInt(0);
}
}
// *** Refactor: This method is an abortion. Needs to be re-written from scratch.
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@@ -71,12 +81,12 @@ public class GroupUpdateMsg extends ClientNetMsg {
writer.putInt(this.group.getObjectUUID());
writer.putInt(this.messageType);
// 5 breaks everything including movement etc
// 5 breaks everything including movement etc
// 4 sends a party dissolved message
// 3 closes the group window and leaves the group
// 2 seems to update the location but not the stats correctly upon coming back into range
// 1 seems to add you to the group but if called by a job tops up your stats on the client and desyncs it
switch (messageType) {
case 4:
GroupUpdateMsg._serializeFour(writer);
@@ -106,10 +116,8 @@ public class GroupUpdateMsg extends ClientNetMsg {
}
}
// *** Refactor: This method is an abortion. Needs to be re-written from scratch.
private void serializePlayer(ByteBufferWriter writer, PlayerCharacter player, int messageType, int count) {
if (messageType == 1) {
writer.putString((player != null) ? player.getFirstName() : "nullError");
writer.putString((player != null) ? player.getLastName() : "");
@@ -141,7 +149,7 @@ public class GroupUpdateMsg extends ClientNetMsg {
writer.putInt((player != null) ? Float.floatToIntBits(player.getLoc().getY()) : 0);
writer.putInt((player != null) ? Float.floatToIntBits(player.getLoc().getZ()) : 0);
}
if (player == null)
writer.putLong(0);
else {
@@ -173,7 +181,7 @@ public class GroupUpdateMsg extends ClientNetMsg {
writer.putInt(1);
writer.put((byte) 1);
// if sending message type 1 this seems to make the group window flicker the button
// if sending message type 1 this seems to make the group window flicker the button
// i think getfollow and split gold might be the wrong way around
if (group != null) {
writer.put(this.group.getSplitGold() ? (byte) 1 : (byte) 0);
@@ -189,14 +197,6 @@ public class GroupUpdateMsg extends ClientNetMsg {
}
}
private static void _serializeFour(ByteBufferWriter writer) {
// 4 sends a party dissolved window
for (int i = 0; i < 3; i++) {
writer.putInt(0);
}
}
//sync player's stats and position
private void _serializeFive(ByteBufferWriter writer) {
writer.putInt(1);
@@ -213,7 +213,7 @@ public class GroupUpdateMsg extends ClientNetMsg {
writer.putFloat(player.getLoc().z);
writer.putInt(GameObjectType.PlayerCharacter.ordinal());
writer.putInt(player.getObjectUUID());
}
writer.putInt(0);
writer.putInt(0);
@@ -243,7 +243,8 @@ public class GroupUpdateMsg extends ClientNetMsg {
}
private void _serializeEight(ByteBufferWriter writer) {
PlayerCharacter player = this.players.iterator().next();;
PlayerCharacter player = this.players.iterator().next();
;
writer.putInt(0);
if (player != null) {
writer.put(player.getFollow() ? (byte) 1 : (byte) 0);
@@ -262,7 +263,7 @@ public class GroupUpdateMsg extends ClientNetMsg {
* ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
protected void _deserialize(ByteBufferReader reader) {
this.players = Collections.newSetFromMap(new ConcurrentHashMap<>());
reader.getInt();
src/engine/net/client/msg/group/LeaveGroupMsg.java
+84 -89
View File
@@ -18,105 +18,100 @@ import engine.net.client.msg.ClientNetMsg;
public class LeaveGroupMsg extends ClientNetMsg {
private int unknown01;
private int unknown02;
private int unknown03;
private int unknown04;
private int unknown01;
private int unknown02;
private int unknown03;
private int unknown04;
/**
* This is the general purpose constructor.
*/
public LeaveGroupMsg() {
super(Protocol.LEAVEGROUP);
}
/**
* This is the general purpose constructor.
*/
public LeaveGroupMsg() {
super(Protocol.LEAVEGROUP);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the ByteBuffer into a message. If a BufferUnderflow occurs (based on reading past the limit) then this constructor Throws that Exception to the caller.
*/
public LeaveGroupMsg(AbstractConnection origin, ByteBufferReader reader)
{
super(Protocol.LEAVEGROUP, origin, reader);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the ByteBuffer into a message. If a BufferUnderflow occurs (based on reading past the limit) then this constructor Throws that Exception to the caller.
*/
public LeaveGroupMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.LEAVEGROUP, origin, reader);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.unknown01);
writer.putInt(this.unknown02);
writer.putInt(this.unknown03);
writer.putInt(this.unknown04);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.unknown01);
writer.putInt(this.unknown02);
writer.putInt(this.unknown03);
writer.putInt(this.unknown04);
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.unknown01 = reader.getInt();
this.unknown02 = reader.getInt();
this.unknown03 = reader.getInt();
this.unknown04 = reader.getInt();
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.unknown01 = reader.getInt();
this.unknown02 = reader.getInt();
this.unknown03 = reader.getInt();
this.unknown04 = reader.getInt();
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @param unknown01
* the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
/**
* @param unknown01 the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
/**
* @return the unknown02
*/
public int getUnknown02() {
return unknown02;
}
/**
* @return the unknown02
*/
public int getUnknown02() {
return unknown02;
}
/**
* @param unknown02
* the unknown02 to set
*/
public void setUnknown02(int unknown02) {
this.unknown02 = unknown02;
}
/**
* @param unknown02 the unknown02 to set
*/
public void setUnknown02(int unknown02) {
this.unknown02 = unknown02;
}
/**
* @return the unknown03
*/
public int getUnknown03() {
return unknown03;
}
/**
* @return the unknown03
*/
public int getUnknown03() {
return unknown03;
}
/**
* @param unknown03
* the unknown03 to set
*/
public void setUnknown03(int unknown03) {
this.unknown03 = unknown03;
}
/**
* @param unknown03 the unknown03 to set
*/
public void setUnknown03(int unknown03) {
this.unknown03 = unknown03;
}
/**
* @return the unknown04
*/
public int getUnknown04() {
return unknown04;
}
/**
* @return the unknown04
*/
public int getUnknown04() {
return unknown04;
}
/**
* @param unknown04
* the unknown04 to set
*/
public void setUnknown04(int unknown04) {
this.unknown04 = unknown04;
}
/**
* @param unknown04 the unknown04 to set
*/
public void setUnknown04(int unknown04) {
this.unknown04 = unknown04;
}
}
src/engine/net/client/msg/group/RemoveFromGroupMsg.java
+90 -94
View File
@@ -18,112 +18,108 @@ import engine.net.client.msg.ClientNetMsg;
public class RemoveFromGroupMsg extends ClientNetMsg {
private int targetType;
private int targetID;
private int response;
private String message;
private int targetType;
private int targetID;
private int response;
private String message;
/**
* This is the general purpose constructor.
*/
public RemoveFromGroupMsg() {
super(Protocol.GROUPREMOVE);
/**
* This is the general purpose constructor.
*/
public RemoveFromGroupMsg() {
super(Protocol.GROUPREMOVE);
this.message = "Quit if you want to remove yourself";
}
this.message = "Quit if you want to remove yourself";
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the
* ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public RemoveFromGroupMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.GROUPREMOVE, origin, reader);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the
* ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public RemoveFromGroupMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.GROUPREMOVE, origin, reader);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.targetType);
writer.putInt(this.targetID);
writer.putInt(this.response);
if (this.response == 1)
writer.putString(this.message);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.targetType);
writer.putInt(this.targetID);
writer.putInt(this.response);
if (this.response == 1)
writer.putString(this.message);
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.targetType = reader.getInt();
this.targetID = reader.getInt();
this.response = reader.getInt();
if (this.response == 1)
this.message = reader.getString();
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.targetType = reader.getInt();
this.targetID = reader.getInt();
this.response = reader.getInt();
if (this.response == 1)
this.message = reader.getString();
}
/**
* @return the targetType
*/
public int getTargetType() {
return targetType;
}
/**
* @return the targetType
*/
public int getTargetType() {
return targetType;
}
/**
* @param targetType
* the targetType to set
*/
public void setTargetType(int targetType) {
this.targetType = targetType;
}
/**
* @param targetType the targetType to set
*/
public void setTargetType(int targetType) {
this.targetType = targetType;
}
/**
* @return the targetID
*/
public int getTargetID() {
return targetID;
}
/**
* @return the targetID
*/
public int getTargetID() {
return targetID;
}
/**
* @param targetID
* the targetID to set
*/
public void setTargetID(int targetID) {
this.targetID = targetID;
}
/**
* @param targetID the targetID to set
*/
public void setTargetID(int targetID) {
this.targetID = targetID;
}
/**
* @return the response
*/
public int getResponse() {
return response;
}
/**
* @return the response
*/
public int getResponse() {
return response;
}
/**
* @param response
* the response to set
*/
public void setResponse(int response) {
this.response = response;
}
/**
* @param response the response to set
*/
public void setResponse(int response) {
this.response = response;
}
/**
* @return the message
*/
public String getMessage() {
return message;
}
/**
* @return the message
*/
public String getMessage() {
return message;
}
/**
* @param message
* the message to set
*/
public void setMessage(String message) {
this.message = message;
}
/**
* @param message the message to set
*/
public void setMessage(String message) {
this.message = message;
}
}
src/engine/net/client/msg/group/ToggleGroupSplitMsg.java
+43 -44
View File
@@ -18,55 +18,54 @@ import engine.net.client.msg.ClientNetMsg;
public class ToggleGroupSplitMsg extends ClientNetMsg {
private int unknown01;
private int unknown01;
/**
* This is the general purpose constructor.
*/
public ToggleGroupSplitMsg() {
super(Protocol.GROUPTREASURE);
this.unknown01 = 1;
}
/**
* This is the general purpose constructor.
*/
public ToggleGroupSplitMsg() {
super(Protocol.GROUPTREASURE);
this.unknown01 = 1;
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the
* ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public ToggleGroupSplitMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.GROUPTREASURE, origin, reader);
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the
* ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public ToggleGroupSplitMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.GROUPTREASURE, origin, reader);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.unknown01);
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.unknown01);
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.unknown01 = reader.getInt();
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.unknown01 = reader.getInt();
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @return the unknown01
*/
public int getUnknown01() {
return unknown01;
}
/**
* @param unknown01
* the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
/**
* @param unknown01 the unknown01 to set
*/
public void setUnknown01(int unknown01) {
this.unknown01 = unknown01;
}
}