Project cleanup pre merge.

This commit is contained in:
2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
@@ -20,12 +20,11 @@ import engine.net.client.Protocol;
public class HirelingServiceMsg extends ClientNetMsg {
public int npcID;
public int buildingID;
public int messageType;
public int repairCost;
public static final int SETREPAIRCOST = 2;
public static final int SETREPAIRCOST = 2;
public int npcID;
public int buildingID;
public int messageType;
public int repairCost;
/**
* This is the general purpose constructor.
@@ -42,7 +41,7 @@ public class HirelingServiceMsg extends ClientNetMsg {
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public HirelingServiceMsg(AbstractConnection origin, ByteBufferReader reader) {
public HirelingServiceMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.HIRELINGSERVICE, origin, reader);
}
@@ -51,72 +50,72 @@ public class HirelingServiceMsg extends ClientNetMsg {
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.messageType);
switch (this.messageType){
case SETREPAIRCOST:
this.writeSetRepairCost(writer);
break;
}
writer.putInt(this.messageType);
switch (this.messageType) {
case SETREPAIRCOST:
this.writeSetRepairCost(writer);
break;
}
}
/**
* Deserializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.messageType = reader.getInt();
switch (this.messageType){
case SETREPAIRCOST:
this.readSetRepairCost(reader);
break;
}
protected void _deserialize(ByteBufferReader reader) {
this.messageType = reader.getInt();
switch (this.messageType) {
case SETREPAIRCOST:
this.readSetRepairCost(reader);
break;
}
}
private void readSetRepairCost(ByteBufferReader reader){
reader.getInt(); //building type;
this.buildingID = reader.getInt();
reader.getInt();
this.npcID = reader.getInt();
reader.getInt();
reader.getInt(); //3
this.repairCost = reader.getInt();
reader.getInt();
reader.getInt();
private void readSetRepairCost(ByteBufferReader reader) {
reader.getInt(); //building type;
this.buildingID = reader.getInt();
reader.getInt();
this.npcID = reader.getInt();
reader.getInt();
reader.getInt(); //3
this.repairCost = reader.getInt();
reader.getInt();
reader.getInt();
}
private void writeSetRepairCost(ByteBufferWriter writer){
writer.putInt(GameObjectType.Building.ordinal());
writer.putInt(this.buildingID);
writer.putInt(GameObjectType.NPC.ordinal());
writer.putInt(this.npcID);
writer.putInt(0);
writer.putInt(3);
writer.putInt(this.repairCost);
writer.putInt(0);
writer.putInt(0);
private void writeSetRepairCost(ByteBufferWriter writer) {
writer.putInt(GameObjectType.Building.ordinal());
writer.putInt(this.buildingID);
writer.putInt(GameObjectType.NPC.ordinal());
writer.putInt(this.npcID);
writer.putInt(0);
writer.putInt(3);
writer.putInt(this.repairCost);
writer.putInt(0);
writer.putInt(0);
}
private void writeTest(ByteBufferWriter writer){
writer.putInt(GameObjectType.Building.ordinal());
writer.putInt(this.buildingID);
writer.putInt(GameObjectType.NPC.ordinal());
writer.putInt(this.npcID);
writer.putInt(3);
writer.putInt(1);
writer.putInt(1);
writer.putInt(GameObjectType.Building.ordinal());
writer.putInt(this.buildingID);
writer.putInt(GameObjectType.NPC.ordinal());
writer.putInt(this.npcID);
writer.putInt(0);
writer.putInt(0);
writer.putInt(3);
writer.putInt(1);
writer.putInt(0);
private void writeTest(ByteBufferWriter writer) {
writer.putInt(GameObjectType.Building.ordinal());
writer.putInt(this.buildingID);
writer.putInt(GameObjectType.NPC.ordinal());
writer.putInt(this.npcID);
writer.putInt(3);
writer.putInt(1);
writer.putInt(1);
writer.putInt(GameObjectType.Building.ordinal());
writer.putInt(this.buildingID);
writer.putInt(GameObjectType.NPC.ordinal());
writer.putInt(this.npcID);
writer.putInt(0);
writer.putInt(0);
writer.putInt(3);
writer.putInt(1);
writer.putInt(0);
}
}