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

Made save format support removed blocks

Browse Source
This commit is contained in:
Anuken
2020-06-04 14:50:08 -04:00
parent f112226178
commit 803f9e8eb6
12 changed files with 103 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/io/SaveFileReader.java
View File

@@ -88,8 +88,8 @@ public abstract class SaveFileReader{
}
/** Reads a chunk of some length. Use the runner for reading to catch more descriptive errors. */
public int readChunk(DataInput input, boolean isByte, IORunner<DataInput> runner) throws IOException{
int length = isByte ? input.readUnsignedShort() : input.readInt();
public int readChunk(DataInput input, boolean isShort, IORunner<DataInput> runner) throws IOException{
int length = isShort ? input.readUnsignedShort() : input.readInt();
runner.accept(input);
return length;
}

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

@@ -152,6 +152,9 @@ public abstract class SaveVersion extends SaveFileReader{
Tile tile = world.rawTile(i % world.width(), i / world.width());
stream.writeShort(tile.blockID());
//make note of whether there was an entity here
stream.writeBoolean(tile.entity != null);
//only write the entity for multiblocks once - in the center
if(tile.entity != null){
if(tile.isCenter()){
@@ -218,8 +221,9 @@ public abstract class SaveVersion extends SaveFileReader{
Tile tile = context.tile(i);
if(block == null) block = Blocks.air;
boolean isCenter = true;
boolean hadEntity = stream.readBoolean();
if(block.hasEntity()){
if(hadEntity){
isCenter = stream.readBoolean();
}
@@ -228,15 +232,20 @@ public abstract class SaveVersion extends SaveFileReader{
tile.setBlock(block);
}
if(block.hasEntity()){
if(hadEntity){
if(isCenter){ //only read entity for center blocks
try{
readChunk(stream, true, in -> {
byte revision = in.readByte();
tile.entity.readAll(Reads.get(in), revision);
});
}catch(Throwable e){
throw new IOException("Failed to read tile entity of block: " + block, e);
if(block.hasEntity()){
try{
readChunk(stream, true, in -> {
byte revision = in.readByte();
tile.entity.readAll(Reads.get(in), revision);
});
}catch(Throwable e){
throw new IOException("Failed to read tile entity of block: " + block, e);
}
}else{
//skip the entity region, as the entity and its IO code are now gone
skipRegion(stream, true);
}
}
}else{