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

Added TileEntity.read/writeConfig()

Browse Source
This commit is contained in:
Anuken
2018-10-28 22:29:23 -04:00
parent ac918c1a81
commit d4ea8c56c3
29 changed files with 109 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
+4 -4
View File
@@ -22,8 +22,8 @@ import io.anuke.ucore.scene.ui.ButtonGroup;
import io.anuke.ucore.scene.ui.ImageButton; import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -182,12 +182,12 @@ public class DebugBlocks extends BlockList implements ContentList{
public Liquid source = Liquids.water; public Liquid source = Liquids.water;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void writeConfig(DataOutput stream) throws IOException{
stream.writeByte(source.id); stream.writeByte(source.id);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void readConfig(DataInput stream) throws IOException{
source = content.liquid(stream.readByte()); source = content.liquid(stream.readByte());
} }
} }
core/src/io/anuke/mindustry/entities/TileEntity.java
+8 -6
View File
@@ -28,8 +28,8 @@ import io.anuke.ucore.entities.trait.HealthTrait;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timer; import io.anuke.ucore.util.Timer;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.tileGroup; import static io.anuke.mindustry.Vars.tileGroup;
@@ -120,11 +120,13 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
return dead || tile.entity != this; return dead || tile.entity != this;
} }
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{}
}
public void read(DataInputStream stream) throws IOException{ public void writeConfig(DataOutput stream) throws IOException{}
}
public void read(DataInput stream) throws IOException{}
public void readConfig(DataInput stream) throws IOException{}
public boolean collide(Bullet other){ public boolean collide(Bullet other){
return true; return true;
core/src/io/anuke/mindustry/entities/units/types/Drone.java
+1 -2
View File
@@ -13,7 +13,6 @@ import io.anuke.mindustry.entities.units.BaseUnit;
import io.anuke.mindustry.entities.units.FlyingUnit; import io.anuke.mindustry.entities.units.FlyingUnit;
import io.anuke.mindustry.entities.units.UnitCommand; import io.anuke.mindustry.entities.units.UnitCommand;
import io.anuke.mindustry.entities.units.UnitState; import io.anuke.mindustry.entities.units.UnitState;
import io.anuke.mindustry.game.EventType.BlockBuildBeginEvent;
import io.anuke.mindustry.game.EventType.BuildSelectEvent; import io.anuke.mindustry.game.EventType.BuildSelectEvent;
import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;
@@ -270,7 +269,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
} }
private void notifyPlaced(BuildEntity entity, boolean isBreaking){ private void notifyPlaced(BuildEntity entity, boolean isBreaking){
float timeToBuild = entity.recipe.cost; float timeToBuild = entity.buildCost;
float dist = Math.min(entity.distanceTo(x, y) - placeDistance, 0); float dist = Math.min(entity.distanceTo(x, y) - placeDistance, 0);
if(!state.is(build) && dist / type.maxVelocity < timeToBuild * 0.9f){ if(!state.is(build) && dist / type.maxVelocity < timeToBuild * 0.9f){
core/src/io/anuke/mindustry/io/SaveFileVersion.java
+2
View File
@@ -67,6 +67,7 @@ public abstract class SaveFileVersion{
if(tile.entity.liquids != null) tile.entity.liquids.write(stream); if(tile.entity.liquids != null) tile.entity.liquids.write(stream);
if(tile.entity.cons != null) tile.entity.cons.write(stream); if(tile.entity.cons != null) tile.entity.cons.write(stream);
tile.entity.writeConfig(stream);
tile.entity.write(stream); tile.entity.write(stream);
}else if(tile.block() == Blocks.air){ }else if(tile.block() == Blocks.air){
int consecutives = 0; int consecutives = 0;
@@ -152,6 +153,7 @@ public abstract class SaveFileVersion{
if(tile.entity.liquids != null) tile.entity.liquids.read(stream); if(tile.entity.liquids != null) tile.entity.liquids.read(stream);
if(tile.entity.cons != null) tile.entity.cons.read(stream); if(tile.entity.cons != null) tile.entity.cons.read(stream);
tile.entity.readConfig(stream);
tile.entity.read(stream); tile.entity.read(stream);
if(tile.block() == StorageBlocks.core){ if(tile.block() == StorageBlocks.core){
core/src/io/anuke/mindustry/net/NetworkIO.java
+2
View File
@@ -73,6 +73,7 @@ public class NetworkIO{
if(tile.entity.liquids != null) tile.entity.liquids.write(stream); if(tile.entity.liquids != null) tile.entity.liquids.write(stream);
if(tile.entity.cons != null) tile.entity.cons.write(stream); if(tile.entity.cons != null) tile.entity.cons.write(stream);
tile.entity.writeConfig(stream);
tile.entity.write(stream); tile.entity.write(stream);
}else if(tile.block() == Blocks.air){ }else if(tile.block() == Blocks.air){
int consecutives = 0; int consecutives = 0;
@@ -229,6 +230,7 @@ public class NetworkIO{
if(tile.entity.liquids != null) tile.entity.liquids.read(stream); if(tile.entity.liquids != null) tile.entity.liquids.read(stream);
if(tile.entity.cons != null) tile.entity.cons.read(stream); if(tile.entity.cons != null) tile.entity.cons.read(stream);
tile.entity.readConfig(stream);
tile.entity.read(stream); tile.entity.read(stream);
}else if(wallid == 0){ }else if(wallid == 0){
int consecutives = stream.readUnsignedByte(); int consecutives = stream.readUnsignedByte();
core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+4 -4
View File
@@ -28,8 +28,8 @@ import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -302,7 +302,7 @@ public class BuildBlock extends Block{
} }
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeFloat(progress); stream.writeFloat(progress);
stream.writeShort(previous == null ? -1 : previous.id); stream.writeShort(previous == null ? -1 : previous.id);
stream.writeShort(recipe == null ? -1 : recipe.result.id); stream.writeShort(recipe == null ? -1 : recipe.result.id);
@@ -319,7 +319,7 @@ public class BuildBlock extends Block{
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
progress = stream.readFloat(); progress = stream.readFloat();
short pid = stream.readShort(); short pid = stream.readShort();
short rid = stream.readShort(); short rid = stream.readShort();
core/src/io/anuke/mindustry/world/blocks/defense/Door.java
+4 -6
View File
@@ -12,8 +12,8 @@ import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Effects.Effect; import io.anuke.ucore.core.Effects.Effect;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.threads; import static io.anuke.mindustry.Vars.threads;
@@ -89,14 +89,12 @@ public class Door extends Wall{
public boolean open = false; public boolean open = false;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeBoolean(open); stream.writeBoolean(open);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
super.read(stream);
open = stream.readBoolean(); open = stream.readBoolean();
} }
} }
core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
+4 -4
View File
@@ -25,8 +25,8 @@ import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Fill; import io.anuke.ucore.graphics.Fill;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -197,7 +197,7 @@ public class ForceProjector extends Block {
float phaseHeat; float phaseHeat;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeBoolean(broken); stream.writeBoolean(broken);
stream.writeFloat(buildup); stream.writeFloat(buildup);
stream.writeFloat(radscl); stream.writeFloat(radscl);
@@ -206,7 +206,7 @@ public class ForceProjector extends Block {
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
broken = stream.readBoolean(); broken = stream.readBoolean();
buildup = stream.readFloat(); buildup = stream.readFloat();
radscl = stream.readFloat(); radscl = stream.readFloat();
core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java
+4 -4
View File
@@ -16,8 +16,8 @@ import io.anuke.ucore.graphics.Hue;
import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.tilesize;
@@ -131,13 +131,13 @@ public class MendProjector extends Block{
float phaseHeat; float phaseHeat;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeFloat(heat); stream.writeFloat(heat);
stream.writeFloat(phaseHeat); stream.writeFloat(phaseHeat);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
heat = stream.readFloat(); heat = stream.readFloat();
phaseHeat = stream.readFloat(); phaseHeat = stream.readFloat();
} }
core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java
+4 -4
View File
@@ -16,8 +16,8 @@ import io.anuke.ucore.graphics.Hue;
import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.tilesize;
@@ -133,13 +133,13 @@ public class OverdriveProjector extends Block{
float phaseHeat; float phaseHeat;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeFloat(heat); stream.writeFloat(heat);
stream.writeFloat(phaseHeat); stream.writeFloat(phaseHeat);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
heat = stream.readFloat(); heat = stream.readFloat();
phaseHeat = stream.readFloat(); phaseHeat = stream.readFloat();
} }
core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
+4 -4
View File
@@ -31,8 +31,8 @@ import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.*; import io.anuke.ucore.util.*;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.content;
@@ -354,7 +354,7 @@ public abstract class Turret extends Block{
public TargetTrait target; public TargetTrait target;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeByte(ammo.size); stream.writeByte(ammo.size);
for(AmmoEntry entry : ammo){ for(AmmoEntry entry : ammo){
stream.writeByte(entry.type.id); stream.writeByte(entry.type.id);
@@ -363,7 +363,7 @@ public abstract class Turret extends Block{
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
byte amount = stream.readByte(); byte amount = stream.readByte();
for(int i = 0; i < amount; i++){ for(int i = 0; i < amount; i++){
AmmoType type = content.getByID(ContentType.ammo, stream.readByte()); AmmoType type = content.getByID(ContentType.ammo, stream.readByte());
core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
+4 -4
View File
@@ -9,8 +9,8 @@ import io.anuke.mindustry.world.modules.LiquidModule;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
public class Conduit extends LiquidBlock{ public class Conduit extends LiquidBlock{
@@ -136,12 +136,12 @@ public class Conduit extends LiquidBlock{
int blendshadowrot; int blendshadowrot;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeFloat(smoothLiquid); stream.writeFloat(smoothLiquid);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
smoothLiquid = stream.readFloat(); smoothLiquid = stream.readFloat();
} }
} }
core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
+4 -4
View File
@@ -16,8 +16,8 @@ import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.util.*; import io.anuke.ucore.util.*;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -384,7 +384,7 @@ public class Conveyor extends Block{
float clogHeat = 0f; float clogHeat = 0f;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeInt(convey.size); stream.writeInt(convey.size);
for(int i = 0; i < convey.size; i++){ for(int i = 0; i < convey.size; i++){
@@ -393,7 +393,7 @@ public class Conveyor extends Block{
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
convey.clear(); convey.clear();
int amount = stream.readInt(); int amount = stream.readInt();
convey.ensureCapacity(amount); convey.ensureCapacity(amount);
core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
+4 -4
View File
@@ -23,8 +23,8 @@ import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.Geometry; import io.anuke.ucore.util.Geometry;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.tilesize;
@@ -325,7 +325,7 @@ public class ItemBridge extends Block{
public float cycleSpeed = 1f; public float cycleSpeed = 1f;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeInt(link); stream.writeInt(link);
stream.writeFloat(uptime); stream.writeFloat(uptime);
stream.writeByte(incoming.size); stream.writeByte(incoming.size);
@@ -338,7 +338,7 @@ public class ItemBridge extends Block{
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
link = stream.readInt(); link = stream.readInt();
uptime = stream.readFloat(); uptime = stream.readFloat();
byte links = stream.readByte(); byte links = stream.readByte();
core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
+4 -4
View File
@@ -30,8 +30,8 @@ import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Pooling; import io.anuke.ucore.util.Pooling;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -322,13 +322,13 @@ public class MassDriver extends Block{
} }
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeInt(link); stream.writeInt(link);
stream.writeFloat(rotation); stream.writeFloat(rotation);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
link = stream.readInt(); link = stream.readInt();
rotation = stream.readFloat(); rotation = stream.readFloat();
} }
core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java
+4 -4
View File
@@ -14,8 +14,8 @@ import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -122,12 +122,12 @@ public class Sorter extends Block implements SelectionTrait{
public Item sortItem = content.item(0); public Item sortItem = content.item(0);
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void writeConfig(DataOutput stream) throws IOException{
stream.writeByte(sortItem.id); stream.writeByte(sortItem.id);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void readConfig(DataInput stream) throws IOException{
sortItem = content.items().get(stream.readByte()); sortItem = content.items().get(stream.readByte());
} }
} }
core/src/io/anuke/mindustry/world/blocks/distribution/WarpGate.java
+4 -4
View File
@@ -27,8 +27,8 @@ import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.tilesize;
@@ -342,7 +342,7 @@ public class WarpGate extends PowerBlock{
public float time; public float time;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeByte(color); stream.writeByte(color);
stream.writeBoolean(active); stream.writeBoolean(active);
stream.writeFloat(activeScl); stream.writeFloat(activeScl);
@@ -351,7 +351,7 @@ public class WarpGate extends PowerBlock{
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
color = stream.readByte(); color = stream.readByte();
active = stream.readBoolean(); active = stream.readBoolean();
activeScl = stream.readFloat(); activeScl = stream.readFloat();
core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java
+4 -4
View File
@@ -17,8 +17,8 @@ import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.tilesize;
@@ -121,12 +121,12 @@ public abstract class ItemGenerator extends PowerGenerator{
public float explosiveness; public float explosiveness;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeFloat(efficiency); stream.writeFloat(efficiency);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
efficiency = stream.readFloat(); efficiency = stream.readFloat();
} }
} }
core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java
+4 -6
View File
@@ -20,8 +20,8 @@ import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Translator; import io.anuke.ucore.util.Translator;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.tilesize;
@@ -202,14 +202,12 @@ public class NuclearReactor extends PowerGenerator{
public float flash; public float flash;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
super.write(stream);
stream.writeFloat(heat); stream.writeFloat(heat);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
super.read(stream);
heat = stream.readFloat(); heat = stream.readFloat();
} }
} }
core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java
+4 -4
View File
@@ -15,8 +15,8 @@ import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.SeedRandom; import io.anuke.ucore.util.SeedRandom;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
public class Cultivator extends Drill{ public class Cultivator extends Drill{
@@ -113,12 +113,12 @@ public class Cultivator extends Drill{
public float warmup; public float warmup;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeFloat(warmup); stream.writeFloat(warmup);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
warmup = stream.readFloat(); warmup = stream.readFloat();
} }
} }
core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java
+4 -4
View File
@@ -18,8 +18,8 @@ import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
public class GenericCrafter extends Block{ public class GenericCrafter extends Block{
@@ -125,13 +125,13 @@ public class GenericCrafter extends Block{
public float warmup; public float warmup;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeFloat(progress); stream.writeFloat(progress);
stream.writeFloat(warmup); stream.writeFloat(warmup);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
progress = stream.readFloat(); progress = stream.readFloat();
warmup = stream.readFloat(); warmup = stream.readFloat();
} }
core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java
+4 -4
View File
@@ -19,8 +19,8 @@ import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Fill; import io.anuke.ucore.graphics.Fill;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -210,12 +210,12 @@ public class PowerSmelter extends PowerBlock{
public float craftTime; public float craftTime;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeFloat(heat); stream.writeFloat(heat);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
heat = stream.readFloat(); heat = stream.readFloat();
} }
} }
core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
+4 -4
View File
@@ -30,8 +30,8 @@ import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.EnumSet; import io.anuke.ucore.util.EnumSet;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -246,13 +246,13 @@ public class CoreBlock extends StorageBlock{
} }
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeBoolean(solid); stream.writeBoolean(solid);
stream.writeInt(droneID); stream.writeInt(droneID);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
solid = stream.readBoolean(); solid = stream.readBoolean();
droneID = stream.readInt(); droneID = stream.readInt();
} }
core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java
+4 -4
View File
@@ -12,8 +12,8 @@ import io.anuke.mindustry.world.blocks.SelectionTrait;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -75,12 +75,12 @@ public class SortedUnloader extends Unloader implements SelectionTrait{
public Item sortItem = null; public Item sortItem = null;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void writeConfig(DataOutput stream) throws IOException{
stream.writeByte(sortItem == null ? -1 : sortItem.id); stream.writeByte(sortItem == null ? -1 : sortItem.id);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void readConfig(DataInput stream) throws IOException{
byte id = stream.readByte(); byte id = stream.readByte();
sortItem = id == -1 ? null : content.items().get(id); sortItem = id == -1 ? null : content.items().get(id);
} }
core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java
+4 -4
View File
@@ -24,8 +24,8 @@ import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.EnumSet; import io.anuke.ucore.util.EnumSet;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -115,12 +115,12 @@ public class CommandCenter extends Block{
public UnitCommand command = UnitCommand.attack; public UnitCommand command = UnitCommand.attack;
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void writeConfig(DataOutput stream) throws IOException{
stream.writeByte(command.ordinal()); stream.writeByte(command.ordinal());
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void readConfig(DataInput stream) throws IOException{
command = UnitCommand.values()[stream.readByte()]; command = UnitCommand.values()[stream.readByte()];
} }
} }
core/src/io/anuke/mindustry/world/blocks/units/DropPoint.java
-28
View File
@@ -1,28 +0,0 @@
package io.anuke.mindustry.world.blocks.units;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
public class DropPoint extends Block{
public DropPoint(String name){
super(name);
hasItems = true;
solid = true;
update = true;
}
@Override
public boolean acceptItem(Item item, Tile tile, Tile source){
return false;
}
@Override
public void update(Tile tile){
if(tile.entity.items.total() > 0){
tryDump(tile);
}
}
}
core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
+4 -4
View File
@@ -27,8 +27,8 @@ import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.Geometry; import io.anuke.ucore.util.Geometry;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.mobile; import static io.anuke.mindustry.Vars.mobile;
@@ -237,14 +237,14 @@ public class MechPad extends Block{
} }
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeFloat(progress); stream.writeFloat(progress);
stream.writeFloat(time); stream.writeFloat(time);
stream.writeFloat(heat); stream.writeFloat(heat);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
progress = stream.readFloat(); progress = stream.readFloat();
time = stream.readFloat(); time = stream.readFloat();
heat = stream.readFloat(); heat = stream.readFloat();
core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java
+4 -4
View File
@@ -23,8 +23,8 @@ import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -329,12 +329,12 @@ public class Reconstructor extends Block{
} }
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeInt(link); stream.writeInt(link);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
link = stream.readInt(); link = stream.readInt();
} }
} }
core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
+4 -4
View File
@@ -30,8 +30,8 @@ import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.EnumSet; import io.anuke.ucore.util.EnumSet;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.io.DataInputStream; import java.io.DataInput;
import java.io.DataOutputStream; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
public class UnitFactory extends Block{ public class UnitFactory extends Block{
@@ -227,13 +227,13 @@ public class UnitFactory extends Block{
public float warmup; //only for enemy spawners public float warmup; //only for enemy spawners
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutput stream) throws IOException{
stream.writeFloat(buildTime); stream.writeFloat(buildTime);
stream.writeFloat(warmup); stream.writeFloat(warmup);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInput stream) throws IOException{
buildTime = stream.readFloat(); buildTime = stream.readFloat();
warmup = stream.readFloat(); warmup = stream.readFloat();
} }