Project cleanup pre merge.

2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
@@ -18,75 +18,72 @@ import engine.net.client.Protocol;
 import engine.objects.PlayerCharacter;


-
 public class RecommendNationMsg extends ClientNetMsg {


-	private int guildID;
-	private byte ally;
-	private byte enemy;
+    private int guildID;
+    private byte ally;
+    private byte enemy;


+    public RecommendNationMsg(PlayerCharacter player) {
+        super(Protocol.RECOMMENDNATION);
+
+    }
+
+    public RecommendNationMsg() {
+        super(Protocol.RECOMMENDNATION);
+    }


-	public RecommendNationMsg(PlayerCharacter player) {
-		super(Protocol.RECOMMENDNATION);
-
-	}
-
-	public RecommendNationMsg() {
-		super(Protocol.RECOMMENDNATION);
-	}
+    /**
+     * 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 RecommendNationMsg(AbstractConnection origin, ByteBufferReader reader) {
+        super(Protocol.RECOMMENDNATION, origin, reader);
+    }
+    //CALL THIS AFTER SANITY CHECKS AND BEFORE UPDATING HEALTH/GOLD.


-	/**
-	 * 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 RecommendNationMsg(AbstractConnection origin, ByteBufferReader reader)  {
-		super(Protocol.RECOMMENDNATION, origin, reader);
-	}
-	//CALL THIS AFTER SANITY CHECKS AND BEFORE UPDATING HEALTH/GOLD.
+    /**
+     * Deserializes the subclass specific items from the supplied NetMsgReader.
+     */
+    @Override
+    protected void _deserialize(ByteBufferReader reader) {
+        reader.getInt();
+        this.guildID = reader.getInt();
+        this.ally = reader.get();
+        this.enemy = reader.get();
+    }


-	/**
-	 * Deserializes the subclass specific items from the supplied NetMsgReader.
-	 */
-	@Override
-	protected void _deserialize(ByteBufferReader reader)  {
-		reader.getInt();
-		this.guildID = reader.getInt();
-		this.ally = reader.get();
-		this.enemy = reader.get();
-	}
+    // Precache and configure this message before we serialize it


-	// Precache and configure this message before we serialize it
+    /**
+     * Serializes the subclass specific items to the supplied NetMsgWriter.
+     */
+    @Override
+    protected void _serialize(ByteBufferWriter writer) throws SerializationException {
+        writer.putInt(GameObjectType.Guild.ordinal());
+        writer.putInt(guildID);
+        writer.put(this.ally);
+        writer.put(this.enemy);
+    }

+    public int getGuildID() {
+        return guildID;
+    }

-	/**
-	 * Serializes the subclass specific items to the supplied NetMsgWriter.
-	 */
-	@Override
-	protected void _serialize(ByteBufferWriter writer) throws SerializationException {
-		writer.putInt(GameObjectType.Guild.ordinal());
-		writer.putInt(guildID);
-		writer.put(this.ally);
-		writer.put(this.enemy);
-	}
+    public byte getAlly() {
+        return ally;
+    }

-	public int getGuildID() {
-		return guildID;
-	}
-
-	public byte getAlly() {
-		return ally;
-	}
-
-	public byte getEnemy() {
-		return enemy;
-	}
+    public byte getEnemy() {
+        return enemy;
+    }

 }