Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Seq.

Browse Source
This commit is contained in:
Anuken
2020-06-08 17:19:47 -04:00
parent 87ab895253
commit 8ea28e1ced
147 changed files with 438 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/io/SaveIO.java
View File

@@ -20,7 +20,7 @@ public class SaveIO{
/** Format header. This is the string 'MSAV' in ASCII. */
public static final byte[] header = {77, 83, 65, 86};
public static final IntMap<SaveVersion> versions = new IntMap<>();
public static final Array<SaveVersion> versionArray = Array.with(new Save1(), new Save2(), new Save3(), new Save4());
public static final Seq<SaveVersion> versionArray = Seq.with(new Save1(), new Save2(), new Save3(), new Save4());
static{
for(SaveVersion version : versionArray){

8
core/src/mindustry/io/SaveVersion.java
View File

@@ -270,7 +270,7 @@ public abstract class SaveVersion extends SaveFileReader{
public void writeEntities(DataOutput stream) throws IOException{
//write team data with entities.
Array<TeamData> data = state.teams.getActive();
Seq<TeamData> data = state.teams.getActive();
stream.writeInt(data.size);
for(TeamData team : data){
stream.writeInt(team.team.id);
@@ -337,17 +337,17 @@ public abstract class SaveVersion extends SaveFileReader{
}
public void writeContentHeader(DataOutput stream) throws IOException{
Array<Content>[] map = content.getContentMap();
Seq<Content>[] map = content.getContentMap();
int mappable = 0;
for(Array<Content> arr : map){
for(Seq<Content> arr : map){
if(arr.size > 0 && arr.first() instanceof MappableContent){
mappable++;
}
}
stream.writeByte(mappable);
for(Array<Content> arr : map){
for(Seq<Content> arr : map){
if(arr.size > 0 && arr.first() instanceof MappableContent){
stream.writeByte(arr.first().getContentType().ordinal());
stream.writeShort(arr.size);

6
core/src/mindustry/io/TypeIO.java
View File

@@ -50,9 +50,9 @@ public class TypeIO{
write.b((byte)5);
write.b((byte)map.getContentType().ordinal());
write.s(map.id);
}else if(object instanceof IntArray){
}else if(object instanceof IntSeq){
write.b((byte)6);
IntArray arr = (IntArray)object;
IntSeq arr = (IntSeq)object;
write.s((short)arr.size);
for(int i = 0; i < arr.size; i++){
write.i(arr.items[i]);
@@ -81,7 +81,7 @@ public class TypeIO{
case 3: return read.f();
case 4: return readString(read);
case 5: return content.getByID(ContentType.all[read.b()], read.s());
case 6: short length = read.s(); IntArray arr = new IntArray(); for(int i = 0; i < length; i ++) arr.add(read.i()); return arr;
case 6: short length = read.s(); IntSeq arr = new IntSeq(); for(int i = 0; i < length; i ++) arr.add(read.i()); return arr;
case 7: return new Point2(read.i(), read.i());
case 8: byte len = read.b(); Point2[] out = new Point2[len]; for(int i = 0; i < len; i ++) out[i] = Point2.unpack(read.i()); return out;
default: throw new IllegalArgumentException("Unknown object type: " + type);

4
core/src/mindustry/io/legacy/LegacyIO.java
View File

@@ -8,8 +8,8 @@ import java.io.*;
public class LegacyIO{
public static Array<Server> readServers(){
Array<Server> arr = new Array<>();
public static Seq<Server> readServers(){
Seq<Server> arr = new Seq<>();
try{
byte[] bytes = Core.settings.getBytes("server-list");