War3MapW3i for version 33 and unit test

https://github.com/ChiefOfGxBxL/WC3MapSpecification/blob/master/Info/0-33.md

Author: tdauth

core/src/com/etheller/warsmash/parsers/w3x/w3i/Player.java

@@ -30,13 +30,13 @@ public void load(final LittleEndianDataInputStream stream, final int version) th
 		ParseUtils.readFloatArray(stream, this.startLocation);
 		this.allyLowPriorities = ParseUtils.readUInt32(stream);
 		this.allyHighPriorities = ParseUtils.readUInt32(stream);
-		if (version > 30) {
+		if (version >= 31) {
 			this.enemyLowPrioritiesFlags = ParseUtils.readUInt32(stream);
 			this.enemyHighPrioritiesFlags = ParseUtils.readUInt32(stream);
 		}
 	}
 
-	public void save(final LittleEndianDataOutputStream stream) throws IOException {
+	public void save(final LittleEndianDataOutputStream stream, int version) throws IOException {
 		ParseUtils.writeUInt32(stream, this.id);
 		stream.writeInt(this.type);
 		stream.writeInt(this.race);
@@ -45,10 +45,10 @@ public void save(final LittleEndianDataOutputStream stream) throws IOException {
 		ParseUtils.writeFloatArray(stream, this.startLocation);
 		ParseUtils.writeUInt32(stream, this.allyLowPriorities);
 		ParseUtils.writeUInt32(stream, this.allyHighPriorities);
-	}
-
-	public int getByteLength() {
-		return 33 + this.name.length();
+		if (version >= 31) {
+			ParseUtils.writeUInt32(stream, this.enemyLowPrioritiesFlags);
+			ParseUtils.writeUInt32(stream, this.enemyHighPrioritiesFlags);
+		}
 	}
 
 	public int getId() {

core/src/com/etheller/warsmash/parsers/w3x/w3i/War3MapW3i.java

@@ -326,7 +326,7 @@ public void save(final LittleEndianDataOutputStream stream) throws IOException {
 		ParseUtils.writeUInt32(stream, this.players.size());
 
 		for (final Player player : this.players) {
-			player.save(stream);
+			player.save(stream, this.version);
 		}
 
 		ParseUtils.writeUInt32(stream, this.forces.size());

core/test/com/etheller/warsmash/parsers/w3x/w3i/War3MapW3iTest.java

@@ -2,6 +2,7 @@
 
 import com.etheller.warsmash.parsers.w3x.w3i.War3MapW3i;
 import com.google.common.io.LittleEndianDataInputStream;
+import com.google.common.io.LittleEndianDataOutputStream;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -21,5 +22,21 @@ void testWoWReforged() throws IOException {
 		assertEquals("TRIGSTR_004", mapInfo.getAuthor());
 		assertEquals(12, mapInfo.getPlayers().size());
 		assertEquals(3, mapInfo.getForces().size());
+
+		java.io.File testFile = new java.io.File("target/wowr_w3x/war3map_out.w3i");
+		testFile.getParentFile().mkdirs();
+
+		try (LittleEndianDataOutputStream out = new LittleEndianDataOutputStream(new java.io.FileOutputStream(testFile))) {
+			mapInfo.save(out);
+		}
+
+		War3MapW3i mapInfo2;
+		try (LittleEndianDataInputStream in = new LittleEndianDataInputStream(new java.io.FileInputStream(testFile))) {
+			mapInfo2 = new War3MapW3i(in);
+		}
+
+		assertEquals(mapInfo.getVersion(), mapInfo2.getVersion());
+		assertEquals(mapInfo.getAuthor(), mapInfo2.getAuthor());
+		assertEquals(mapInfo.getPlayers().size(), mapInfo2.getPlayers().size());
 	}
 }