From d4ea8c56c365ac1b74ed719b56f62059d2582af7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 28 Oct 2018 22:29:23 -0400 Subject: [PATCH] Added TileEntity.read/writeConfig() --- .../mindustry/content/blocks/DebugBlocks.java | 8 +++--- .../anuke/mindustry/entities/TileEntity.java | 14 ++++++---- .../mindustry/entities/units/types/Drone.java | 3 +- .../anuke/mindustry/io/SaveFileVersion.java | 2 ++ .../src/io/anuke/mindustry/net/NetworkIO.java | 2 ++ .../mindustry/world/blocks/BuildBlock.java | 8 +++--- .../mindustry/world/blocks/defense/Door.java | 10 +++---- .../world/blocks/defense/ForceProjector.java | 8 +++--- .../world/blocks/defense/MendProjector.java | 8 +++--- .../blocks/defense/OverdriveProjector.java | 8 +++--- .../world/blocks/defense/turrets/Turret.java | 8 +++--- .../world/blocks/distribution/Conduit.java | 8 +++--- .../world/blocks/distribution/Conveyor.java | 8 +++--- .../world/blocks/distribution/ItemBridge.java | 8 +++--- .../world/blocks/distribution/MassDriver.java | 8 +++--- .../world/blocks/distribution/Sorter.java | 8 +++--- .../world/blocks/distribution/WarpGate.java | 8 +++--- .../world/blocks/power/ItemGenerator.java | 8 +++--- .../world/blocks/power/NuclearReactor.java | 10 +++---- .../world/blocks/production/Cultivator.java | 8 +++--- .../blocks/production/GenericCrafter.java | 8 +++--- .../world/blocks/production/PowerSmelter.java | 8 +++--- .../world/blocks/storage/CoreBlock.java | 8 +++--- .../world/blocks/storage/SortedUnloader.java | 8 +++--- .../world/blocks/units/CommandCenter.java | 8 +++--- .../world/blocks/units/DropPoint.java | 28 ------------------- .../mindustry/world/blocks/units/MechPad.java | 8 +++--- .../world/blocks/units/Reconstructor.java | 8 +++--- .../world/blocks/units/UnitFactory.java | 8 +++--- 29 files changed, 109 insertions(+), 136 deletions(-) delete mode 100644 core/src/io/anuke/mindustry/world/blocks/units/DropPoint.java diff --git a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java index bc6c5e37cc..db663a422a 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java @@ -22,8 +22,8 @@ import io.anuke.ucore.scene.ui.ButtonGroup; import io.anuke.ucore.scene.ui.ImageButton; import io.anuke.ucore.scene.ui.layout.Table; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.*; @@ -182,12 +182,12 @@ public class DebugBlocks extends BlockList implements ContentList{ public Liquid source = Liquids.water; @Override - public void write(DataOutputStream stream) throws IOException{ + public void writeConfig(DataOutput stream) throws IOException{ stream.writeByte(source.id); } @Override - public void read(DataInputStream stream) throws IOException{ + public void readConfig(DataInput stream) throws IOException{ source = content.liquid(stream.readByte()); } } diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java index ea3af6d622..cec34d962d 100644 --- a/core/src/io/anuke/mindustry/entities/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/TileEntity.java @@ -28,8 +28,8 @@ import io.anuke.ucore.entities.trait.HealthTrait; import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Timer; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.tileGroup; @@ -120,11 +120,13 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ 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){ return true; diff --git a/core/src/io/anuke/mindustry/entities/units/types/Drone.java b/core/src/io/anuke/mindustry/entities/units/types/Drone.java index 7e906ef758..85c9b9705a 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Drone.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Drone.java @@ -13,7 +13,6 @@ import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.FlyingUnit; import io.anuke.mindustry.entities.units.UnitCommand; 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.gen.Call; import io.anuke.mindustry.graphics.Palette; @@ -270,7 +269,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{ } 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); if(!state.is(build) && dist / type.maxVelocity < timeToBuild * 0.9f){ diff --git a/core/src/io/anuke/mindustry/io/SaveFileVersion.java b/core/src/io/anuke/mindustry/io/SaveFileVersion.java index 5f3d005030..b4b60634a9 100644 --- a/core/src/io/anuke/mindustry/io/SaveFileVersion.java +++ b/core/src/io/anuke/mindustry/io/SaveFileVersion.java @@ -67,6 +67,7 @@ public abstract class SaveFileVersion{ if(tile.entity.liquids != null) tile.entity.liquids.write(stream); if(tile.entity.cons != null) tile.entity.cons.write(stream); + tile.entity.writeConfig(stream); tile.entity.write(stream); }else if(tile.block() == Blocks.air){ int consecutives = 0; @@ -152,6 +153,7 @@ public abstract class SaveFileVersion{ if(tile.entity.liquids != null) tile.entity.liquids.read(stream); if(tile.entity.cons != null) tile.entity.cons.read(stream); + tile.entity.readConfig(stream); tile.entity.read(stream); if(tile.block() == StorageBlocks.core){ diff --git a/core/src/io/anuke/mindustry/net/NetworkIO.java b/core/src/io/anuke/mindustry/net/NetworkIO.java index f6a3abf58b..5f23abf5b3 100644 --- a/core/src/io/anuke/mindustry/net/NetworkIO.java +++ b/core/src/io/anuke/mindustry/net/NetworkIO.java @@ -73,6 +73,7 @@ public class NetworkIO{ if(tile.entity.liquids != null) tile.entity.liquids.write(stream); if(tile.entity.cons != null) tile.entity.cons.write(stream); + tile.entity.writeConfig(stream); tile.entity.write(stream); }else if(tile.block() == Blocks.air){ int consecutives = 0; @@ -229,6 +230,7 @@ public class NetworkIO{ if(tile.entity.liquids != null) tile.entity.liquids.read(stream); if(tile.entity.cons != null) tile.entity.cons.read(stream); + tile.entity.readConfig(stream); tile.entity.read(stream); }else if(wallid == 0){ int consecutives = stream.readUnsignedByte(); diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java index be34438d0c..e2fe0f5865 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java @@ -28,8 +28,8 @@ import io.anuke.ucore.core.Graphics; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.*; @@ -302,7 +302,7 @@ public class BuildBlock extends Block{ } @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeFloat(progress); stream.writeShort(previous == null ? -1 : previous.id); stream.writeShort(recipe == null ? -1 : recipe.result.id); @@ -319,7 +319,7 @@ public class BuildBlock extends Block{ } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ progress = stream.readFloat(); short pid = stream.readShort(); short rid = stream.readShort(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java index 6ae5589fc8..1c17e6e9d0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java @@ -12,8 +12,8 @@ import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Effects.Effect; import io.anuke.ucore.graphics.Draw; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.threads; @@ -89,14 +89,12 @@ public class Door extends Wall{ public boolean open = false; @Override - public void write(DataOutputStream stream) throws IOException{ - super.write(stream); + public void write(DataOutput stream) throws IOException{ stream.writeBoolean(open); } @Override - public void read(DataInputStream stream) throws IOException{ - super.read(stream); + public void read(DataInput stream) throws IOException{ open = stream.readBoolean(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java index 60259b398a..343faa4a9e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java @@ -25,8 +25,8 @@ import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Fill; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.*; @@ -197,7 +197,7 @@ public class ForceProjector extends Block { float phaseHeat; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeBoolean(broken); stream.writeFloat(buildup); stream.writeFloat(radscl); @@ -206,7 +206,7 @@ public class ForceProjector extends Block { } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ broken = stream.readBoolean(); buildup = stream.readFloat(); radscl = stream.readFloat(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java index c68cefd5a8..1119cf311f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java @@ -16,8 +16,8 @@ import io.anuke.ucore.graphics.Hue; import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.tilesize; @@ -131,13 +131,13 @@ public class MendProjector extends Block{ float phaseHeat; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeFloat(heat); stream.writeFloat(phaseHeat); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ heat = stream.readFloat(); phaseHeat = stream.readFloat(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java index 48c7166431..cb340d1e40 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java @@ -16,8 +16,8 @@ import io.anuke.ucore.graphics.Hue; import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.tilesize; @@ -133,13 +133,13 @@ public class OverdriveProjector extends Block{ float phaseHeat; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeFloat(heat); stream.writeFloat(phaseHeat); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ heat = stream.readFloat(); phaseHeat = stream.readFloat(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java index 1d86095bd8..5026064b88 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java @@ -31,8 +31,8 @@ import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.*; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.content; @@ -354,7 +354,7 @@ public abstract class Turret extends Block{ public TargetTrait target; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeByte(ammo.size); for(AmmoEntry entry : ammo){ stream.writeByte(entry.type.id); @@ -363,7 +363,7 @@ public abstract class Turret extends Block{ } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ byte amount = stream.readByte(); for(int i = 0; i < amount; i++){ AmmoType type = content.getByID(ContentType.ammo, stream.readByte()); diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java index cfc357c5bb..1abaf16411 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java @@ -9,8 +9,8 @@ import io.anuke.mindustry.world.modules.LiquidModule; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; public class Conduit extends LiquidBlock{ @@ -136,12 +136,12 @@ public class Conduit extends LiquidBlock{ int blendshadowrot; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeFloat(smoothLiquid); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ smoothLiquid = stream.readFloat(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java index 63a2680e43..a00510748b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java @@ -16,8 +16,8 @@ import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.util.*; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.*; @@ -384,7 +384,7 @@ public class Conveyor extends Block{ float clogHeat = 0f; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeInt(convey.size); for(int i = 0; i < convey.size; i++){ @@ -393,7 +393,7 @@ public class Conveyor extends Block{ } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ convey.clear(); int amount = stream.readInt(); convey.ensureCapacity(amount); diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java index ed3b5c3ebe..20bcb47b7a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java @@ -23,8 +23,8 @@ import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.Geometry; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.tilesize; @@ -325,7 +325,7 @@ public class ItemBridge extends Block{ public float cycleSpeed = 1f; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeInt(link); stream.writeFloat(uptime); stream.writeByte(incoming.size); @@ -338,7 +338,7 @@ public class ItemBridge extends Block{ } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ link = stream.readInt(); uptime = stream.readFloat(); byte links = stream.readByte(); diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java index 7301b1a30f..8e33ea1e4d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -30,8 +30,8 @@ import io.anuke.ucore.util.Angles; import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Pooling; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.*; @@ -322,13 +322,13 @@ public class MassDriver extends Block{ } @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeInt(link); stream.writeFloat(rotation); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ link = stream.readInt(); rotation = stream.readFloat(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java index f942c6650c..f9da9999b8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java @@ -14,8 +14,8 @@ import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.*; @@ -122,12 +122,12 @@ public class Sorter extends Block implements SelectionTrait{ public Item sortItem = content.item(0); @Override - public void write(DataOutputStream stream) throws IOException{ + public void writeConfig(DataOutput stream) throws IOException{ stream.writeByte(sortItem.id); } @Override - public void read(DataInputStream stream) throws IOException{ + public void readConfig(DataInput stream) throws IOException{ sortItem = content.items().get(stream.readByte()); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/WarpGate.java b/core/src/io/anuke/mindustry/world/blocks/distribution/WarpGate.java index f034b3969c..5ea2c97709 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/WarpGate.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/WarpGate.java @@ -27,8 +27,8 @@ import io.anuke.ucore.scene.ui.ImageButton; import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.tilesize; @@ -342,7 +342,7 @@ public class WarpGate extends PowerBlock{ public float time; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeByte(color); stream.writeBoolean(active); stream.writeFloat(activeScl); @@ -351,7 +351,7 @@ public class WarpGate extends PowerBlock{ } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ color = stream.readByte(); active = stream.readBoolean(); activeScl = stream.readFloat(); diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java index 450c984787..285cebb5fc 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java @@ -17,8 +17,8 @@ import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.tilesize; @@ -121,12 +121,12 @@ public abstract class ItemGenerator extends PowerGenerator{ public float explosiveness; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeFloat(efficiency); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ efficiency = stream.readFloat(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java index 8202f66615..43831f738c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java @@ -20,8 +20,8 @@ import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Translator; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.tilesize; @@ -202,14 +202,12 @@ public class NuclearReactor extends PowerGenerator{ public float flash; @Override - public void write(DataOutputStream stream) throws IOException{ - super.write(stream); + public void write(DataOutput stream) throws IOException{ stream.writeFloat(heat); } @Override - public void read(DataInputStream stream) throws IOException{ - super.read(stream); + public void read(DataInput stream) throws IOException{ heat = stream.readFloat(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java index 02256c0646..65eacb6ef7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java @@ -15,8 +15,8 @@ import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.SeedRandom; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; public class Cultivator extends Drill{ @@ -113,12 +113,12 @@ public class Cultivator extends Drill{ public float warmup; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeFloat(warmup); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ warmup = stream.readFloat(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java index 3de1799dd3..a0e08537f3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java @@ -18,8 +18,8 @@ import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; public class GenericCrafter extends Block{ @@ -125,13 +125,13 @@ public class GenericCrafter extends Block{ public float warmup; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeFloat(progress); stream.writeFloat(warmup); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ progress = stream.readFloat(); warmup = stream.readFloat(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java index 1f6948f785..a1e587315a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java @@ -19,8 +19,8 @@ import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Fill; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.*; @@ -210,12 +210,12 @@ public class PowerSmelter extends PowerBlock{ public float craftTime; @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeFloat(heat); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ heat = stream.readFloat(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index 3df2db69d3..591344afdb 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -30,8 +30,8 @@ import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.EnumSet; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.*; @@ -246,13 +246,13 @@ public class CoreBlock extends StorageBlock{ } @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeBoolean(solid); stream.writeInt(droneID); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ solid = stream.readBoolean(); droneID = stream.readInt(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java b/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java index c4677747e5..c50509f413 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java @@ -12,8 +12,8 @@ import io.anuke.mindustry.world.blocks.SelectionTrait; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.scene.ui.layout.Table; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.*; @@ -75,12 +75,12 @@ public class SortedUnloader extends Unloader implements SelectionTrait{ public Item sortItem = null; @Override - public void write(DataOutputStream stream) throws IOException{ + public void writeConfig(DataOutput stream) throws IOException{ stream.writeByte(sortItem == null ? -1 : sortItem.id); } @Override - public void read(DataInputStream stream) throws IOException{ + public void readConfig(DataInput stream) throws IOException{ byte id = stream.readByte(); sortItem = id == -1 ? null : content.items().get(id); } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java index 25c816a52a..87e672e337 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java @@ -24,8 +24,8 @@ import io.anuke.ucore.scene.ui.ImageButton; import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.util.EnumSet; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.*; @@ -115,12 +115,12 @@ public class CommandCenter extends Block{ public UnitCommand command = UnitCommand.attack; @Override - public void write(DataOutputStream stream) throws IOException{ + public void writeConfig(DataOutput stream) throws IOException{ stream.writeByte(command.ordinal()); } @Override - public void read(DataInputStream stream) throws IOException{ + public void readConfig(DataInput stream) throws IOException{ command = UnitCommand.values()[stream.readByte()]; } } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/DropPoint.java b/core/src/io/anuke/mindustry/world/blocks/units/DropPoint.java deleted file mode 100644 index 8acdf20be9..0000000000 --- a/core/src/io/anuke/mindustry/world/blocks/units/DropPoint.java +++ /dev/null @@ -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); - } - } -} diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java index 2370dbe295..38cec398f8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java @@ -27,8 +27,8 @@ import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.Geometry; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.mobile; @@ -237,14 +237,14 @@ public class MechPad extends Block{ } @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeFloat(progress); stream.writeFloat(time); stream.writeFloat(heat); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ progress = stream.readFloat(); time = stream.readFloat(); heat = stream.readFloat(); diff --git a/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java b/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java index b55fe56774..066f8584f2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java @@ -23,8 +23,8 @@ import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.*; @@ -329,12 +329,12 @@ public class Reconstructor extends Block{ } @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeInt(link); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ link = stream.readInt(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java index ae28270215..ae7b2f98c5 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -30,8 +30,8 @@ import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.EnumSet; import io.anuke.ucore.util.Mathf; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; public class UnitFactory extends Block{ @@ -227,13 +227,13 @@ public class UnitFactory extends Block{ public float warmup; //only for enemy spawners @Override - public void write(DataOutputStream stream) throws IOException{ + public void write(DataOutput stream) throws IOException{ stream.writeFloat(buildTime); stream.writeFloat(warmup); } @Override - public void read(DataInputStream stream) throws IOException{ + public void read(DataInput stream) throws IOException{ buildTime = stream.readFloat(); warmup = stream.readFloat(); }