Fixed tests

core/src/mindustry/io/SaveFileReader.java

@@ -203,6 +203,8 @@ public abstract class SaveFileReader{
     public interface CustomChunk{
         void write(DataOutput stream) throws IOException;
         void read(DataInput stream) throws IOException;
-        boolean shouldWrite();
+        default boolean shouldWrite(){
+            return true;
+        }
     }
 }

core/src/mindustry/io/versions/LegacyRegionSaveVersion.java

@@ -0,0 +1,31 @@
+package mindustry.io.versions;
+
+import arc.util.io.*;
+import mindustry.io.*;
+import mindustry.world.*;
+
+import java.io.*;
+
+import static mindustry.Vars.*;
+
+/** This version does not read custom chunk data (<= 6). */
+public class LegacyRegionSaveVersion extends SaveVersion{
+
+    public LegacyRegionSaveVersion(int version){
+        super(version);
+    }
+
+    @Override
+    public void read(DataInputStream stream, CounterInputStream counter, WorldContext context) throws IOException{
+        region("meta", stream, counter, this::readMeta);
+        region("content", stream, counter, this::readContentHeader);
+
+        try{
+            region("map", stream, counter, in -> readMap(in, context));
+            region("entities", stream, counter, this::readEntities);
+        }finally{
+            content.setTemporaryMapper(null);
+
+        }
+    }
+}

core/src/mindustry/io/versions/LegacySaveVersion.java

@@ -4,14 +4,13 @@ import arc.util.*;
 import arc.util.io.*;
 import mindustry.content.*;
 import mindustry.game.*;
-import mindustry.io.*;
 import mindustry.world.*;
 
 import java.io.*;
 
 import static mindustry.Vars.*;
 
-public abstract class LegacySaveVersion extends SaveVersion{
+public abstract class LegacySaveVersion extends LegacyRegionSaveVersion{
 
     public LegacySaveVersion(int version){
         super(version);

core/src/mindustry/io/versions/LegacySaveVersion2.java

@@ -3,12 +3,11 @@ package mindustry.io.versions;
 import arc.func.*;
 import arc.util.io.*;
 import mindustry.gen.*;
-import mindustry.io.*;
 
 import java.io.*;
 
 /** This version did not read/write entity IDs to the save. */
-public class LegacySaveVersion2 extends SaveVersion{
+public class LegacySaveVersion2 extends LegacyRegionSaveVersion{
 
     public LegacySaveVersion2(int version){
         super(version);

core/src/mindustry/io/versions/Save6.java

@@ -1,31 +1,9 @@
 package mindustry.io.versions;
 
-import arc.util.io.*;
-import mindustry.io.*;
-import mindustry.world.*;
-
-import java.io.*;
-
-import static mindustry.Vars.*;
-
 /** This version does not read custom chunk data. */
-public class Save6 extends SaveVersion{
+public class Save6 extends LegacyRegionSaveVersion{
 
     public Save6(){
         super(6);
     }
-
-    @Override
-    public void read(DataInputStream stream, CounterInputStream counter, WorldContext context) throws IOException{
-        region("meta", stream, counter, this::readMeta);
-        region("content", stream, counter, this::readContentHeader);
-
-        try{
-            region("map", stream, counter, in -> readMap(in, context));
-            region("entities", stream, counter, this::readEntities);
-        }finally{
-            content.setTemporaryMapper(null);
-
-        }
-    }
 }