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

Added backwards compatibility for legacy saves

Browse Source
This commit is contained in:
Anuken
2020-02-17 11:13:46 -05:00
parent 18d4efa315
commit e215772f30
34 changed files with 1009 additions and 855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/Vars.java
View File

@@ -152,7 +152,7 @@ public class Vars implements Loadable{
/** list of all locales that can be switched to */
public static Locale[] locales;
public static FileTree tree;
public static FileTree tree = new FileTree();
public static Net net;
public static ContentLoader content;
public static GameState state;

2
core/src/mindustry/ai/WaveSpawner.java
View File

@@ -35,7 +35,7 @@ public class WaveSpawner{
/** @return true if the player is near a ground spawn point. */
public boolean playerNear(){
return groundSpawns.contains(g -> Mathf.dst(g.x * tilesize, g.y * tilesize, player.x(), player.y()) < state.rules.dropZoneRadius && player.team() != state.rules.waveTeam);
return !player.dead() && groundSpawns.contains(g -> Mathf.dst(g.x * tilesize, g.y * tilesize, player.x(), player.y()) < state.rules.dropZoneRadius && player.team() != state.rules.waveTeam);
}
public void spawnEnemies(){

2
core/src/mindustry/core/FileTree.java
View File

@@ -19,6 +19,8 @@ public class FileTree implements FileHandleResolver{
return files.get(path);
}else if(files.containsKey("/" + path)){
return files.get("/" + path);
}else if(Core.files == null){ //headless
return Fi.get(path);
}else{
return Core.files.internal(path);
}

2
core/src/mindustry/core/NetClient.java
View File

@@ -407,7 +407,7 @@ public class NetClient implements ApplicationListener{
Log.warn("Missing entity at {0}. Skipping block snapshot.", tile);
break;
}
tile.entity.read(Reads.get(input), tile.entity.version());
tile.entity.readAll(Reads.get(input), tile.entity.version());
}
}catch(Exception e){
e.printStackTrace();

2
core/src/mindustry/core/NetServer.java
View File

@@ -715,7 +715,7 @@ public class NetServer implements ApplicationListener{
sent ++;
dataStream.writeInt(entity.tile().pos());
entity.write(Writes.get(dataStream));
entity.writeAll(Writes.get(dataStream));
if(syncStream.size() > maxSnapshotSize){
dataStream.close();

4
core/src/mindustry/entities/Fires.java
View File

@@ -62,4 +62,8 @@ public class Fires{
public static void remove(Tile tile){
map.remove(tile.pos());
}
public static void register(Firec fire){
map.put(fire.tile().pos(), fire);
}
}

4
core/src/mindustry/entities/Puddles.java
View File

@@ -73,6 +73,10 @@ public class Puddles{
map.remove(tile.pos());
}
public static void register(Puddlec puddle){
map.put(puddle.tile().pos(), puddle);
}
/** Reacts two liquids together at a location. */
private static float reactPuddle(Liquid dest, Liquid liquid, float amount, Tile tile, float x, float y){
if((dest.flammability > 0.3f && liquid.temperature > 0.7f) ||

4
core/src/mindustry/entities/def/FireComp.java
View File

@@ -95,4 +95,8 @@ abstract class FireComp implements Timedc, Posc, Firec{
Fires.remove(tile);
}
@Override
public void afterRead(){
Fires.register(this);
}
}

2
core/src/mindustry/entities/def/HealthComp.java
View File

@@ -46,7 +46,7 @@ abstract class HealthComp implements Entityc{
}
boolean damaged(){
return health <= maxHealth - 0.0001f;
return health < maxHealth - 0.001f;
}
void damage(float amount){

12
core/src/mindustry/entities/def/PuddleComp.java
View File

@@ -18,7 +18,7 @@ import static mindustry.entities.Puddles.maxLiquid;
@EntityDef(value = {Puddlec.class}, pooled = true)
@Component
abstract class PuddleComp implements Posc, DrawLayerFloorOverc{
abstract class PuddleComp implements Posc, DrawLayerFloorOverc, Puddlec{
private static final int maxGeneration = 2;
private static final Color tmp = new Color();
private static final Rect rect = new Rect();
@@ -112,8 +112,18 @@ abstract class PuddleComp implements Posc, DrawLayerFloorOverc{
}
}
@Override
public float clipSize(){
return 20;
}
@Override
public void remove(){
Puddles.remove(tile);
}
@Override
public void afterRead(){
Puddles.register(this);
}
}

38
core/src/mindustry/entities/def/TileComp.java
View File

@@ -61,8 +61,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
return this;
}
@CallSuper
public void write(Writes write){
public final void writeBase(Writes write){
write.f(health());
write.b(tile.rotation());
write.b(tile.getTeamID());
@@ -72,22 +71,38 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
if(cons != null) cons.write(write);
}
@CallSuper
@Override
public void read(Reads read, byte revision){
public final void readBase(Reads read){
health(read.f());
byte rotation = read.b();
byte team = read.b();
tile.setTeam(Team.get(team));
tile.rotation(rotation);
tile.rotation(read.b());
tile.setTeam(Team.get(read.b()));
if(items != null) items.read(read);
if(power != null) power.read(read);
if(liquids != null) liquids.read(read);
if(cons != null) cons.read(read);
}
public void writeAll(Writes write){
writeBase(write);
write(write);
}
public void readAll(Reads read, byte revision){
readBase(read);
read(read, revision);
}
@CallSuper
@Override
public void write(Writes write){
//overriden by subclasses!
}
@CallSuper
@Override
public void read(Reads read, byte revision){
//overriden by subclasses!
}
@Override
public void applyBoost(float intensity, float duration){
timeScale = Math.max(timeScale, intensity);
@@ -144,7 +159,6 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
}
/** Returns the version of this TileEntity IO code.*/
//TODO implement
@Override
public byte version(){
return 0;

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

@@ -1,11 +1,9 @@
package mindustry.io;
import arc.struct.ObjectMap;
import arc.struct.ObjectMap.Entry;
import arc.struct.StringMap;
import arc.util.io.CounterInputStream;
import arc.util.io.ReusableByteOutStream;
import mindustry.world.WorldContext;
import arc.struct.*;
import arc.struct.ObjectMap.*;
import arc.util.io.*;
import mindustry.world.*;
import java.io.*;

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

@@ -5,6 +5,7 @@ import arc.files.Fi;
import arc.util.io.CounterInputStream;
import arc.util.io.FastDeflaterOutputStream;
import mindustry.Vars;
import mindustry.io.legacy.*;
import mindustry.io.versions.*;
import mindustry.world.WorldContext;
@@ -18,7 +19,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());
public static final Array<SaveVersion> versionArray = Array.with(new Save1(), new Save2(), new Save3(), new Save4());
static{
for(SaveVersion version : versionArray){

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

@@ -125,7 +125,7 @@ public abstract class SaveVersion extends SaveFileReader{
if(tile.entity != null){
writeChunk(stream, true, out -> {
out.writeByte(tile.entity.version());
tile.entity.write(Writes.get(out));
tile.entity.writeAll(Writes.get(out));
});
}else{
//write consecutive non-entity blocks
@@ -188,7 +188,7 @@ public abstract class SaveVersion extends SaveFileReader{
try{
readChunk(stream, true, in -> {
byte revision = in.readByte();
tile.entity.read(Reads.get(in), revision);
tile.entity.readAll(Reads.get(in), revision);
});
}catch(Exception e){
throw new IOException("Failed to read tile entity of block: " + block, e);

109
core/src/mindustry/io/legacy/LegacySaveVersion.java Normal file
View File

@@ -0,0 +1,109 @@
package mindustry.io.legacy;
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.content;
public abstract class LegacySaveVersion extends SaveVersion{
public LegacySaveVersion(int version){
super(version);
}
@Override
public void readMap(DataInput stream, WorldContext context) throws IOException{
int width = stream.readUnsignedShort();
int height = stream.readUnsignedShort();
boolean generating = context.isGenerating();
if(!generating) context.begin();
try{
context.resize(width, height);
//read floor and create tiles first
for(int i = 0; i < width * height; i++){
int x = i % width, y = i / width;
short floorid = stream.readShort();
short oreid = stream.readShort();
int consecutives = stream.readUnsignedByte();
if(content.block(floorid) == Blocks.air) floorid = Blocks.stone.id;
context.create(x, y, floorid, oreid, (short)0);
for(int j = i + 1; j < i + 1 + consecutives; j++){
int newx = j % width, newy = j / width;
context.create(newx, newy, floorid, oreid, (short)0);
}
i += consecutives;
}
//read blocks
for(int i = 0; i < width * height; i++){
int x = i % width, y = i / width;
Block block = content.block(stream.readShort());
Tile tile = context.tile(x, y);
if(block == null) block = Blocks.air;
tile.setBlock(block);
if(tile.entity != null){
try{
readChunk(stream, true, in -> {
byte version = in.readByte();
//legacy impl of TileEntity#read()
tile.entity.health(stream.readUnsignedShort());
byte packedrot = stream.readByte();
byte team = Pack.leftByte(packedrot) == 8 ? stream.readByte() : Pack.leftByte(packedrot);
byte rotation = Pack.rightByte(packedrot);
tile.setTeam(Team.get(team));
tile.rotation(rotation);
if(tile.entity.items() != null) tile.entity.items().read(Reads.get(stream));
if(tile.entity.power() != null) tile.entity.power().read(Reads.get(stream));
if(tile.entity.liquids() != null) tile.entity.liquids().read(Reads.get(stream));
if(tile.entity.cons() != null) tile.entity.cons().read(Reads.get(stream));
//read only from subclasses!
tile.entity.read(Reads.get(in), version);
});
}catch(Exception e){
throw new IOException("Failed to read tile entity of block: " + block, e);
}
}else{
int consecutives = stream.readUnsignedByte();
for(int j = i + 1; j < i + 1 + consecutives; j++){
int newx = j % width, newy = j / width;
context.tile(newx, newy).setBlock(block);
}
i += consecutives;
}
}
}finally{
if(!generating) context.end();
}
}
public void readLegacyEntities(DataInput stream) throws IOException{
byte groups = stream.readByte();
for(int i = 0; i < groups; i++){
int amount = stream.readInt();
for(int j = 0; j < amount; j++){
//simply skip all the entities
skipRegion(stream, true);
}
}
}
}

2
core/src/mindustry/io/versions/LegacyTypeTable.java → core/src/mindustry/io/legacy/LegacyTypeTable.java
View File

@@ -1,4 +1,4 @@
package mindustry.io.versions;
package mindustry.io.legacy;
/*
Latest data: [build 81]

15
core/src/mindustry/io/legacy/Save1.java Normal file
View File

@@ -0,0 +1,15 @@
package mindustry.io.legacy;
import java.io.*;
public class Save1 extends LegacySaveVersion{
public Save1(){
super(1);
}
@Override
public void readEntities(DataInput stream) throws IOException{
readLegacyEntities(stream);
}
}

15
core/src/mindustry/io/legacy/Save2.java Normal file
View File

@@ -0,0 +1,15 @@
package mindustry.io.legacy;
import java.io.*;
public class Save2 extends LegacySaveVersion{
public Save2(){
super(2);
}
@Override
public void readEntities(DataInput stream) throws IOException{
readLegacyEntities(stream);
}
}

29
core/src/mindustry/io/legacy/Save3.java Normal file
View File

@@ -0,0 +1,29 @@
package mindustry.io.legacy;
import mindustry.game.*;
import mindustry.game.Teams.*;
import java.io.*;
import static mindustry.Vars.content;
public class Save3 extends LegacySaveVersion{
public Save3(){
super(3);
}
@Override
public void readEntities(DataInput stream) throws IOException{
int teamc = stream.readInt();
for(int i = 0; i < teamc; i++){
Team team = Team.get(stream.readInt());
TeamData data = team.data();
int blocks = stream.readInt();
for(int j = 0; j < blocks; j++){
data.brokenBlocks.addLast(new BrokenBlock(stream.readShort(), stream.readShort(), stream.readShort(), content.block(stream.readShort()).id, stream.readInt()));
}
}
readLegacyEntities(stream);
}
}

30
core/src/mindustry/io/versions/Save1.java
View File

@@ -1,30 +0,0 @@
package mindustry.io.versions;
import java.io.*;
public class Save1 extends Save2{
public Save1(){
version = 1;
}
@Override
public void readEntities(DataInput stream) throws IOException{
//TODO implement
//Prov[] table = LegacyTypeTable.getTable(lastReadBuild);
byte groups = stream.readByte();
for(int i = 0; i < groups; i++){
int amount = stream.readInt();
for(int j = 0; j < amount; j++){
readChunk(stream, true, in -> {
byte typeid = in.readByte();
byte version = in.readByte();
//SaveTrait trait = (SaveTrait)table[typeid].get();
//trait.readSave(in, version);
});
}
}
}
}

31
core/src/mindustry/io/versions/Save2.java
View File

@@ -1,31 +0,0 @@
package mindustry.io.versions;
import mindustry.io.*;
import java.io.*;
public class Save2 extends SaveVersion{
public Save2(){
super(2);
}
@Override
public void readEntities(DataInput stream) throws IOException{
//TODO implement
byte groups = stream.readByte();
for(int i = 0; i < groups; i++){
int amount = stream.readInt();
for(int j = 0; j < amount; j++){
//TODO throw exception on read fail
readChunk(stream, true, in -> {
byte typeid = in.readByte();
byte version = in.readByte();
//SaveTrait trait = (SaveTrait)content.<TypeID>getByID(ContentType.typeid, typeid).constructor.get();
//trait.readSave(in, version);
});
}
}
}
}

9
core/src/mindustry/io/versions/Save3.java
View File

@@ -1,9 +0,0 @@
package mindustry.io.versions;
import mindustry.io.*;
public class Save3 extends SaveVersion{
public Save3(){
super(3);
}
}

10
core/src/mindustry/io/versions/Save4.java Normal file
View File

@@ -0,0 +1,10 @@
package mindustry.io.versions;
import mindustry.io.*;
public class Save4 extends SaveVersion{
public Save4(){
super(4);
}
}

2
core/src/mindustry/type/Planet.java
View File

@@ -53,7 +53,7 @@ public class Planet extends UnlockableContent{
}
}else{
//TODO crash instead - this is a critical error!
Log.err("Planet {0} is missing its data file.");
Log.err("Planet {0} is missing its data file.", name);
}
}

12
core/src/mindustry/world/blocks/defense/MendProjector.java
View File

@@ -1,20 +1,18 @@
package mindustry.world.blocks.defense;
import arc.Core;
import arc.struct.IntSet;
import arc.graphics.Color;
import arc.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.Mathf;
import arc.math.*;
import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.Fx;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.*;
import mindustry.world.meta.*;
import java.io.*;
import static mindustry.Vars.*;
public class MendProjector extends Block{

14
core/src/mindustry/world/blocks/defense/OverdriveProjector.java
View File

@@ -1,19 +1,17 @@
package mindustry.world.blocks.defense;
import arc.Core;
import arc.struct.IntSet;
import arc.graphics.Color;
import arc.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.Mathf;
import arc.util.Time;
import arc.math.*;
import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.*;
import mindustry.world.meta.*;
import java.io.*;
import static mindustry.Vars.*;
public class OverdriveProjector extends Block{
@@ -90,7 +88,7 @@ public class OverdriveProjector extends Block{
float realBoost = (speedBoost + entity.phaseHeat * speedBoostPhase) * entity.efficiency();
entity.charge = 0f;
indexer.eachBlock(entity, realRange, other -> other.entity.timeScale() <= realBoost, other -> other.entity.applyBoost(realBoost, reload + 1f));
indexer.eachBlock(entity, realRange, other -> other.entity.timeScale() < realBoost, other -> other.entity.applyBoost(realBoost, reload + 1f));
}
}

32
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -1,29 +1,23 @@
package mindustry.world.blocks.defense.turrets;
import arc.Core;
import arc.*;
import arc.audio.*;
import arc.struct.Array;
import arc.struct.EnumSet;
import arc.func.Cons2;
import arc.graphics.Blending;
import arc.graphics.Color;
import arc.func.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.Angles;
import arc.math.Mathf;
import arc.math.geom.Vec2;
import arc.util.Time;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.Fx;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.entities.bullet.BulletType;
import mindustry.entities.bullet.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.Block;
import mindustry.world.Tile;
import mindustry.world.*;
import mindustry.world.meta.*;
import java.io.*;
import static mindustry.Vars.tilesize;
public abstract class Turret extends Block{
@@ -330,8 +324,10 @@ public abstract class Turret extends Block{
@Override
public void read(Reads read, byte revision){
super.read(read, revision);
reload = read.f();
rotation = read.f();
if(revision == 1){
reload = read.f();
rotation = read.f();
}
}
@Override