Payload support

core/src/mindustry/entities/comp/BlockUnitComp.java

@@ -10,7 +10,7 @@ import static mindustry.Vars.tilesize;
 abstract class BlockUnitComp implements Unitc{
     @Import Team team;
 
-    @ReadOnly Tilec tile;
+    @ReadOnly transient Tilec tile;
 
     public void tile(Tilec tile){
         this.tile = tile;

core/src/mindustry/entities/comp/PayloadComp.java

@@ -1,12 +1,17 @@
 package mindustry.entities.comp;
 
+import arc.math.*;
 import arc.struct.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.gen.*;
+import mindustry.world.*;
 import mindustry.world.blocks.payloads.*;
 
 /** An entity that holds a payload. */
 @Component
-abstract class PayloadComp{
+abstract class PayloadComp implements Posc, Rotc{
     Array<Payload> payloads = new Array<>();
 
     boolean hasPayload(){
@@ -16,4 +21,72 @@ abstract class PayloadComp{
     void addPayload(Payload load){
         payloads.add(load);
     }
+
+    void pickup(Unitc unit){
+        unit.remove();
+        payloads.add(new UnitPayload(unit));
+        Fx.unitPickup.at(unit);
+    }
+
+    void pickup(Tilec tile){
+        tile.tile().remove();
+        payloads.add(new BlockPayload(tile));
+        Fx.unitPickup.at(tile);
+    }
+
+    boolean dropLastPayload(){
+        if(payloads.isEmpty()) return false;
+
+        Payload load = payloads.peek();
+
+        if(tryDropPayload(load)){
+            payloads.pop();
+
+            return true;
+        }
+        return false;
+    }
+
+    boolean tryDropPayload(Payload payload){
+        if(payload instanceof BlockPayload){
+            return dropBlock((BlockPayload)payload);
+        }else if(payload instanceof UnitPayload){
+            return dropUnit((UnitPayload)payload);
+        }
+        return false;
+    }
+
+    boolean dropUnit(UnitPayload payload){
+        //TODO create an effect here and/or make them be at a lower elevation
+        Unitc u = payload.unit;
+
+        //can't drop ground units
+        if((tileOn() == null || tileOn().solid()) && u.elevation() < 0.1f){
+            return false;
+        }
+
+        u.set(this);
+        u.trns(Tmp.v1.rnd(Mathf.random(2f)));
+        u.add();
+        Fx.unitDrop.at(u);
+
+        return true;
+    }
+
+    /** @return whether the tile has been successfully placed. */
+    boolean dropBlock(BlockPayload payload){
+        Tilec tile = payload.entity;
+        int tx = tileX(), ty = tileY();
+        Tile on = tileOn();
+        if(Build.validPlace(tile.team(), tx, ty, tile.block(), tile.rotation())){
+            int rot = (int)((rotation() + 45f) / 90f) % 4;
+            payload.place(tileOn(), rot);
+
+            Fx.unitDrop.at(tile);
+            Fx.placeBlock.at(on.drawx(), on.drawy(), on.block().size);
+            return true;
+        }
+
+        return false;
+    }
 }

core/src/mindustry/entities/comp/PosComp.java

@@ -40,13 +40,17 @@ abstract class PosComp implements Position{
     }
 
     /** Returns air if this unit is on a non-air top block. */
-    public Floor floorOn(){
+    Floor floorOn(){
         Tile tile = tileOn();
         return tile == null || tile.block() != Blocks.air ? (Floor)Blocks.air : tile.floor();
     }
 
-    public @Nullable
-    Tile tileOn(){
+     Block blockOn(){
+        Tile tile = tileOn();
+        return tile == null ? Blocks.air : tile.block();
+    }
+
+    @Nullable Tile tileOn(){
         return world.tileWorld(x, y);
     }
 

core/src/mindustry/entities/comp/PuddleComp.java

@@ -27,7 +27,8 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
 
     @Import float x, y;
 
-    float amount, lastRipple, accepting, updateTime;
+    transient float accepting, updateTime, lastRipple;
+    float amount;
     int generation;
     Tile tile;
     Liquid liquid;