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

Renamed TeamData blocks -> plans

Browse Source
This commit is contained in:
Anuken
2022-05-07 10:57:21 -04:00
parent 8f2e1163dd
commit 7885a46cd5
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,8 +342,8 @@ public abstract class SaveVersion extends SaveFileReader{
stream.writeInt(data.size);
for(TeamData team : data){
stream.writeInt(team.team.id);
stream.writeInt(team.blocks.size);
for(BlockPlan block : team.blocks){
stream.writeInt(team.plans.size);
for(BlockPlan block : team.plans){
stream.writeShort(block.x);
stream.writeShort(block.y);
stream.writeShort(block.rotation);
@@ -387,8 +387,8 @@ public abstract class SaveVersion extends SaveFileReader{
Team team = Team.get(stream.readInt());
TeamData data = team.data();
int blocks = stream.readInt();
data.blocks.clear();
data.blocks.ensureCapacity(Math.min(blocks, 1000));
data.plans.clear();
data.plans.ensureCapacity(Math.min(blocks, 1000));
var reads = Reads.get(stream);
var set = new IntSet();
@@ -397,7 +397,7 @@ public abstract class SaveVersion extends SaveFileReader{
var obj = TypeIO.readObject(reads);
//cannot have two in the same position
if(set.add(Point2.pack(x, y))){
data.blocks.addLast(new BlockPlan(x, y, rot, content.block(bid).id, obj));
data.plans.addLast(new BlockPlan(x, y, rot, content.block(bid).id, obj));
}
}
}

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

@@ -21,7 +21,7 @@ public class Save3 extends LegacySaveVersion{
TeamData data = team.data();
int blocks = stream.readInt();
for(int j = 0; j < blocks; j++){
data.blocks.addLast(new BlockPlan(stream.readShort(), stream.readShort(), stream.readShort(), content.block(stream.readShort()).id, stream.readInt()));
data.plans.addLast(new BlockPlan(stream.readShort(), stream.readShort(), stream.readShort(), content.block(stream.readShort()).id, stream.readInt()));
}
}