Merge remote-tracking branch 'origin/4.0' into 4.0

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

@@ -23,6 +23,7 @@ import io.anuke.ucore.entities.impl.EffectEntity;
 import io.anuke.ucore.entities.trait.DrawTrait;
 import io.anuke.ucore.scene.ui.layout.Unit;
 import io.anuke.ucore.util.OS;
+import io.anuke.ucore.util.Translator;
 
 import java.util.Locale;
 
@@ -130,6 +131,8 @@ public class Vars{
     public static EntityGroup<Fire> fireGroup;
     public static EntityGroup<BaseUnit>[] unitGroups;
 
+    public static final Translator[] tmptr = new Translator[]{new Translator(), new Translator(), new Translator(), new Translator()};
+
     public static void init(){
         Version.init();
 

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

@@ -33,5 +33,10 @@ public abstract class Decal extends TimedEntity implements BelowLiquidTrait, Dra
         return groundEffectGroup;
     }
 
+    @Override
+    public float fin() {
+        return time / lifetime();
+    }
+
     abstract void drawDecal();
 }

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

@@ -134,4 +134,9 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{
     public EntityGroup targetGroup(){
         return effectGroup;
     }
+
+    @Override
+    public float fin(){
+        return time() / lifetime();
+    }
 }

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

@@ -34,6 +34,7 @@ import java.io.IOException;
 import java.util.Arrays;
 
 import static io.anuke.mindustry.Vars.tilesize;
+import static io.anuke.mindustry.Vars.tmptr;
 import static io.anuke.mindustry.Vars.world;
 
 /**
@@ -41,7 +42,6 @@ import static io.anuke.mindustry.Vars.world;
  */
 public interface BuilderTrait extends Entity{
     //these are not instance variables!
-    Translator[] tmptr = {new Translator(), new Translator(), new Translator(), new Translator()};
     float placeDistance = 140f;
     float mineDistance = 70f;