Updated uCore

core/src/io/anuke/mindustry/core/Renderer.java

@@ -14,7 +14,7 @@ import io.anuke.mindustry.content.fx.Fx;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.entities.Unit;
-import io.anuke.mindustry.entities.effect.BelowLiquidEffect;
+import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
 import io.anuke.mindustry.entities.units.BaseUnit;
@@ -204,9 +204,9 @@ public class Renderer extends RendererModule{
 		
 		blocks.drawFloor();
 
-		EntityDraw.draw(groundEffectGroup, e -> e instanceof BelowLiquidEffect);
+		EntityDraw.draw(groundEffectGroup, e -> e instanceof BelowLiquidTrait);
 		EntityDraw.draw(puddleGroup);
-		EntityDraw.draw(groundEffectGroup, e -> !(e instanceof BelowLiquidEffect));
+		EntityDraw.draw(groundEffectGroup, e -> !(e instanceof BelowLiquidTrait));
 
 		blocks.processBlocks();
 		blocks.drawBlocks(Layer.block);

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

@@ -166,6 +166,7 @@ public class Player extends Unit implements BuilderTrait {
 	public void set(float x, float y){
 		this.x = x;
 		this.y = y;
+
 		if(isFlying() && isLocal){
 			Core.camera.position.set(x, y, 0f);
 		}

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

@@ -1,5 +0,0 @@
-package io.anuke.mindustry.entities.effect;
-
-/**A flag interface for marking an effect as appearing below liquids.*/
-public interface BelowLiquidEffect {
-}

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

@@ -6,6 +6,7 @@ import com.badlogic.gdx.utils.Pools;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.type.Item;
 import io.anuke.ucore.entities.EntityGroup;
+import io.anuke.ucore.entities.component.DrawTrait;
 import io.anuke.ucore.entities.impl.TimedEntity;
 import io.anuke.ucore.function.Callable;
 import io.anuke.ucore.graphics.Draw;
@@ -16,7 +17,7 @@ import io.anuke.ucore.util.Position;
 
 import static io.anuke.mindustry.Vars.effectGroup;
 
-public class ItemTransfer extends TimedEntity{
+public class ItemTransfer extends TimedEntity implements DrawTrait{
     private Vector2 from = new Vector2();
     private Vector2 current = new Vector2();
     private Vector2 tovec = new Vector2();

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

@@ -1,6 +1,7 @@
 package io.anuke.mindustry.entities.effect;
 
 import com.badlogic.gdx.graphics.Color;
+import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
 import io.anuke.ucore.entities.EntityGroup;
 import io.anuke.ucore.entities.impl.TimedEntity;
 import io.anuke.ucore.graphics.Draw;
@@ -9,7 +10,7 @@ import io.anuke.ucore.util.Mathf;
 import static io.anuke.mindustry.Vars.groundEffectGroup;
 
 /**Class for creating block rubble on the ground.*/
-public class Rubble extends TimedEntity implements BelowLiquidEffect{
+public class Rubble extends TimedEntity implements BelowLiquidTrait {
     private static final Color color = Color.valueOf("52504e");
     private int size;
 

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

@@ -0,0 +1,5 @@
+package io.anuke.mindustry.entities.traits;
+
+/**A flag interface for marking an effect as appearing below liquids.*/
+public interface BelowLiquidTrait {
+}