diff --git a/core/assets/scripts/base.js b/core/assets/scripts/base.js
index fd92b48f74..ab3d740c91 100755
--- a/core/assets/scripts/base.js
+++ b/core/assets/scripts/base.js
@@ -8,4 +8,8 @@ const extendContent = function(classType, name, params){
 
 const extend = function(classType, params){
     return new JavaAdapter(classType, params)
-}
\ No newline at end of file
+}
+
+const run = method => new java.lang.Runnable(){run: method}
+const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer}))
+const Calls = Packages.io.anuke.mindustry.gen.Call
\ No newline at end of file
diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js
index c23b01a8aa..60a315c74b 100755
--- a/core/assets/scripts/global.js
+++ b/core/assets/scripts/global.js
@@ -11,8 +11,13 @@ const extendContent = function(classType, name, params){
 const extend = function(classType, params){
     return new JavaAdapter(classType, params)
 }
+
+const run = method => new java.lang.Runnable(){run: method}
+const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer}))
+const Calls = Packages.io.anuke.mindustry.gen.Call
 importPackage(Packages.io.anuke.arc)
 importPackage(Packages.io.anuke.arc.collection)
+importPackage(Packages.io.anuke.arc.func)
 importPackage(Packages.io.anuke.arc.graphics)
 importPackage(Packages.io.anuke.arc.graphics.g2d)
 importPackage(Packages.io.anuke.arc.math)
@@ -38,6 +43,7 @@ importPackage(Packages.io.anuke.mindustry.entities.type)
 importPackage(Packages.io.anuke.mindustry.entities.type.base)
 importPackage(Packages.io.anuke.mindustry.entities.units)
 importPackage(Packages.io.anuke.mindustry.game)
+importPackage(Packages.io.anuke.mindustry.gen)
 importPackage(Packages.io.anuke.mindustry.graphics)
 importPackage(Packages.io.anuke.mindustry.input)
 importPackage(Packages.io.anuke.mindustry.maps)
diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index b68c24587a..167e1289ae 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -484,7 +484,7 @@ public class Blocks implements ContentList{
             drawer = tile -> {
                 Draw.rect(region, tile.drawx(), tile.drawy());
 
-                GenericCrafterEntity entity = tile.entity();
+                GenericCrafterEntity entity = tile.ent();
 
                 Draw.alpha(Mathf.absin(entity.totalProgress, 3f, 0.9f) * entity.warmup);
                 Draw.rect(reg(topRegion), tile.drawx(), tile.drawy());
@@ -509,7 +509,7 @@ public class Blocks implements ContentList{
             drawIcons = () -> new TextureRegion[]{Core.atlas.find(name + "-bottom"), Core.atlas.find(name), Core.atlas.find(name + "-weave")};
 
             drawer = tile -> {
-                GenericCrafterEntity entity = tile.entity();
+                GenericCrafterEntity entity = tile.ent();
 
                 Draw.rect(reg(bottomRegion), tile.drawx(), tile.drawy());
                 Draw.rect(reg(weaveRegion), tile.drawx(), tile.drawy(), entity.totalProgress);
@@ -659,7 +659,7 @@ public class Blocks implements ContentList{
             drawIcons = () -> new TextureRegion[]{Core.atlas.find(name), Core.atlas.find(name + "-top")};
 
             drawer = tile -> {
-                GenericCrafterEntity entity = tile.entity();
+                GenericCrafterEntity entity = tile.ent();
 
                 Draw.rect(region, tile.drawx(), tile.drawy());
                 Draw.rect(reg(frameRegions[(int)Mathf.absin(entity.totalProgress, 5f, 2.999f)]), tile.drawx(), tile.drawy());
@@ -686,7 +686,7 @@ public class Blocks implements ContentList{
             drawIcons = () -> new TextureRegion[]{Core.atlas.find(name), Core.atlas.find(name + "-rotator")};
 
             drawer = tile -> {
-                GenericCrafterEntity entity = tile.entity();
+                GenericCrafterEntity entity = tile.ent();
 
                 Draw.rect(region, tile.drawx(), tile.drawy());
                 Draw.rect(reg(rotatorRegion), tile.drawx(), tile.drawy(), entity.totalProgress * 2f);
diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java
index 91b7e9ba3a..69c667e625 100644
--- a/core/src/io/anuke/mindustry/core/Logic.java
+++ b/core/src/io/anuke/mindustry/core/Logic.java
@@ -52,7 +52,7 @@ public class Logic implements ApplicationListener{
 
             if(block instanceof BuildBlock){
 
-                BuildEntity entity = tile.entity();
+                BuildEntity entity = tile.ent();
 
                 //update block to reflect the fact that something was being constructed
                 if(entity.cblock != null && entity.cblock.synthetic()){
diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java
index 149bb9b4d8..e637c6081e 100644
--- a/core/src/io/anuke/mindustry/entities/Damage.java
+++ b/core/src/io/anuke/mindustry/entities/Damage.java
@@ -38,7 +38,7 @@ public class Damage{
         }
 
         for(int i = 0; i < Mathf.clamp(flammability / 4, 0, 30); i++){
-            Time.run(i / 2f, () -> Call.createBullet(Bullets.fireball, x, y, Mathf.random(360f)));
+            Time.run(i / 2f, () -> Call.createBullet(Bullets.fireball, Team.derelict, x, y, Mathf.random(360f), 1, 1));
         }
 
         int waves = Mathf.clamp((int)(explosiveness / 4), 0, 30);
diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/io/anuke/mindustry/entities/effect/Fire.java
index 2c47550426..8546ec45e8 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Fire.java
+++ b/core/src/io/anuke/mindustry/entities/effect/Fire.java
@@ -10,10 +10,10 @@ import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.TimedEntity;
 import io.anuke.mindustry.game.EventType.*;
+import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.type.TypeID;
+import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;
 
 import java.io.*;
@@ -144,7 +144,7 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait{
             create(other);
 
             if(Mathf.chance(fireballChance * Time.delta() * Mathf.clamp(flammability / 10f))){
-                Call.createBullet(Bullets.fireball, x, y, Mathf.random(360f));
+                Call.createBullet(Bullets.fireball, Team.derelict, x, y, Mathf.random(360f), 1, 1);
             }
         }
 
diff --git a/core/src/io/anuke/mindustry/entities/effect/Puddle.java b/core/src/io/anuke/mindustry/entities/effect/Puddle.java
index e7f1330a10..e53e40e8dc 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Puddle.java
+++ b/core/src/io/anuke/mindustry/entities/effect/Puddle.java
@@ -1,25 +1,22 @@
 package io.anuke.mindustry.entities.effect;
 
-import io.anuke.annotations.Annotations.Loc;
-import io.anuke.annotations.Annotations.Remote;
-import io.anuke.arc.collection.IntMap;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.Fill;
-import io.anuke.arc.math.Angles;
-import io.anuke.arc.math.Mathf;
+import io.anuke.annotations.Annotations.*;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.graphics.g2d.*;
+import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.pooling.Pool.Poolable;
-import io.anuke.arc.util.pooling.Pools;
+import io.anuke.arc.util.*;
+import io.anuke.arc.util.pooling.Pool.*;
+import io.anuke.arc.util.pooling.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.type.SolidEntity;
 import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.type.TypeID;
-import io.anuke.mindustry.gen.Call;
-import io.anuke.mindustry.type.Liquid;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.mindustry.entities.type.*;
+import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.gen.*;
+import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.world.*;
 
 import java.io.*;
 
@@ -118,7 +115,7 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai
         (liquid.flammability > 0.3f && dest.temperature > 0.7f)){ //flammable liquid + hot liquid
             Fire.create(tile);
             if(Mathf.chance(0.006 * amount)){
-                Call.createBullet(Bullets.fireball, x, y, Mathf.random(360f));
+                Call.createBullet(Bullets.fireball, Team.derelict, x, y, Mathf.random(360f), 1f, 1f);
             }
         }else if(dest.temperature > 0.7f && liquid.temperature < 0.55f){ //cold liquid poured onto hot puddle
             if(Mathf.chance(0.5f * amount)){
diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
index 3459e3b18e..c7ced76ec8 100644
--- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
+++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
@@ -2,7 +2,6 @@ package io.anuke.mindustry.entities.traits;
 
 import io.anuke.arc.*;
 import io.anuke.arc.collection.Queue;
-import io.anuke.arc.collection.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
@@ -88,7 +87,7 @@ public interface BuilderTrait extends Entity, TeamTrait{
         }
 
         //otherwise, update it.
-        BuildEntity entity = tile.entity();
+        BuildEntity entity = tile.ent();
 
         if(entity == null){
             return;
@@ -210,7 +209,7 @@ public interface BuilderTrait extends Entity, TeamTrait{
         }
         Tile tile = world.tile(place.x, place.y);
         if(tile != null && tile.entity instanceof BuildEntity){
-            place.progress = tile.<BuildEntity>entity().progress;
+            place.progress = tile.<BuildEntity>ent().progress;
         }
         if(tail){
             buildQueue().addLast(place);
diff --git a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java
index ab22a7933b..b0b741bacb 100644
--- a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java
+++ b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java
@@ -107,7 +107,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
 
     public @Nullable UnitCommand getCommand(){
         if(isCommanded()){
-            return indexer.getAllied(team, BlockFlag.comandCenter).first().<CommandCenterEntity>entity().command;
+            return indexer.getAllied(team, BlockFlag.comandCenter).first().<CommandCenterEntity>ent().command;
         }
         return null;
     }
diff --git a/core/src/io/anuke/mindustry/entities/type/Bullet.java b/core/src/io/anuke/mindustry/entities/type/Bullet.java
index a5c3d21697..abf7952aeb 100644
--- a/core/src/io/anuke/mindustry/entities/type/Bullet.java
+++ b/core/src/io/anuke/mindustry/entities/type/Bullet.java
@@ -77,16 +77,9 @@ public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Pool
         return create(type, parent.owner, parent.team, x, y, angle, velocityScl);
     }
 
-    /** Internal use only. */
     @Remote(called = Loc.server, unreliable = true)
-    public static void createBullet(BulletType type, float x, float y, float angle){
-        create(type, null, Team.derelict, x, y, angle);
-    }
-
-    /** ok */
-    @Remote(called = Loc.server, unreliable = true)
-    public static void createBullet(BulletType type, Team team, float x, float y, float angle){
-        create(type, null, team, x, y, angle);
+    public static void createBullet(BulletType type, Team team, float x, float y, float angle, float velocityScl, float lifetimeScl){
+        create(type, null, team, x, y, angle, velocityScl, lifetimeScl, null);
     }
 
     public Entity getOwner(){
diff --git a/core/src/io/anuke/mindustry/entities/type/TileEntity.java b/core/src/io/anuke/mindustry/entities/type/TileEntity.java
index 947748ffeb..8c9617b28b 100644
--- a/core/src/io/anuke/mindustry/entities/type/TileEntity.java
+++ b/core/src/io/anuke/mindustry/entities/type/TileEntity.java
@@ -37,7 +37,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
     public PowerModule power;
     public ItemModule items;
     public LiquidModule liquids;
-    public ConsumeModule cons;
+    public @Nullable ConsumeModule cons;
 
     /** List of (cached) tiles with entities in proximity, used for outputting to */
     private Array<Tile> proximity = new Array<>(8);
diff --git a/core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java b/core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java
index 06a3ceb60d..ca31f4c401 100644
--- a/core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java
@@ -171,7 +171,7 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{
                     BuildRequest req = player.buildRequest();
                     Tile tile = world.tile(req.x, req.y);
                     if(tile != null && tile.entity instanceof BuildEntity){
-                        BuildEntity b = tile.entity();
+                        BuildEntity b = tile.ent();
                         float dist = Math.min(b.dst(x, y) - placeDistance, 0);
                         if(dist / type.maxVelocity < b.buildCost * 0.9f){
                             target = b;
diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java
index f95f7a2b04..c2ff9db807 100644
--- a/core/src/io/anuke/mindustry/input/InputHandler.java
+++ b/core/src/io/anuke/mindustry/input/InputHandler.java
@@ -221,7 +221,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
     public boolean requestMatches(BuildRequest request){
         Tile tile = world.tile(request.x, request.y);
-        return tile != null && tile.block() instanceof BuildBlock && tile.<BuildEntity>entity().cblock == request.block;
+        return tile != null && tile.block() instanceof BuildBlock && tile.<BuildEntity>ent().cblock == request.block;
     }
 
     public void drawBreaking(int x, int y){
diff --git a/core/src/io/anuke/mindustry/mod/ClassAccess.java b/core/src/io/anuke/mindustry/mod/ClassAccess.java
index 48c67d839f..d126af792c 100644
--- a/core/src/io/anuke/mindustry/mod/ClassAccess.java
+++ b/core/src/io/anuke/mindustry/mod/ClassAccess.java
@@ -3,5 +3,5 @@ package io.anuke.mindustry.mod;
 import io.anuke.arc.collection.*;
 //obviously autogenerated, do not touch
 public class ClassAccess{
-	public static final ObjectSet<String> allowedClassNames = ObjectSet.with("io.anuke.arc.Core", "io.anuke.arc.collection.Array", "io.anuke.arc.collection.Array$ArrayIterable", "io.anuke.arc.collection.ArrayMap", "io.anuke.arc.collection.ArrayMap$Entries", "io.anuke.arc.collection.ArrayMap$Keys", "io.anuke.arc.collection.ArrayMap$Values", "io.anuke.arc.collection.AtomicQueue", "io.anuke.arc.collection.BinaryHeap", "io.anuke.arc.collection.BinaryHeap$Node", "io.anuke.arc.collection.Bits", "io.anuke.arc.collection.BooleanArray", "io.anuke.arc.collection.ByteArray", "io.anuke.arc.collection.CharArray", "io.anuke.arc.collection.ComparableTimSort", "io.anuke.arc.collection.DelayedRemovalArray", "io.anuke.arc.collection.EnumSet", "io.anuke.arc.collection.EnumSet$EnumSetIterator", "io.anuke.arc.collection.FloatArray", "io.anuke.arc.collection.GridBits", "io.anuke.arc.collection.GridMap", "io.anuke.arc.collection.IdentityMap", "io.anuke.arc.collection.IdentityMap$Entries", "io.anuke.arc.collection.IdentityMap$Entry", "io.anuke.arc.collection.IdentityMap$Keys", "io.anuke.arc.collection.IdentityMap$Values", "io.anuke.arc.collection.IntArray", "io.anuke.arc.collection.IntFloatMap", "io.anuke.arc.collection.IntFloatMap$Entries", "io.anuke.arc.collection.IntFloatMap$Entry", "io.anuke.arc.collection.IntFloatMap$Keys", "io.anuke.arc.collection.IntFloatMap$Values", "io.anuke.arc.collection.IntIntMap", "io.anuke.arc.collection.IntIntMap$Entries", "io.anuke.arc.collection.IntIntMap$Entry", "io.anuke.arc.collection.IntIntMap$Keys", "io.anuke.arc.collection.IntIntMap$Values", "io.anuke.arc.collection.IntMap", "io.anuke.arc.collection.IntMap$Entries", "io.anuke.arc.collection.IntMap$Entry", "io.anuke.arc.collection.IntMap$Keys", "io.anuke.arc.collection.IntMap$Values", "io.anuke.arc.collection.IntQueue", "io.anuke.arc.collection.IntSet", "io.anuke.arc.collection.IntSet$IntSetIterator", "io.anuke.arc.collection.LongArray", "io.anuke.arc.collection.LongMap", "io.anuke.arc.collection.LongMap$Entries", "io.anuke.arc.collection.LongMap$Entry", "io.anuke.arc.collection.LongMap$Keys", "io.anuke.arc.collection.LongMap$Values", "io.anuke.arc.collection.LongQueue", "io.anuke.arc.collection.ObjectFloatMap", "io.anuke.arc.collection.ObjectFloatMap$Entries", "io.anuke.arc.collection.ObjectFloatMap$Entry", "io.anuke.arc.collection.ObjectFloatMap$Keys", "io.anuke.arc.collection.ObjectFloatMap$Values", "io.anuke.arc.collection.ObjectIntMap", "io.anuke.arc.collection.ObjectIntMap$Entries", "io.anuke.arc.collection.ObjectIntMap$Entry", "io.anuke.arc.collection.ObjectIntMap$Keys", "io.anuke.arc.collection.ObjectIntMap$Values", "io.anuke.arc.collection.ObjectMap", "io.anuke.arc.collection.ObjectMap$Entries", "io.anuke.arc.collection.ObjectMap$Entry", "io.anuke.arc.collection.ObjectMap$Keys", "io.anuke.arc.collection.ObjectMap$Values", "io.anuke.arc.collection.ObjectSet", "io.anuke.arc.collection.ObjectSet$ObjectSetIterator", "io.anuke.arc.collection.OrderedMap", "io.anuke.arc.collection.OrderedMap$OrderedMapEntries", "io.anuke.arc.collection.OrderedMap$OrderedMapKeys", "io.anuke.arc.collection.OrderedMap$OrderedMapValues", "io.anuke.arc.collection.OrderedSet", "io.anuke.arc.collection.OrderedSet$OrderedSetIterator", "io.anuke.arc.collection.PooledLinkedList", "io.anuke.arc.collection.PooledLinkedList$Item", "io.anuke.arc.collection.Queue", "io.anuke.arc.collection.Queue$QueueIterable", "io.anuke.arc.collection.ShortArray", "io.anuke.arc.collection.SnapshotArray", "io.anuke.arc.collection.Sort", "io.anuke.arc.collection.SortedIntList", "io.anuke.arc.collection.SortedIntList$Iterator", "io.anuke.arc.collection.SortedIntList$Node", "io.anuke.arc.collection.StringMap", "io.anuke.arc.collection.TimSort", "io.anuke.arc.func.Boolc", "io.anuke.arc.func.Boolf", "io.anuke.arc.func.Boolf2", "io.anuke.arc.func.Boolp", "io.anuke.arc.func.Cons", "io.anuke.arc.func.Cons2", "io.anuke.arc.func.Floatc", "io.anuke.arc.func.Floatc2", "io.anuke.arc.func.Floatc4", "io.anuke.arc.func.Floatf", "io.anuke.arc.func.Floatp", "io.anuke.arc.func.Func", "io.anuke.arc.func.Func2", "io.anuke.arc.func.Func3", "io.anuke.arc.func.Intc", "io.anuke.arc.func.Intc2", "io.anuke.arc.func.Intc4", "io.anuke.arc.func.Intf", "io.anuke.arc.func.Intp", "io.anuke.arc.func.Prov", "io.anuke.arc.graphics.Color", "io.anuke.arc.graphics.g2d.Draw", "io.anuke.arc.graphics.g2d.Fill", "io.anuke.arc.graphics.g2d.Lines", "io.anuke.arc.graphics.g2d.TextureAtlas", "io.anuke.arc.graphics.g2d.TextureAtlas$AtlasRegion", "io.anuke.arc.graphics.g2d.TextureRegion", "io.anuke.arc.math.Angles", "io.anuke.arc.math.Mathf", "io.anuke.arc.scene.Action", "io.anuke.arc.scene.Element", "io.anuke.arc.scene.Group", "io.anuke.arc.scene.Scene", "io.anuke.arc.scene.Scene$TouchFocus", "io.anuke.arc.scene.actions.Actions", "io.anuke.arc.scene.actions.AddAction", "io.anuke.arc.scene.actions.AddListenerAction", "io.anuke.arc.scene.actions.AfterAction", "io.anuke.arc.scene.actions.AlphaAction", "io.anuke.arc.scene.actions.ColorAction", "io.anuke.arc.scene.actions.DelayAction", "io.anuke.arc.scene.actions.DelegateAction", "io.anuke.arc.scene.actions.FloatAction", "io.anuke.arc.scene.actions.IntAction", "io.anuke.arc.scene.actions.LayoutAction", "io.anuke.arc.scene.actions.MoveByAction", "io.anuke.arc.scene.actions.MoveToAction", "io.anuke.arc.scene.actions.OriginAction", "io.anuke.arc.scene.actions.ParallelAction", "io.anuke.arc.scene.actions.RelativeTemporalAction", "io.anuke.arc.scene.actions.RemoveAction", "io.anuke.arc.scene.actions.RemoveActorAction", "io.anuke.arc.scene.actions.RemoveListenerAction", "io.anuke.arc.scene.actions.RepeatAction", "io.anuke.arc.scene.actions.RotateByAction", "io.anuke.arc.scene.actions.RotateToAction", "io.anuke.arc.scene.actions.RunnableAction", "io.anuke.arc.scene.actions.ScaleByAction", "io.anuke.arc.scene.actions.ScaleToAction", "io.anuke.arc.scene.actions.SequenceAction", "io.anuke.arc.scene.actions.SizeByAction", "io.anuke.arc.scene.actions.SizeToAction", "io.anuke.arc.scene.actions.TemporalAction", "io.anuke.arc.scene.actions.TimeScaleAction", "io.anuke.arc.scene.actions.TouchableAction", "io.anuke.arc.scene.actions.TranslateByAction", "io.anuke.arc.scene.actions.VisibleAction", "io.anuke.arc.scene.event.ChangeListener", "io.anuke.arc.scene.event.ChangeListener$ChangeEvent", "io.anuke.arc.scene.event.ClickListener", "io.anuke.arc.scene.event.DragListener", "io.anuke.arc.scene.event.DragScrollListener", "io.anuke.arc.scene.event.ElementGestureListener", "io.anuke.arc.scene.event.EventListener", "io.anuke.arc.scene.event.FocusListener", "io.anuke.arc.scene.event.FocusListener$FocusEvent", "io.anuke.arc.scene.event.FocusListener$FocusEvent$Type", "io.anuke.arc.scene.event.HandCursorListener", "io.anuke.arc.scene.event.IbeamCursorListener", "io.anuke.arc.scene.event.InputEvent", "io.anuke.arc.scene.event.InputEvent$Type", "io.anuke.arc.scene.event.InputListener", "io.anuke.arc.scene.event.SceneEvent", "io.anuke.arc.scene.event.Touchable", "io.anuke.arc.scene.event.VisibilityEvent", "io.anuke.arc.scene.event.VisibilityListener", "io.anuke.arc.scene.style.BaseDrawable", "io.anuke.arc.scene.style.Drawable", "io.anuke.arc.scene.style.NinePatchDrawable", "io.anuke.arc.scene.style.ScaledNinePatchDrawable", "io.anuke.arc.scene.style.Style", "io.anuke.arc.scene.style.TextureRegionDrawable", "io.anuke.arc.scene.style.TiledDrawable", "io.anuke.arc.scene.style.TransformDrawable", "io.anuke.arc.scene.ui.Button", "io.anuke.arc.scene.ui.Button$ButtonStyle", "io.anuke.arc.scene.ui.ButtonGroup", "io.anuke.arc.scene.ui.CheckBox", "io.anuke.arc.scene.ui.CheckBox$CheckBoxStyle", "io.anuke.arc.scene.ui.ColorImage", "io.anuke.arc.scene.ui.Dialog", "io.anuke.arc.scene.ui.Dialog$DialogStyle", "io.anuke.arc.scene.ui.Image", "io.anuke.arc.scene.ui.ImageButton", "io.anuke.arc.scene.ui.ImageButton$ImageButtonStyle", "io.anuke.arc.scene.ui.KeybindDialog", "io.anuke.arc.scene.ui.KeybindDialog$KeybindDialogStyle", "io.anuke.arc.scene.ui.Label", "io.anuke.arc.scene.ui.Label$LabelStyle", "io.anuke.arc.scene.ui.ProgressBar", "io.anuke.arc.scene.ui.ProgressBar$ProgressBarStyle", "io.anuke.arc.scene.ui.ScrollPane", "io.anuke.arc.scene.ui.ScrollPane$ScrollPaneStyle", "io.anuke.arc.scene.ui.SettingsDialog", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable$CheckSetting", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable$Setting", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable$SliderSetting", "io.anuke.arc.scene.ui.SettingsDialog$StringProcessor", "io.anuke.arc.scene.ui.Slider", "io.anuke.arc.scene.ui.Slider$SliderStyle", "io.anuke.arc.scene.ui.TextArea", "io.anuke.arc.scene.ui.TextArea$TextAreaListener", "io.anuke.arc.scene.ui.TextButton", "io.anuke.arc.scene.ui.TextButton$TextButtonStyle", "io.anuke.arc.scene.ui.TextField", "io.anuke.arc.scene.ui.TextField$DefaultOnscreenKeyboard", "io.anuke.arc.scene.ui.TextField$OnscreenKeyboard", "io.anuke.arc.scene.ui.TextField$TextFieldClickListener", "io.anuke.arc.scene.ui.TextField$TextFieldFilter", "io.anuke.arc.scene.ui.TextField$TextFieldListener", "io.anuke.arc.scene.ui.TextField$TextFieldStyle", "io.anuke.arc.scene.ui.TextField$TextFieldValidator", "io.anuke.arc.scene.ui.Tooltip", "io.anuke.arc.scene.ui.Tooltip$Tooltips", "io.anuke.arc.scene.ui.Touchpad", "io.anuke.arc.scene.ui.Touchpad$TouchpadStyle", "io.anuke.arc.scene.ui.TreeElement", "io.anuke.arc.scene.ui.TreeElement$Node", "io.anuke.arc.scene.ui.TreeElement$TreeStyle", "io.anuke.arc.scene.ui.layout.Cell", "io.anuke.arc.scene.ui.layout.Collapser", "io.anuke.arc.scene.ui.layout.HorizontalGroup", "io.anuke.arc.scene.ui.layout.Scl", "io.anuke.arc.scene.ui.layout.Stack", "io.anuke.arc.scene.ui.layout.Table", "io.anuke.arc.scene.ui.layout.Table$DrawRect", "io.anuke.arc.scene.ui.layout.VerticalGroup", "io.anuke.arc.scene.ui.layout.WidgetGroup", "io.anuke.arc.scene.utils.ArraySelection", "io.anuke.arc.scene.utils.Cullable", "io.anuke.arc.scene.utils.Disableable", "io.anuke.arc.scene.utils.DragAndDrop", "io.anuke.arc.scene.utils.DragAndDrop$Payload", "io.anuke.arc.scene.utils.DragAndDrop$Source", "io.anuke.arc.scene.utils.DragAndDrop$Target", "io.anuke.arc.scene.utils.Elements", "io.anuke.arc.scene.utils.Layout", "io.anuke.arc.scene.utils.Selection", "io.anuke.arc.util.Time", "io.anuke.mindustry.Vars", "io.anuke.mindustry.ai.BlockIndexer", "io.anuke.mindustry.ai.Pathfinder", "io.anuke.mindustry.ai.Pathfinder$PathData", "io.anuke.mindustry.ai.Pathfinder$PathTarget", "io.anuke.mindustry.ai.Pathfinder$PathTileStruct", "io.anuke.mindustry.ai.WaveSpawner", "io.anuke.mindustry.content.Blocks", "io.anuke.mindustry.content.Bullets", "io.anuke.mindustry.content.Fx", "io.anuke.mindustry.content.Items", "io.anuke.mindustry.content.Liquids", "io.anuke.mindustry.content.Loadouts", "io.anuke.mindustry.content.Mechs", "io.anuke.mindustry.content.StatusEffects", "io.anuke.mindustry.content.TechTree", "io.anuke.mindustry.content.TechTree$TechNode", "io.anuke.mindustry.content.TypeIDs", "io.anuke.mindustry.content.UnitTypes", "io.anuke.mindustry.content.Zones", "io.anuke.mindustry.core.ContentLoader", "io.anuke.mindustry.core.Control", "io.anuke.mindustry.core.FileTree", "io.anuke.mindustry.core.GameState", "io.anuke.mindustry.core.GameState$State", "io.anuke.mindustry.core.Logic", "io.anuke.mindustry.core.Platform", "io.anuke.mindustry.core.Renderer", "io.anuke.mindustry.core.UI", "io.anuke.mindustry.core.Version", "io.anuke.mindustry.core.World", "io.anuke.mindustry.core.World$Raycaster", "io.anuke.mindustry.ctype.Content", "io.anuke.mindustry.ctype.ContentList", "io.anuke.mindustry.ctype.MappableContent", "io.anuke.mindustry.ctype.UnlockableContent", "io.anuke.mindustry.editor.DrawOperation", "io.anuke.mindustry.editor.DrawOperation$OpType", "io.anuke.mindustry.editor.DrawOperation$TileOpStruct", "io.anuke.mindustry.editor.EditorTile", "io.anuke.mindustry.editor.EditorTool", "io.anuke.mindustry.editor.MapEditor", "io.anuke.mindustry.editor.MapEditor$Context", "io.anuke.mindustry.editor.MapEditorDialog", "io.anuke.mindustry.editor.MapGenerateDialog", "io.anuke.mindustry.editor.MapInfoDialog", "io.anuke.mindustry.editor.MapLoadDialog", "io.anuke.mindustry.editor.MapRenderer", "io.anuke.mindustry.editor.MapResizeDialog", "io.anuke.mindustry.editor.MapSaveDialog", "io.anuke.mindustry.editor.MapView", "io.anuke.mindustry.editor.OperationStack", "io.anuke.mindustry.editor.WaveInfoDialog", "io.anuke.mindustry.entities.Damage", "io.anuke.mindustry.entities.Damage$PropCellStruct", "io.anuke.mindustry.entities.Effects", "io.anuke.mindustry.entities.Effects$Effect", "io.anuke.mindustry.entities.Effects$EffectContainer", "io.anuke.mindustry.entities.Effects$EffectProvider", "io.anuke.mindustry.entities.Effects$EffectRenderer", "io.anuke.mindustry.entities.Effects$ScreenshakeProvider", "io.anuke.mindustry.entities.Entities", "io.anuke.mindustry.entities.EntityCollisions", "io.anuke.mindustry.entities.EntityGroup", "io.anuke.mindustry.entities.Predict", "io.anuke.mindustry.entities.TargetPriority", "io.anuke.mindustry.entities.Units", "io.anuke.mindustry.entities.bullet.ArtilleryBulletType", "io.anuke.mindustry.entities.bullet.BasicBulletType", "io.anuke.mindustry.entities.bullet.BombBulletType", "io.anuke.mindustry.entities.bullet.BulletType", "io.anuke.mindustry.entities.bullet.FlakBulletType", "io.anuke.mindustry.entities.bullet.HealBulletType", "io.anuke.mindustry.entities.bullet.LiquidBulletType", "io.anuke.mindustry.entities.bullet.MassDriverBolt", "io.anuke.mindustry.entities.bullet.MissileBulletType", "io.anuke.mindustry.entities.effect.Decal", "io.anuke.mindustry.entities.effect.Fire", "io.anuke.mindustry.entities.effect.GroundEffectEntity", "io.anuke.mindustry.entities.effect.GroundEffectEntity$GroundEffect", "io.anuke.mindustry.entities.effect.ItemTransfer", "io.anuke.mindustry.entities.effect.Lightning", "io.anuke.mindustry.entities.effect.Puddle", "io.anuke.mindustry.entities.effect.RubbleDecal", "io.anuke.mindustry.entities.effect.ScorchDecal", "io.anuke.mindustry.entities.traits.AbsorbTrait", "io.anuke.mindustry.entities.traits.BelowLiquidTrait", "io.anuke.mindustry.entities.traits.BuilderMinerTrait", "io.anuke.mindustry.entities.traits.BuilderTrait", "io.anuke.mindustry.entities.traits.BuilderTrait$BuildDataStatic", "io.anuke.mindustry.entities.traits.BuilderTrait$BuildRequest", "io.anuke.mindustry.entities.traits.DamageTrait", "io.anuke.mindustry.entities.traits.DrawTrait", "io.anuke.mindustry.entities.traits.Entity", "io.anuke.mindustry.entities.traits.HealthTrait", "io.anuke.mindustry.entities.traits.KillerTrait", "io.anuke.mindustry.entities.traits.MinerTrait", "io.anuke.mindustry.entities.traits.MoveTrait", "io.anuke.mindustry.entities.traits.SaveTrait", "io.anuke.mindustry.entities.traits.Saveable", "io.anuke.mindustry.entities.traits.ScaleTrait", "io.anuke.mindustry.entities.traits.ShooterTrait", "io.anuke.mindustry.entities.traits.SolidTrait", "io.anuke.mindustry.entities.traits.SpawnerTrait", "io.anuke.mindustry.entities.traits.SyncTrait", "io.anuke.mindustry.entities.traits.TargetTrait", "io.anuke.mindustry.entities.traits.TeamTrait", "io.anuke.mindustry.entities.traits.TimeTrait", "io.anuke.mindustry.entities.traits.TypeTrait", "io.anuke.mindustry.entities.traits.VelocityTrait", "io.anuke.mindustry.entities.type.BaseEntity", "io.anuke.mindustry.entities.type.BaseUnit", "io.anuke.mindustry.entities.type.Bullet", "io.anuke.mindustry.entities.type.DestructibleEntity", "io.anuke.mindustry.entities.type.EffectEntity", "io.anuke.mindustry.entities.type.Player", "io.anuke.mindustry.entities.type.SolidEntity", "io.anuke.mindustry.entities.type.TileEntity", "io.anuke.mindustry.entities.type.TimedEntity", "io.anuke.mindustry.entities.type.Unit", "io.anuke.mindustry.entities.type.base.BaseDrone", "io.anuke.mindustry.entities.type.base.BuilderDrone", "io.anuke.mindustry.entities.type.base.Crawler", "io.anuke.mindustry.entities.type.base.Dagger", "io.anuke.mindustry.entities.type.base.Draug", "io.anuke.mindustry.entities.type.base.Eruptor", "io.anuke.mindustry.entities.type.base.FlyingUnit", "io.anuke.mindustry.entities.type.base.Fortress", "io.anuke.mindustry.entities.type.base.Ghoul", "io.anuke.mindustry.entities.type.base.GroundUnit", "io.anuke.mindustry.entities.type.base.MinerDrone", "io.anuke.mindustry.entities.type.base.Phantom", "io.anuke.mindustry.entities.type.base.RepairDrone", "io.anuke.mindustry.entities.type.base.Revenant", "io.anuke.mindustry.entities.type.base.Spirit", "io.anuke.mindustry.entities.type.base.Titan", "io.anuke.mindustry.entities.type.base.Wraith", "io.anuke.mindustry.entities.units.StateMachine", "io.anuke.mindustry.entities.units.Statuses", "io.anuke.mindustry.entities.units.Statuses$StatusEntry", "io.anuke.mindustry.entities.units.UnitCommand", "io.anuke.mindustry.entities.units.UnitDrops", "io.anuke.mindustry.entities.units.UnitState", "io.anuke.mindustry.game.DefaultWaves", "io.anuke.mindustry.game.Difficulty", "io.anuke.mindustry.game.EventType", "io.anuke.mindustry.game.EventType$BlockBuildBeginEvent", "io.anuke.mindustry.game.EventType$BlockBuildEndEvent", "io.anuke.mindustry.game.EventType$BlockDestroyEvent", "io.anuke.mindustry.game.EventType$BlockInfoEvent", "io.anuke.mindustry.game.EventType$BuildSelectEvent", "io.anuke.mindustry.game.EventType$ClientLoadEvent", "io.anuke.mindustry.game.EventType$CommandIssueEvent", "io.anuke.mindustry.game.EventType$ContentReloadEvent", "io.anuke.mindustry.game.EventType$CoreItemDeliverEvent", "io.anuke.mindustry.game.EventType$DepositEvent", "io.anuke.mindustry.game.EventType$DisposeEvent", "io.anuke.mindustry.game.EventType$GameOverEvent", "io.anuke.mindustry.game.EventType$LaunchEvent", "io.anuke.mindustry.game.EventType$LaunchItemEvent", "io.anuke.mindustry.game.EventType$LineConfirmEvent", "io.anuke.mindustry.game.EventType$LoseEvent", "io.anuke.mindustry.game.EventType$MapMakeEvent", "io.anuke.mindustry.game.EventType$MapPublishEvent", "io.anuke.mindustry.game.EventType$MechChangeEvent", "io.anuke.mindustry.game.EventType$PlayEvent", "io.anuke.mindustry.game.EventType$PlayerBanEvent", "io.anuke.mindustry.game.EventType$PlayerChatEvent", "io.anuke.mindustry.game.EventType$PlayerConnect", "io.anuke.mindustry.game.EventType$PlayerIpBanEvent", "io.anuke.mindustry.game.EventType$PlayerIpUnbanEvent", "io.anuke.mindustry.game.EventType$PlayerJoin", "io.anuke.mindustry.game.EventType$PlayerLeave", "io.anuke.mindustry.game.EventType$PlayerUnbanEvent", "io.anuke.mindustry.game.EventType$ResearchEvent", "io.anuke.mindustry.game.EventType$ResetEvent", "io.anuke.mindustry.game.EventType$ResizeEvent", "io.anuke.mindustry.game.EventType$StateChangeEvent", "io.anuke.mindustry.game.EventType$TapConfigEvent", "io.anuke.mindustry.game.EventType$TapEvent", "io.anuke.mindustry.game.EventType$TileChangeEvent", "io.anuke.mindustry.game.EventType$Trigger", "io.anuke.mindustry.game.EventType$TurretAmmoDeliverEvent", "io.anuke.mindustry.game.EventType$UnitCreateEvent", "io.anuke.mindustry.game.EventType$UnitDestroyEvent", "io.anuke.mindustry.game.EventType$UnlockEvent", "io.anuke.mindustry.game.EventType$WaveEvent", "io.anuke.mindustry.game.EventType$WinEvent", "io.anuke.mindustry.game.EventType$WithdrawEvent", "io.anuke.mindustry.game.EventType$WorldLoadEvent", "io.anuke.mindustry.game.EventType$ZoneConfigureCompleteEvent", "io.anuke.mindustry.game.EventType$ZoneRequireCompleteEvent", "io.anuke.mindustry.game.Gamemode", "io.anuke.mindustry.game.GlobalData", "io.anuke.mindustry.game.LoopControl", "io.anuke.mindustry.game.MusicControl", "io.anuke.mindustry.game.Objective", "io.anuke.mindustry.game.Objectives", "io.anuke.mindustry.game.Objectives$Launched", "io.anuke.mindustry.game.Objectives$Unlock", "io.anuke.mindustry.game.Objectives$Wave", "io.anuke.mindustry.game.Objectives$ZoneObjective", "io.anuke.mindustry.game.Objectives$ZoneWave", "io.anuke.mindustry.game.Rules", "io.anuke.mindustry.game.Saves", "io.anuke.mindustry.game.Saves$SaveSlot", "io.anuke.mindustry.game.Schematic", "io.anuke.mindustry.game.Schematic$Stile", "io.anuke.mindustry.game.Schematics", "io.anuke.mindustry.game.SoundLoop", "io.anuke.mindustry.game.SpawnGroup", "io.anuke.mindustry.game.Stats", "io.anuke.mindustry.game.Stats$Rank", "io.anuke.mindustry.game.Stats$RankResult", "io.anuke.mindustry.game.Team", "io.anuke.mindustry.game.Teams", "io.anuke.mindustry.game.Teams$BrokenBlock", "io.anuke.mindustry.game.Teams$TeamData", "io.anuke.mindustry.game.Tutorial", "io.anuke.mindustry.game.Tutorial$TutorialStage", "io.anuke.mindustry.graphics.BlockRenderer", "io.anuke.mindustry.graphics.Bloom", "io.anuke.mindustry.graphics.CacheLayer", "io.anuke.mindustry.graphics.Drawf", "io.anuke.mindustry.graphics.FloorRenderer", "io.anuke.mindustry.graphics.IndexedRenderer", "io.anuke.mindustry.graphics.Layer", "io.anuke.mindustry.graphics.LightRenderer", "io.anuke.mindustry.graphics.MenuRenderer", "io.anuke.mindustry.graphics.MinimapRenderer", "io.anuke.mindustry.graphics.MultiPacker", "io.anuke.mindustry.graphics.MultiPacker$PageType", "io.anuke.mindustry.graphics.OverlayRenderer", "io.anuke.mindustry.graphics.Pal", "io.anuke.mindustry.graphics.Pixelator", "io.anuke.mindustry.graphics.Shaders", "io.anuke.mindustry.input.Binding", "io.anuke.mindustry.input.DesktopInput", "io.anuke.mindustry.input.InputHandler", "io.anuke.mindustry.input.InputHandler$PlaceLine", "io.anuke.mindustry.input.MobileInput", "io.anuke.mindustry.input.PlaceMode", "io.anuke.mindustry.input.Placement", "io.anuke.mindustry.input.Placement$DistanceHeuristic", "io.anuke.mindustry.input.Placement$NormalizeDrawResult", "io.anuke.mindustry.input.Placement$NormalizeResult", "io.anuke.mindustry.input.Placement$TileHueristic", "io.anuke.mindustry.maps.Map", "io.anuke.mindustry.maps.Maps", "io.anuke.mindustry.maps.Maps$MapProvider", "io.anuke.mindustry.maps.Maps$ShuffleMode", "io.anuke.mindustry.maps.Maps$ShuffleMode", "io.anuke.mindustry.maps.filters.BlendFilter", "io.anuke.mindustry.maps.filters.ClearFilter", "io.anuke.mindustry.maps.filters.DistortFilter", "io.anuke.mindustry.maps.filters.FilterOption", "io.anuke.mindustry.maps.filters.FilterOption$BlockOption", "io.anuke.mindustry.maps.filters.FilterOption$SliderOption", "io.anuke.mindustry.maps.filters.GenerateFilter", "io.anuke.mindustry.maps.filters.GenerateFilter$GenerateInput", "io.anuke.mindustry.maps.filters.GenerateFilter$GenerateInput$TileProvider", "io.anuke.mindustry.maps.filters.MedianFilter", "io.anuke.mindustry.maps.filters.MirrorFilter", "io.anuke.mindustry.maps.filters.NoiseFilter", "io.anuke.mindustry.maps.filters.OreFilter", "io.anuke.mindustry.maps.filters.OreMedianFilter", "io.anuke.mindustry.maps.filters.RiverNoiseFilter", "io.anuke.mindustry.maps.filters.ScatterFilter", "io.anuke.mindustry.maps.filters.TerrainFilter", "io.anuke.mindustry.maps.generators.BasicGenerator", "io.anuke.mindustry.maps.generators.BasicGenerator$DistanceHeuristic", "io.anuke.mindustry.maps.generators.BasicGenerator$TileHueristic", "io.anuke.mindustry.maps.generators.Generator", "io.anuke.mindustry.maps.generators.MapGenerator", "io.anuke.mindustry.maps.generators.MapGenerator$Decoration", "io.anuke.mindustry.maps.generators.RandomGenerator", "io.anuke.mindustry.maps.zonegen.DesertWastesGenerator", "io.anuke.mindustry.maps.zonegen.OvergrowthGenerator", "io.anuke.mindustry.type.Category", "io.anuke.mindustry.type.ContentType", "io.anuke.mindustry.type.Item", "io.anuke.mindustry.type.ItemStack", "io.anuke.mindustry.type.ItemType", "io.anuke.mindustry.type.Liquid", "io.anuke.mindustry.type.LiquidStack", "io.anuke.mindustry.type.Mech", "io.anuke.mindustry.type.Publishable", "io.anuke.mindustry.type.StatusEffect", "io.anuke.mindustry.type.StatusEffect$TransitionHandler", "io.anuke.mindustry.type.TypeID", "io.anuke.mindustry.type.UnitType", "io.anuke.mindustry.type.Weapon", "io.anuke.mindustry.type.WeatherEvent", "io.anuke.mindustry.type.Zone", "io.anuke.mindustry.ui.Bar", "io.anuke.mindustry.ui.BorderImage", "io.anuke.mindustry.ui.Cicon", "io.anuke.mindustry.ui.ContentDisplay", "io.anuke.mindustry.ui.Fonts", "io.anuke.mindustry.ui.GridImage", "io.anuke.mindustry.ui.IconSize", "io.anuke.mindustry.ui.IntFormat", "io.anuke.mindustry.ui.ItemDisplay", "io.anuke.mindustry.ui.ItemImage", "io.anuke.mindustry.ui.ItemsDisplay", "io.anuke.mindustry.ui.Links", "io.anuke.mindustry.ui.Links$LinkEntry", "io.anuke.mindustry.ui.LiquidDisplay", "io.anuke.mindustry.ui.Minimap", "io.anuke.mindustry.ui.MobileButton", "io.anuke.mindustry.ui.MultiReqImage", "io.anuke.mindustry.ui.ReqImage", "io.anuke.mindustry.ui.Styles", "io.anuke.mindustry.ui.dialogs.AboutDialog", "io.anuke.mindustry.ui.dialogs.AdminsDialog", "io.anuke.mindustry.ui.dialogs.BansDialog", "io.anuke.mindustry.ui.dialogs.ColorPicker", "io.anuke.mindustry.ui.dialogs.ContentInfoDialog", "io.anuke.mindustry.ui.dialogs.ControlsDialog", "io.anuke.mindustry.ui.dialogs.CustomGameDialog", "io.anuke.mindustry.ui.dialogs.CustomRulesDialog", "io.anuke.mindustry.ui.dialogs.DatabaseDialog", "io.anuke.mindustry.ui.dialogs.DeployDialog", "io.anuke.mindustry.ui.dialogs.DeployDialog$View", "io.anuke.mindustry.ui.dialogs.DeployDialog$ZoneNode", "io.anuke.mindustry.ui.dialogs.DiscordDialog", "io.anuke.mindustry.ui.dialogs.FileChooser", "io.anuke.mindustry.ui.dialogs.FileChooser$FileHistory", "io.anuke.mindustry.ui.dialogs.FloatingDialog", "io.anuke.mindustry.ui.dialogs.GameOverDialog", "io.anuke.mindustry.ui.dialogs.HostDialog", "io.anuke.mindustry.ui.dialogs.JoinDialog", "io.anuke.mindustry.ui.dialogs.JoinDialog$Server", "io.anuke.mindustry.ui.dialogs.LanguageDialog", "io.anuke.mindustry.ui.dialogs.LoadDialog", "io.anuke.mindustry.ui.dialogs.LoadoutDialog", "io.anuke.mindustry.ui.dialogs.MapPlayDialog", "io.anuke.mindustry.ui.dialogs.MapsDialog", "io.anuke.mindustry.ui.dialogs.MinimapDialog", "io.anuke.mindustry.ui.dialogs.ModsDialog", "io.anuke.mindustry.ui.dialogs.PaletteDialog", "io.anuke.mindustry.ui.dialogs.PausedDialog", "io.anuke.mindustry.ui.dialogs.SaveDialog", "io.anuke.mindustry.ui.dialogs.SchematicsDialog", "io.anuke.mindustry.ui.dialogs.SchematicsDialog$SchematicImage", "io.anuke.mindustry.ui.dialogs.SchematicsDialog$SchematicInfoDialog", "io.anuke.mindustry.ui.dialogs.SettingsMenuDialog", "io.anuke.mindustry.ui.dialogs.TechTreeDialog", "io.anuke.mindustry.ui.dialogs.TechTreeDialog$LayoutNode", "io.anuke.mindustry.ui.dialogs.TechTreeDialog$TechTreeNode", "io.anuke.mindustry.ui.dialogs.TechTreeDialog$View", "io.anuke.mindustry.ui.dialogs.TraceDialog", "io.anuke.mindustry.ui.dialogs.ZoneInfoDialog", "io.anuke.mindustry.ui.fragments.BlockConfigFragment", "io.anuke.mindustry.ui.fragments.BlockInventoryFragment", "io.anuke.mindustry.ui.fragments.ChatFragment", "io.anuke.mindustry.ui.fragments.FadeInFragment", "io.anuke.mindustry.ui.fragments.Fragment", "io.anuke.mindustry.ui.fragments.HudFragment", "io.anuke.mindustry.ui.fragments.LoadingFragment", "io.anuke.mindustry.ui.fragments.MenuFragment", "io.anuke.mindustry.ui.fragments.OverlayFragment", "io.anuke.mindustry.ui.fragments.PlacementFragment", "io.anuke.mindustry.ui.fragments.PlayerListFragment", "io.anuke.mindustry.ui.fragments.ScriptConsoleFragment", "io.anuke.mindustry.ui.layout.BranchTreeLayout", "io.anuke.mindustry.ui.layout.BranchTreeLayout$TreeAlignment", "io.anuke.mindustry.ui.layout.BranchTreeLayout$TreeLocation", "io.anuke.mindustry.ui.layout.RadialTreeLayout", "io.anuke.mindustry.ui.layout.TreeLayout", "io.anuke.mindustry.ui.layout.TreeLayout$TreeNode", "io.anuke.mindustry.world.Block", "io.anuke.mindustry.world.BlockStorage", "io.anuke.mindustry.world.Build", "io.anuke.mindustry.world.CachedTile", "io.anuke.mindustry.world.DirectionalItemBuffer", "io.anuke.mindustry.world.DirectionalItemBuffer$BufferItemStruct", "io.anuke.mindustry.world.Edges", "io.anuke.mindustry.world.ItemBuffer", "io.anuke.mindustry.world.LegacyColorMapper", "io.anuke.mindustry.world.LegacyColorMapper$LegacyBlock", "io.anuke.mindustry.world.Pos", "io.anuke.mindustry.world.StaticTree", "io.anuke.mindustry.world.Tile", "io.anuke.mindustry.world.WorldContext", "io.anuke.mindustry.world.blocks.Attributes", "io.anuke.mindustry.world.blocks.Autotiler", "io.anuke.mindustry.world.blocks.Autotiler$AutotilerHolder", "io.anuke.mindustry.world.blocks.BlockPart", "io.anuke.mindustry.world.blocks.BuildBlock", "io.anuke.mindustry.world.blocks.BuildBlock$BuildEntity", "io.anuke.mindustry.world.blocks.DoubleOverlayFloor", "io.anuke.mindustry.world.blocks.Floor", "io.anuke.mindustry.world.blocks.ItemSelection", "io.anuke.mindustry.world.blocks.LiquidBlock", "io.anuke.mindustry.world.blocks.OreBlock", "io.anuke.mindustry.world.blocks.OverlayFloor", "io.anuke.mindustry.world.blocks.PowerBlock", "io.anuke.mindustry.world.blocks.RespawnBlock", "io.anuke.mindustry.world.blocks.Rock", "io.anuke.mindustry.world.blocks.StaticWall", "io.anuke.mindustry.world.blocks.TreeBlock", "io.anuke.mindustry.world.blocks.defense.DeflectorWall", "io.anuke.mindustry.world.blocks.defense.DeflectorWall$DeflectorEntity", "io.anuke.mindustry.world.blocks.defense.Door", "io.anuke.mindustry.world.blocks.defense.Door$DoorEntity", "io.anuke.mindustry.world.blocks.defense.ForceProjector", "io.anuke.mindustry.world.blocks.defense.ForceProjector$ForceEntity", "io.anuke.mindustry.world.blocks.defense.ForceProjector$ShieldEntity", "io.anuke.mindustry.world.blocks.defense.MendProjector", "io.anuke.mindustry.world.blocks.defense.MendProjector$MendEntity", "io.anuke.mindustry.world.blocks.defense.OverdriveProjector", "io.anuke.mindustry.world.blocks.defense.OverdriveProjector$OverdriveEntity", "io.anuke.mindustry.world.blocks.defense.ShockMine", "io.anuke.mindustry.world.blocks.defense.SurgeWall", "io.anuke.mindustry.world.blocks.defense.Wall", "io.anuke.mindustry.world.blocks.defense.turrets.ArtilleryTurret", "io.anuke.mindustry.world.blocks.defense.turrets.BurstTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ChargeTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ChargeTurret$LaserTurretEntity", "io.anuke.mindustry.world.blocks.defense.turrets.CooledTurret", "io.anuke.mindustry.world.blocks.defense.turrets.DoubleTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ItemTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ItemTurret$ItemEntry", "io.anuke.mindustry.world.blocks.defense.turrets.ItemTurret$ItemTurretEntity", "io.anuke.mindustry.world.blocks.defense.turrets.LaserTurret", "io.anuke.mindustry.world.blocks.defense.turrets.LaserTurret$LaserTurretEntity", "io.anuke.mindustry.world.blocks.defense.turrets.LiquidTurret", "io.anuke.mindustry.world.blocks.defense.turrets.PowerTurret", "io.anuke.mindustry.world.blocks.defense.turrets.Turret", "io.anuke.mindustry.world.blocks.defense.turrets.Turret$AmmoEntry", "io.anuke.mindustry.world.blocks.defense.turrets.Turret$TurretEntity", "io.anuke.mindustry.world.blocks.distribution.ArmoredConveyor", "io.anuke.mindustry.world.blocks.distribution.BufferedItemBridge", "io.anuke.mindustry.world.blocks.distribution.BufferedItemBridge$BufferedItemBridgeEntity", "io.anuke.mindustry.world.blocks.distribution.Conveyor", "io.anuke.mindustry.world.blocks.distribution.Conveyor$ConveyorEntity", "io.anuke.mindustry.world.blocks.distribution.Conveyor$ItemPos", "io.anuke.mindustry.world.blocks.distribution.ExtendingItemBridge", "io.anuke.mindustry.world.blocks.distribution.ItemBridge", "io.anuke.mindustry.world.blocks.distribution.ItemBridge$ItemBridgeEntity", "io.anuke.mindustry.world.blocks.distribution.Junction", "io.anuke.mindustry.world.blocks.distribution.Junction$JunctionEntity", "io.anuke.mindustry.world.blocks.distribution.MassDriver", "io.anuke.mindustry.world.blocks.distribution.MassDriver$DriverBulletData", "io.anuke.mindustry.world.blocks.distribution.MassDriver$DriverState", "io.anuke.mindustry.world.blocks.distribution.MassDriver$MassDriverEntity", "io.anuke.mindustry.world.blocks.distribution.OverflowGate", "io.anuke.mindustry.world.blocks.distribution.OverflowGate$OverflowGateEntity", "io.anuke.mindustry.world.blocks.distribution.Router", "io.anuke.mindustry.world.blocks.distribution.Router$RouterEntity", "io.anuke.mindustry.world.blocks.distribution.Sorter", "io.anuke.mindustry.world.blocks.distribution.Sorter$SorterEntity", "io.anuke.mindustry.world.blocks.liquid.ArmoredConduit", "io.anuke.mindustry.world.blocks.liquid.Conduit", "io.anuke.mindustry.world.blocks.liquid.Conduit$ConduitEntity", "io.anuke.mindustry.world.blocks.liquid.LiquidBridge", "io.anuke.mindustry.world.blocks.liquid.LiquidExtendingBridge", "io.anuke.mindustry.world.blocks.liquid.LiquidJunction", "io.anuke.mindustry.world.blocks.liquid.LiquidOverflowGate", "io.anuke.mindustry.world.blocks.liquid.LiquidRouter", "io.anuke.mindustry.world.blocks.liquid.LiquidTank", "io.anuke.mindustry.world.blocks.logic.LogicBlock", "io.anuke.mindustry.world.blocks.logic.MessageBlock", "io.anuke.mindustry.world.blocks.logic.MessageBlock$MessageBlockEntity", "io.anuke.mindustry.world.blocks.power.Battery", "io.anuke.mindustry.world.blocks.power.BurnerGenerator", "io.anuke.mindustry.world.blocks.power.ConditionalConsumePower", "io.anuke.mindustry.world.blocks.power.DecayGenerator", "io.anuke.mindustry.world.blocks.power.ImpactReactor", "io.anuke.mindustry.world.blocks.power.ImpactReactor$FusionReactorEntity", "io.anuke.mindustry.world.blocks.power.ItemLiquidGenerator", "io.anuke.mindustry.world.blocks.power.ItemLiquidGenerator$ItemLiquidGeneratorEntity", "io.anuke.mindustry.world.blocks.power.LightBlock", "io.anuke.mindustry.world.blocks.power.LightBlock$LightEntity", "io.anuke.mindustry.world.blocks.power.NuclearReactor", "io.anuke.mindustry.world.blocks.power.NuclearReactor$NuclearReactorEntity", "io.anuke.mindustry.world.blocks.power.PowerDiode", "io.anuke.mindustry.world.blocks.power.PowerDistributor", "io.anuke.mindustry.world.blocks.power.PowerGenerator", "io.anuke.mindustry.world.blocks.power.PowerGenerator$GeneratorEntity", "io.anuke.mindustry.world.blocks.power.PowerGraph", "io.anuke.mindustry.world.blocks.power.PowerNode", "io.anuke.mindustry.world.blocks.power.SingleTypeGenerator", "io.anuke.mindustry.world.blocks.power.SolarGenerator", "io.anuke.mindustry.world.blocks.power.ThermalGenerator", "io.anuke.mindustry.world.blocks.production.Cultivator", "io.anuke.mindustry.world.blocks.production.Cultivator$CultivatorEntity", "io.anuke.mindustry.world.blocks.production.Drill", "io.anuke.mindustry.world.blocks.production.Drill$DrillEntity", "io.anuke.mindustry.world.blocks.production.Fracker", "io.anuke.mindustry.world.blocks.production.Fracker$FrackerEntity", "io.anuke.mindustry.world.blocks.production.GenericCrafter", "io.anuke.mindustry.world.blocks.production.GenericCrafter$GenericCrafterEntity", "io.anuke.mindustry.world.blocks.production.GenericSmelter", "io.anuke.mindustry.world.blocks.production.Incinerator", "io.anuke.mindustry.world.blocks.production.Incinerator$IncineratorEntity", "io.anuke.mindustry.world.blocks.production.LiquidConverter", "io.anuke.mindustry.world.blocks.production.Pump", "io.anuke.mindustry.world.blocks.production.Separator", "io.anuke.mindustry.world.blocks.production.SolidPump", "io.anuke.mindustry.world.blocks.production.SolidPump$SolidPumpEntity", "io.anuke.mindustry.world.blocks.sandbox.ItemSource", "io.anuke.mindustry.world.blocks.sandbox.ItemSource$ItemSourceEntity", "io.anuke.mindustry.world.blocks.sandbox.ItemVoid", "io.anuke.mindustry.world.blocks.sandbox.LiquidSource", "io.anuke.mindustry.world.blocks.sandbox.LiquidSource$LiquidSourceEntity", "io.anuke.mindustry.world.blocks.sandbox.PowerSource", "io.anuke.mindustry.world.blocks.sandbox.PowerVoid", "io.anuke.mindustry.world.blocks.storage.CoreBlock", "io.anuke.mindustry.world.blocks.storage.CoreBlock$CoreEntity", "io.anuke.mindustry.world.blocks.storage.LaunchPad", "io.anuke.mindustry.world.blocks.storage.StorageBlock", "io.anuke.mindustry.world.blocks.storage.StorageBlock$StorageBlockEntity", "io.anuke.mindustry.world.blocks.storage.Unloader", "io.anuke.mindustry.world.blocks.storage.Unloader$UnloaderEntity", "io.anuke.mindustry.world.blocks.storage.Vault", "io.anuke.mindustry.world.blocks.units.CommandCenter", "io.anuke.mindustry.world.blocks.units.CommandCenter$CommandCenterEntity", "io.anuke.mindustry.world.blocks.units.MechPad", "io.anuke.mindustry.world.blocks.units.MechPad$MechFactoryEntity", "io.anuke.mindustry.world.blocks.units.RallyPoint", "io.anuke.mindustry.world.blocks.units.RepairPoint", "io.anuke.mindustry.world.blocks.units.RepairPoint$RepairPointEntity", "io.anuke.mindustry.world.blocks.units.UnitFactory", "io.anuke.mindustry.world.blocks.units.UnitFactory$UnitFactoryEntity", "io.anuke.mindustry.world.consumers.Consume", "io.anuke.mindustry.world.consumers.ConsumeItemFilter", "io.anuke.mindustry.world.consumers.ConsumeItems", "io.anuke.mindustry.world.consumers.ConsumeLiquid", "io.anuke.mindustry.world.consumers.ConsumeLiquidBase", "io.anuke.mindustry.world.consumers.ConsumeLiquidFilter", "io.anuke.mindustry.world.consumers.ConsumePower", "io.anuke.mindustry.world.consumers.ConsumeType", "io.anuke.mindustry.world.consumers.Consumers", "io.anuke.mindustry.world.meta.Attribute", "io.anuke.mindustry.world.meta.BlockBars", "io.anuke.mindustry.world.meta.BlockFlag", "io.anuke.mindustry.world.meta.BlockGroup", "io.anuke.mindustry.world.meta.BlockStat", "io.anuke.mindustry.world.meta.BlockStats", "io.anuke.mindustry.world.meta.BuildVisibility", "io.anuke.mindustry.world.meta.PowerType", "io.anuke.mindustry.world.meta.Producers", "io.anuke.mindustry.world.meta.StatCategory", "io.anuke.mindustry.world.meta.StatUnit", "io.anuke.mindustry.world.meta.StatValue", "io.anuke.mindustry.world.meta.values.AmmoListValue", "io.anuke.mindustry.world.meta.values.BooleanValue", "io.anuke.mindustry.world.meta.values.BoosterListValue", "io.anuke.mindustry.world.meta.values.ItemFilterValue", "io.anuke.mindustry.world.meta.values.ItemListValue", "io.anuke.mindustry.world.meta.values.LiquidFilterValue", "io.anuke.mindustry.world.meta.values.LiquidValue", "io.anuke.mindustry.world.meta.values.NumberValue", "io.anuke.mindustry.world.meta.values.StringValue", "io.anuke.mindustry.world.modules.BlockModule", "io.anuke.mindustry.world.modules.ConsumeModule", "io.anuke.mindustry.world.modules.ItemModule", "io.anuke.mindustry.world.modules.ItemModule$ItemCalculator", "io.anuke.mindustry.world.modules.ItemModule$ItemConsumer", "io.anuke.mindustry.world.modules.LiquidModule", "io.anuke.mindustry.world.modules.LiquidModule$LiquidCalculator", "io.anuke.mindustry.world.modules.LiquidModule$LiquidConsumer", "io.anuke.mindustry.world.modules.PowerModule", "io.anuke.mindustry.world.producers.Produce", "io.anuke.mindustry.world.producers.ProduceItem", "java.io.PrintStream", "java.lang.String", "java.lang.System");
+	public static final ObjectSet<String> allowedClassNames = ObjectSet.with("io.anuke.arc.Core", "io.anuke.arc.collection.Array", "io.anuke.arc.collection.Array$ArrayIterable", "io.anuke.arc.collection.ArrayMap", "io.anuke.arc.collection.ArrayMap$Entries", "io.anuke.arc.collection.ArrayMap$Keys", "io.anuke.arc.collection.ArrayMap$Values", "io.anuke.arc.collection.AtomicQueue", "io.anuke.arc.collection.BinaryHeap", "io.anuke.arc.collection.BinaryHeap$Node", "io.anuke.arc.collection.Bits", "io.anuke.arc.collection.BooleanArray", "io.anuke.arc.collection.ByteArray", "io.anuke.arc.collection.CharArray", "io.anuke.arc.collection.ComparableTimSort", "io.anuke.arc.collection.DelayedRemovalArray", "io.anuke.arc.collection.EnumSet", "io.anuke.arc.collection.EnumSet$EnumSetIterator", "io.anuke.arc.collection.FloatArray", "io.anuke.arc.collection.GridBits", "io.anuke.arc.collection.GridMap", "io.anuke.arc.collection.IdentityMap", "io.anuke.arc.collection.IdentityMap$Entries", "io.anuke.arc.collection.IdentityMap$Entry", "io.anuke.arc.collection.IdentityMap$Keys", "io.anuke.arc.collection.IdentityMap$Values", "io.anuke.arc.collection.IntArray", "io.anuke.arc.collection.IntFloatMap", "io.anuke.arc.collection.IntFloatMap$Entries", "io.anuke.arc.collection.IntFloatMap$Entry", "io.anuke.arc.collection.IntFloatMap$Keys", "io.anuke.arc.collection.IntFloatMap$Values", "io.anuke.arc.collection.IntIntMap", "io.anuke.arc.collection.IntIntMap$Entries", "io.anuke.arc.collection.IntIntMap$Entry", "io.anuke.arc.collection.IntIntMap$Keys", "io.anuke.arc.collection.IntIntMap$Values", "io.anuke.arc.collection.IntMap", "io.anuke.arc.collection.IntMap$Entries", "io.anuke.arc.collection.IntMap$Entry", "io.anuke.arc.collection.IntMap$Keys", "io.anuke.arc.collection.IntMap$Values", "io.anuke.arc.collection.IntQueue", "io.anuke.arc.collection.IntSet", "io.anuke.arc.collection.IntSet$IntSetIterator", "io.anuke.arc.collection.LongArray", "io.anuke.arc.collection.LongMap", "io.anuke.arc.collection.LongMap$Entries", "io.anuke.arc.collection.LongMap$Entry", "io.anuke.arc.collection.LongMap$Keys", "io.anuke.arc.collection.LongMap$Values", "io.anuke.arc.collection.LongQueue", "io.anuke.arc.collection.ObjectFloatMap", "io.anuke.arc.collection.ObjectFloatMap$Entries", "io.anuke.arc.collection.ObjectFloatMap$Entry", "io.anuke.arc.collection.ObjectFloatMap$Keys", "io.anuke.arc.collection.ObjectFloatMap$Values", "io.anuke.arc.collection.ObjectIntMap", "io.anuke.arc.collection.ObjectIntMap$Entries", "io.anuke.arc.collection.ObjectIntMap$Entry", "io.anuke.arc.collection.ObjectIntMap$Keys", "io.anuke.arc.collection.ObjectIntMap$Values", "io.anuke.arc.collection.ObjectMap", "io.anuke.arc.collection.ObjectMap$Entries", "io.anuke.arc.collection.ObjectMap$Entry", "io.anuke.arc.collection.ObjectMap$Keys", "io.anuke.arc.collection.ObjectMap$Values", "io.anuke.arc.collection.ObjectSet", "io.anuke.arc.collection.ObjectSet$ObjectSetIterator", "io.anuke.arc.collection.OrderedMap", "io.anuke.arc.collection.OrderedMap$OrderedMapEntries", "io.anuke.arc.collection.OrderedMap$OrderedMapKeys", "io.anuke.arc.collection.OrderedMap$OrderedMapValues", "io.anuke.arc.collection.OrderedSet", "io.anuke.arc.collection.OrderedSet$OrderedSetIterator", "io.anuke.arc.collection.PooledLinkedList", "io.anuke.arc.collection.PooledLinkedList$Item", "io.anuke.arc.collection.Queue", "io.anuke.arc.collection.Queue$QueueIterable", "io.anuke.arc.collection.ShortArray", "io.anuke.arc.collection.SnapshotArray", "io.anuke.arc.collection.Sort", "io.anuke.arc.collection.SortedIntList", "io.anuke.arc.collection.SortedIntList$Iterator", "io.anuke.arc.collection.SortedIntList$Node", "io.anuke.arc.collection.StringMap", "io.anuke.arc.collection.TimSort", "io.anuke.arc.func.Boolc", "io.anuke.arc.func.Boolf", "io.anuke.arc.func.Boolf2", "io.anuke.arc.func.Boolp", "io.anuke.arc.func.Cons", "io.anuke.arc.func.Cons2", "io.anuke.arc.func.Floatc", "io.anuke.arc.func.Floatc2", "io.anuke.arc.func.Floatc4", "io.anuke.arc.func.Floatf", "io.anuke.arc.func.Floatp", "io.anuke.arc.func.Func", "io.anuke.arc.func.Func2", "io.anuke.arc.func.Func3", "io.anuke.arc.func.Intc", "io.anuke.arc.func.Intc2", "io.anuke.arc.func.Intc4", "io.anuke.arc.func.Intf", "io.anuke.arc.func.Intp", "io.anuke.arc.func.Prov", "io.anuke.arc.graphics.Color", "io.anuke.arc.graphics.g2d.Draw", "io.anuke.arc.graphics.g2d.Fill", "io.anuke.arc.graphics.g2d.Lines", "io.anuke.arc.graphics.g2d.TextureAtlas", "io.anuke.arc.graphics.g2d.TextureAtlas$AtlasRegion", "io.anuke.arc.graphics.g2d.TextureRegion", "io.anuke.arc.math.Angles", "io.anuke.arc.math.Mathf", "io.anuke.arc.scene.Action", "io.anuke.arc.scene.Element", "io.anuke.arc.scene.Group", "io.anuke.arc.scene.Scene", "io.anuke.arc.scene.Scene$TouchFocus", "io.anuke.arc.scene.actions.Actions", "io.anuke.arc.scene.actions.AddAction", "io.anuke.arc.scene.actions.AddListenerAction", "io.anuke.arc.scene.actions.AfterAction", "io.anuke.arc.scene.actions.AlphaAction", "io.anuke.arc.scene.actions.ColorAction", "io.anuke.arc.scene.actions.DelayAction", "io.anuke.arc.scene.actions.DelegateAction", "io.anuke.arc.scene.actions.FloatAction", "io.anuke.arc.scene.actions.IntAction", "io.anuke.arc.scene.actions.LayoutAction", "io.anuke.arc.scene.actions.MoveByAction", "io.anuke.arc.scene.actions.MoveToAction", "io.anuke.arc.scene.actions.OriginAction", "io.anuke.arc.scene.actions.ParallelAction", "io.anuke.arc.scene.actions.RelativeTemporalAction", "io.anuke.arc.scene.actions.RemoveAction", "io.anuke.arc.scene.actions.RemoveActorAction", "io.anuke.arc.scene.actions.RemoveListenerAction", "io.anuke.arc.scene.actions.RepeatAction", "io.anuke.arc.scene.actions.RotateByAction", "io.anuke.arc.scene.actions.RotateToAction", "io.anuke.arc.scene.actions.RunnableAction", "io.anuke.arc.scene.actions.ScaleByAction", "io.anuke.arc.scene.actions.ScaleToAction", "io.anuke.arc.scene.actions.SequenceAction", "io.anuke.arc.scene.actions.SizeByAction", "io.anuke.arc.scene.actions.SizeToAction", "io.anuke.arc.scene.actions.TemporalAction", "io.anuke.arc.scene.actions.TimeScaleAction", "io.anuke.arc.scene.actions.TouchableAction", "io.anuke.arc.scene.actions.TranslateByAction", "io.anuke.arc.scene.actions.VisibleAction", "io.anuke.arc.scene.event.ChangeListener", "io.anuke.arc.scene.event.ChangeListener$ChangeEvent", "io.anuke.arc.scene.event.ClickListener", "io.anuke.arc.scene.event.DragListener", "io.anuke.arc.scene.event.DragScrollListener", "io.anuke.arc.scene.event.ElementGestureListener", "io.anuke.arc.scene.event.EventListener", "io.anuke.arc.scene.event.FocusListener", "io.anuke.arc.scene.event.FocusListener$FocusEvent", "io.anuke.arc.scene.event.FocusListener$FocusEvent$Type", "io.anuke.arc.scene.event.HandCursorListener", "io.anuke.arc.scene.event.IbeamCursorListener", "io.anuke.arc.scene.event.InputEvent", "io.anuke.arc.scene.event.InputEvent$Type", "io.anuke.arc.scene.event.InputListener", "io.anuke.arc.scene.event.SceneEvent", "io.anuke.arc.scene.event.Touchable", "io.anuke.arc.scene.event.VisibilityEvent", "io.anuke.arc.scene.event.VisibilityListener", "io.anuke.arc.scene.style.BaseDrawable", "io.anuke.arc.scene.style.Drawable", "io.anuke.arc.scene.style.NinePatchDrawable", "io.anuke.arc.scene.style.ScaledNinePatchDrawable", "io.anuke.arc.scene.style.Style", "io.anuke.arc.scene.style.TextureRegionDrawable", "io.anuke.arc.scene.style.TiledDrawable", "io.anuke.arc.scene.style.TransformDrawable", "io.anuke.arc.scene.ui.Button", "io.anuke.arc.scene.ui.Button$ButtonStyle", "io.anuke.arc.scene.ui.ButtonGroup", "io.anuke.arc.scene.ui.CheckBox", "io.anuke.arc.scene.ui.CheckBox$CheckBoxStyle", "io.anuke.arc.scene.ui.ColorImage", "io.anuke.arc.scene.ui.Dialog", "io.anuke.arc.scene.ui.Dialog$DialogStyle", "io.anuke.arc.scene.ui.Image", "io.anuke.arc.scene.ui.ImageButton", "io.anuke.arc.scene.ui.ImageButton$ImageButtonStyle", "io.anuke.arc.scene.ui.KeybindDialog", "io.anuke.arc.scene.ui.KeybindDialog$KeybindDialogStyle", "io.anuke.arc.scene.ui.Label", "io.anuke.arc.scene.ui.Label$LabelStyle", "io.anuke.arc.scene.ui.ProgressBar", "io.anuke.arc.scene.ui.ProgressBar$ProgressBarStyle", "io.anuke.arc.scene.ui.ScrollPane", "io.anuke.arc.scene.ui.ScrollPane$ScrollPaneStyle", "io.anuke.arc.scene.ui.SettingsDialog", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable$CheckSetting", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable$Setting", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable$SliderSetting", "io.anuke.arc.scene.ui.SettingsDialog$StringProcessor", "io.anuke.arc.scene.ui.Slider", "io.anuke.arc.scene.ui.Slider$SliderStyle", "io.anuke.arc.scene.ui.TextArea", "io.anuke.arc.scene.ui.TextArea$TextAreaListener", "io.anuke.arc.scene.ui.TextButton", "io.anuke.arc.scene.ui.TextButton$TextButtonStyle", "io.anuke.arc.scene.ui.TextField", "io.anuke.arc.scene.ui.TextField$DefaultOnscreenKeyboard", "io.anuke.arc.scene.ui.TextField$OnscreenKeyboard", "io.anuke.arc.scene.ui.TextField$TextFieldClickListener", "io.anuke.arc.scene.ui.TextField$TextFieldFilter", "io.anuke.arc.scene.ui.TextField$TextFieldListener", "io.anuke.arc.scene.ui.TextField$TextFieldStyle", "io.anuke.arc.scene.ui.TextField$TextFieldValidator", "io.anuke.arc.scene.ui.Tooltip", "io.anuke.arc.scene.ui.Tooltip$Tooltips", "io.anuke.arc.scene.ui.Touchpad", "io.anuke.arc.scene.ui.Touchpad$TouchpadStyle", "io.anuke.arc.scene.ui.TreeElement", "io.anuke.arc.scene.ui.TreeElement$Node", "io.anuke.arc.scene.ui.TreeElement$TreeStyle", "io.anuke.arc.scene.ui.layout.Cell", "io.anuke.arc.scene.ui.layout.Collapser", "io.anuke.arc.scene.ui.layout.HorizontalGroup", "io.anuke.arc.scene.ui.layout.Scl", "io.anuke.arc.scene.ui.layout.Stack", "io.anuke.arc.scene.ui.layout.Table", "io.anuke.arc.scene.ui.layout.Table$DrawRect", "io.anuke.arc.scene.ui.layout.VerticalGroup", "io.anuke.arc.scene.ui.layout.WidgetGroup", "io.anuke.arc.scene.utils.ArraySelection", "io.anuke.arc.scene.utils.Cullable", "io.anuke.arc.scene.utils.Disableable", "io.anuke.arc.scene.utils.DragAndDrop", "io.anuke.arc.scene.utils.DragAndDrop$Payload", "io.anuke.arc.scene.utils.DragAndDrop$Source", "io.anuke.arc.scene.utils.DragAndDrop$Target", "io.anuke.arc.scene.utils.Elements", "io.anuke.arc.scene.utils.Layout", "io.anuke.arc.scene.utils.Selection", "io.anuke.arc.util.Time", "io.anuke.mindustry.Vars", "io.anuke.mindustry.ai.BlockIndexer", "io.anuke.mindustry.ai.Pathfinder", "io.anuke.mindustry.ai.Pathfinder$PathData", "io.anuke.mindustry.ai.Pathfinder$PathTarget", "io.anuke.mindustry.ai.Pathfinder$PathTileStruct", "io.anuke.mindustry.ai.WaveSpawner", "io.anuke.mindustry.content.Blocks", "io.anuke.mindustry.content.Bullets", "io.anuke.mindustry.content.Fx", "io.anuke.mindustry.content.Items", "io.anuke.mindustry.content.Liquids", "io.anuke.mindustry.content.Loadouts", "io.anuke.mindustry.content.Mechs", "io.anuke.mindustry.content.StatusEffects", "io.anuke.mindustry.content.TechTree", "io.anuke.mindustry.content.TechTree$TechNode", "io.anuke.mindustry.content.TypeIDs", "io.anuke.mindustry.content.UnitTypes", "io.anuke.mindustry.content.Zones", "io.anuke.mindustry.core.ContentLoader", "io.anuke.mindustry.core.Control", "io.anuke.mindustry.core.FileTree", "io.anuke.mindustry.core.GameState", "io.anuke.mindustry.core.GameState$State", "io.anuke.mindustry.core.Logic", "io.anuke.mindustry.core.Platform", "io.anuke.mindustry.core.Renderer", "io.anuke.mindustry.core.UI", "io.anuke.mindustry.core.Version", "io.anuke.mindustry.core.World", "io.anuke.mindustry.core.World$Raycaster", "io.anuke.mindustry.ctype.Content", "io.anuke.mindustry.ctype.ContentList", "io.anuke.mindustry.ctype.MappableContent", "io.anuke.mindustry.ctype.UnlockableContent", "io.anuke.mindustry.editor.DrawOperation", "io.anuke.mindustry.editor.DrawOperation$OpType", "io.anuke.mindustry.editor.DrawOperation$TileOpStruct", "io.anuke.mindustry.editor.EditorTile", "io.anuke.mindustry.editor.EditorTool", "io.anuke.mindustry.editor.MapEditor", "io.anuke.mindustry.editor.MapEditor$Context", "io.anuke.mindustry.editor.MapEditorDialog", "io.anuke.mindustry.editor.MapGenerateDialog", "io.anuke.mindustry.editor.MapInfoDialog", "io.anuke.mindustry.editor.MapLoadDialog", "io.anuke.mindustry.editor.MapRenderer", "io.anuke.mindustry.editor.MapResizeDialog", "io.anuke.mindustry.editor.MapSaveDialog", "io.anuke.mindustry.editor.MapView", "io.anuke.mindustry.editor.OperationStack", "io.anuke.mindustry.editor.WaveInfoDialog", "io.anuke.mindustry.entities.Damage", "io.anuke.mindustry.entities.Damage$PropCellStruct", "io.anuke.mindustry.entities.Effects", "io.anuke.mindustry.entities.Effects$Effect", "io.anuke.mindustry.entities.Effects$EffectContainer", "io.anuke.mindustry.entities.Effects$EffectProvider", "io.anuke.mindustry.entities.Effects$EffectRenderer", "io.anuke.mindustry.entities.Effects$ScreenshakeProvider", "io.anuke.mindustry.entities.Entities", "io.anuke.mindustry.entities.EntityCollisions", "io.anuke.mindustry.entities.EntityGroup", "io.anuke.mindustry.entities.Predict", "io.anuke.mindustry.entities.TargetPriority", "io.anuke.mindustry.entities.Units", "io.anuke.mindustry.entities.bullet.ArtilleryBulletType", "io.anuke.mindustry.entities.bullet.BasicBulletType", "io.anuke.mindustry.entities.bullet.BombBulletType", "io.anuke.mindustry.entities.bullet.BulletType", "io.anuke.mindustry.entities.bullet.FlakBulletType", "io.anuke.mindustry.entities.bullet.HealBulletType", "io.anuke.mindustry.entities.bullet.LiquidBulletType", "io.anuke.mindustry.entities.bullet.MassDriverBolt", "io.anuke.mindustry.entities.bullet.MissileBulletType", "io.anuke.mindustry.entities.effect.Decal", "io.anuke.mindustry.entities.effect.Fire", "io.anuke.mindustry.entities.effect.GroundEffectEntity", "io.anuke.mindustry.entities.effect.GroundEffectEntity$GroundEffect", "io.anuke.mindustry.entities.effect.ItemTransfer", "io.anuke.mindustry.entities.effect.Lightning", "io.anuke.mindustry.entities.effect.Puddle", "io.anuke.mindustry.entities.effect.RubbleDecal", "io.anuke.mindustry.entities.effect.ScorchDecal", "io.anuke.mindustry.entities.traits.AbsorbTrait", "io.anuke.mindustry.entities.traits.BelowLiquidTrait", "io.anuke.mindustry.entities.traits.BuilderMinerTrait", "io.anuke.mindustry.entities.traits.BuilderTrait", "io.anuke.mindustry.entities.traits.BuilderTrait$BuildDataStatic", "io.anuke.mindustry.entities.traits.BuilderTrait$BuildRequest", "io.anuke.mindustry.entities.traits.DamageTrait", "io.anuke.mindustry.entities.traits.DrawTrait", "io.anuke.mindustry.entities.traits.Entity", "io.anuke.mindustry.entities.traits.HealthTrait", "io.anuke.mindustry.entities.traits.KillerTrait", "io.anuke.mindustry.entities.traits.MinerTrait", "io.anuke.mindustry.entities.traits.MoveTrait", "io.anuke.mindustry.entities.traits.SaveTrait", "io.anuke.mindustry.entities.traits.Saveable", "io.anuke.mindustry.entities.traits.ScaleTrait", "io.anuke.mindustry.entities.traits.ShooterTrait", "io.anuke.mindustry.entities.traits.SolidTrait", "io.anuke.mindustry.entities.traits.SpawnerTrait", "io.anuke.mindustry.entities.traits.SyncTrait", "io.anuke.mindustry.entities.traits.TargetTrait", "io.anuke.mindustry.entities.traits.TeamTrait", "io.anuke.mindustry.entities.traits.TimeTrait", "io.anuke.mindustry.entities.traits.TypeTrait", "io.anuke.mindustry.entities.traits.VelocityTrait", "io.anuke.mindustry.entities.type.BaseEntity", "io.anuke.mindustry.entities.type.BaseUnit", "io.anuke.mindustry.entities.type.Bullet", "io.anuke.mindustry.entities.type.DestructibleEntity", "io.anuke.mindustry.entities.type.EffectEntity", "io.anuke.mindustry.entities.type.Player", "io.anuke.mindustry.entities.type.SolidEntity", "io.anuke.mindustry.entities.type.TileEntity", "io.anuke.mindustry.entities.type.TimedEntity", "io.anuke.mindustry.entities.type.Unit", "io.anuke.mindustry.entities.type.base.BaseDrone", "io.anuke.mindustry.entities.type.base.BuilderDrone", "io.anuke.mindustry.entities.type.base.Crawler", "io.anuke.mindustry.entities.type.base.Dagger", "io.anuke.mindustry.entities.type.base.Draug", "io.anuke.mindustry.entities.type.base.Eruptor", "io.anuke.mindustry.entities.type.base.FlyingUnit", "io.anuke.mindustry.entities.type.base.Fortress", "io.anuke.mindustry.entities.type.base.Ghoul", "io.anuke.mindustry.entities.type.base.GroundUnit", "io.anuke.mindustry.entities.type.base.MinerDrone", "io.anuke.mindustry.entities.type.base.Phantom", "io.anuke.mindustry.entities.type.base.RepairDrone", "io.anuke.mindustry.entities.type.base.Revenant", "io.anuke.mindustry.entities.type.base.Spirit", "io.anuke.mindustry.entities.type.base.Titan", "io.anuke.mindustry.entities.type.base.Wraith", "io.anuke.mindustry.entities.units.StateMachine", "io.anuke.mindustry.entities.units.Statuses", "io.anuke.mindustry.entities.units.Statuses$StatusEntry", "io.anuke.mindustry.entities.units.UnitCommand", "io.anuke.mindustry.entities.units.UnitDrops", "io.anuke.mindustry.entities.units.UnitState", "io.anuke.mindustry.game.DefaultWaves", "io.anuke.mindustry.game.Difficulty", "io.anuke.mindustry.game.EventType", "io.anuke.mindustry.game.EventType$BlockBuildBeginEvent", "io.anuke.mindustry.game.EventType$BlockBuildEndEvent", "io.anuke.mindustry.game.EventType$BlockDestroyEvent", "io.anuke.mindustry.game.EventType$BlockInfoEvent", "io.anuke.mindustry.game.EventType$BuildSelectEvent", "io.anuke.mindustry.game.EventType$ClientLoadEvent", "io.anuke.mindustry.game.EventType$CommandIssueEvent", "io.anuke.mindustry.game.EventType$ContentReloadEvent", "io.anuke.mindustry.game.EventType$CoreItemDeliverEvent", "io.anuke.mindustry.game.EventType$DepositEvent", "io.anuke.mindustry.game.EventType$DisposeEvent", "io.anuke.mindustry.game.EventType$GameOverEvent", "io.anuke.mindustry.game.EventType$LaunchEvent", "io.anuke.mindustry.game.EventType$LaunchItemEvent", "io.anuke.mindustry.game.EventType$LineConfirmEvent", "io.anuke.mindustry.game.EventType$LoseEvent", "io.anuke.mindustry.game.EventType$MapMakeEvent", "io.anuke.mindustry.game.EventType$MapPublishEvent", "io.anuke.mindustry.game.EventType$MechChangeEvent", "io.anuke.mindustry.game.EventType$PlayEvent", "io.anuke.mindustry.game.EventType$PlayerBanEvent", "io.anuke.mindustry.game.EventType$PlayerChatEvent", "io.anuke.mindustry.game.EventType$PlayerConnect", "io.anuke.mindustry.game.EventType$PlayerIpBanEvent", "io.anuke.mindustry.game.EventType$PlayerIpUnbanEvent", "io.anuke.mindustry.game.EventType$PlayerJoin", "io.anuke.mindustry.game.EventType$PlayerLeave", "io.anuke.mindustry.game.EventType$PlayerUnbanEvent", "io.anuke.mindustry.game.EventType$ResearchEvent", "io.anuke.mindustry.game.EventType$ResetEvent", "io.anuke.mindustry.game.EventType$ResizeEvent", "io.anuke.mindustry.game.EventType$StateChangeEvent", "io.anuke.mindustry.game.EventType$TapConfigEvent", "io.anuke.mindustry.game.EventType$TapEvent", "io.anuke.mindustry.game.EventType$TileChangeEvent", "io.anuke.mindustry.game.EventType$Trigger", "io.anuke.mindustry.game.EventType$TurretAmmoDeliverEvent", "io.anuke.mindustry.game.EventType$UnitCreateEvent", "io.anuke.mindustry.game.EventType$UnitDestroyEvent", "io.anuke.mindustry.game.EventType$UnlockEvent", "io.anuke.mindustry.game.EventType$WaveEvent", "io.anuke.mindustry.game.EventType$WinEvent", "io.anuke.mindustry.game.EventType$WithdrawEvent", "io.anuke.mindustry.game.EventType$WorldLoadEvent", "io.anuke.mindustry.game.EventType$ZoneConfigureCompleteEvent", "io.anuke.mindustry.game.EventType$ZoneRequireCompleteEvent", "io.anuke.mindustry.game.Gamemode", "io.anuke.mindustry.game.GlobalData", "io.anuke.mindustry.game.LoopControl", "io.anuke.mindustry.game.MusicControl", "io.anuke.mindustry.game.Objective", "io.anuke.mindustry.game.Objectives", "io.anuke.mindustry.game.Objectives$Launched", "io.anuke.mindustry.game.Objectives$Unlock", "io.anuke.mindustry.game.Objectives$Wave", "io.anuke.mindustry.game.Objectives$ZoneObjective", "io.anuke.mindustry.game.Objectives$ZoneWave", "io.anuke.mindustry.game.Rules", "io.anuke.mindustry.game.Saves", "io.anuke.mindustry.game.Saves$SaveSlot", "io.anuke.mindustry.game.Schematic", "io.anuke.mindustry.game.Schematic$Stile", "io.anuke.mindustry.game.Schematics", "io.anuke.mindustry.game.SoundLoop", "io.anuke.mindustry.game.SpawnGroup", "io.anuke.mindustry.game.Stats", "io.anuke.mindustry.game.Stats$Rank", "io.anuke.mindustry.game.Stats$RankResult", "io.anuke.mindustry.game.Team", "io.anuke.mindustry.game.Teams", "io.anuke.mindustry.game.Teams$BrokenBlock", "io.anuke.mindustry.game.Teams$TeamData", "io.anuke.mindustry.game.Tutorial", "io.anuke.mindustry.game.Tutorial$TutorialStage", "io.anuke.mindustry.gen.BufferItem", "io.anuke.mindustry.gen.Call", "io.anuke.mindustry.gen.Call", "io.anuke.mindustry.gen.Icon", "io.anuke.mindustry.gen.Icon", "io.anuke.mindustry.gen.MethodHash", "io.anuke.mindustry.gen.Musics", "io.anuke.mindustry.gen.Musics", "io.anuke.mindustry.gen.PathTile", "io.anuke.mindustry.gen.PropCell", "io.anuke.mindustry.gen.RemoteReadClient", "io.anuke.mindustry.gen.RemoteReadServer", "io.anuke.mindustry.gen.Serialization", "io.anuke.mindustry.gen.Sounds", "io.anuke.mindustry.gen.Sounds", "io.anuke.mindustry.gen.Tex", "io.anuke.mindustry.gen.Tex", "io.anuke.mindustry.gen.TileOp", "io.anuke.mindustry.graphics.BlockRenderer", "io.anuke.mindustry.graphics.Bloom", "io.anuke.mindustry.graphics.CacheLayer", "io.anuke.mindustry.graphics.Drawf", "io.anuke.mindustry.graphics.FloorRenderer", "io.anuke.mindustry.graphics.IndexedRenderer", "io.anuke.mindustry.graphics.Layer", "io.anuke.mindustry.graphics.LightRenderer", "io.anuke.mindustry.graphics.MenuRenderer", "io.anuke.mindustry.graphics.MinimapRenderer", "io.anuke.mindustry.graphics.MultiPacker", "io.anuke.mindustry.graphics.MultiPacker$PageType", "io.anuke.mindustry.graphics.OverlayRenderer", "io.anuke.mindustry.graphics.Pal", "io.anuke.mindustry.graphics.Pixelator", "io.anuke.mindustry.graphics.Shaders", "io.anuke.mindustry.input.Binding", "io.anuke.mindustry.input.DesktopInput", "io.anuke.mindustry.input.InputHandler", "io.anuke.mindustry.input.InputHandler$PlaceLine", "io.anuke.mindustry.input.MobileInput", "io.anuke.mindustry.input.PlaceMode", "io.anuke.mindustry.input.Placement", "io.anuke.mindustry.input.Placement$DistanceHeuristic", "io.anuke.mindustry.input.Placement$NormalizeDrawResult", "io.anuke.mindustry.input.Placement$NormalizeResult", "io.anuke.mindustry.input.Placement$TileHueristic", "io.anuke.mindustry.maps.Map", "io.anuke.mindustry.maps.Maps", "io.anuke.mindustry.maps.Maps$MapProvider", "io.anuke.mindustry.maps.Maps$ShuffleMode", "io.anuke.mindustry.maps.Maps$ShuffleMode", "io.anuke.mindustry.maps.filters.BlendFilter", "io.anuke.mindustry.maps.filters.ClearFilter", "io.anuke.mindustry.maps.filters.DistortFilter", "io.anuke.mindustry.maps.filters.FilterOption", "io.anuke.mindustry.maps.filters.FilterOption$BlockOption", "io.anuke.mindustry.maps.filters.FilterOption$SliderOption", "io.anuke.mindustry.maps.filters.GenerateFilter", "io.anuke.mindustry.maps.filters.GenerateFilter$GenerateInput", "io.anuke.mindustry.maps.filters.GenerateFilter$GenerateInput$TileProvider", "io.anuke.mindustry.maps.filters.MedianFilter", "io.anuke.mindustry.maps.filters.MirrorFilter", "io.anuke.mindustry.maps.filters.NoiseFilter", "io.anuke.mindustry.maps.filters.OreFilter", "io.anuke.mindustry.maps.filters.OreMedianFilter", "io.anuke.mindustry.maps.filters.RiverNoiseFilter", "io.anuke.mindustry.maps.filters.ScatterFilter", "io.anuke.mindustry.maps.filters.TerrainFilter", "io.anuke.mindustry.maps.generators.BasicGenerator", "io.anuke.mindustry.maps.generators.BasicGenerator$DistanceHeuristic", "io.anuke.mindustry.maps.generators.BasicGenerator$TileHueristic", "io.anuke.mindustry.maps.generators.Generator", "io.anuke.mindustry.maps.generators.MapGenerator", "io.anuke.mindustry.maps.generators.MapGenerator$Decoration", "io.anuke.mindustry.maps.generators.RandomGenerator", "io.anuke.mindustry.maps.zonegen.DesertWastesGenerator", "io.anuke.mindustry.maps.zonegen.OvergrowthGenerator", "io.anuke.mindustry.type.Category", "io.anuke.mindustry.type.ContentType", "io.anuke.mindustry.type.Item", "io.anuke.mindustry.type.ItemStack", "io.anuke.mindustry.type.ItemType", "io.anuke.mindustry.type.Liquid", "io.anuke.mindustry.type.LiquidStack", "io.anuke.mindustry.type.Mech", "io.anuke.mindustry.type.Publishable", "io.anuke.mindustry.type.StatusEffect", "io.anuke.mindustry.type.StatusEffect$TransitionHandler", "io.anuke.mindustry.type.TypeID", "io.anuke.mindustry.type.UnitType", "io.anuke.mindustry.type.Weapon", "io.anuke.mindustry.type.WeatherEvent", "io.anuke.mindustry.type.Zone", "io.anuke.mindustry.ui.Bar", "io.anuke.mindustry.ui.BorderImage", "io.anuke.mindustry.ui.Cicon", "io.anuke.mindustry.ui.ContentDisplay", "io.anuke.mindustry.ui.Fonts", "io.anuke.mindustry.ui.GridImage", "io.anuke.mindustry.ui.IconSize", "io.anuke.mindustry.ui.IntFormat", "io.anuke.mindustry.ui.ItemDisplay", "io.anuke.mindustry.ui.ItemImage", "io.anuke.mindustry.ui.ItemsDisplay", "io.anuke.mindustry.ui.Links", "io.anuke.mindustry.ui.Links$LinkEntry", "io.anuke.mindustry.ui.LiquidDisplay", "io.anuke.mindustry.ui.Minimap", "io.anuke.mindustry.ui.MobileButton", "io.anuke.mindustry.ui.MultiReqImage", "io.anuke.mindustry.ui.ReqImage", "io.anuke.mindustry.ui.Styles", "io.anuke.mindustry.ui.dialogs.AboutDialog", "io.anuke.mindustry.ui.dialogs.AdminsDialog", "io.anuke.mindustry.ui.dialogs.BansDialog", "io.anuke.mindustry.ui.dialogs.ColorPicker", "io.anuke.mindustry.ui.dialogs.ContentInfoDialog", "io.anuke.mindustry.ui.dialogs.ControlsDialog", "io.anuke.mindustry.ui.dialogs.CustomGameDialog", "io.anuke.mindustry.ui.dialogs.CustomRulesDialog", "io.anuke.mindustry.ui.dialogs.DatabaseDialog", "io.anuke.mindustry.ui.dialogs.DeployDialog", "io.anuke.mindustry.ui.dialogs.DeployDialog$View", "io.anuke.mindustry.ui.dialogs.DeployDialog$ZoneNode", "io.anuke.mindustry.ui.dialogs.DiscordDialog", "io.anuke.mindustry.ui.dialogs.FileChooser", "io.anuke.mindustry.ui.dialogs.FileChooser$FileHistory", "io.anuke.mindustry.ui.dialogs.FloatingDialog", "io.anuke.mindustry.ui.dialogs.GameOverDialog", "io.anuke.mindustry.ui.dialogs.HostDialog", "io.anuke.mindustry.ui.dialogs.JoinDialog", "io.anuke.mindustry.ui.dialogs.JoinDialog$Server", "io.anuke.mindustry.ui.dialogs.LanguageDialog", "io.anuke.mindustry.ui.dialogs.LoadDialog", "io.anuke.mindustry.ui.dialogs.LoadoutDialog", "io.anuke.mindustry.ui.dialogs.MapPlayDialog", "io.anuke.mindustry.ui.dialogs.MapsDialog", "io.anuke.mindustry.ui.dialogs.MinimapDialog", "io.anuke.mindustry.ui.dialogs.ModsDialog", "io.anuke.mindustry.ui.dialogs.PaletteDialog", "io.anuke.mindustry.ui.dialogs.PausedDialog", "io.anuke.mindustry.ui.dialogs.SaveDialog", "io.anuke.mindustry.ui.dialogs.SchematicsDialog", "io.anuke.mindustry.ui.dialogs.SchematicsDialog$SchematicImage", "io.anuke.mindustry.ui.dialogs.SchematicsDialog$SchematicInfoDialog", "io.anuke.mindustry.ui.dialogs.SettingsMenuDialog", "io.anuke.mindustry.ui.dialogs.TechTreeDialog", "io.anuke.mindustry.ui.dialogs.TechTreeDialog$LayoutNode", "io.anuke.mindustry.ui.dialogs.TechTreeDialog$TechTreeNode", "io.anuke.mindustry.ui.dialogs.TechTreeDialog$View", "io.anuke.mindustry.ui.dialogs.TraceDialog", "io.anuke.mindustry.ui.dialogs.ZoneInfoDialog", "io.anuke.mindustry.ui.fragments.BlockConfigFragment", "io.anuke.mindustry.ui.fragments.BlockInventoryFragment", "io.anuke.mindustry.ui.fragments.ChatFragment", "io.anuke.mindustry.ui.fragments.FadeInFragment", "io.anuke.mindustry.ui.fragments.Fragment", "io.anuke.mindustry.ui.fragments.HudFragment", "io.anuke.mindustry.ui.fragments.LoadingFragment", "io.anuke.mindustry.ui.fragments.MenuFragment", "io.anuke.mindustry.ui.fragments.OverlayFragment", "io.anuke.mindustry.ui.fragments.PlacementFragment", "io.anuke.mindustry.ui.fragments.PlayerListFragment", "io.anuke.mindustry.ui.fragments.ScriptConsoleFragment", "io.anuke.mindustry.ui.layout.BranchTreeLayout", "io.anuke.mindustry.ui.layout.BranchTreeLayout$TreeAlignment", "io.anuke.mindustry.ui.layout.BranchTreeLayout$TreeLocation", "io.anuke.mindustry.ui.layout.RadialTreeLayout", "io.anuke.mindustry.ui.layout.TreeLayout", "io.anuke.mindustry.ui.layout.TreeLayout$TreeNode", "io.anuke.mindustry.world.Block", "io.anuke.mindustry.world.BlockStorage", "io.anuke.mindustry.world.Build", "io.anuke.mindustry.world.CachedTile", "io.anuke.mindustry.world.DirectionalItemBuffer", "io.anuke.mindustry.world.DirectionalItemBuffer$BufferItemStruct", "io.anuke.mindustry.world.Edges", "io.anuke.mindustry.world.ItemBuffer", "io.anuke.mindustry.world.LegacyColorMapper", "io.anuke.mindustry.world.LegacyColorMapper$LegacyBlock", "io.anuke.mindustry.world.Pos", "io.anuke.mindustry.world.StaticTree", "io.anuke.mindustry.world.Tile", "io.anuke.mindustry.world.WorldContext", "io.anuke.mindustry.world.blocks.Attributes", "io.anuke.mindustry.world.blocks.Autotiler", "io.anuke.mindustry.world.blocks.Autotiler$AutotilerHolder", "io.anuke.mindustry.world.blocks.BlockPart", "io.anuke.mindustry.world.blocks.BuildBlock", "io.anuke.mindustry.world.blocks.BuildBlock$BuildEntity", "io.anuke.mindustry.world.blocks.DoubleOverlayFloor", "io.anuke.mindustry.world.blocks.Floor", "io.anuke.mindustry.world.blocks.ItemSelection", "io.anuke.mindustry.world.blocks.LiquidBlock", "io.anuke.mindustry.world.blocks.OreBlock", "io.anuke.mindustry.world.blocks.OverlayFloor", "io.anuke.mindustry.world.blocks.PowerBlock", "io.anuke.mindustry.world.blocks.RespawnBlock", "io.anuke.mindustry.world.blocks.Rock", "io.anuke.mindustry.world.blocks.StaticWall", "io.anuke.mindustry.world.blocks.TreeBlock", "io.anuke.mindustry.world.blocks.defense.DeflectorWall", "io.anuke.mindustry.world.blocks.defense.DeflectorWall$DeflectorEntity", "io.anuke.mindustry.world.blocks.defense.Door", "io.anuke.mindustry.world.blocks.defense.Door$DoorEntity", "io.anuke.mindustry.world.blocks.defense.ForceProjector", "io.anuke.mindustry.world.blocks.defense.ForceProjector$ForceEntity", "io.anuke.mindustry.world.blocks.defense.ForceProjector$ShieldEntity", "io.anuke.mindustry.world.blocks.defense.MendProjector", "io.anuke.mindustry.world.blocks.defense.MendProjector$MendEntity", "io.anuke.mindustry.world.blocks.defense.OverdriveProjector", "io.anuke.mindustry.world.blocks.defense.OverdriveProjector$OverdriveEntity", "io.anuke.mindustry.world.blocks.defense.ShockMine", "io.anuke.mindustry.world.blocks.defense.SurgeWall", "io.anuke.mindustry.world.blocks.defense.Wall", "io.anuke.mindustry.world.blocks.defense.turrets.ArtilleryTurret", "io.anuke.mindustry.world.blocks.defense.turrets.BurstTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ChargeTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ChargeTurret$LaserTurretEntity", "io.anuke.mindustry.world.blocks.defense.turrets.CooledTurret", "io.anuke.mindustry.world.blocks.defense.turrets.DoubleTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ItemTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ItemTurret$ItemEntry", "io.anuke.mindustry.world.blocks.defense.turrets.ItemTurret$ItemTurretEntity", "io.anuke.mindustry.world.blocks.defense.turrets.LaserTurret", "io.anuke.mindustry.world.blocks.defense.turrets.LaserTurret$LaserTurretEntity", "io.anuke.mindustry.world.blocks.defense.turrets.LiquidTurret", "io.anuke.mindustry.world.blocks.defense.turrets.PowerTurret", "io.anuke.mindustry.world.blocks.defense.turrets.Turret", "io.anuke.mindustry.world.blocks.defense.turrets.Turret$AmmoEntry", "io.anuke.mindustry.world.blocks.defense.turrets.Turret$TurretEntity", "io.anuke.mindustry.world.blocks.distribution.ArmoredConveyor", "io.anuke.mindustry.world.blocks.distribution.BufferedItemBridge", "io.anuke.mindustry.world.blocks.distribution.BufferedItemBridge$BufferedItemBridgeEntity", "io.anuke.mindustry.world.blocks.distribution.Conveyor", "io.anuke.mindustry.world.blocks.distribution.Conveyor$ConveyorEntity", "io.anuke.mindustry.world.blocks.distribution.Conveyor$ItemPos", "io.anuke.mindustry.world.blocks.distribution.ExtendingItemBridge", "io.anuke.mindustry.world.blocks.distribution.ItemBridge", "io.anuke.mindustry.world.blocks.distribution.ItemBridge$ItemBridgeEntity", "io.anuke.mindustry.world.blocks.distribution.Junction", "io.anuke.mindustry.world.blocks.distribution.Junction$JunctionEntity", "io.anuke.mindustry.world.blocks.distribution.MassDriver", "io.anuke.mindustry.world.blocks.distribution.MassDriver$DriverBulletData", "io.anuke.mindustry.world.blocks.distribution.MassDriver$DriverState", "io.anuke.mindustry.world.blocks.distribution.MassDriver$MassDriverEntity", "io.anuke.mindustry.world.blocks.distribution.OverflowGate", "io.anuke.mindustry.world.blocks.distribution.OverflowGate$OverflowGateEntity", "io.anuke.mindustry.world.blocks.distribution.Router", "io.anuke.mindustry.world.blocks.distribution.Router$RouterEntity", "io.anuke.mindustry.world.blocks.distribution.Sorter", "io.anuke.mindustry.world.blocks.distribution.Sorter$SorterEntity", "io.anuke.mindustry.world.blocks.liquid.ArmoredConduit", "io.anuke.mindustry.world.blocks.liquid.Conduit", "io.anuke.mindustry.world.blocks.liquid.Conduit$ConduitEntity", "io.anuke.mindustry.world.blocks.liquid.LiquidBridge", "io.anuke.mindustry.world.blocks.liquid.LiquidExtendingBridge", "io.anuke.mindustry.world.blocks.liquid.LiquidJunction", "io.anuke.mindustry.world.blocks.liquid.LiquidOverflowGate", "io.anuke.mindustry.world.blocks.liquid.LiquidRouter", "io.anuke.mindustry.world.blocks.liquid.LiquidTank", "io.anuke.mindustry.world.blocks.logic.LogicBlock", "io.anuke.mindustry.world.blocks.logic.MessageBlock", "io.anuke.mindustry.world.blocks.logic.MessageBlock$MessageBlockEntity", "io.anuke.mindustry.world.blocks.power.Battery", "io.anuke.mindustry.world.blocks.power.BurnerGenerator", "io.anuke.mindustry.world.blocks.power.ConditionalConsumePower", "io.anuke.mindustry.world.blocks.power.DecayGenerator", "io.anuke.mindustry.world.blocks.power.ImpactReactor", "io.anuke.mindustry.world.blocks.power.ImpactReactor$FusionReactorEntity", "io.anuke.mindustry.world.blocks.power.ItemLiquidGenerator", "io.anuke.mindustry.world.blocks.power.ItemLiquidGenerator$ItemLiquidGeneratorEntity", "io.anuke.mindustry.world.blocks.power.LightBlock", "io.anuke.mindustry.world.blocks.power.LightBlock$LightEntity", "io.anuke.mindustry.world.blocks.power.NuclearReactor", "io.anuke.mindustry.world.blocks.power.NuclearReactor$NuclearReactorEntity", "io.anuke.mindustry.world.blocks.power.PowerDiode", "io.anuke.mindustry.world.blocks.power.PowerDistributor", "io.anuke.mindustry.world.blocks.power.PowerGenerator", "io.anuke.mindustry.world.blocks.power.PowerGenerator$GeneratorEntity", "io.anuke.mindustry.world.blocks.power.PowerGraph", "io.anuke.mindustry.world.blocks.power.PowerNode", "io.anuke.mindustry.world.blocks.power.SingleTypeGenerator", "io.anuke.mindustry.world.blocks.power.SolarGenerator", "io.anuke.mindustry.world.blocks.power.ThermalGenerator", "io.anuke.mindustry.world.blocks.production.Cultivator", "io.anuke.mindustry.world.blocks.production.Cultivator$CultivatorEntity", "io.anuke.mindustry.world.blocks.production.Drill", "io.anuke.mindustry.world.blocks.production.Drill$DrillEntity", "io.anuke.mindustry.world.blocks.production.Fracker", "io.anuke.mindustry.world.blocks.production.Fracker$FrackerEntity", "io.anuke.mindustry.world.blocks.production.GenericCrafter", "io.anuke.mindustry.world.blocks.production.GenericCrafter$GenericCrafterEntity", "io.anuke.mindustry.world.blocks.production.GenericSmelter", "io.anuke.mindustry.world.blocks.production.Incinerator", "io.anuke.mindustry.world.blocks.production.Incinerator$IncineratorEntity", "io.anuke.mindustry.world.blocks.production.LiquidConverter", "io.anuke.mindustry.world.blocks.production.Pump", "io.anuke.mindustry.world.blocks.production.Separator", "io.anuke.mindustry.world.blocks.production.SolidPump", "io.anuke.mindustry.world.blocks.production.SolidPump$SolidPumpEntity", "io.anuke.mindustry.world.blocks.sandbox.ItemSource", "io.anuke.mindustry.world.blocks.sandbox.ItemSource$ItemSourceEntity", "io.anuke.mindustry.world.blocks.sandbox.ItemVoid", "io.anuke.mindustry.world.blocks.sandbox.LiquidSource", "io.anuke.mindustry.world.blocks.sandbox.LiquidSource$LiquidSourceEntity", "io.anuke.mindustry.world.blocks.sandbox.PowerSource", "io.anuke.mindustry.world.blocks.sandbox.PowerVoid", "io.anuke.mindustry.world.blocks.storage.CoreBlock", "io.anuke.mindustry.world.blocks.storage.CoreBlock$CoreEntity", "io.anuke.mindustry.world.blocks.storage.LaunchPad", "io.anuke.mindustry.world.blocks.storage.StorageBlock", "io.anuke.mindustry.world.blocks.storage.StorageBlock$StorageBlockEntity", "io.anuke.mindustry.world.blocks.storage.Unloader", "io.anuke.mindustry.world.blocks.storage.Unloader$UnloaderEntity", "io.anuke.mindustry.world.blocks.storage.Vault", "io.anuke.mindustry.world.blocks.units.CommandCenter", "io.anuke.mindustry.world.blocks.units.CommandCenter$CommandCenterEntity", "io.anuke.mindustry.world.blocks.units.MechPad", "io.anuke.mindustry.world.blocks.units.MechPad$MechFactoryEntity", "io.anuke.mindustry.world.blocks.units.RallyPoint", "io.anuke.mindustry.world.blocks.units.RepairPoint", "io.anuke.mindustry.world.blocks.units.RepairPoint$RepairPointEntity", "io.anuke.mindustry.world.blocks.units.UnitFactory", "io.anuke.mindustry.world.blocks.units.UnitFactory$UnitFactoryEntity", "io.anuke.mindustry.world.consumers.Consume", "io.anuke.mindustry.world.consumers.ConsumeItemFilter", "io.anuke.mindustry.world.consumers.ConsumeItems", "io.anuke.mindustry.world.consumers.ConsumeLiquid", "io.anuke.mindustry.world.consumers.ConsumeLiquidBase", "io.anuke.mindustry.world.consumers.ConsumeLiquidFilter", "io.anuke.mindustry.world.consumers.ConsumePower", "io.anuke.mindustry.world.consumers.ConsumeType", "io.anuke.mindustry.world.consumers.Consumers", "io.anuke.mindustry.world.meta.Attribute", "io.anuke.mindustry.world.meta.BlockBars", "io.anuke.mindustry.world.meta.BlockFlag", "io.anuke.mindustry.world.meta.BlockGroup", "io.anuke.mindustry.world.meta.BlockStat", "io.anuke.mindustry.world.meta.BlockStats", "io.anuke.mindustry.world.meta.BuildVisibility", "io.anuke.mindustry.world.meta.PowerType", "io.anuke.mindustry.world.meta.Producers", "io.anuke.mindustry.world.meta.StatCategory", "io.anuke.mindustry.world.meta.StatUnit", "io.anuke.mindustry.world.meta.StatValue", "io.anuke.mindustry.world.meta.values.AmmoListValue", "io.anuke.mindustry.world.meta.values.BooleanValue", "io.anuke.mindustry.world.meta.values.BoosterListValue", "io.anuke.mindustry.world.meta.values.ItemFilterValue", "io.anuke.mindustry.world.meta.values.ItemListValue", "io.anuke.mindustry.world.meta.values.LiquidFilterValue", "io.anuke.mindustry.world.meta.values.LiquidValue", "io.anuke.mindustry.world.meta.values.NumberValue", "io.anuke.mindustry.world.meta.values.StringValue", "io.anuke.mindustry.world.modules.BlockModule", "io.anuke.mindustry.world.modules.ConsumeModule", "io.anuke.mindustry.world.modules.ItemModule", "io.anuke.mindustry.world.modules.ItemModule$ItemCalculator", "io.anuke.mindustry.world.modules.ItemModule$ItemConsumer", "io.anuke.mindustry.world.modules.LiquidModule", "io.anuke.mindustry.world.modules.LiquidModule$LiquidCalculator", "io.anuke.mindustry.world.modules.LiquidModule$LiquidConsumer", "io.anuke.mindustry.world.modules.PowerModule", "io.anuke.mindustry.world.producers.Produce", "io.anuke.mindustry.world.producers.ProduceItem", "java.io.PrintStream", "java.lang.Object", "java.lang.Runnable", "java.lang.String", "java.lang.System");
 }
\ No newline at end of file
diff --git a/core/src/io/anuke/mindustry/mod/ContentParser.java b/core/src/io/anuke/mindustry/mod/ContentParser.java
index e2b1970b46..ded39c15f0 100644
--- a/core/src/io/anuke/mindustry/mod/ContentParser.java
+++ b/core/src/io/anuke/mindustry/mod/ContentParser.java
@@ -165,11 +165,11 @@ public class ContentParser{
 
             Block block;
 
-            if(Vars.content.getByName(ContentType.block, name) != null){
-                block = Vars.content.getByName(ContentType.block, name);
+            if(locate(ContentType.block, name) != null){
+                block = locate(ContentType.block, name);
 
                 if(value.has("type")){
-                    throw new IllegalArgumentException("When overwriting an existing block, you must not re-declare its type. The original type will be used. Block: " + name);
+                    throw new IllegalArgumentException("When defining properties for an existing block, you must not re-declare its type. The original type will be used. Block: " + name);
                 }
             }else{
                 //TODO generate dynamically instead of doing.. this
@@ -386,16 +386,21 @@ public class ContentParser{
         }
 
         currentMod = mod;
-        boolean exists = Vars.content.getByName(type, name) != null;
+        boolean located = locate(type, name) != null;
         Content c = parsers.get(type).parse(mod.name, name, value);
         toBeParsed.add(c);
-        if(!exists){
+        if(!located){
             c.sourceFile = file;
             c.mod = mod;
         }
         return c;
     }
 
+    private <T extends MappableContent> T locate(ContentType type, String name){
+        T first = Vars.content.getByName(type, name); //try vanilla replacement
+        return first != null ? first : Vars.content.getByName(type, currentMod.name + "-" + name);
+    }
+
     private <T> T make(Class<T> type){
         try{
             Constructor<T> cons = type.getDeclaredConstructor();
diff --git a/core/src/io/anuke/mindustry/mod/Scripts.java b/core/src/io/anuke/mindustry/mod/Scripts.java
index 9048200bc9..6ab13c4208 100644
--- a/core/src/io/anuke/mindustry/mod/Scripts.java
+++ b/core/src/io/anuke/mindustry/mod/Scripts.java
@@ -42,7 +42,7 @@ public class Scripts implements Disposable{
     }
 
     private String getError(Throwable t){
-        t = Strings.getFinalCause(t);
+        t.printStackTrace();
         return t.getClass().getSimpleName() + (t.getMessage() == null ? "" : ": " + t.getMessage());
     }
 
diff --git a/core/src/io/anuke/mindustry/type/ItemStack.java b/core/src/io/anuke/mindustry/type/ItemStack.java
index 4ea87f5605..723a6e4c24 100644
--- a/core/src/io/anuke/mindustry/type/ItemStack.java
+++ b/core/src/io/anuke/mindustry/type/ItemStack.java
@@ -38,7 +38,7 @@ public class ItemStack implements Comparable<ItemStack>{
     public static ItemStack[] with(Object... items){
         ItemStack[] stacks = new ItemStack[items.length / 2];
         for(int i = 0; i < items.length; i += 2){
-            stacks[i / 2] = new ItemStack((Item)items[i], (Integer)items[i + 1]);
+            stacks[i / 2] = new ItemStack((Item)items[i], ((Number)items[i + 1]).intValue());
         }
         return stacks;
     }
@@ -46,7 +46,7 @@ public class ItemStack implements Comparable<ItemStack>{
     public static Array<ItemStack> list(Object... items){
         Array<ItemStack> stacks = new Array<>(items.length / 2);
         for(int i = 0; i < items.length; i += 2){
-            stacks.add(new ItemStack((Item)items[i], (Integer)items[i + 1]));
+            stacks.add(new ItemStack((Item)items[i], ((Number)items[i + 1]).intValue()));
         }
         return stacks;
     }
diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java
index 7644ec9559..663c275e11 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java
@@ -50,7 +50,7 @@ public class BlockConfigFragment extends Fragment{
 
         table.visible(true);
         table.clear();
-        tile.block().buildTable(tile, table);
+        tile.block().buildConfiguration(tile, table);
         table.pack();
         table.setTransform(true);
         table.actions(Actions.scaleTo(0f, 1f), Actions.visible(true),
diff --git a/core/src/io/anuke/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/io/anuke/mindustry/ui/fragments/ScriptConsoleFragment.java
index 32fdbb9394..87b7f76d6e 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/ScriptConsoleFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/ScriptConsoleFragment.java
@@ -53,7 +53,7 @@ public class ScriptConsoleFragment extends Table{
                 clearChatInput();
             }
 
-            return shown && !Vars.net.client();
+            return shown && !Vars.net.active();
         });
 
         update(() -> {
@@ -163,8 +163,8 @@ public class ScriptConsoleFragment extends Table{
 
         history.insert(1, message);
 
-        addMessage("[lightgray]> " + message);
-        addMessage(mods.getScripts().runConsole(message));
+        addMessage("[lightgray]> " + message.replace("[", "[["));
+        addMessage(mods.getScripts().runConsole(message).replace("[", "[["));
     }
 
     public void toggle(){
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index 6e001d38b5..e1f7e4763d 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -184,7 +184,7 @@ public class Block extends BlockStorage{
     }
 
     protected void updatePowerGraph(Tile tile){
-        TileEntity entity = tile.entity();
+        TileEntity entity = tile.ent();
 
         for(Tile other : getPowerConnections(tile, tempTiles)){
             if(other.entity.power != null){
@@ -483,7 +483,7 @@ public class Block extends BlockStorage{
      * Called when this block is tapped to build a UI on the table.
      * {@link #configurable} must return true for this to be called.
      */
-    public void buildTable(Tile tile, Table table){
+    public void buildConfiguration(Tile tile, Table table){
     }
 
     /** Update table alignment after configuring.*/
diff --git a/core/src/io/anuke/mindustry/world/Build.java b/core/src/io/anuke/mindustry/world/Build.java
index 5f7834ed25..276caefba7 100644
--- a/core/src/io/anuke/mindustry/world/Build.java
+++ b/core/src/io/anuke/mindustry/world/Build.java
@@ -39,7 +39,7 @@ public class Build{
         Block sub = BuildBlock.get(previous.size);
 
         world.setBlock(tile, sub, team, rotation);
-        tile.<BuildEntity>entity().setDeconstruct(previous);
+        tile.<BuildEntity>ent().setDeconstruct(previous);
         tile.entity.health = tile.entity.maxHealth() * prevPercent;
 
         Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, true)));
@@ -61,7 +61,7 @@ public class Build{
         Block sub = BuildBlock.get(result.size);
 
         world.setBlock(tile, sub, team, rotation);
-        tile.<BuildEntity>entity().setConstruct(previous, result);
+        tile.<BuildEntity>ent().setConstruct(previous, result);
 
         Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, false)));
     }
diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java
index 06e6cdca81..b3b82a3c45 100644
--- a/core/src/io/anuke/mindustry/world/Tile.java
+++ b/core/src/io/anuke/mindustry/world/Tile.java
@@ -99,7 +99,7 @@ public class Tile implements Position, TargetTrait{
     }
 
     @SuppressWarnings("unchecked")
-    public <T extends TileEntity> T entity(){
+    public <T extends TileEntity> T ent(){
         return (T)entity;
     }
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index 9a31172660..60d99e730c 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -118,19 +118,19 @@ public class BuildBlock extends Block{
 
     @Override
     public String getDisplayName(Tile tile){
-        BuildEntity entity = tile.entity();
+        BuildEntity entity = tile.ent();
         return Core.bundle.format("block.constructing", entity.cblock == null ? entity.previous.localizedName : entity.cblock.localizedName);
     }
 
     @Override
     public TextureRegion getDisplayIcon(Tile tile){
-        BuildEntity entity = tile.entity();
+        BuildEntity entity = tile.ent();
         return (entity.cblock == null ? entity.previous : entity.cblock).icon(io.anuke.mindustry.ui.Cicon.full);
     }
 
     @Override
     public boolean isSolidFor(Tile tile){
-        BuildEntity entity = tile.entity();
+        BuildEntity entity = tile.ent();
         return entity == null || (entity.cblock != null && entity.cblock.solid) || entity.previous == null || entity.previous.solid;
     }
 
@@ -141,7 +141,7 @@ public class BuildBlock extends Block{
 
     @Override
     public void tapped(Tile tile, Player player){
-        BuildEntity entity = tile.entity();
+        BuildEntity entity = tile.ent();
 
         //if the target is constructible, begin constructing
         if(entity.cblock != null){
@@ -164,7 +164,7 @@ public class BuildBlock extends Block{
 
     @Override
     public void draw(Tile tile){
-        BuildEntity entity = tile.entity();
+        BuildEntity entity = tile.ent();
 
         //When breaking, don't draw the previous block... since it's the thing you were breaking
         if(entity.cblock != null && entity.previous == entity.cblock){
@@ -181,7 +181,7 @@ public class BuildBlock extends Block{
     @Override
     public void drawLayer(Tile tile){
 
-        BuildEntity entity = tile.entity();
+        BuildEntity entity = tile.ent();
 
         Shaders.blockbuild.color = Pal.accent;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java
index 1dff9f636c..3cc6d177f0 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java
@@ -27,7 +27,7 @@ public class DeflectorWall extends Wall{
     public void draw(Tile tile){
         super.draw(tile);
 
-        DeflectorEntity entity = tile.entity();
+        DeflectorEntity entity = tile.ent();
 
         if(entity.hit < 0.0001f) return;
 
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 dc05d1ee58..e8bfd2c4b4 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java
@@ -36,7 +36,7 @@ public class Door extends Wall{
 
     @Remote(called = Loc.server)
     public static void onDoorToggle(Player player, Tile tile, boolean open){
-        DoorEntity entity = tile.entity();
+        DoorEntity entity = tile.ent();
         if(entity != null){
             entity.open = open;
             Door door = (Door)tile.block();
@@ -59,7 +59,7 @@ public class Door extends Wall{
 
     @Override
     public void draw(Tile tile){
-        DoorEntity entity = tile.entity();
+        DoorEntity entity = tile.ent();
 
         if(!entity.open){
             Draw.rect(region, tile.drawx(), tile.drawy());
@@ -75,13 +75,13 @@ public class Door extends Wall{
 
     @Override
     public boolean isSolidFor(Tile tile){
-        DoorEntity entity = tile.entity();
+        DoorEntity entity = tile.ent();
         return !entity.open;
     }
 
     @Override
     public void tapped(Tile tile, Player player){
-        DoorEntity entity = tile.entity();
+        DoorEntity entity = tile.ent();
 
         if((Units.anyEntities(tile) && entity.open) || !tile.entity.timer.get(timerToggle, 30f)){
             return;
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 5b385578d1..466d677b6c 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
@@ -88,7 +88,7 @@ public class ForceProjector extends Block{
 
     @Override
     public void update(Tile tile){
-        ForceEntity entity = tile.entity();
+        ForceEntity entity = tile.ent();
 
         if(entity.shield == null){
             entity.shield = new ShieldEntity(tile);
@@ -170,7 +170,7 @@ public class ForceProjector extends Block{
     public void draw(Tile tile){
         super.draw(tile);
 
-        ForceEntity entity = tile.entity();
+        ForceEntity entity = tile.ent();
 
         if(entity.buildup <= 0f) return;
         Draw.alpha(entity.buildup / breakage * 0.75f);
@@ -214,7 +214,7 @@ public class ForceProjector extends Block{
         final ForceEntity entity;
 
         public ShieldEntity(Tile tile){
-            this.entity = tile.entity();
+            this.entity = tile.ent();
             set(tile.drawx(), tile.drawy());
         }
 
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 1d737a4900..a19d536018 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java
@@ -64,7 +64,7 @@ public class MendProjector extends Block{
 
     @Override
     public void update(Tile tile){
-        MendEntity entity = tile.entity();
+        MendEntity entity = tile.ent();
         entity.heat = Mathf.lerpDelta(entity.heat, entity.cons.valid() || tile.isEnemyCheat() ? 1f : 0f, 0.08f);
         entity.charge += entity.heat * entity.delta();
 
@@ -106,7 +106,7 @@ public class MendProjector extends Block{
 
     @Override
     public void drawSelect(Tile tile){
-        MendEntity entity = tile.entity();
+        MendEntity entity = tile.ent();
         float realRange = range + entity.phaseHeat * phaseRangeBoost;
 
         Drawf.dashCircle(tile.drawx(), tile.drawy(), realRange, baseColor);
@@ -116,7 +116,7 @@ public class MendProjector extends Block{
     public void draw(Tile tile){
         super.draw(tile);
 
-        MendEntity entity = tile.entity();
+        MendEntity entity = tile.ent();
         float f = 1f - (Time.time() / 100f) % 1f;
 
         Draw.color(baseColor, phaseColor, entity.phaseHeat);
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 f1708354b5..84e88b2f22 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java
@@ -74,7 +74,7 @@ public class OverdriveProjector extends Block{
 
     @Override
     public void update(Tile tile){
-        OverdriveEntity entity = tile.entity();
+        OverdriveEntity entity = tile.ent();
         entity.heat = Mathf.lerpDelta(entity.heat, entity.cons.valid() ? 1f : 0f, 0.08f);
         entity.charge += entity.heat * Time.delta();
 
@@ -115,7 +115,7 @@ public class OverdriveProjector extends Block{
 
     @Override
     public void drawSelect(Tile tile){
-        OverdriveEntity entity = tile.entity();
+        OverdriveEntity entity = tile.ent();
         float realRange = range + entity.phaseHeat * phaseRangeBoost;
 
         Drawf.dashCircle(tile.drawx(), tile.drawy(), realRange, baseColor);
@@ -125,7 +125,7 @@ public class OverdriveProjector extends Block{
     public void draw(Tile tile){
         super.draw(tile);
 
-        OverdriveEntity entity = tile.entity();
+        OverdriveEntity entity = tile.ent();
         float f = 1f - (Time.time() / 100f) % 1f;
 
         Draw.color(baseColor, phaseColor, entity.phaseHeat);
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java
index f7095474c8..433987d2c6 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java
@@ -22,7 +22,7 @@ public class ArtilleryTurret extends ItemTurret{
 
     @Override
     protected void shoot(Tile tile, BulletType ammo){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         entity.recoil = recoil;
         entity.heat = 1f;
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java
index 66775fb14e..3661ec175c 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java
@@ -16,7 +16,7 @@ public class BurstTurret extends ItemTurret{
 
     @Override
     protected void shoot(Tile tile, BulletType ammo){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         entity.heat = 1f;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java
index e6aac80ea9..dc12e2425f 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java
@@ -25,7 +25,7 @@ public class ChargeTurret extends PowerTurret{
 
     @Override
     public void shoot(Tile tile, BulletType ammo){
-        LaserTurretEntity entity = tile.entity();
+        LaserTurretEntity entity = tile.ent();
 
         useAmmo(tile);
 
@@ -55,7 +55,7 @@ public class ChargeTurret extends PowerTurret{
 
     @Override
     public boolean shouldTurn(Tile tile){
-        LaserTurretEntity entity = tile.entity();
+        LaserTurretEntity entity = tile.ent();
         return !entity.shooting;
     }
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java
index 03c35de0d0..9e48e3fc3a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java
@@ -50,7 +50,7 @@ public class CooledTurret extends Turret{
 
         float maxUsed = consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount;
 
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         Liquid liquid = entity.liquids.current();
 
         float used = Math.min(Math.min(entity.liquids.get(liquid), maxUsed * Time.delta()), Math.max(0, ((reload - entity.reload) / coolantMultiplier) / liquid.heatCapacity)) * baseReloadSpeed(tile);
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java
index 813280bb2f..70be09ad4a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java
@@ -26,7 +26,7 @@ public class DoubleTurret extends ItemTurret{
 
     @Override
     protected void shoot(Tile tile, BulletType ammo){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         entity.shots++;
 
         int i = Mathf.signs[entity.shots % 2];
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java
index ea670a37e5..393e102d7a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java
@@ -47,7 +47,7 @@ public class ItemTurret extends CooledTurret{
             public void build(Tile tile, Table table){
                 MultiReqImage image = new MultiReqImage();
                 content.items().each(i -> filter.get(i) && (!world.isZone() || data.isUnlocked(i)), item -> image.add(new ReqImage(new ItemImage(item.icon(Cicon.medium)),
-                    () -> tile.entity != null && !((ItemTurretEntity)tile.entity).ammo.isEmpty() && ((ItemEntry)tile.<ItemTurretEntity>entity().ammo.peek()).item == item)));
+                    () -> tile.entity != null && !((ItemTurretEntity)tile.entity).ammo.isEmpty() && ((ItemEntry)tile.<ItemTurretEntity>ent().ammo.peek()).item == item)));
 
                 table.add(image).size(8 * 4);
             }
@@ -79,7 +79,7 @@ public class ItemTurret extends CooledTurret{
     public void displayBars(Tile tile, Table bars){
         super.displayBars(tile, bars);
 
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         bars.add(new Bar("blocks.ammo", Pal.ammo, () -> (float)entity.totalAmmo / maxAmmo)).growX();
         bars.row();
@@ -87,7 +87,7 @@ public class ItemTurret extends CooledTurret{
 
     @Override
     public int acceptStack(Item item, int amount, Tile tile, Unit source){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         BulletType type = ammo.get(item);
 
@@ -111,7 +111,7 @@ public class ItemTurret extends CooledTurret{
 
     @Override
     public void handleItem(Item item, Tile tile, Tile source){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         if(entity == null) return;
 
         if(item == Items.pyratite){
@@ -144,7 +144,7 @@ public class ItemTurret extends CooledTurret{
 
     @Override
     public boolean acceptItem(Item item, Tile tile, Tile source){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         return ammo != null && ammo.get(item) != null && entity.totalAmmo + ammo.get(item).ammoMultiplier <= maxAmmo;
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java
index 74e8490928..422b5b57b8 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java
@@ -41,7 +41,7 @@ public class LaserTurret extends PowerTurret{
     public void update(Tile tile){
         super.update(tile);
 
-        LaserTurretEntity entity = tile.entity();
+        LaserTurretEntity entity = tile.ent();
 
         if(entity.bulletLife > 0 && entity.bullet != null){
             tr.trns(entity.rotation, size * tilesize / 2f, 0f);
@@ -59,7 +59,7 @@ public class LaserTurret extends PowerTurret{
 
     @Override
     protected void updateShooting(Tile tile){
-        LaserTurretEntity entity = tile.entity();
+        LaserTurretEntity entity = tile.ent();
 
         if(entity.bulletLife > 0 && entity.bullet != null){
             return;
@@ -87,14 +87,14 @@ public class LaserTurret extends PowerTurret{
 
     @Override
     protected void turnToTarget(Tile tile, float targetRot){
-        LaserTurretEntity entity = tile.entity();
+        LaserTurretEntity entity = tile.ent();
 
         entity.rotation = Angles.moveToward(entity.rotation, targetRot, rotatespeed * entity.delta() * (entity.bulletLife > 0f ? firingMoveFract : 1f));
     }
 
     @Override
     protected void bullet(Tile tile, BulletType type, float angle){
-        LaserTurretEntity entity = tile.entity();
+        LaserTurretEntity entity = tile.ent();
 
         entity.bullet = Bullet.create(type, tile.entity, tile.getTeam(), tile.drawx() + tr.x, tile.drawy() + tr.y, angle);
         entity.bulletLife = shootDuration;
@@ -102,7 +102,7 @@ public class LaserTurret extends PowerTurret{
 
     @Override
     public boolean shouldActiveSound(Tile tile){
-        LaserTurretEntity entity = tile.entity();
+        LaserTurretEntity entity = tile.ent();
 
         return entity.bulletLife > 0 && entity.bullet != null;
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java
index 83b9a75d8b..7192ba09fe 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -48,13 +48,13 @@ public class LiquidTurret extends Turret{
 
     @Override
     public boolean shouldActiveSound(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         return entity.target != null && hasAmmo(tile);
     }
 
     @Override
     protected boolean validateTarget(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         if(entity.liquids.current().canExtinguish() && entity.target instanceof Tile){
             return Fire.has(((Tile)entity.target).x, ((Tile)entity.target).y);
         }
@@ -63,7 +63,7 @@ public class LiquidTurret extends Turret{
 
     @Override
     protected void findTarget(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         if(entity.liquids.current().canExtinguish()){
             int tr = (int)(range / tilesize);
             for(int x = -tr; x <= tr; x++){
@@ -83,7 +83,7 @@ public class LiquidTurret extends Turret{
     protected void effects(Tile tile){
         BulletType type = peekAmmo(tile);
 
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         Effects.effect(type.shootEffect, entity.liquids.current().color, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation);
         Effects.effect(type.smokeEffect, entity.liquids.current().color, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation);
@@ -98,7 +98,7 @@ public class LiquidTurret extends Turret{
 
     @Override
     public BulletType useAmmo(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         if(tile.isEnemyCheat()) return ammo.get(entity.liquids.current());
         BulletType type = ammo.get(entity.liquids.current());
         entity.liquids.remove(entity.liquids.current(), type.ammoMultiplier);
@@ -112,7 +112,7 @@ public class LiquidTurret extends Turret{
 
     @Override
     public boolean hasAmmo(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         return ammo.get(entity.liquids.current()) != null && entity.liquids.total() >= ammo.get(entity.liquids.current()).ammoMultiplier;
     }
 
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 9f2cfa9ed6..e6c3b129d4 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
@@ -115,7 +115,7 @@ public abstract class Turret extends Block{
 
     @Override
     public void drawLayer(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         tr2.trns(entity.rotation, -entity.recoil);
 
@@ -143,7 +143,7 @@ public abstract class Turret extends Block{
 
     @Override
     public void update(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         if(!validateTarget(tile)) entity.target = null;
 
@@ -185,12 +185,12 @@ public abstract class Turret extends Block{
     }
 
     protected boolean validateTarget(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         return !Units.invalidateTarget(entity.target, tile.getTeam(), tile.drawx(), tile.drawy());
     }
 
     protected void findTarget(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         if(targetAir && !targetGround){
             entity.target = Units.closestEnemy(tile.getTeam(), tile.drawx(), tile.drawy(), range, e -> !e.isDead() && e.isFlying());
@@ -200,7 +200,7 @@ public abstract class Turret extends Block{
     }
 
     protected void turnToTarget(Tile tile, float targetRot){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         entity.rotation = Angles.moveToward(entity.rotation, targetRot, rotatespeed * entity.delta() * baseReloadSpeed(tile));
     }
@@ -213,7 +213,7 @@ public abstract class Turret extends Block{
     public BulletType useAmmo(Tile tile){
         if(tile.isEnemyCheat()) return peekAmmo(tile);
 
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         AmmoEntry entry = entity.ammo.peek();
         entry.amount -= ammoPerShot;
         if(entry.amount == 0) entity.ammo.pop();
@@ -226,7 +226,7 @@ public abstract class Turret extends Block{
      * Get the ammo type that will be returned if useAmmo is called.
      */
     public BulletType peekAmmo(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         return entity.ammo.peek().type();
     }
 
@@ -234,12 +234,12 @@ public abstract class Turret extends Block{
      * Returns whether the turret has ammo.
      */
     public boolean hasAmmo(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
         return entity.ammo.size > 0 && entity.ammo.peek().amount >= ammoPerShot;
     }
 
     protected void updateShooting(Tile tile){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         if(entity.reload >= reload){
             BulletType type = peekAmmo(tile);
@@ -253,7 +253,7 @@ public abstract class Turret extends Block{
     }
 
     protected void shoot(Tile tile, BulletType type){
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         entity.recoil = recoil;
         entity.heat = 1f;
@@ -276,7 +276,7 @@ public abstract class Turret extends Block{
         Effect shootEffect = this.shootEffect == Fx.none ? peekAmmo(tile).shootEffect : this.shootEffect;
         Effect smokeEffect = this.smokeEffect == Fx.none ? peekAmmo(tile).smokeEffect : this.smokeEffect;
 
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         Effects.effect(shootEffect, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation);
         Effects.effect(smokeEffect, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation);
@@ -291,7 +291,7 @@ public abstract class Turret extends Block{
 
     protected void ejectEffects(Tile tile){
         if(!isTurret(tile)) return;
-        TurretEntity entity = tile.entity();
+        TurretEntity entity = tile.ent();
 
         Effects.effect(ammoUseEffect, tile.drawx() - Angles.trnsx(entity.rotation, ammoEjectBack),
         tile.drawy() - Angles.trnsy(entity.rotation, ammoEjectBack), entity.rotation);
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java
index cb684c90f3..89b91cb50c 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java
@@ -21,7 +21,7 @@ public class BufferedItemBridge extends ExtendingItemBridge{
 
     @Override
     public void updateTransport(Tile tile, Tile other){
-        BufferedItemBridgeEntity entity = tile.entity();
+        BufferedItemBridgeEntity entity = tile.ent();
 
         if(entity.buffer.accepts() && entity.items.total() > 0){
             entity.buffer.accept(entity.items.take());
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 f046a63850..a3799def15 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
@@ -75,7 +75,7 @@ public class Conveyor extends Block implements Autotiler{
 
     @Override
     public void draw(Tile tile){
-        ConveyorEntity entity = tile.entity();
+        ConveyorEntity entity = tile.ent();
         byte rotation = tile.rotation();
 
         int frame = entity.clogHeat <= 0.5f ? (int)(((Time.time() * speed * 8f * entity.timeScale)) % 4) : 0;
@@ -85,7 +85,7 @@ public class Conveyor extends Block implements Autotiler{
 
     @Override
     public boolean shouldIdleSound(Tile tile){
-        ConveyorEntity entity = tile.entity();
+        ConveyorEntity entity = tile.ent();
         return entity.clogHeat <= 0.5f ;
     }
 
@@ -93,7 +93,7 @@ public class Conveyor extends Block implements Autotiler{
     public void onProximityUpdate(Tile tile){
         super.onProximityUpdate(tile);
 
-        ConveyorEntity entity = tile.entity();
+        ConveyorEntity entity = tile.ent();
         int[] bits = buildBlending(tile, tile.rotation(), null, true);
         entity.blendbits = bits[0];
         entity.blendsclx = bits[1];
@@ -122,7 +122,7 @@ public class Conveyor extends Block implements Autotiler{
 
     @Override
     public void drawLayer(Tile tile){
-        ConveyorEntity entity = tile.entity();
+        ConveyorEntity entity = tile.ent();
 
         byte rotation = tile.rotation();
 
@@ -148,7 +148,7 @@ public class Conveyor extends Block implements Autotiler{
 
     @Override
     public void unitOn(Tile tile, Unit unit){
-        ConveyorEntity entity = tile.entity();
+        ConveyorEntity entity = tile.ent();
 
         if(entity.clogHeat > 0.5f){
             return;
@@ -178,12 +178,12 @@ public class Conveyor extends Block implements Autotiler{
 
     @Override
     public void update(Tile tile){
-        ConveyorEntity entity = tile.entity();
+        ConveyorEntity entity = tile.ent();
         entity.minitem = 1f;
         Tile next = tile.getNearby(tile.rotation());
         if(next != null) next = next.link();
 
-        float nextMax = next != null && next.block() instanceof Conveyor && next.block().acceptItem(null, next, tile) ? 1f - Math.max(itemSpace - next.<ConveyorEntity>entity().minitem, 0) : 1f;
+        float nextMax = next != null && next.block() instanceof Conveyor && next.block().acceptItem(null, next, tile) ? 1f - Math.max(itemSpace - next.<ConveyorEntity>ent().minitem, 0) : 1f;
         int minremove = Integer.MAX_VALUE;
 
         for(int i = entity.convey.size - 1; i >= 0; i--){
@@ -211,7 +211,7 @@ public class Conveyor extends Block implements Autotiler{
 
             if(pos.y >= 0.9999f && offloadDir(tile, pos.item)){
                 if(next != null && next.block() instanceof Conveyor){
-                    ConveyorEntity othere = next.entity();
+                    ConveyorEntity othere = next.ent();
 
                     ItemPos ni = pos2.set(othere.convey.get(othere.lastInserted), ItemPos.updateShorts);
 
@@ -263,7 +263,7 @@ public class Conveyor extends Block implements Autotiler{
 
     @Override
     public int removeStack(Tile tile, Item item, int amount){
-        ConveyorEntity entity = tile.entity();
+        ConveyorEntity entity = tile.ent();
         entity.noSleep();
         int removed = 0;
 
@@ -289,13 +289,13 @@ public class Conveyor extends Block implements Autotiler{
 
     @Override
     public int acceptStack(Item item, int amount, Tile tile, Unit source){
-        ConveyorEntity entity = tile.entity();
+        ConveyorEntity entity = tile.ent();
         return Math.min((int)(entity.minitem / itemSpace), amount);
     }
 
     @Override
     public void handleStack(Item item, int amount, Tile tile, Unit source){
-        ConveyorEntity entity = tile.entity();
+        ConveyorEntity entity = tile.ent();
 
         for(int i = amount - 1; i >= 0; i--){
             long result = ItemPos.packItem(item, 0f, i * itemSpace);
@@ -309,7 +309,7 @@ public class Conveyor extends Block implements Autotiler{
     @Override
     public boolean acceptItem(Item item, Tile tile, Tile source){
         int direction = source == null ? 0 : Math.abs(source.relativeTo(tile.x, tile.y) - tile.rotation());
-        float minitem = tile.<ConveyorEntity>entity().minitem;
+        float minitem = tile.<ConveyorEntity>ent().minitem;
         return (((direction == 0) && minitem > itemSpace) ||
         ((direction % 2 == 1) && minitem > 0.52f)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation()));
     }
@@ -324,7 +324,7 @@ public class Conveyor extends Block implements Autotiler{
         float pos = ch == 0 ? 0 : ch % 2 == 1 ? 0.5f : 1f;
         float y = (ang == -1 || ang == 3) ? 1 : (ang == 1 || ang == -3) ? -1 : 0;
 
-        ConveyorEntity entity = tile.entity();
+        ConveyorEntity entity = tile.ent();
         entity.noSleep();
         long result = ItemPos.packItem(item, y * 0.9f, pos);
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java
index 3889a8078a..7a0a2b1d06 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java
@@ -16,7 +16,7 @@ public class ExtendingItemBridge extends ItemBridge{
 
     @Override
     public void drawLayer(Tile tile){
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
 
         Tile other = world.tile(entity.link);
         if(!linkValid(tile, other)) return;
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 8965a1be97..3624a1079b 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
@@ -46,7 +46,7 @@ public class ItemBridge extends Block{
 
     @Override
     public void configured(Tile tile, Player player, int value){
-        tile.<ItemBridgeEntity>entity().link = value;
+        tile.<ItemBridgeEntity>ent().link = value;
     }
 
     @Override
@@ -126,7 +126,7 @@ public class ItemBridge extends Block{
 
     @Override
     public void drawConfigure(Tile tile){
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
 
         Draw.color(Pal.accent);
         Lines.stroke(1f);
@@ -151,7 +151,7 @@ public class ItemBridge extends Block{
 
     @Override
     public boolean onConfigureTileTapped(Tile tile, Tile other){
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
 
         if(linkValid(tile, other)){
             if(entity.link == other.pos()){
@@ -166,7 +166,7 @@ public class ItemBridge extends Block{
 
     @Override
     public void update(Tile tile){
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
 
         entity.time += entity.cycleSpeed * entity.delta();
         entity.time2 += (entity.cycleSpeed - 1f) * entity.delta();
@@ -175,7 +175,7 @@ public class ItemBridge extends Block{
         while(it.hasNext){
             int i = it.next();
             Tile other = world.tile(i);
-            if(!linkValid(tile, other, false) || other.<ItemBridgeEntity>entity().link != tile.pos()){
+            if(!linkValid(tile, other, false) || other.<ItemBridgeEntity>ent().link != tile.pos()){
                 it.remove();
             }
         }
@@ -198,7 +198,7 @@ public class ItemBridge extends Block{
     }
 
     public void updateTransport(Tile tile, Tile other){
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
 
         if(entity.uptime >= 0.5f && entity.timer.get(timerTransport, transportTime)){
             Item item = entity.items.take();
@@ -214,7 +214,7 @@ public class ItemBridge extends Block{
 
     @Override
     public void drawLayer(Tile tile){
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
 
         Tile other = world.tile(entity.link);
         if(!linkValid(tile, other)) return;
@@ -254,7 +254,7 @@ public class ItemBridge extends Block{
     public boolean acceptItem(Item item, Tile tile, Tile source){
         if(tile.getTeam() != source.getTeam()) return false;
 
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
         Tile other = world.tile(entity.link);
 
         if(linkValid(tile, other)){
@@ -263,7 +263,7 @@ public class ItemBridge extends Block{
 
             if(rel == rel2) return false;
         }else{
-            return source.block() instanceof ItemBridge && source.<ItemBridgeEntity>entity().link == tile.pos() && tile.entity.items.total() < itemCapacity;
+            return source.block() instanceof ItemBridge && source.<ItemBridgeEntity>ent().link == tile.pos() && tile.entity.items.total() < itemCapacity;
         }
 
         return tile.entity.items.total() < itemCapacity;
@@ -272,7 +272,7 @@ public class ItemBridge extends Block{
 
     @Override
     public boolean canDumpLiquid(Tile tile, Tile to, Liquid liquid){
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
 
         Tile other = world.tile(entity.link);
         if(!linkValid(tile, other)){
@@ -300,7 +300,7 @@ public class ItemBridge extends Block{
     public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount){
         if(tile.getTeam() != source.getTeam() || !hasLiquids) return false;
 
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
         Tile other = world.tile(entity.link);
 
         if(linkValid(tile, other)){
@@ -308,7 +308,7 @@ public class ItemBridge extends Block{
             int rel2 = tile.relativeTo(source.x, source.y);
 
             if(rel == rel2) return false;
-        }else if(!(source.block() instanceof ItemBridge && source.<ItemBridgeEntity>entity().link == tile.pos())){
+        }else if(!(source.block() instanceof ItemBridge && source.<ItemBridgeEntity>ent().link == tile.pos())){
             return false;
         }
 
@@ -317,7 +317,7 @@ public class ItemBridge extends Block{
 
     @Override
     public boolean canDump(Tile tile, Tile to, Item item){
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
 
         Tile other = world.tile(entity.link);
         if(!linkValid(tile, other)){
@@ -355,7 +355,7 @@ public class ItemBridge extends Block{
             return false;
         }
 
-        return other.block() == this && (!checkDouble || other.<ItemBridgeEntity>entity().link != tile.pos());
+        return other.block() == this && (!checkDouble || other.<ItemBridgeEntity>ent().link != tile.pos());
     }
 
     public static class ItemBridgeEntity extends TileEntity{
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java
index 8fe62c1a05..45fea7b8a4 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java
@@ -42,7 +42,7 @@ public class Junction extends Block{
 
     @Override
     public void update(Tile tile){
-        JunctionEntity entity = tile.entity();
+        JunctionEntity entity = tile.ent();
         DirectionalItemBuffer buffer = entity.buffer;
 
         for(int i = 0; i < 4; i++){
@@ -72,14 +72,14 @@ public class Junction extends Block{
 
     @Override
     public void handleItem(Item item, Tile tile, Tile source){
-        JunctionEntity entity = tile.entity();
+        JunctionEntity entity = tile.ent();
         int relative = source.relativeTo(tile.x, tile.y);
         entity.buffer.accept(relative, item);
     }
 
     @Override
     public boolean acceptItem(Item item, Tile tile, Tile source){
-        JunctionEntity entity = tile.entity();
+        JunctionEntity entity = tile.ent();
         int relative = source.relativeTo(tile.x, tile.y);
 
         if(entity == null || relative == -1 || !entity.buffer.accepts(relative))
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 f6799d7dc7..1f75a716c8 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
@@ -47,7 +47,7 @@ public class MassDriver extends Block{
 
     @Override
     public void configured(Tile tile, Player player, int value){
-        tile.<MassDriverEntity>entity().link = value;
+        tile.<MassDriverEntity>ent().link = value;
     }
 
     @Override
@@ -64,7 +64,7 @@ public class MassDriver extends Block{
 
     @Override
     public void update(Tile tile){
-        MassDriverEntity entity = tile.entity();
+        MassDriverEntity entity = tile.ent();
         Tile link = world.tile(entity.link);
         boolean hasLink = linkValid(tile);
 
@@ -120,7 +120,7 @@ public class MassDriver extends Block{
                 tile.entity.items.total() >= minDistribute && //must shoot minimum amount of items
                 link.block().itemCapacity - link.entity.items.total() >= minDistribute //must have minimum amount of space
             ){
-                MassDriverEntity other = link.entity();
+                MassDriverEntity other = link.ent();
                 other.waitingShooters.add(tile);
 
                 if(entity.reload <= 0.0001f){
@@ -152,7 +152,7 @@ public class MassDriver extends Block{
 
     @Override
     public void drawLayer(Tile tile){
-        MassDriverEntity entity = tile.entity();
+        MassDriverEntity entity = tile.ent();
 
         Draw.rect(region,
         tile.drawx() + Angles.trnsx(entity.rotation + 180f, entity.reload * knockback),
@@ -172,7 +172,7 @@ public class MassDriver extends Block{
         Lines.stroke(1f);
         Drawf.circles(tile.drawx(), tile.drawy(), (tile.block().size / 2f + 1) * tilesize + sin - 2f, Pal.accent);
 
-        MassDriverEntity entity = tile.entity();
+        MassDriverEntity entity = tile.ent();
 
         if(linkValid(tile)){
             Tile target = world.tile(entity.link);
@@ -187,7 +187,7 @@ public class MassDriver extends Block{
     public boolean onConfigureTileTapped(Tile tile, Tile other){
         if(tile == other) return false;
 
-        MassDriverEntity entity = tile.entity();
+        MassDriverEntity entity = tile.ent();
 
         if(entity.link == other.pos()){
             tile.configure(-1);
@@ -207,8 +207,8 @@ public class MassDriver extends Block{
     }
 
     protected void fire(Tile tile, Tile target){
-        MassDriverEntity entity = tile.entity();
-        MassDriverEntity other = target.entity();
+        MassDriverEntity entity = tile.ent();
+        MassDriverEntity other = target.ent();
 
         //reset reload, use power.
         entity.reload = 1f;
@@ -264,13 +264,13 @@ public class MassDriver extends Block{
     protected boolean shooterValid(Tile tile, Tile other){
         if(other == null) return true;
         if(!(other.block() instanceof MassDriver)) return false;
-        MassDriverEntity entity = other.entity();
+        MassDriverEntity entity = other.ent();
         return entity.link == tile.pos() && tile.dst(other) <= range;
     }
 
     protected boolean linkValid(Tile tile){
         if(tile == null) return false;
-        MassDriverEntity entity = tile.entity();
+        MassDriverEntity entity = tile.ent();
         if(entity == null || entity.link == -1) return false;
         Tile link = world.tile(entity.link);
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
index a510bae97c..a6c8f779ac 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
@@ -29,7 +29,7 @@ public class OverflowGate extends Block{
 
     @Override
     public int removeStack(Tile tile, Item item, int amount){
-        OverflowGateEntity entity = tile.entity();
+        OverflowGateEntity entity = tile.ent();
         int result = super.removeStack(tile, item, amount);
         if(result != 0 && item == entity.lastItem){
             entity.lastItem = null;
@@ -39,7 +39,7 @@ public class OverflowGate extends Block{
 
     @Override
     public void update(Tile tile){
-        OverflowGateEntity entity = tile.entity();
+        OverflowGateEntity entity = tile.ent();
 
         if(entity.lastItem == null && entity.items.total() > 0){
             entity.items.clear();
@@ -60,14 +60,14 @@ public class OverflowGate extends Block{
 
     @Override
     public boolean acceptItem(Item item, Tile tile, Tile source){
-        OverflowGateEntity entity = tile.entity();
+        OverflowGateEntity entity = tile.ent();
 
         return tile.getTeam() == source.getTeam() && entity.lastItem == null && entity.items.total() == 0;
     }
 
     @Override
     public void handleItem(Item item, Tile tile, Tile source){
-        OverflowGateEntity entity = tile.entity();
+        OverflowGateEntity entity = tile.ent();
         entity.items.add(item, 1);
         entity.lastItem = item;
         entity.time = 0f;
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
index c8e9fb441d..1893af98e2 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
@@ -24,7 +24,7 @@ public class Router extends Block{
 
     @Override
     public void update(Tile tile){
-        RouterEntity entity = tile.entity();
+        RouterEntity entity = tile.ent();
 
         if(entity.lastItem == null && entity.items.total() > 0){
             entity.items.clear();
@@ -45,14 +45,14 @@ public class Router extends Block{
 
     @Override
     public boolean acceptItem(Item item, Tile tile, Tile source){
-        RouterEntity entity = tile.entity();
+        RouterEntity entity = tile.ent();
 
         return tile.getTeam() == source.getTeam() && entity.lastItem == null && entity.items.total() == 0;
     }
 
     @Override
     public void handleItem(Item item, Tile tile, Tile source){
-        RouterEntity entity = tile.entity();
+        RouterEntity entity = tile.ent();
         entity.items.add(item, 1);
         entity.lastItem = item;
         entity.time = 0f;
@@ -75,7 +75,7 @@ public class Router extends Block{
 
     @Override
     public int removeStack(Tile tile, Item item, int amount){
-        RouterEntity entity = tile.entity();
+        RouterEntity entity = tile.ent();
         int result = super.removeStack(tile, item, amount);
         if(result != 0 && item == entity.lastItem){
             entity.lastItem = null;
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 60c88e77b1..1794161654 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java
@@ -45,7 +45,7 @@ public class Sorter extends Block{
 
     @Override
     public void configured(Tile tile, Player player, int value){
-        tile.<SorterEntity>entity().sortItem = content.item(value);
+        tile.<SorterEntity>ent().sortItem = content.item(value);
     }
 
     @Override
@@ -57,7 +57,7 @@ public class Sorter extends Block{
     public void draw(Tile tile){
         super.draw(tile);
 
-        SorterEntity entity = tile.entity();
+        SorterEntity entity = tile.ent();
         if(entity.sortItem == null) return;
 
         Draw.color(entity.sortItem.color);
@@ -67,7 +67,7 @@ public class Sorter extends Block{
 
     @Override
     public int minimapColor(Tile tile){
-        return tile.<SorterEntity>entity().sortItem == null ? 0 : tile.<SorterEntity>entity().sortItem.color.rgba();
+        return tile.<SorterEntity>ent().sortItem == null ? 0 : tile.<SorterEntity>ent().sortItem.color.rgba();
     }
 
     @Override
@@ -89,7 +89,7 @@ public class Sorter extends Block{
     }
 
     Tile getTileTarget(Item item, Tile dest, Tile source, boolean flip){
-        SorterEntity entity = dest.entity();
+        SorterEntity entity = dest.ent();
 
         int dir = source.relativeTo(dest.x, dest.y);
         if(dir == -1) return null;
@@ -130,8 +130,8 @@ public class Sorter extends Block{
     }
 
     @Override
-    public void buildTable(Tile tile, Table table){
-        SorterEntity entity = tile.entity();
+    public void buildConfiguration(Tile tile, Table table){
+        SorterEntity entity = tile.ent();
         ItemSelection.buildItemTable(table, () -> entity.sortItem, item -> {
             lastItem = item;
             tile.configure(item == null ? -1 : item.id);
diff --git a/core/src/io/anuke/mindustry/world/blocks/liquid/Conduit.java b/core/src/io/anuke/mindustry/world/blocks/liquid/Conduit.java
index e68b58e48d..0b6518b956 100644
--- a/core/src/io/anuke/mindustry/world/blocks/liquid/Conduit.java
+++ b/core/src/io/anuke/mindustry/world/blocks/liquid/Conduit.java
@@ -47,7 +47,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
     public void onProximityUpdate(Tile tile){
         super.onProximityUpdate(tile);
 
-        ConduitEntity entity = tile.entity();
+        ConduitEntity entity = tile.ent();
         int[] bits = buildBlending(tile, tile.rotation(), null, true);
         entity.blendbits = bits[0];
     }
@@ -91,7 +91,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
 
     @Override
     public void draw(Tile tile){
-        ConduitEntity entity = tile.entity();
+        ConduitEntity entity = tile.ent();
         LiquidModule mod = tile.entity.liquids;
         int rotation = tile.rotation() * 90;
 
@@ -108,7 +108,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
 
     @Override
     public void update(Tile tile){
-        ConduitEntity entity = tile.entity();
+        ConduitEntity entity = tile.ent();
         entity.smoothLiquid = Mathf.lerpDelta(entity.smoothLiquid, entity.liquids.total() / liquidCapacity, 0.05f);
 
         if(tile.entity.liquids.total() > 0.001f && tile.entity.timer.get(timerFlow, 1)){
diff --git a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidBridge.java b/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidBridge.java
index f64a16ba80..5575d6d779 100644
--- a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidBridge.java
@@ -21,7 +21,7 @@ public class LiquidBridge extends ItemBridge{
 
     @Override
     public void update(Tile tile){
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
 
         entity.time += entity.cycleSpeed * Time.delta();
         entity.time2 += (entity.cycleSpeed - 1f) * Time.delta();
diff --git a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidExtendingBridge.java b/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
index 8c82053b7f..1753e17d55 100644
--- a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
@@ -21,7 +21,7 @@ public class LiquidExtendingBridge extends ExtendingItemBridge{
 
     @Override
     public void update(Tile tile){
-        ItemBridgeEntity entity = tile.entity();
+        ItemBridgeEntity entity = tile.ent();
 
         entity.time += entity.cycleSpeed * Time.delta();
         entity.time2 += (entity.cycleSpeed - 1f) * Time.delta();
diff --git a/core/src/io/anuke/mindustry/world/blocks/logic/MessageBlock.java b/core/src/io/anuke/mindustry/world/blocks/logic/MessageBlock.java
index 9b773c6356..0cb2611815 100644
--- a/core/src/io/anuke/mindustry/world/blocks/logic/MessageBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/logic/MessageBlock.java
@@ -61,7 +61,7 @@ public class MessageBlock extends Block{
             }
         }
 
-        MessageBlockEntity entity = tile.entity();
+        MessageBlockEntity entity = tile.ent();
         if(entity != null){
             entity.message = result.toString();
             entity.lines = entity.message.split("\n");
@@ -70,7 +70,7 @@ public class MessageBlock extends Block{
 
     @Override
     public void drawSelect(Tile tile){
-        MessageBlockEntity entity = tile.entity();
+        MessageBlockEntity entity = tile.ent();
         BitmapFont font = Fonts.outline;
         GlyphLayout l = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
         boolean ints = font.usesIntegerPositions();
@@ -95,8 +95,8 @@ public class MessageBlock extends Block{
     }
 
     @Override
-    public void buildTable(Tile tile, Table table){
-        MessageBlockEntity entity = tile.entity();
+    public void buildConfiguration(Tile tile, Table table){
+        MessageBlockEntity entity = tile.ent();
 
         table.addImageButton(Icon.pencilSmall, () -> {
             if(mobile){
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java
index 77e2cf2ad2..e74eab58ef 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java
@@ -69,7 +69,7 @@ public class ImpactReactor extends PowerGenerator{
 
     @Override
     public void update(Tile tile){
-        FusionReactorEntity entity = tile.entity();
+        FusionReactorEntity entity = tile.ent();
 
         if(entity.cons.valid() && entity.power.status >= 0.99f){
             boolean prevOut = getPowerProduction(tile) <= consumes.getPower().requestedPower(entity);
@@ -95,7 +95,7 @@ public class ImpactReactor extends PowerGenerator{
 
     @Override
     public void draw(Tile tile){
-        FusionReactorEntity entity = tile.entity();
+        FusionReactorEntity entity = tile.ent();
 
         Draw.rect(reg(bottomRegion), tile.drawx(), tile.drawy());
 
@@ -118,7 +118,7 @@ public class ImpactReactor extends PowerGenerator{
 
     @Override
     public void drawLight(Tile tile){
-        float fract = tile.<FusionReactorEntity>entity().warmup;
+        float fract = tile.<FusionReactorEntity>ent().warmup;
         renderer.lights.add(tile.drawx(), tile.drawy(), (110f + Mathf.absin(5, 5f)) * fract, Tmp.c1.set(plasma2).lerp(plasma1, Mathf.absin(7f, 0.2f)), 0.8f * fract);
     }
 
@@ -131,7 +131,7 @@ public class ImpactReactor extends PowerGenerator{
     public void onDestroyed(Tile tile){
         super.onDestroyed(tile);
 
-        FusionReactorEntity entity = tile.entity();
+        FusionReactorEntity entity = tile.ent();
 
         if(entity.warmup < 0.4f || !state.rules.reactorExplosions) return;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
index 7d4b378b2a..75bd3bd578 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
@@ -87,13 +87,13 @@ public class ItemLiquidGenerator extends PowerGenerator{
 
     @Override
     public boolean productionValid(Tile tile){
-        ItemLiquidGeneratorEntity entity = tile.entity();
+        ItemLiquidGeneratorEntity entity = tile.ent();
         return entity.generateTime > 0;
     }
 
     @Override
     public void update(Tile tile){
-        ItemLiquidGeneratorEntity entity = tile.entity();
+        ItemLiquidGeneratorEntity entity = tile.ent();
 
         //Note: Do not use this delta when calculating the amount of power or the power efficiency, but use it for resource consumption if necessary.
         //Power amount is delta'd by PowerGraph class already.
@@ -156,7 +156,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
     public void draw(Tile tile){
         super.draw(tile);
 
-        ItemLiquidGeneratorEntity entity = tile.entity();
+        ItemLiquidGeneratorEntity entity = tile.ent();
 
         if(hasItems){
             Draw.color(heatColor);
@@ -175,7 +175,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
 
     @Override
     public void drawLight(Tile tile){
-        ItemLiquidGeneratorEntity entity = tile.entity();
+        ItemLiquidGeneratorEntity entity = tile.ent();
 
         renderer.lights.add(tile.drawx(), tile.drawy(), (60f + Mathf.absin(10f, 5f)) * entity.productionEfficiency * size, Color.orange, 0.5f);
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/LightBlock.java b/core/src/io/anuke/mindustry/world/blocks/power/LightBlock.java
index 06e1b257cb..989775dc40 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/LightBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/LightBlock.java
@@ -39,7 +39,7 @@ public class LightBlock extends Block{
     @Override
     public void draw(Tile tile){
         super.draw(tile);
-        LightEntity entity = tile.entity();
+        LightEntity entity = tile.ent();
 
         Draw.blend(Blending.additive);
         Draw.color(Tmp.c1.set(entity.color), entity.efficiency() * 0.3f);
@@ -49,8 +49,8 @@ public class LightBlock extends Block{
     }
 
     @Override
-    public void buildTable(Tile tile, Table table){
-        LightEntity entity = tile.entity();
+    public void buildConfiguration(Tile tile, Table table){
+        LightEntity entity = tile.ent();
 
         table.addImageButton(Icon.pencilSmall, () -> {
             ui.picker.show(Tmp.c1.set(entity.color).a(0.5f), false, res -> {
@@ -63,12 +63,12 @@ public class LightBlock extends Block{
 
     @Override
     public void configured(Tile tile, Player player, int value){
-        tile.<LightEntity>entity().color = value;
+        tile.<LightEntity>ent().color = value;
     }
 
     @Override
     public void drawLight(Tile tile){
-        LightEntity entity = tile.entity();
+        LightEntity entity = tile.ent();
         renderer.lights.add(tile.drawx(), tile.drawy(), radius, Tmp.c1.set(entity.color), brightness * tile.entity.efficiency());
     }
 
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 7ae1e4ca70..5957a92ac6 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java
@@ -73,7 +73,7 @@ public class NuclearReactor extends PowerGenerator{
 
     @Override
     public void update(Tile tile){
-        NuclearReactorEntity entity = tile.entity();
+        NuclearReactorEntity entity = tile.ent();
 
         ConsumeLiquid cliquid = consumes.get(ConsumeType.liquid);
         Item item = consumes.<ConsumeItems>get(ConsumeType.item).items[0].item;
@@ -120,7 +120,7 @@ public class NuclearReactor extends PowerGenerator{
 
         Sounds.explosionbig.at(tile);
 
-        NuclearReactorEntity entity = tile.entity();
+        NuclearReactorEntity entity = tile.ent();
 
         int fuel = entity.items.get(consumes.<ConsumeItems>get(ConsumeType.item).items[0].item);
 
@@ -151,7 +151,7 @@ public class NuclearReactor extends PowerGenerator{
 
     @Override
     public void drawLight(Tile tile){
-        NuclearReactorEntity entity = tile.entity();
+        NuclearReactorEntity entity = tile.ent();
         float fract = entity.productionEfficiency;
         renderer.lights.add(tile.drawx(), tile.drawy(), (90f + Mathf.absin(5, 5f)) * fract, Tmp.c1.set(lightColor).lerp(Color.scarlet, entity.heat), 0.6f * fract);
     }
@@ -160,7 +160,7 @@ public class NuclearReactor extends PowerGenerator{
     public void draw(Tile tile){
         super.draw(tile);
 
-        NuclearReactorEntity entity = tile.entity();
+        NuclearReactorEntity entity = tile.ent();
 
         Draw.color(coolColor, hotColor, entity.heat);
         Fill.rect(tile.drawx(), tile.drawy(), size * tilesize, size * tilesize);
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java
index d5e4c2ccfd..7612e9ff16 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java
@@ -45,7 +45,7 @@ public class PowerGenerator extends PowerDistributor{
 
     @Override
     public float getPowerProduction(Tile tile){
-        return powerProduction * tile.<GeneratorEntity>entity().productionEfficiency;
+        return powerProduction * tile.<GeneratorEntity>ent().productionEfficiency;
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
index b5d29266ac..d0d1a80425 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
@@ -296,7 +296,7 @@ public class PowerGraph{
 
     private boolean otherConsumersAreValid(Tile tile, Consume consumePower){
         for(Consume cons : tile.block().consumes.all()){
-            if(cons != consumePower && !cons.isOptional() && !cons.valid(tile.entity())){
+            if(cons != consumePower && !cons.isOptional() && !cons.valid(tile.ent())){
                 return false;
             }
         }
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
index 4cb97d6bba..bfd60a2cdb 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
@@ -172,7 +172,7 @@ public class PowerNode extends PowerBlock{
 
     @Override
     public boolean onConfigureTileTapped(Tile tile, Tile other){
-        TileEntity entity = tile.entity();
+        TileEntity entity = tile.ent();
         other = other.link();
 
         if(linkValid(tile, other)){
@@ -262,7 +262,7 @@ public class PowerNode extends PowerBlock{
     public void drawLayer(Tile tile){
         if(Core.settings.getInt("lasersopacity") == 0) return;
 
-        TileEntity entity = tile.entity();
+        TileEntity entity = tile.ent();
 
         for(int i = 0; i < entity.power.links.size; i++){
             Tile link = world.tile(entity.power.links.get(i));
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java
index 4844fc2297..81712ba4bc 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java
@@ -17,7 +17,7 @@ public class SolarGenerator extends PowerGenerator{
 
     @Override
     public void update(Tile tile){
-        tile.<GeneratorEntity>entity().productionEfficiency = state.rules.lighting ? 1f - state.rules.ambientLight.a : 1f;
+        tile.<GeneratorEntity>ent().productionEfficiency = state.rules.lighting ? 1f - state.rules.ambientLight.a : 1f;
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java
index 5bb3cce8d7..61570c66df 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java
@@ -20,7 +20,7 @@ public class ThermalGenerator extends PowerGenerator{
 
     @Override
     public void update(Tile tile){
-        GeneratorEntity entity = tile.entity();
+        GeneratorEntity entity = tile.ent();
 
         if(entity.productionEfficiency > 0.1f && Mathf.chance(0.05 * entity.delta())){
             Effects.effect(generateEffect, tile.drawx() + Mathf.range(3f), tile.drawy() + Mathf.range(3f));
@@ -34,7 +34,7 @@ public class ThermalGenerator extends PowerGenerator{
 
     @Override
     public void drawLight(Tile tile){
-        GeneratorEntity entity = tile.entity();
+        GeneratorEntity entity = tile.ent();
         renderer.lights.add(tile.drawx(), tile.drawy(), (40f + Mathf.absin(10f, 5f)) * entity.productionEfficiency * size, Color.scarlet, 0.4f);
     }
 
@@ -42,7 +42,7 @@ public class ThermalGenerator extends PowerGenerator{
     public void onProximityAdded(Tile tile){
         super.onProximityAdded(tile);
 
-        GeneratorEntity entity = tile.entity();
+        GeneratorEntity entity = tile.ent();
         entity.productionEfficiency = sumAttribute(Attribute.heat, tile.x, tile.y);
     }
 
@@ -50,7 +50,7 @@ public class ThermalGenerator extends PowerGenerator{
     public float getPowerProduction(Tile tile){
         //in this case, productionEfficiency means 'total heat'
         //thus, it may be greater than 1.0
-        return powerProduction * tile.<GeneratorEntity>entity().productionEfficiency;
+        return powerProduction * tile.<GeneratorEntity>ent().productionEfficiency;
     }
 
     @Override
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 4cf0a6b2f1..640f438b40 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java
@@ -43,7 +43,7 @@ public class Cultivator extends GenericCrafter{
     public void update(Tile tile){
         super.update(tile);
 
-        CultivatorEntity entity = tile.entity();
+        CultivatorEntity entity = tile.ent();
         entity.warmup = Mathf.lerpDelta(entity.warmup, entity.cons.valid() ? 1f : 0f, 0.015f);
     }
 
@@ -64,7 +64,7 @@ public class Cultivator extends GenericCrafter{
 
     @Override
     public void draw(Tile tile){
-        CultivatorEntity entity = tile.entity();
+        CultivatorEntity entity = tile.ent();
 
         Draw.rect(region, tile.drawx(), tile.drawy());
 
@@ -99,7 +99,7 @@ public class Cultivator extends GenericCrafter{
     public void onProximityAdded(Tile tile){
         super.onProximityAdded(tile);
 
-        CultivatorEntity entity = tile.entity();
+        CultivatorEntity entity = tile.ent();
         entity.boost = sumAttribute(attribute, tile.x, tile.y);
     }
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
index 14788104d9..865fb8aea7 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
@@ -98,7 +98,7 @@ public class Drill extends Block{
         float s = 0.3f;
         float ts = 0.6f;
 
-        DrillEntity entity = tile.entity();
+        DrillEntity entity = tile.ent();
 
         Draw.rect(region, tile.drawx(), tile.drawy());
         super.drawCracks(tile);
@@ -163,7 +163,7 @@ public class Drill extends Block{
 
     @Override
     public void drawSelect(Tile tile){
-        DrillEntity entity = tile.entity();
+        DrillEntity entity = tile.ent();
 
         if(entity.dominantItem != null){
             float dx = tile.drawx() - size * tilesize/2f, dy = tile.drawy() + size * tilesize/2f;
@@ -239,7 +239,7 @@ public class Drill extends Block{
 
     @Override
     public void update(Tile tile){
-        DrillEntity entity = tile.entity();
+        DrillEntity entity = tile.ent();
 
         if(entity.dominantItem == null){
             countOre(tile);
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java b/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java
index 4f79a420b5..d70d8e878c 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java
@@ -49,7 +49,7 @@ public class Fracker extends SolidPump{
 
     @Override
     public void draw(Tile tile){
-        FrackerEntity entity = tile.entity();
+        FrackerEntity entity = tile.ent();
 
         Draw.rect(region, tile.drawx(), tile.drawy());
         super.drawCracks(tile);
@@ -70,7 +70,7 @@ public class Fracker extends SolidPump{
 
     @Override
     public void update(Tile tile){
-        FrackerEntity entity = tile.entity();
+        FrackerEntity entity = tile.ent();
 
         if(entity.cons.valid()){
             if(entity.accumulator >= itemUseTime){
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 512be4ddd6..00075370e4 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java
@@ -86,7 +86,7 @@ public class GenericCrafter extends Block{
 
     @Override
     public void update(Tile tile){
-        GenericCrafterEntity entity = tile.entity();
+        GenericCrafterEntity entity = tile.ent();
 
         if(entity.cons.valid()){
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/GenericSmelter.java b/core/src/io/anuke/mindustry/world/blocks/production/GenericSmelter.java
index ba0c20bb75..3fe9e1eb7a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/GenericSmelter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/GenericSmelter.java
@@ -28,7 +28,7 @@ public class GenericSmelter extends GenericCrafter{
     public void draw(Tile tile){
         super.draw(tile);
 
-        GenericCrafterEntity entity = tile.entity();
+        GenericCrafterEntity entity = tile.ent();
 
         //draw glowing center
         if(entity.warmup > 0f && flameColor.a > 0.001f){
@@ -50,7 +50,7 @@ public class GenericSmelter extends GenericCrafter{
 
     @Override
     public void drawLight(Tile tile){
-        GenericCrafterEntity entity = tile.entity();
+        GenericCrafterEntity entity = tile.ent();
 
         renderer.lights.add(tile.drawx(), tile.drawy(), (60f + Mathf.absin(10f, 5f)) * entity.warmup * size, flameColor, 0.65f);
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java b/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java
index 57c00e5a2c..656476c4d8 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java
@@ -29,7 +29,7 @@ public class Incinerator extends Block{
 
     @Override
     public void update(Tile tile){
-        IncineratorEntity entity = tile.entity();
+        IncineratorEntity entity = tile.ent();
 
         if(entity.cons.valid()){
             entity.heat = Mathf.lerpDelta(entity.heat, 1f, 0.04f);
@@ -42,7 +42,7 @@ public class Incinerator extends Block{
     public void draw(Tile tile){
         super.draw(tile);
 
-        IncineratorEntity entity = tile.entity();
+        IncineratorEntity entity = tile.ent();
 
         if(entity.heat > 0f){
             float g = 0.3f;
@@ -68,7 +68,7 @@ public class Incinerator extends Block{
 
     @Override
     public boolean acceptItem(Item item, Tile tile, Tile source){
-        IncineratorEntity entity = tile.entity();
+        IncineratorEntity entity = tile.ent();
         return entity.heat > 0.5f;
     }
 
@@ -81,7 +81,7 @@ public class Incinerator extends Block{
 
     @Override
     public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount){
-        IncineratorEntity entity = tile.entity();
+        IncineratorEntity entity = tile.ent();
         return entity.heat > 0.5f;
     }
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/LiquidConverter.java b/core/src/io/anuke/mindustry/world/blocks/production/LiquidConverter.java
index 6908ad4176..95fdc2184f 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/LiquidConverter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/LiquidConverter.java
@@ -41,7 +41,7 @@ public class LiquidConverter extends GenericCrafter{
 
     @Override
     public void update(Tile tile){
-        GenericCrafterEntity entity = tile.entity();
+        GenericCrafterEntity entity = tile.ent();
         ConsumeLiquidBase cl = consumes.get(ConsumeType.liquid);
 
         if(tile.entity.cons.valid()){
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
index bd3f98966b..c297851e67 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
@@ -64,7 +64,7 @@ public class Separator extends Block{
     public void draw(Tile tile){
         super.draw(tile);
 
-        GenericCrafterEntity entity = tile.entity();
+        GenericCrafterEntity entity = tile.ent();
 
         Draw.color(tile.entity.liquids.current().color);
         Draw.alpha(tile.entity.liquids.total() / liquidCapacity);
@@ -78,7 +78,7 @@ public class Separator extends Block{
 
     @Override
     public void update(Tile tile){
-        GenericCrafterEntity entity = tile.entity();
+        GenericCrafterEntity entity = tile.ent();
 
         entity.totalProgress += entity.warmup * entity.delta();
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java
index 6a3e5d806c..e7ac5b0c14 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java
@@ -67,7 +67,7 @@ public class SolidPump extends Pump{
 
     @Override
     public void draw(Tile tile){
-        SolidPumpEntity entity = tile.entity();
+        SolidPumpEntity entity = tile.ent();
 
         Draw.rect(region, tile.drawx(), tile.drawy());
         Draw.color(tile.entity.liquids.current().color);
@@ -85,7 +85,7 @@ public class SolidPump extends Pump{
 
     @Override
     public void update(Tile tile){
-        SolidPumpEntity entity = tile.entity();
+        SolidPumpEntity entity = tile.ent();
 
         float fraction = 0f;
 
@@ -140,7 +140,7 @@ public class SolidPump extends Pump{
         super.onProximityAdded(tile);
 
         if(attribute != null){
-            SolidPumpEntity entity = tile.entity();
+            SolidPumpEntity entity = tile.ent();
             entity.boost = sumAttribute(attribute, tile.x, tile.y);
         }
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java
index d38c9dc432..46e1e86ee2 100644
--- a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java
+++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java
@@ -30,7 +30,7 @@ public class ItemSource extends Block{
 
     @Override
     public void configured(Tile tile, Player player, int value){
-        tile.<ItemSourceEntity>entity().outputItem = content.item(value);
+        tile.<ItemSourceEntity>ent().outputItem = content.item(value);
     }
 
     @Override
@@ -60,7 +60,7 @@ public class ItemSource extends Block{
     public void draw(Tile tile){
         super.draw(tile);
 
-        ItemSourceEntity entity = tile.entity();
+        ItemSourceEntity entity = tile.ent();
         if(entity.outputItem == null) return;
 
         Draw.color(entity.outputItem.color);
@@ -70,7 +70,7 @@ public class ItemSource extends Block{
 
     @Override
     public void update(Tile tile){
-        ItemSourceEntity entity = tile.entity();
+        ItemSourceEntity entity = tile.ent();
         if(entity.outputItem == null) return;
 
         entity.items.set(entity.outputItem, 1);
@@ -79,8 +79,8 @@ public class ItemSource extends Block{
     }
 
     @Override
-    public void buildTable(Tile tile, Table table){
-        ItemSourceEntity entity = tile.entity();
+    public void buildConfiguration(Tile tile, Table table){
+        ItemSourceEntity entity = tile.ent();
         ItemSelection.buildItemTable(table, () -> entity.outputItem, item -> {
             lastItem = item;
             tile.configure(item == null ? -1 : item.id);
diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java
index ec3f325db2..ac260679a7 100644
--- a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java
+++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java
@@ -50,7 +50,7 @@ public class LiquidSource extends Block{
 
     @Override
     public void update(Tile tile){
-        LiquidSourceEntity entity = tile.entity();
+        LiquidSourceEntity entity = tile.ent();
 
         if(entity.source == null){
             tile.entity.liquids.clear();
@@ -69,7 +69,7 @@ public class LiquidSource extends Block{
     public void draw(Tile tile){
         super.draw(tile);
 
-        LiquidSourceEntity entity = tile.entity();
+        LiquidSourceEntity entity = tile.ent();
 
         if(entity.source != null){
             Draw.color(entity.source.color);
@@ -79,8 +79,8 @@ public class LiquidSource extends Block{
     }
 
     @Override
-    public void buildTable(Tile tile, Table table){
-        LiquidSourceEntity entity = tile.entity();
+    public void buildConfiguration(Tile tile, Table table){
+        LiquidSourceEntity entity = tile.ent();
 
         Array<Liquid> items = content.liquids();
 
@@ -109,7 +109,7 @@ public class LiquidSource extends Block{
 
     @Override
     public void configured(Tile tile, Player player, int value){
-        tile.<LiquidSourceEntity>entity().source = value == -1 ? null : content.liquid(value);
+        tile.<LiquidSourceEntity>ent().source = value == -1 ? null : content.liquid(value);
     }
 
     class LiquidSourceEntity extends TileEntity{
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 3ee36c332b..557dddce45 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
@@ -43,7 +43,7 @@ public class CoreBlock extends StorageBlock{
     public static void onUnitRespawn(Tile tile, Player player){
         if(player == null || tile.entity == null) return;
 
-        CoreEntity entity = tile.entity();
+        CoreEntity entity = tile.ent();
         Effects.effect(Fx.spawn, entity);
         entity.progress = 0;
         entity.spawnPlayer = player;
@@ -76,13 +76,13 @@ public class CoreBlock extends StorageBlock{
 
     @Override
     public int getMaximumAccepted(Tile tile, Item item){
-        CoreEntity entity = tile.entity();
+        CoreEntity entity = tile.ent();
         return item.type == ItemType.material ? entity.storageCapacity : 0;
     }
 
     @Override
     public void onProximityUpdate(Tile tile){
-        CoreEntity entity = tile.entity();
+        CoreEntity entity = tile.ent();
 
         for(Tile other : state.teams.get(tile.getTeam()).cores){
             if(other != tile){
@@ -94,7 +94,7 @@ public class CoreBlock extends StorageBlock{
         entity.storageCapacity = itemCapacity + entity.proximity().sum(e -> isContainer(e) ? e.block().itemCapacity : 0);
         entity.proximity().each(this::isContainer, t -> {
             t.entity.items = entity.items;
-            t.<StorageBlockEntity>entity().linkedCore = tile;
+            t.<StorageBlockEntity>ent().linkedCore = tile;
         });
 
         for(Tile other : state.teams.get(tile.getTeam()).cores){
@@ -109,7 +109,7 @@ public class CoreBlock extends StorageBlock{
         }
 
         for(Tile other : state.teams.get(tile.getTeam()).cores){
-            CoreEntity oe = other.entity();
+            CoreEntity oe = other.ent();
             oe.storageCapacity = entity.storageCapacity;
         }
     }
@@ -183,7 +183,7 @@ public class CoreBlock extends StorageBlock{
 
     @Override
     public void drawLayer(Tile tile){
-        CoreEntity entity = tile.entity();
+        CoreEntity entity = tile.ent();
 
         if(entity.heat > 0.001f){
             RespawnBlock.drawRespawn(tile, entity.heat, entity.progress, entity.time, entity.spawnPlayer, mech);
@@ -202,7 +202,7 @@ public class CoreBlock extends StorageBlock{
 
     @Override
     public void update(Tile tile){
-        CoreEntity entity = tile.entity();
+        CoreEntity entity = tile.ent();
 
         if(entity.spawnPlayer != null){
             if(!entity.spawnPlayer.isDead() || !entity.spawnPlayer.isAdded()){
@@ -225,7 +225,7 @@ public class CoreBlock extends StorageBlock{
 
     @Override
     public boolean shouldActiveSound(Tile tile){
-        CoreEntity entity = tile.entity();
+        CoreEntity entity = tile.ent();
 
         return entity.spawnPlayer != null;
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/StorageBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/StorageBlock.java
index 7746932916..710f97fbe3 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/StorageBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/StorageBlock.java
@@ -16,7 +16,7 @@ public abstract class StorageBlock extends Block{
 
     @Override
     public boolean acceptItem(Item item, Tile tile, Tile source){
-        StorageBlockEntity entity = tile.entity();
+        StorageBlockEntity entity = tile.ent();
         return entity.linkedCore != null ? entity.linkedCore.block().acceptItem(item, entity.linkedCore, source) : tile.entity.items.get(item) < getMaximumAccepted(tile, item);
     }
 
@@ -27,7 +27,7 @@ public abstract class StorageBlock extends Block{
 
     @Override
     public void drawSelect(Tile tile){
-        StorageBlockEntity entity = tile.entity();
+        StorageBlockEntity entity = tile.ent();
         if(entity.linkedCore != null){
             entity.linkedCore.block().drawSelect(entity.linkedCore);
         }
diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java b/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java
index b809fc351c..8186ade094 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java
@@ -56,12 +56,12 @@ public class Unloader extends Block{
     @Override
     public void configured(Tile tile, Player player, int value){
         tile.entity.items.clear();
-        tile.<UnloaderEntity>entity().sortItem = content.item(value);
+        tile.<UnloaderEntity>ent().sortItem = content.item(value);
     }
 
     @Override
     public void update(Tile tile){
-        UnloaderEntity entity = tile.entity();
+        UnloaderEntity entity = tile.ent();
 
         if(tile.entity.timer.get(timerUnload, speed / entity.timeScale) && tile.entity.items.total() == 0){
             for(Tile other : tile.entity.proximity()){
@@ -113,7 +113,7 @@ public class Unloader extends Block{
     public void draw(Tile tile){
         super.draw(tile);
 
-        UnloaderEntity entity = tile.entity();
+        UnloaderEntity entity = tile.ent();
 
         Draw.color(entity.sortItem == null ? Color.clear : entity.sortItem.color);
         Draw.rect("unloader-center", tile.worldx(), tile.worldy());
@@ -121,8 +121,8 @@ public class Unloader extends Block{
     }
 
     @Override
-    public void buildTable(Tile tile, Table table){
-        UnloaderEntity entity = tile.entity();
+    public void buildConfiguration(Tile tile, Table table){
+        UnloaderEntity entity = tile.ent();
         ItemSelection.buildItemTable(table, () -> entity.sortItem, item -> {
             lastItem = item;
             tile.configure(item == null ? -1 : item.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 d44b966493..9423ac6cae 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java
@@ -45,8 +45,8 @@ public class CommandCenter extends Block{
         ObjectSet<Tile> set = indexer.getAllied(tile.getTeam(), BlockFlag.comandCenter);
 
         if(set.size > 0){
-            CommandCenterEntity entity = tile.entity();
-            CommandCenterEntity oe = set.first().entity();
+            CommandCenterEntity entity = tile.ent();
+            CommandCenterEntity oe = set.first().ent();
             entity.command = oe.command;
         }
     }
@@ -75,7 +75,7 @@ public class CommandCenter extends Block{
 
     @Override
     public void draw(Tile tile){
-        CommandCenterEntity entity = tile.entity();
+        CommandCenterEntity entity = tile.ent();
         super.draw(tile);
 
         float size = IconSize.small.size/4f;
@@ -88,8 +88,8 @@ public class CommandCenter extends Block{
     }
 
     @Override
-    public void buildTable(Tile tile, Table table){
-        CommandCenterEntity entity = tile.entity();
+    public void buildConfiguration(Tile tile, Table table){
+        CommandCenterEntity entity = tile.ent();
         ButtonGroup<ImageButton> group = new ButtonGroup<>();
         Table buttons = new Table();
 
@@ -109,7 +109,7 @@ public class CommandCenter extends Block{
 
         for(Tile center : indexer.getAllied(tile.getTeam(), BlockFlag.comandCenter)){
             if(center.block() instanceof CommandCenter){
-                CommandCenterEntity entity = center.entity();
+                CommandCenterEntity entity = center.ent();
                 entity.command = command;
             }
         }
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 c5a07cdead..594ec7b154 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
@@ -49,7 +49,7 @@ public class MechPad extends Block{
     public static void onMechFactoryTap(Player player, Tile tile){
         if(player == null || !(tile.block() instanceof MechPad) || !checkValidTap(tile, player)) return;
 
-        MechFactoryEntity entity = tile.entity();
+        MechFactoryEntity entity = tile.ent();
 
         if(!entity.cons.valid()) return;
         player.beginRespawning(entity);
@@ -60,7 +60,7 @@ public class MechPad extends Block{
     public static void onMechFactoryDone(Tile tile){
         if(!(tile.entity instanceof MechFactoryEntity)) return;
 
-        MechFactoryEntity entity = tile.entity();
+        MechFactoryEntity entity = tile.ent();
 
         Effects.effect(Fx.spawn, entity);
 
@@ -80,7 +80,7 @@ public class MechPad extends Block{
     }
 
     protected static boolean checkValidTap(Tile tile, Player player){
-        MechFactoryEntity entity = tile.entity();
+        MechFactoryEntity entity = tile.ent();
         return !player.isDead() && tile.interactable(player.getTeam()) && Math.abs(player.x - tile.drawx()) <= tile.block().size * tilesize &&
         Math.abs(player.y - tile.drawy()) <= tile.block().size * tilesize && entity.cons.valid() && entity.player == null;
     }
@@ -97,7 +97,7 @@ public class MechPad extends Block{
 
     @Override
     public void tapped(Tile tile, Player player){
-        MechFactoryEntity entity = tile.entity();
+        MechFactoryEntity entity = tile.ent();
 
         if(checkValidTap(tile, player)){
             Call.onMechFactoryTap(player, tile);
@@ -109,7 +109,7 @@ public class MechPad extends Block{
 
     @Override
     public void drawLayer(Tile tile){
-        MechFactoryEntity entity = tile.entity();
+        MechFactoryEntity entity = tile.ent();
 
         if(entity.player != null){
             RespawnBlock.drawRespawn(tile, entity.heat, entity.progress, entity.time, entity.player, (!entity.sameMech && entity.player.mech == mech ? mech : Mechs.starter));
@@ -118,7 +118,7 @@ public class MechPad extends Block{
 
     @Override
     public void update(Tile tile){
-        MechFactoryEntity entity = tile.entity();
+        MechFactoryEntity entity = tile.ent();
 
         if(entity.player != null){
             entity.player.set(tile.drawx(), tile.drawy());
diff --git a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java
index e02381d73d..a6bfb1ffeb 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java
@@ -66,14 +66,14 @@ public class RepairPoint extends Block{
 
     @Override
     public void drawLayer(Tile tile){
-        RepairPointEntity entity = tile.entity();
+        RepairPointEntity entity = tile.ent();
 
         Draw.rect(region, tile.drawx(), tile.drawy(), entity.rotation - 90);
     }
 
     @Override
     public void drawLayer2(Tile tile){
-        RepairPointEntity entity = tile.entity();
+        RepairPointEntity entity = tile.ent();
 
         if(entity.target != null &&
         Angles.angleDist(entity.angleTo(entity.target), entity.rotation) < 30f){
@@ -95,7 +95,7 @@ public class RepairPoint extends Block{
 
     @Override
     public void update(Tile tile){
-        RepairPointEntity entity = tile.entity();
+        RepairPointEntity entity = tile.ent();
 
         boolean targetIsBeingRepaired = false;
         if(entity.target != null && (entity.target.isDead() || entity.target.dst(tile) > repairRadius || entity.target.health >= entity.target.maxHealth())){
@@ -122,7 +122,7 @@ public class RepairPoint extends Block{
 
     @Override
     public boolean shouldConsume(Tile tile){
-        RepairPointEntity entity = tile.entity();
+        RepairPointEntity entity = tile.ent();
 
         return entity.target != null;
     }
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 93e19b7266..8879f991b5 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
@@ -48,7 +48,7 @@ public class UnitFactory extends Block{
     public static void onUnitFactorySpawn(Tile tile, int spawns){
         if(!(tile.entity instanceof UnitFactoryEntity) || !(tile.block() instanceof UnitFactory)) return;
 
-        UnitFactoryEntity entity = tile.entity();
+        UnitFactoryEntity entity = tile.ent();
         UnitFactory factory = (UnitFactory)tile.block();
 
         entity.buildTime = 0f;
@@ -110,7 +110,7 @@ public class UnitFactory extends Block{
 
     @Override
     public void unitRemoved(Tile tile, Unit unit){
-        UnitFactoryEntity entity = tile.entity();
+        UnitFactoryEntity entity = tile.ent();
         entity.spawned--;
         entity.spawned = Math.max(entity.spawned, 0);
     }
@@ -122,7 +122,7 @@ public class UnitFactory extends Block{
 
     @Override
     public void draw(Tile tile){
-        UnitFactoryEntity entity = tile.entity();
+        UnitFactoryEntity entity = tile.ent();
         TextureRegion region = unitType.icon(Cicon.full);
 
         Draw.rect(name, tile.drawx(), tile.drawy());
@@ -153,7 +153,7 @@ public class UnitFactory extends Block{
 
     @Override
     public void update(Tile tile){
-        UnitFactoryEntity entity = tile.entity();
+        UnitFactoryEntity entity = tile.ent();
 
         if(entity.spawned >= maxSpawn){
             return;
@@ -184,7 +184,7 @@ public class UnitFactory extends Block{
 
     @Override
     public boolean shouldConsume(Tile tile){
-        UnitFactoryEntity entity = tile.entity();
+        UnitFactoryEntity entity = tile.ent();
         return entity.spawned < maxSpawn;
     }
 
diff --git a/tests/src/test/java/power/DirectConsumerTests.java b/tests/src/test/java/power/DirectConsumerTests.java
index 89ed331c8b..0892b13d88 100644
--- a/tests/src/test/java/power/DirectConsumerTests.java
+++ b/tests/src/test/java/power/DirectConsumerTests.java
@@ -41,7 +41,7 @@ public class DirectConsumerTests extends PowerTestFixture{
         consumerTile.entity.items.add(Items.lead, leadAmount);
 
         Tile producerTile = createFakeTile(2, 0, createFakeProducerBlock(producedPower));
-        producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 1f;
+        producerTile.<PowerGenerator.GeneratorEntity>ent().productionEfficiency = 1f;
 
         PowerGraph graph = new PowerGraph();
         graph.add(producerTile);
diff --git a/tests/src/test/java/power/ItemLiquidGeneratorTests.java b/tests/src/test/java/power/ItemLiquidGeneratorTests.java
index e6bc2a20de..5e5a2ed034 100644
--- a/tests/src/test/java/power/ItemLiquidGeneratorTests.java
+++ b/tests/src/test/java/power/ItemLiquidGeneratorTests.java
@@ -52,7 +52,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{
         };
 
         tile = createFakeTile(0, 0, generator);
-        entity = tile.entity();
+        entity = tile.ent();
     }
 
     /** Tests the consumption and efficiency when being supplied with liquids. */
diff --git a/tests/src/test/java/power/PowerTests.java b/tests/src/test/java/power/PowerTests.java
index 6b253e4f29..b3353cfc2c 100644
--- a/tests/src/test/java/power/PowerTests.java
+++ b/tests/src/test/java/power/PowerTests.java
@@ -51,7 +51,7 @@ public class PowerTests extends PowerTestFixture{
 
         void simulateDirectConsumption(float producedPower, float requiredPower, float expectedSatisfaction, String parameterDescription){
             Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(producedPower));
-            producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 1f;
+            producerTile.<PowerGenerator.GeneratorEntity>ent().productionEfficiency = 1f;
             Tile directConsumerTile = createFakeTile(0, 1, createFakeDirectConsumer(requiredPower));
 
             PowerGraph powerGraph = new PowerGraph();
@@ -91,7 +91,7 @@ public class PowerTests extends PowerTestFixture{
 
             if(producedPower > 0.0f){
                 Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(producedPower));
-                producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 1f;
+                producerTile.<PowerGenerator.GeneratorEntity>ent().productionEfficiency = 1f;
                 powerGraph.add(producerTile);
             }
             Tile directConsumerTile = null;
@@ -116,7 +116,7 @@ public class PowerTests extends PowerTestFixture{
         @Test
         void directConsumptionStopsWithNoPower(){
             Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(10.0f));
-            producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 1.0f;
+            producerTile.<PowerGenerator.GeneratorEntity>ent().productionEfficiency = 1.0f;
             Tile consumerTile = createFakeTile(0, 1, createFakeDirectConsumer(5.0f));
 
             PowerGraph powerGraph = new PowerGraph();
@@ -133,7 +133,7 @@ public class PowerTests extends PowerTestFixture{
             assertEquals(0.0f, consumerTile.entity.power.status, Mathf.FLOAT_ROUNDING_ERROR);
             if(consumerTile.block().consumes.hasPower()){
                 ConsumePower consumePower = consumerTile.block().consumes.getPower();
-                assertFalse(consumePower.valid(consumerTile.entity()));
+                assertFalse(consumePower.valid(consumerTile.ent()));
             }
         }
     }
diff --git a/tools/src/io/anuke/mindustry/tools/ScriptStubGenerator.java b/tools/src/io/anuke/mindustry/tools/ScriptStubGenerator.java
index 6914d09636..ac29c6adb4 100644
--- a/tools/src/io/anuke/mindustry/tools/ScriptStubGenerator.java
+++ b/tools/src/io/anuke/mindustry/tools/ScriptStubGenerator.java
@@ -9,6 +9,7 @@ import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.graphics.g2d.TextureAtlas.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.util.*;
+import io.anuke.mindustry.gen.*;
 import org.reflections.*;
 import org.reflections.scanners.*;
 import org.reflections.util.*;
@@ -21,10 +22,11 @@ public class ScriptStubGenerator{
 
     public static void main(String[] args){
         String base = "io.anuke.mindustry";
-        Array<String> blacklist = Array.with("plugin", "mod", "net", "io", "tools", "gen");
+        Array<String> blacklist = Array.with("plugin", "mod", "net", "io", "tools");
         Array<String> nameBlacklist = Array.with("ClientLauncher", "NetClient", "NetServer", "ClassAccess");
-        Array<Class<?>> whitelist = Array.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class, AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class);
-        Array<String> nopackage = Array.with("io.anuke.arc.func", "java.lang", "java");
+        Array<Class<?>> whitelist = Array.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class,
+            AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class, Runnable.class, Object.class, Icon.class, Tex.class, Sounds.class, Musics.class, Call.class);
+        Array<String> nopackage = Array.with("java.lang", "java");
 
         String fileTemplate = "package io.anuke.mindustry.mod;\n" +
         "\n" +