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

Better IO

Browse Source
This commit is contained in:
Anuken
2020-02-13 22:11:59 -05:00
parent e3621f44da
commit 09c57c32d6
54 changed files with 568 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/mindustry/world/DirectionalItemBuffer.java
View File

@@ -1,9 +1,10 @@
package mindustry.world;
import mindustry.annotations.Annotations.Struct;
import arc.util.Time;
import mindustry.gen.BufferItem;
import mindustry.type.Item;
import arc.util.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;
import mindustry.gen.*;
import mindustry.type.*;
import java.io.*;
@@ -46,22 +47,22 @@ public class DirectionalItemBuffer{
indexes[buffer] --;
}
public void write(DataOutput stream) throws IOException{
public void write(Writes write){
for(int i = 0; i < 4; i++){
stream.writeByte(indexes[i]);
stream.writeByte(buffers[i].length);
write.b(indexes[i]);
write.b(buffers[i].length);
for(long l : buffers[i]){
stream.writeLong(l);
write.l(l);
}
}
}
public void read(DataInput stream) throws IOException{
public void read(Reads read){
for(int i = 0; i < 4; i++){
indexes[i] = stream.readByte();
byte length = stream.readByte();
indexes[i] = read.b();
byte length = read.b();
for(int j = 0; j < length; j++){
long value = stream.readLong();
long value = read.l();
if(j < buffers[i].length){
buffers[i][j] = value;
}

21
core/src/mindustry/world/ItemBuffer.java
View File

@@ -1,9 +1,8 @@
package mindustry.world;
import arc.util.*;
import mindustry.type.Item;
import java.io.*;
import arc.util.io.*;
import mindustry.type.*;
import static mindustry.Vars.content;
@@ -60,19 +59,19 @@ public class ItemBuffer{
index--;
}
public void write(DataOutput stream) throws IOException{
stream.writeByte((byte)index);
stream.writeByte((byte)buffer.length);
public void write(Writes write){
write.b((byte)index);
write.b((byte)buffer.length);
for(long l : buffer){
stream.writeLong(l);
write.l(l);
}
}
public void read(DataInput stream) throws IOException{
index = stream.readByte();
byte length = stream.readByte();
public void read(Reads read){
index = read.b();
byte length = read.b();
for(int i = 0; i < length; i++){
long l = stream.readLong();
long l = read.l();
if(i < buffer.length){
buffer[i] = l;
}

35
core/src/mindustry/world/blocks/BuildBlock.java
View File

@@ -7,6 +7,7 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.entities.*;
@@ -347,37 +348,37 @@ public class BuildBlock extends Block{
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(progress);
stream.writeShort(previous == null ? -1 : previous.id);
stream.writeShort(cblock == null ? -1 : cblock.id);
public void write(Writes write){
super.write(write);
write.f(progress);
write.s(previous == null ? -1 : previous.id);
write.s(cblock == null ? -1 : cblock.id);
if(accumulator == null){
stream.writeByte(-1);
write.b(-1);
}else{
stream.writeByte(accumulator.length);
write.b(accumulator.length);
for(int i = 0; i < accumulator.length; i++){
stream.writeFloat(accumulator[i]);
stream.writeFloat(totalAccumulator[i]);
write.f(accumulator[i]);
write.f(totalAccumulator[i]);
}
}
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
progress = stream.readFloat();
short pid = stream.readShort();
short rid = stream.readShort();
byte acsize = stream.readByte();
public void read(Reads read, byte revision){
super.read(read, revision);
progress = read.f();
short pid = read.s();
short rid = read.s();
byte acsize = read.b();
if(acsize != -1){
accumulator = new float[acsize];
totalAccumulator = new float[acsize];
for(int i = 0; i < acsize; i++){
accumulator[i] = stream.readFloat();
totalAccumulator[i] = stream.readFloat();
accumulator[i] = read.f();
totalAccumulator[i] = read.f();
}
}

13
core/src/mindustry/world/blocks/defense/Door.java
View File

@@ -1,6 +1,7 @@
package mindustry.world.blocks.defense;
import arc.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;
import arc.Graphics.*;
import arc.Graphics.Cursor.*;
@@ -92,15 +93,15 @@ public class Door extends Wall{
public boolean open = false;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeBoolean(open);
public void write(Writes write){
super.write(write);
write.bool(open);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
open = stream.readBoolean();
public void read(Reads read, byte revision){
super.read(read, revision);
open = read.bool();
}
}

29
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -7,6 +7,7 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.graphics.*;
@@ -171,23 +172,23 @@ public class ForceProjector extends Block{
float phaseHeat;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeBoolean(broken);
stream.writeFloat(buildup);
stream.writeFloat(radscl);
stream.writeFloat(warmup);
stream.writeFloat(phaseHeat);
public void write(Writes write){
super.write(write);
write.bool(broken);
write.f(buildup);
write.f(radscl);
write.f(warmup);
write.f(phaseHeat);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
broken = stream.readBoolean();
buildup = stream.readFloat();
radscl = stream.readFloat();
warmup = stream.readFloat();
phaseHeat = stream.readFloat();
public void read(Reads read, byte revision){
super.read(read, revision);
broken = read.bool();
buildup = read.f();
radscl = read.f();
warmup = read.f();
phaseHeat = read.f();
}
}

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

@@ -6,6 +6,7 @@ import arc.graphics.Color;
import arc.graphics.g2d.*;
import arc.math.Mathf;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.Fx;
import mindustry.gen.*;
import mindustry.graphics.*;
@@ -126,17 +127,17 @@ public class MendProjector extends Block{
float phaseHeat;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(heat);
stream.writeFloat(phaseHeat);
public void write(Writes write){
super.write(write);
write.f(heat);
write.f(phaseHeat);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
heat = stream.readFloat();
phaseHeat = stream.readFloat();
public void read(Reads read, byte revision){
super.read(read, revision);
heat = read.f();
phaseHeat = read.f();
}
}
}

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

@@ -6,6 +6,7 @@ import arc.graphics.Color;
import arc.graphics.g2d.*;
import arc.math.Mathf;
import arc.util.Time;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.*;
@@ -124,17 +125,17 @@ public class OverdriveProjector extends Block{
float phaseHeat;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(heat);
stream.writeFloat(phaseHeat);
public void write(Writes write){
super.write(write);
write.f(heat);
write.f(phaseHeat);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
heat = stream.readFloat();
phaseHeat = stream.readFloat();
public void read(Reads read, byte revision){
super.read(read, revision);
heat = read.f();
phaseHeat = read.f();
}
}
}

21
core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
View File

@@ -3,6 +3,7 @@ package mindustry.world.blocks.defense.turrets;
import arc.*;
import arc.struct.*;
import arc.scene.ui.layout.*;
import arc.util.io.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.entities.bullet.*;
@@ -151,23 +152,23 @@ public class ItemTurret extends CooledTurret{
public class ItemTurretEntity extends TurretEntity{
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeByte(ammo.size);
public void write(Writes write){
super.write(write);
write.b(ammo.size);
for(AmmoEntry entry : ammo){
ItemEntry i = (ItemEntry)entry;
stream.writeByte(i.item.id);
stream.writeShort(i.amount);
write.b(i.item.id);
write.s(i.amount);
}
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
byte amount = stream.readByte();
public void read(Reads read, byte revision){
super.read(read, revision);
byte amount = read.b();
for(int i = 0; i < amount; i++){
Item item = Vars.content.item(stream.readByte());
short a = stream.readShort();
Item item = Vars.content.item(read.b());
short a = read.s();
totalAmmo += a;
ammo.add(new ItemEntry(item, a));
}

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

@@ -12,6 +12,7 @@ import arc.math.Angles;
import arc.math.Mathf;
import arc.math.geom.Vec2;
import arc.util.Time;
import arc.util.io.*;
import mindustry.content.Fx;
import mindustry.entities.*;
import mindustry.entities.bullet.BulletType;
@@ -320,17 +321,17 @@ public abstract class Turret extends Block{
public Posc target;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(reload);
stream.writeFloat(rotation);
public void write(Writes write){
super.write(write);
write.f(reload);
write.f(rotation);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
reload = stream.readFloat();
rotation = stream.readFloat();
public void read(Reads read, byte revision){
super.read(read, revision);
reload = read.f();
rotation = read.f();
}
@Override

13
core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
View File

@@ -1,6 +1,7 @@
package mindustry.world.blocks.distribution;
import arc.math.*;
import arc.util.io.*;
import mindustry.type.*;
import mindustry.world.*;
@@ -41,15 +42,15 @@ public class BufferedItemBridge extends ExtendingItemBridge{
ItemBuffer buffer = new ItemBuffer(bufferCapacity, speed);
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
buffer.write(stream);
public void write(Writes write){
super.write(write);
buffer.write(write);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
buffer.read(stream);
public void read(Reads read, byte revision){
super.read(read, revision);
buffer.read(read);
}
}
}

17
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -8,6 +8,7 @@ import arc.math.geom.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.entities.units.*;
@@ -351,23 +352,23 @@ public class Conveyor extends Block implements Autotiler{
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeInt(len);
public void write(Writes write){
super.write(write);
write.i(len);
for(int i = 0; i < len; i++){
stream.writeInt(Pack.intBytes((byte)ids[i].id, (byte)(xs[i] * 127), (byte)(ys[i] * 255 - 128), (byte)0));
write.i(Pack.intBytes((byte)ids[i].id, (byte)(xs[i] * 127), (byte)(ys[i] * 255 - 128), (byte)0));
}
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
int amount = stream.readInt();
public void read(Reads read, byte revision){
super.read(read, revision);
int amount = read.i();
len = Math.min(amount, capacity);
for(int i = 0; i < amount; i++){
int val = stream.readInt();
int val = read.i();
byte id = (byte)(val >> 24);
float x = (float)((byte)(val >> 16)) / 127f;
float y = ((float)((byte)(val >> 8)) + 128f) / 255f;

25
core/src/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -8,6 +8,7 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.entities.units.*;
import mindustry.graphics.*;
@@ -375,27 +376,27 @@ public class ItemBridge extends Block{
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeInt(link);
stream.writeFloat(uptime);
stream.writeByte(incoming.size);
public void write(Writes write){
super.write(write);
write.i(link);
write.f(uptime);
write.b(incoming.size);
IntSetIterator it = incoming.iterator();
while(it.hasNext){
stream.writeInt(it.next());
write.i(it.next());
}
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
link = stream.readInt();
uptime = stream.readFloat();
byte links = stream.readByte();
public void read(Reads read, byte revision){
super.read(read, revision);
link = read.i();
uptime = read.f();
byte links = read.b();
for(int i = 0; i < links; i++){
incoming.add(stream.readInt());
incoming.add(read.i());
}
}
}

15
core/src/mindustry/world/blocks/distribution/Junction.java
View File

@@ -1,6 +1,7 @@
package mindustry.world.blocks.distribution;
import arc.util.Time;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.gen.BufferItem;
import mindustry.type.Item;
@@ -9,8 +10,6 @@ import mindustry.world.DirectionalItemBuffer;
import mindustry.world.Tile;
import mindustry.world.meta.BlockGroup;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import static mindustry.Vars.content;
@@ -89,15 +88,15 @@ public class Junction extends Block{
DirectionalItemBuffer buffer = new DirectionalItemBuffer(capacity, speed);
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
buffer.write(stream);
public void write(Writes write){
super.write(write);
buffer.write(write);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
buffer.read(stream);
public void read(Reads read, byte revision){
super.read(read, revision);
buffer.read(read);
}
}
}

21
core/src/mindustry/world/blocks/distribution/MassDriver.java
View File

@@ -5,6 +5,7 @@ import arc.struct.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.*;
import arc.util.io.*;
import arc.util.pooling.Pool.*;
import arc.util.pooling.*;
import mindustry.content.*;
@@ -332,19 +333,19 @@ public class MassDriver extends Block{
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeInt(link);
stream.writeFloat(rotation);
stream.writeByte((byte)state.ordinal());
public void write(Writes write){
super.write(write);
write.i(link);
write.f(rotation);
write.b((byte)state.ordinal());
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
link = stream.readInt();
rotation = stream.readFloat();
state = DriverState.values()[stream.readByte()];
public void read(Reads read, byte revision){
super.read(read, revision);
link = read.i();
rotation = read.f();
state = DriverState.values()[read.b()];
}
}

7
core/src/mindustry/world/blocks/distribution/OverflowGate.java
View File

@@ -2,6 +2,7 @@ package mindustry.world.blocks.distribution;
import arc.math.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.world.*;
@@ -124,10 +125,10 @@ public class OverflowGate extends Block{
float time;
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
public void read(Reads read, byte revision){
super.read(read, revision);
if(revision == 1){
new DirectionalItemBuffer(25, 50f).read(stream);
new DirectionalItemBuffer(25, 50f).read(read);
}
}
}

15
core/src/mindustry/world/blocks/distribution/Sorter.java
View File

@@ -5,6 +5,7 @@ import arc.math.*;
import arc.scene.ui.layout.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.entities.units.*;
import mindustry.type.*;
@@ -156,18 +157,18 @@ public class Sorter extends Block{
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeShort(sortItem == null ? -1 : sortItem.id);
public void write(Writes write){
super.write(write);
write.s(sortItem == null ? -1 : sortItem.id);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
sortItem = content.item(stream.readShort());
public void read(Reads read, byte revision){
super.read(read, revision);
sortItem = content.item(read.s());
if(revision == 1){
new DirectionalItemBuffer(20, 45f).read(stream);
new DirectionalItemBuffer(20, 45f).read(read);
}
}
}

17
core/src/mindustry/world/blocks/logic/MessageBlock.java
View File

@@ -1,7 +1,6 @@
package mindustry.world.blocks.logic;
import arc.*;
import mindustry.annotations.Annotations.*;
import arc.Input.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
@@ -9,7 +8,9 @@ import arc.math.geom.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import arc.util.io.*;
import arc.util.pooling.*;
import mindustry.annotations.Annotations.*;
import mindustry.entities.*;
import mindustry.gen.*;
import mindustry.net.*;
@@ -17,8 +18,6 @@ import mindustry.ui.*;
import mindustry.ui.dialogs.*;
import mindustry.world.*;
import java.io.*;
import static mindustry.Vars.*;
public class MessageBlock extends Block{
@@ -150,15 +149,15 @@ public class MessageBlock extends Block{
public String[] lines = {""};
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeUTF(message);
public void write(Writes write){
super.write(write);
write.str(message);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
message = stream.readUTF();
public void read(Reads read, byte revision){
super.read(read, revision);
message = read.str();
}
}
}

13
core/src/mindustry/world/blocks/power/ImpactReactor.java
View File

@@ -5,6 +5,7 @@ import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.game.EventType.*;
@@ -165,15 +166,15 @@ public class ImpactReactor extends PowerGenerator{
public float warmup;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(warmup);
public void write(Writes write){
super.write(write);
write.f(warmup);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
warmup = stream.readFloat();
public void read(Reads read, byte revision){
super.read(read, revision);
warmup = read.f();
}
}
}

13
core/src/mindustry/world/blocks/power/LightBlock.java
View File

@@ -4,6 +4,7 @@ import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.*;
@@ -80,15 +81,15 @@ public class LightBlock extends Block{
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeInt(color);
public void write(Writes write){
super.write(write);
write.i(color);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
color = stream.readInt();
public void read(Reads read, byte revision){
super.read(read, revision);
color = read.i();
}
}
}

13
core/src/mindustry/world/blocks/power/NuclearReactor.java
View File

@@ -6,6 +6,7 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.game.EventType.*;
@@ -186,15 +187,15 @@ public class NuclearReactor extends PowerGenerator{
public float flash;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(heat);
public void write(Writes write){
super.write(write);
write.f(heat);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
heat = stream.readFloat();
public void read(Reads read, byte revision){
super.read(read, revision);
heat = read.f();
}
}
}

13
core/src/mindustry/world/blocks/power/PowerGenerator.java
View File

@@ -3,6 +3,7 @@ package mindustry.world.blocks.power;
import arc.Core;
import arc.struct.EnumSet;
import arc.util.Strings;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.graphics.Pal;
import mindustry.ui.Bar;
@@ -59,15 +60,15 @@ public class PowerGenerator extends PowerDistributor{
public float productionEfficiency = 0.0f;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(productionEfficiency);
public void write(Writes write){
super.write(write);
write.f(productionEfficiency);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
productionEfficiency = stream.readFloat();
public void read(Reads read, byte revision){
super.read(read, revision);
productionEfficiency = read.f();
}
}
}

13
core/src/mindustry/world/blocks/production/Cultivator.java
View File

@@ -5,6 +5,7 @@ import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.graphics.*;
@@ -120,15 +121,15 @@ public class Cultivator extends GenericCrafter{
public float boost;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(warmup);
public void write(Writes write){
super.write(write);
write.f(warmup);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
warmup = stream.readFloat();
public void read(Reads read, byte revision){
super.read(read, revision);
warmup = read.f();
}
}
}

17
core/src/mindustry/world/blocks/production/GenericCrafter.java
View File

@@ -4,6 +4,7 @@ import arc.func.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.gen.*;
@@ -151,17 +152,17 @@ public class GenericCrafter extends Block{
public float warmup;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(progress);
stream.writeFloat(warmup);
public void write(Writes write){
super.write(write);
write.f(progress);
write.f(warmup);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
progress = stream.readFloat();
warmup = stream.readFloat();
public void read(Reads read, byte revision){
super.read(read, revision);
progress = read.f();
warmup = read.f();
}
}
}

13
core/src/mindustry/world/blocks/sandbox/ItemSource.java
View File

@@ -4,6 +4,7 @@ import arc.*;
import arc.graphics.g2d.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.entities.units.*;
import mindustry.type.*;
@@ -101,15 +102,15 @@ public class ItemSource extends Block{
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeShort(outputItem == null ? -1 : outputItem.id);
public void write(Writes write){
super.write(write);
write.s(outputItem == null ? -1 : outputItem.id);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
outputItem = content.item(stream.readShort());
public void read(Reads read, byte revision){
super.read(read, revision);
outputItem = content.item(read.s());
}
}
}

13
core/src/mindustry/world/blocks/sandbox/LiquidSource.java
View File

@@ -5,6 +5,7 @@ import arc.graphics.g2d.*;
import arc.scene.ui.layout.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.entities.units.*;
import mindustry.gen.*;
import mindustry.type.*;
@@ -97,15 +98,15 @@ public class LiquidSource extends Block{
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeByte(source == null ? -1 : source.id);
public void write(Writes write){
super.write(write);
write.b(source == null ? -1 : source.id);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
byte id = stream.readByte();
public void read(Reads read, byte revision){
super.read(read, revision);
byte id = read.b();
source = id == -1 ? null : content.liquid(id);
}
}

13
core/src/mindustry/world/blocks/storage/Unloader.java
View File

@@ -4,6 +4,7 @@ import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.entities.units.*;
import mindustry.type.*;
@@ -138,15 +139,15 @@ public class Unloader extends Block{
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeByte(sortItem == null ? -1 : sortItem.id);
public void write(Writes write){
super.write(write);
write.b(sortItem == null ? -1 : sortItem.id);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
byte id = stream.readByte();
public void read(Reads read, byte revision){
super.read(read, revision);
byte id = read.b();
sortItem = id == -1 ? null : content.items().get(id);
}
}

13
core/src/mindustry/world/blocks/units/CommandCenter.java
View File

@@ -8,6 +8,7 @@ import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.gen.*;
@@ -126,15 +127,15 @@ public class CommandCenter extends Block{
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeByte(command.ordinal());
public void write(Writes write){
super.write(write);
write.b(command.ordinal());
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
command = UnitCommand.all[stream.readByte()];
public void read(Reads read, byte revision){
super.read(read, revision);
command = UnitCommand.all[read.b()];
}
}
}

21
core/src/mindustry/world/blocks/units/MechPad.java
View File

@@ -6,6 +6,7 @@ import arc.math.geom.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.gen.*;
@@ -140,19 +141,19 @@ public class MechPad extends Block{
float heat;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(progress);
stream.writeFloat(time);
stream.writeFloat(heat);
public void write(Writes write){
super.write(write);
write.f(progress);
write.f(time);
write.f(heat);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
progress = stream.readFloat();
time = stream.readFloat();
heat = stream.readFloat();
public void read(Reads read, byte revision){
super.read(read, revision);
progress = read.f();
time = read.f();
heat = read.f();
}
}
}

17
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -4,6 +4,7 @@ import arc.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.struct.*;
import arc.util.io.*;
import mindustry.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
@@ -189,17 +190,17 @@ public class UnitFactory extends Block{
int spawned;
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(buildTime);
stream.writeInt(spawned);
public void write(Writes write){
super.write(write);
write.f(buildTime);
write.i(spawned);
}
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
buildTime = stream.readFloat();
spawned = stream.readInt();
public void read(Reads read, byte revision){
super.read(read, revision);
buildTime = read.f();
spawned = read.i();
}
}
}

7
core/src/mindustry/world/modules/BlockModule.java
View File

@@ -1,10 +1,9 @@
package mindustry.world.modules;
import java.io.*;
import arc.util.io.*;
/** A class that represents compartmentalized tile entity state. */
public abstract class BlockModule{
public abstract void write(DataOutput stream) throws IOException;
public abstract void read(DataInput stream) throws IOException;
public abstract void write(Writes write);
public abstract void read(Reads read);
}

11
core/src/mindustry/world/modules/ConsumeModule.java
View File

@@ -1,10 +1,9 @@
package mindustry.world.modules;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.world.consumers.Consume;
import java.io.*;
public class ConsumeModule extends BlockModule{
private boolean valid, optionalValid;
private final Tilec entity;
@@ -59,12 +58,12 @@ public class ConsumeModule extends BlockModule{
}
@Override
public void write(DataOutput stream) throws IOException{
stream.writeBoolean(valid);
public void write(Writes write){
write.bool(valid);
}
@Override
public void read(DataInput stream) throws IOException{
valid = stream.readBoolean();
public void read(Reads read){
valid = read.bool();
}
}

18
core/src/mindustry/world/modules/ItemModule.java
View File

@@ -1,9 +1,9 @@
package mindustry.world.modules;
import arc.util.io.*;
import mindustry.type.Item;
import mindustry.type.ItemStack;
import java.io.*;
import java.util.Arrays;
import static mindustry.Vars.content;
@@ -121,32 +121,32 @@ public class ItemModule extends BlockModule{
}
@Override
public void write(DataOutput stream) throws IOException{
public void write(Writes write){
byte amount = 0;
for(int item : items){
if(item > 0) amount++;
}
stream.writeByte(amount); //amount of items
write.b(amount); //amount of items
for(int i = 0; i < items.length; i++){
if(items[i] > 0){
stream.writeByte(i); //item ID
stream.writeInt(items[i]); //item amount
write.b(i); //item ID
write.i(items[i]); //item amount
}
}
}
@Override
public void read(DataInput stream) throws IOException{
public void read(Reads read){
//just in case, reset items
Arrays.fill(items, 0);
byte count = stream.readByte();
byte count = read.b();
total = 0;
for(int j = 0; j < count; j++){
int itemid = stream.readByte();
int itemamount = stream.readInt();
int itemid = read.b();
int itemamount = read.i();
items[content.item(itemid).id] = itemamount;
total += itemamount;
}

18
core/src/mindustry/world/modules/LiquidModule.java
View File

@@ -1,9 +1,9 @@
package mindustry.world.modules;
import arc.math.*;
import arc.util.io.*;
import mindustry.type.Liquid;
import java.io.*;
import java.util.Arrays;
import static mindustry.Vars.content;
@@ -83,31 +83,31 @@ public class LiquidModule extends BlockModule{
}
@Override
public void write(DataOutput stream) throws IOException{
public void write(Writes write){
byte amount = 0;
for(float liquid : liquids){
if(liquid > 0) amount++;
}
stream.writeByte(amount); //amount of liquids
write.b(amount); //amount of liquids
for(int i = 0; i < liquids.length; i++){
if(liquids[i] > 0){
stream.writeByte(i); //liquid ID
stream.writeFloat(liquids[i]); //item amount
write.b(i); //liquid ID
write.f(liquids[i]); //item amount
}
}
}
@Override
public void read(DataInput stream) throws IOException{
public void read(Reads read){
Arrays.fill(liquids, 0);
total = 0f;
byte count = stream.readByte();
byte count = read.b();
for(int j = 0; j < count; j++){
int liquidid = stream.readByte();
float amount = stream.readFloat();
int liquidid = read.b();
float amount = read.f();
liquids[liquidid] = amount;
if(amount > 0){
current = content.liquid(liquidid);

21
core/src/mindustry/world/modules/PowerModule.java
View File

@@ -1,12 +1,9 @@
package mindustry.world.modules;
import arc.struct.IntArray;
import arc.util.io.*;
import mindustry.world.blocks.power.PowerGraph;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
public class PowerModule extends BlockModule{
/**
* In case of unbuffered consumers, this is the percentage (1.0f = 100%) of the demanded power which can be supplied.
@@ -18,22 +15,22 @@ public class PowerModule extends BlockModule{
public IntArray links = new IntArray();
@Override
public void write(DataOutput stream) throws IOException{
stream.writeShort(links.size);
public void write(Writes write){
write.s(links.size);
for(int i = 0; i < links.size; i++){
stream.writeInt(links.get(i));
write.i(links.get(i));
}
stream.writeFloat(status);
write.f(status);
}
@Override
public void read(DataInput stream) throws IOException{
public void read(Reads read){
links.clear();
short amount = stream.readShort();
short amount = read.s();
for(int i = 0; i < amount; i++){
links.add(stream.readInt());
links.add(read.i());
}
status = stream.readFloat();
status = read.f();
if(Float.isNaN(status) || Float.isInfinite(status)) status = 0f;
}
}