Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry

# Conflicts:
#	core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
#	gradle.properties

core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java

@@ -47,10 +47,8 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{
     @Remote(called = Loc.server)
     public static void transferItemTo(Item item, int amount, float x, float y, Tile tile){
         if(tile == null || tile.entity == null || tile.entity.items == null) return;
-        if(!Units.canInteract(player, tile)) return;
         for(int i = 0; i < Mathf.clamp(amount / 3, 1, 8); i++){
-            Time.run(i * 3, () -> create(item, x, y, tile, () -> {
-            }));
+            Time.run(i * 3, () -> create(item, x, y, tile, () -> {}));
         }
         tile.entity.items.add(item, amount);
     }

core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java

@@ -1,6 +1,5 @@
 package io.anuke.mindustry.entities.traits;
 
-import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.Queue;
 import io.anuke.arc.collection.*;
@@ -8,6 +7,7 @@ import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.type.*;
@@ -200,7 +200,8 @@ public interface BuilderTrait extends Entity, TeamTrait{
      * Return the build requests currently active, or the one at the top of the queue.
      * May return null.
      */
-    default @Nullable BuildRequest buildRequest(){
+    default @Nullable
+    BuildRequest buildRequest(){
         return buildQueue().size == 0 ? null : buildQueue().first();
     }
 

core/src/io/anuke/mindustry/entities/type/BaseUnit.java

@@ -6,6 +6,7 @@ import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
@@ -93,7 +94,8 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
         }
     }
 
-    public @Nullable Tile getSpawner(){
+    public @Nullable
+    Tile getSpawner(){
         return world.tile(spawner);
     }
 
@@ -263,7 +265,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
 
     @Override
     public boolean isFlying(){
-        return type.isFlying;
+        return type.flying;
     }
 
     @Override

core/src/io/anuke/mindustry/entities/type/Player.java

@@ -10,6 +10,7 @@ import io.anuke.arc.math.geom.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.arc.util.pooling.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
@@ -48,7 +49,8 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
     public float baseRotation;
     public float pointerX, pointerY;
     public String name = "noname";
-    public @Nullable String uuid, usid;
+    public @Nullable
+    String uuid, usid;
     public boolean isAdmin, isTransferring, isShooting, isBoosting, isMobile, isTyping;
     public float boostHeat, shootHeat, destructTime;
     public boolean achievedFlight;

core/src/io/anuke/mindustry/entities/type/TileEntity.java

@@ -7,6 +7,7 @@ import io.anuke.arc.collection.ObjectSet;
 import io.anuke.arc.math.geom.Point2;
 import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.traits.HealthTrait;
 import io.anuke.mindustry.entities.traits.TargetTrait;
@@ -42,7 +43,8 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
     private boolean dead = false;
     private boolean sleeping;
     private float sleepTime;
-    private @Nullable SoundLoop sound;
+    private @Nullable
+    SoundLoop sound;
 
     @Remote(called = Loc.server, unreliable = true)
     public static void onTileDamage(Tile tile, float health){

core/src/io/anuke/mindustry/entities/type/Unit.java

@@ -1,6 +1,5 @@
 package io.anuke.mindustry.entities.type;
 
-import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.graphics.*;
@@ -9,6 +8,7 @@ import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.effect.*;
@@ -234,7 +234,8 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
         }
     }
 
-    public @Nullable TileEntity getClosestCore(){
+    public @Nullable
+    TileEntity getClosestCore(){
         TeamData data = state.teams.get(team);
 
         Tile tile = Geometry.findClosest(x, y, data.cores);

core/src/io/anuke/mindustry/entities/type/base/BaseDrone.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
-import io.anuke.mindustry.entities.type.FlyingUnit;
 import io.anuke.mindustry.entities.units.*;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;

core/src/io/anuke/mindustry/entities/type/base/Crawler.java

@@ -1,6 +1,4 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.GroundUnit;
-
 public class Crawler extends GroundUnit{
 }

core/src/io/anuke/mindustry/entities/type/base/Dagger.java

@@ -1,7 +1,5 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.GroundUnit;
-
 public class Dagger extends GroundUnit{
 
 }

core/src/io/anuke/mindustry/entities/type/base/Eruptor.java

@@ -1,6 +1,4 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.GroundUnit;
-
 public class Eruptor extends GroundUnit{
 }

core/src/io/anuke/mindustry/entities/type/base/FlyingUnit.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
@@ -8,6 +8,7 @@ import io.anuke.arc.util.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.bullet.*;
+import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.entities.units.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.world.*;
@@ -15,7 +16,7 @@ import io.anuke.mindustry.world.meta.*;
 
 import static io.anuke.mindustry.Vars.*;
 
-public abstract class FlyingUnit extends BaseUnit{
+public class FlyingUnit extends BaseUnit{
     protected float[] weaponAngles = {0,0};
 
     protected final UnitState

core/src/io/anuke/mindustry/entities/type/base/Fortress.java

@@ -1,6 +1,4 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.GroundUnit;
-
 public class Fortress extends GroundUnit{
 }

core/src/io/anuke/mindustry/entities/type/base/Ghoul.java

@@ -1,7 +1,5 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.FlyingUnit;
-
 public class Ghoul extends FlyingUnit{
 
 }

core/src/io/anuke/mindustry/entities/type/base/GroundUnit.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
@@ -9,6 +9,7 @@ import io.anuke.mindustry.*;
 import io.anuke.mindustry.ai.Pathfinder.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.bullet.*;
+import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.entities.units.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.*;
@@ -18,7 +19,7 @@ import io.anuke.mindustry.world.meta.*;
 
 import static io.anuke.mindustry.Vars.*;
 
-public abstract class GroundUnit extends BaseUnit{
+public class GroundUnit extends BaseUnit{
     protected static Vector2 vec = new Vector2();
 
     protected float walkTime;

core/src/io/anuke/mindustry/entities/type/base/Revenant.java

@@ -4,7 +4,6 @@ import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 import io.anuke.mindustry.entities.Units;
-import io.anuke.mindustry.entities.type.FlyingUnit;
 
 public class Revenant extends FlyingUnit{
 

core/src/io/anuke/mindustry/entities/type/base/Titan.java

@@ -1,7 +1,5 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.GroundUnit;
-
 public class Titan extends GroundUnit{
 
 }

core/src/io/anuke/mindustry/entities/type/base/Wraith.java

@@ -1,7 +1,5 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.FlyingUnit;
-
 public class Wraith extends FlyingUnit{
 
 }