Source reformat

.travis.yml

@@ -1,4 +1,3 @@
-
 jdk:
   - openjdk8
 script:

android/project.properties

@@ -9,6 +9,5 @@
 #
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
 # Project target.
 target=android-19

android/src/io/anuke/mindustry/AndroidLauncher.java

@@ -18,18 +18,15 @@ import io.anuke.arc.function.Consumer;
 import io.anuke.arc.scene.ui.layout.Unit;
 import io.anuke.arc.util.Strings;
 import io.anuke.arc.util.serialization.Base64Coder;
-import io.anuke.net.KryoClient;
-import io.anuke.net.KryoServer;
 import io.anuke.mindustry.core.Platform;
 import io.anuke.mindustry.game.Saves.SaveSlot;
 import io.anuke.mindustry.io.SaveIO;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.ui.dialogs.FileChooser;
+import io.anuke.net.KryoClient;
+import io.anuke.net.KryoServer;
 
-import java.io.File;
+import java.io.*;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 
 import static io.anuke.mindustry.Vars.*;

annotations/src/main/java/io/anuke/annotations/Annotations.java

@@ -1,9 +1,6 @@
 package io.anuke.annotations;
 
-import java.lang.annotation.ElementType;
+import java.lang.annotation.*;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 
 public class Annotations{
 

annotations/src/main/java/io/anuke/annotations/ClassEntry.java

@@ -1,7 +1,5 @@
 package io.anuke.annotations;
 
-import io.anuke.annotations.MethodEntry;
-
 import java.util.ArrayList;
 
 /** Represents a class witha list method entries to include in it. */

annotations/src/main/java/io/anuke/annotations/MethodEntry.java

@@ -1,8 +1,6 @@
 package io.anuke.annotations;
 
-import io.anuke.annotations.Annotations.Loc;
+import io.anuke.annotations.Annotations.*;
-import io.anuke.annotations.Annotations.PacketPriority;
-import io.anuke.annotations.Annotations.Variant;
 
 import javax.lang.model.element.ExecutableElement;
 

annotations/src/main/java/io/anuke/annotations/RemoteMethodAnnotationProcessor.java

@@ -1,18 +1,13 @@
 package io.anuke.annotations;
 
-import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.*;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.TypeSpec;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.annotations.IOFinder.ClassSerializer;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
+import javax.lang.model.element.*;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic.Kind;
 import java.util.*;
 import java.util.stream.Collectors;

annotations/src/main/java/io/anuke/annotations/RemoteReadGenerator.java

@@ -3,9 +3,7 @@ package io.anuke.annotations;
 import com.squareup.javapoet.*;
 import io.anuke.annotations.IOFinder.ClassSerializer;
 
-import javax.lang.model.element.Modifier;
+import javax.lang.model.element.*;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.tools.Diagnostic.Kind;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -25,7 +23,6 @@ public class RemoteReadGenerator{
 
     /**
      * Generates a class for reading remote invoke packets.
-     *
      * @param entries List of methods to use.
      * @param className Simple target class name.
      * @param packageName Full target package name.

annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java

@@ -4,10 +4,7 @@ import com.squareup.javapoet.*;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.IOFinder.ClassSerializer;
 
-import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.*;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.tools.Diagnostic.Kind;
 import java.io.IOException;
 import java.nio.ByteBuffer;

annotations/src/main/java/io/anuke/annotations/SerializeAnnotationProcessor.java

@@ -5,13 +5,9 @@ import io.anuke.annotations.Annotations.Serialize;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Modifier;
+import javax.lang.model.element.*;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.util.ElementFilter;
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Set;
@@ -99,7 +95,8 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
 
                 List<VariableElement> fields = ElementFilter.fieldsIn(Utils.elementUtils.getAllMembers(elem));
                 for(VariableElement field : fields){
-                    if(field.getModifiers().contains(Modifier.STATIC) || field.getModifiers().contains(Modifier.TRANSIENT) || field.getModifiers().contains(Modifier.PRIVATE)) continue;
+                    if(field.getModifiers().contains(Modifier.STATIC) || field.getModifiers().contains(Modifier.TRANSIENT) || field.getModifiers().contains(Modifier.PRIVATE))
+                        continue;
 
                     String name = field.getSimpleName().toString();
                     String typeName = Utils.typeUtils.erasure(field.asType()).toString().replace('$', '.');

annotations/src/main/java/io/anuke/annotations/StructAnnotationProcessor.java

@@ -1,25 +1,22 @@
 package io.anuke.annotations;
 
-import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.*;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
 import io.anuke.annotations.Annotations.Struct;
 import io.anuke.annotations.Annotations.StructField;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Modifier;
+import javax.lang.model.element.*;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.util.ElementFilter;
 import javax.tools.Diagnostic.Kind;
 import java.util.List;
 import java.util.Set;
 
-/**Generates ""value types"" classes that are packed into integer primitives of the most aproppriate size.
+/**
- * It would be nice if Java didn't make crazy hacks like this necessary.*/
+ * Generates ""value types"" classes that are packed into integer primitives of the most aproppriate size.
+ * It would be nice if Java didn't make crazy hacks like this necessary.
+ */
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes({
 "io.anuke.annotations.Annotations.Struct"

build.gradle

@@ -89,7 +89,8 @@ allprojects{
 
             try{
                 pfile.createNewFile()
-            }catch(Exception ignored){}
+            }catch(Exception ignored){
+            }
 
             if(pfile.exists()){
                 props.load(new FileInputStream(pfile))

core/assets-raw/sprites/blocks/environment/pack.json

@@ -4,5 +4,5 @@
   flattenPaths: true,
   maxWidth: 2048,
   maxHeight: 2048,
-	fast: true,
+  fast: true
 }

core/assets-raw/sprites/blocks/environment/pack_fallback.json

@@ -4,5 +4,5 @@
   flattenPaths: true,
   maxWidth: 1024,
   maxHeight: 1024,
-	fast: true,
+  fast: true
 }

core/assets-raw/sprites/pack.json

@@ -4,5 +4,5 @@
   flattenPaths: true,
   maxWidth: 2048,
   maxHeight: 2048,
-	fast: true,
+  fast: true
 }

core/assets-raw/sprites/pack_fallback.json

@@ -4,5 +4,5 @@
   flattenPaths: true,
   maxWidth: 1024,
   maxHeight: 1024,
-	fast: true,
+  fast: true
 }

core/assets-raw/sprites_replacement/editor/pack.json

@@ -4,5 +4,5 @@
   flattenPaths: true,
   maxWidth: 2048,
   maxHeight: 2048,
-	fast: true,
+  fast: true
 }

core/assets/bundles/bundle_ko.properties

@@ -14,7 +14,6 @@ screenshot = 화면 캡쳐가 {0} 경로에 저장되었습니다.
 gameover = 게임 오버
 gameover.pvp = [accent]{0}[] 팀이 승리했습니다!
 highscore = [accent]최고점수 달성!
-
 stat.wave = 웨이브 성공:[accent]{0}
 stat.enemiesDestroyed = 파괴한 적 수:[accent]{0}
 stat.built = 건설한 건물 수:[accent]{0}
@@ -22,10 +21,8 @@ stat.destroyed = 파괴된 건물 수:[accent]{0}
 stat.deconstructed = 파괴한 건물 수:[accent]{0}
 stat.delivered = 획득한 자원:
 stat.rank = 최종 기록: [accent]{0}
-
 placeline = 블록을 선택하셨습니다.\n][accent]몇초간 설치 시작지점을 누르고[] 원하는 방향을 향해 드래그 하면 [accent]일렬로[] 설치할 수 있습니다.\n한번 해 보세요.
 removearea = 블록 제거모드를 선택하셨습니다.\n[accent]몇초간 제거 시작지점을 누르고[] 원하는 구역 끝을 향해 드래그 하면 [accent]직사각형[] 안에 있는 모든 건물을 제거할 수 있습니다.\n한번 해 보세요.
-
 launcheditems = [accent]출격 아이템
 map.delete = 정말로 "[accent]{0}[]" 맵을 삭제하시겠습니까?\n
 level.highscore = 최고 점수: [accent]{0}
@@ -284,7 +281,6 @@ tutorial = 게임 방법
 editor = 편집기
 mapeditor = 맵 편집기
 donate = 기부
-
 abandon = 포기
 abandon.text = 이 구역과 모든 자원이 적에게 빼앗길 것입니다.
 locked = 잠김
@@ -306,7 +302,6 @@ zone.config.complete = 웨이브 {0} 달성:\n로드아웃 설정 잠금 해제
 zone.resources = 자원 감지됨:
 add = 추가...
 boss.health = 보스 체력
-
 connectfail = [crimson]{0}[accent] 서버에 연결하지 못했습니다.[]
 error.unreachable = 서버에 연결하지 못했습니다.\n서버 주소가 정확히 입력되었나요?
 error.invalidaddress = 잘못된 주소입니다.
@@ -316,7 +311,6 @@ error.alreadyconnected = 이미 접속중입니다.
 error.mapnotfound = 맵 파일을 찾을 수 없습니다!
 error.io = 네트워크 I/O 오류.
 error.any = 알 수 없는 네트워크 오류.
-
 zone.groundZero.name = 그라운드 제로
 zone.craters.name = 분화구
 zone.frozenForest.name = 얼어붙은 숲
@@ -324,7 +318,6 @@ zone.ruinousShores.name = 파멸의 기슭
 zone.stainedMountains.name = 얼룩진 산맥
 zone.desolateRift.name = 황량한 강
 zone.nuclearComplex.name = 핵 생산 단지
-
 settings.language = 언어
 settings.reset = 설정 초기화
 settings.rebind = 키 재설정
@@ -384,7 +377,6 @@ bar.heat = 발열
 bar.power = 전력
 bar.progress = 건설 진행
 bar.spawned = 유닛: {0}/{1}
-
 bullet.damage = [stat]{0}[lightgray] 데미지
 bullet.splashdamage = [stat]{0}[lightgray] area 데미지 ~[stat] {1}[lightgray] 타일
 bullet.incendiary = [stat]방화
@@ -396,7 +388,6 @@ bullet.freezing = [stat]동결
 bullet.tarred = [stat]타르
 bullet.multiplier = [stat]{0}[lightgray]x 탄약 배율
 bullet.reload = [stat]{0}[lightgray]x 사격 속도
-
 unit.blocks = 블록
 unit.powersecond = 전력/초
 unit.liquidsecond = 액체/초
@@ -497,7 +488,6 @@ mode.pvp.description = 실제 플레이어와 PvP를 합니다.
 mode.attack.name = 공격
 mode.attack.description = 일정 시간마다 적이 오는 단계가 없으며, 적의 기지를 파괴하는 것을 목표로 합니다.
 mode.custom = 커스텀 규칙
-
 rules.infiniteresources = 무한 자원
 rules.wavetimer = 웨이브 타이머
 rules.waves = 웨이브
@@ -512,7 +502,6 @@ rules.respawntime = 리스폰 시간:[LIGHT_GRAY] (초)
 rules.wavespacing = 웨이브 간격:[LIGHT_GRAY] (초)
 rules.buildcostmultiplier = 건설 소모 배율
 rules.buildspeedmultiplier = 건설 속도 배율
-
 content.item.name = 아이템
 content.liquid.name = 액체
 content.unit.name = 유닛
@@ -597,7 +586,6 @@ mech.buildspeed = [LIGHT_GRAY]건설 속도: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]발열 용량: {0}
 liquid.viscosity = [LIGHT_GRAY]점도: {0}
 liquid.temperature = [LIGHT_GRAY]온도: {0}
-
 block.grass.name = 잔디
 block.salt.name = 소금
 block.sandrocks.name = 모래 바위
@@ -896,7 +884,6 @@ block.wraith-factory.description = 빠른 뺑소니 요격기 유닛을 생산
 block.ghoul-factory.description = 중탄두 폭격기를 생산합니다.
 block.dagger-factory.description = 기본 지상 유닛을 생산합니다.
 block.titan-factory.description = 첨단 장갑 지상부대를 생산합니다.
-
 block.fortress-factory.description = 중대포 지상부대를 생산합니다.
 block.revenant-factory.description = 중량의 레이저 포대를 가진 공중부대를 생산합니다.
 block.repair-point.description = 주변에서 가장 가까운 손상된 유닛을 지속적으로 치료합니다.

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

@@ -1,8 +1,6 @@
 package io.anuke.mindustry;
 
-import io.anuke.arc.ApplicationCore;
+import io.anuke.arc.*;
-import io.anuke.arc.Core;
-import io.anuke.arc.Events;
 import io.anuke.arc.util.Log;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.core.*;

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

@@ -14,12 +14,8 @@ import io.anuke.mindustry.entities.effect.Puddle;
 import io.anuke.mindustry.entities.impl.EffectEntity;
 import io.anuke.mindustry.entities.traits.DrawTrait;
 import io.anuke.mindustry.entities.traits.SyncTrait;
-import io.anuke.mindustry.entities.type.BaseUnit;
+import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.Player;
+import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.entities.type.TileEntity;
-import io.anuke.mindustry.game.GlobalData;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.gen.Serialization;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity;

core/src/io/anuke/mindustry/ai/BlockIndexer.java

@@ -167,7 +167,8 @@ public class BlockIndexer{
 
                         other = other.target();
 
-                        if(other.entity == null || other.getTeam() != team || !pred.test(other) || !other.block().targetable) continue;
+                        if(other.entity == null || other.getTeam() != team || !pred.test(other) || !other.block().targetable)
+                            continue;
 
                         TileEntity e = other.entity;
 

core/src/io/anuke/mindustry/ai/Pathfinder.java

@@ -86,8 +86,10 @@ public class Pathfinder{
         return (!tile.solid()) || (tile.breakable() && (tile.target().getTeam() != team));
     }
 
-    /**Clears the frontier, increments the search and sets up all flow sources.
+    /**
-     * This only occurs for active teams.*/
+     * Clears the frontier, increments the search and sets up all flow sources.
+     * This only occurs for active teams.
+     */
     private void update(Tile tile, Team team){
         //make sure team exists
         if(paths != null && paths[team.ordinal()] != null && paths[team.ordinal()].weights != null){

core/src/io/anuke/mindustry/ai/WaveSpawner.java

@@ -16,9 +16,7 @@ import io.anuke.mindustry.game.SpawnGroup;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.Pos;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 
 import static io.anuke.mindustry.Vars.*;
 

core/src/io/anuke/mindustry/content/Blocks.java

@@ -2,18 +2,12 @@ package io.anuke.mindustry.content;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Mathf;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.game.ContentList;
-import io.anuke.mindustry.graphics.CacheLayer;
+import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.graphics.Pal;
+import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.graphics.Shaders;
-import io.anuke.mindustry.type.Category;
-import io.anuke.mindustry.type.ItemStack;
-import io.anuke.mindustry.type.LiquidStack;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.*;
@@ -23,13 +17,8 @@ import io.anuke.mindustry.world.blocks.distribution.*;
 import io.anuke.mindustry.world.blocks.power.*;
 import io.anuke.mindustry.world.blocks.production.*;
 import io.anuke.mindustry.world.blocks.sandbox.*;
-import io.anuke.mindustry.world.blocks.storage.CoreBlock;
+import io.anuke.mindustry.world.blocks.storage.*;
-import io.anuke.mindustry.world.blocks.storage.LaunchPad;
+import io.anuke.mindustry.world.blocks.units.*;
-import io.anuke.mindustry.world.blocks.storage.Unloader;
-import io.anuke.mindustry.world.blocks.storage.Vault;
-import io.anuke.mindustry.world.blocks.units.MechPad;
-import io.anuke.mindustry.world.blocks.units.RepairPoint;
-import io.anuke.mindustry.world.blocks.units.UnitFactory;
 import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter;
 import io.anuke.mindustry.world.meta.Attribute;
 import io.anuke.mindustry.world.modules.LiquidModule;
@@ -91,15 +80,25 @@ public class Blocks implements ContentList{
     public void load(){
         //region environment
 
-        air = new Floor("air"){{
+        air = new Floor("air"){
+            {
                 alwaysReplace = true;
                 hasShadow = false;
             }
 
-            public void draw(Tile tile){}
+            public void draw(Tile tile){
-            public void load(){}
+            }
-            public void init(){}
+
-            public boolean isHidden(){ return true; }
+            public void load(){
+            }
+
+            public void init(){
+            }
+
+            public boolean isHidden(){
+                return true;
+            }
+
             public TextureRegion[] variantRegions(){
                 if(variantRegions == null){
                     variantRegions = new TextureRegion[]{Core.atlas.find("clear")};
@@ -111,7 +110,8 @@ public class Blocks implements ContentList{
         part = new BlockPart();
 
         spawn = new Block("spawn"){
-            public void drawShadow(Tile tile){}
+            public void drawShadow(Tile tile){
+            }
         };
 
         //Registers build blocks from size 1-6

core/src/io/anuke/mindustry/content/Bullets.java

@@ -1,20 +1,15 @@
 package io.anuke.mindustry.content;
 
-import io.anuke.mindustry.entities.Effects;
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.CapStyle;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.Fill;
-import io.anuke.arc.graphics.g2d.Lines;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Time;
 import io.anuke.arc.util.Tmp;
 import io.anuke.mindustry.entities.Damage;
-import io.anuke.mindustry.entities.type.Unit;
+import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.effect.Fire;
+import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.effect.Lightning;
+import io.anuke.mindustry.entities.type.Unit;
-import io.anuke.mindustry.entities.effect.Puddle;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.graphics.Pal;
 import io.anuke.mindustry.graphics.Shapes;
@@ -586,6 +581,7 @@ public class Bullets implements ContentList{
         fuseShot = new BulletType(0.01f, 70){
             int rays = 3;
             float rayLength = 80f;
+
             {
                 hitEffect = Fx.hitFuse;
                 lifetime = 13f;
@@ -665,14 +661,16 @@ public class Bullets implements ContentList{
             }
         };
 
-        arc = new BulletType(0.001f, 25){{
+        arc = new BulletType(0.001f, 25){
+            {
                 lifetime = 1;
                 despawnEffect = Fx.none;
                 hitEffect = Fx.hitLancer;
             }
 
             @Override
-            public void draw(Bullet b){}
+            public void draw(Bullet b){
+            }
 
             @Override
             public void init(Bullet b){
@@ -709,7 +707,8 @@ public class Bullets implements ContentList{
             incendSpread = 10f;
         }};
 
-        bombOil = new BombBulletType(2f, 3f, "shell"){{
+        bombOil = new BombBulletType(2f, 3f, "shell"){
+            {
                 bulletWidth = 8f;
                 bulletHeight = 12f;
                 hitEffect = Fx.pulverize;
@@ -728,7 +727,8 @@ public class Bullets implements ContentList{
             }
         };
 
-        explode = new BombBulletType(2f, 3f, "clear"){{
+        explode = new BombBulletType(2f, 3f, "clear"){
+            {
                 hitEffect = Fx.pulverize;
                 lifetime = 23f;
                 speed = 1f;

core/src/io/anuke/mindustry/content/Fx.java

@@ -2,9 +2,7 @@ package io.anuke.mindustry.content;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.g2d.Fill;
-import io.anuke.arc.graphics.g2d.Lines;
 import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Tmp;
@@ -39,7 +37,8 @@ public class Fx implements ContentList{
     @Override
     public void load(){
 
-        none = new Effect(0, 0f, e -> {});
+        none = new Effect(0, 0f, e -> {
+        });
 
         unitSpawn = new Effect(30f, e -> {
             if(!(e.data instanceof BaseUnit)) return;

core/src/io/anuke/mindustry/content/Mechs.java

@@ -257,6 +257,7 @@ public class Mechs implements ContentList{
             float minV = 3.6f;
             float maxV = 6f;
             TextureRegion shield;
+
             {
                 drillPower = -1;
                 speed = 0.11f;

core/src/io/anuke/mindustry/content/StatusEffects.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.content;
 
-import io.anuke.mindustry.entities.Effects;
 import io.anuke.arc.math.Mathf;
+import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.type.StatusEffect;
 

core/src/io/anuke/mindustry/content/TechTree.java

@@ -88,7 +88,6 @@ public class TechTree implements ContentList{
                 });
 
 
-
                 node(copperWall, () -> {
                     node(copperWallLarge);
                     node(titaniumWall, () -> {
@@ -172,7 +171,6 @@ public class TechTree implements ContentList{
                 });
 
 
-
                 node(mechanicalPump, () -> {
                     node(conduit, () -> {
                         node(liquidJunction, () -> {
@@ -280,7 +278,8 @@ public class TechTree implements ContentList{
     }
 
     private TechNode node(Block block){
-        return node(block, () -> {});
+        return node(block, () -> {
+        });
     }
 
     public static class TechNode{

core/src/io/anuke/mindustry/content/Zones.java

@@ -4,9 +4,7 @@ import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.game.Rules;
 import io.anuke.mindustry.maps.generators.MapGenerator;
 import io.anuke.mindustry.maps.generators.MapGenerator.Decoration;
-import io.anuke.mindustry.type.Item;
+import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.type.ItemStack;
-import io.anuke.mindustry.type.Zone;
 import io.anuke.mindustry.world.Block;
 
 public class Zones implements ContentList{

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

@@ -1,8 +1,6 @@
 package io.anuke.mindustry.core;
 
-import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.ObjectMap;
-import io.anuke.arc.collection.ObjectSet;
 import io.anuke.arc.function.Consumer;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.Pixmap;
@@ -10,14 +8,10 @@ import io.anuke.arc.util.Log;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.entities.bullet.BulletType;
-import io.anuke.mindustry.entities.effect.Fire;
+import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.effect.Lightning;
-import io.anuke.mindustry.entities.effect.Puddle;
 import io.anuke.mindustry.entities.traits.TypeTrait;
 import io.anuke.mindustry.entities.type.Player;
-import io.anuke.mindustry.game.Content;
+import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.ContentList;
-import io.anuke.mindustry.game.MappableContent;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.LegacyColorMapper;
@@ -250,5 +244,9 @@ public class ContentLoader{
         TypeTrait.registerType(Lightning.class, Lightning::new);
     }
 
-    private class ImpendingDoomException extends RuntimeException{ ImpendingDoomException(String s){ super(s); }}
+    private class ImpendingDoomException extends RuntimeException{
+        ImpendingDoomException(String s){
+            super(s);
+        }
+    }
 }

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

@@ -1,8 +1,6 @@
 package io.anuke.mindustry.core;
 
-import io.anuke.arc.ApplicationListener;
+import io.anuke.arc.*;
-import io.anuke.arc.Core;
-import io.anuke.arc.Events;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.GL20;
 import io.anuke.arc.graphics.g2d.Draw;
@@ -16,16 +14,10 @@ import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.EntityQuery;
 import io.anuke.mindustry.entities.type.Player;
-import io.anuke.mindustry.game.Content;
+import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.GlobalData;
-import io.anuke.mindustry.game.Rules;
-import io.anuke.mindustry.game.Saves;
 import io.anuke.mindustry.gen.Call;
-import io.anuke.mindustry.input.Binding;
+import io.anuke.mindustry.input.*;
-import io.anuke.mindustry.input.DesktopInput;
-import io.anuke.mindustry.input.InputHandler;
-import io.anuke.mindustry.input.MobileInput;
 import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.Item;

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

@@ -3,9 +3,7 @@ package io.anuke.mindustry.core;
 import io.anuke.arc.Events;
 import io.anuke.mindustry.entities.type.BaseUnit;
 import io.anuke.mindustry.game.EventType.StateChangeEvent;
-import io.anuke.mindustry.game.Rules;
+import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.Stats;
-import io.anuke.mindustry.game.Teams;
 import io.anuke.mindustry.net.Net;
 
 import static io.anuke.mindustry.Vars.unitGroups;

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

@@ -8,15 +8,9 @@ import io.anuke.arc.collection.ObjectSet.ObjectSetIterator;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.entities.Effects;
+import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.Entities;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.EntityQuery;
 import io.anuke.mindustry.entities.type.TileEntity;
-import io.anuke.mindustry.game.EventType.GameOverEvent;
+import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.EventType.PlayEvent;
-import io.anuke.mindustry.game.EventType.ResetEvent;
-import io.anuke.mindustry.game.EventType.WaveEvent;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.Item;

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

@@ -1,17 +1,12 @@
 package io.anuke.mindustry.core;
 
-import io.anuke.annotations.Annotations.Loc;
+import io.anuke.annotations.Annotations.*;
-import io.anuke.annotations.Annotations.PacketPriority;
-import io.anuke.annotations.Annotations.Remote;
-import io.anuke.annotations.Annotations.Variant;
 import io.anuke.arc.ApplicationListener;
 import io.anuke.arc.Core;
 import io.anuke.arc.collection.IntSet;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.RandomXS128;
-import io.anuke.arc.util.Interval;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Log;
-import io.anuke.arc.util.Time;
 import io.anuke.arc.util.io.ReusableByteArrayInputStream;
 import io.anuke.arc.util.serialization.Base64Coder;
 import io.anuke.mindustry.Vars;
@@ -25,11 +20,9 @@ import io.anuke.mindustry.entities.type.Player;
 import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.gen.RemoteReadClient;
-import io.anuke.mindustry.net.Net;
+import io.anuke.mindustry.net.*;
 import io.anuke.mindustry.net.Net.SendMode;
-import io.anuke.mindustry.net.NetworkIO;
 import io.anuke.mindustry.net.Packets.*;
-import io.anuke.mindustry.net.ValidateException;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.modules.ItemModule;
 

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

@@ -4,26 +4,19 @@ import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.arc.ApplicationListener;
 import io.anuke.arc.Events;
-import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.IntMap;
-import io.anuke.arc.collection.ObjectSet;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.Colors;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Rectangle;
 import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.util.Log;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Structs;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.Tmp;
 import io.anuke.arc.util.io.ByteBufferOutput;
 import io.anuke.arc.util.io.CountableByteArrayOutputStream;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.content.Mechs;
 import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.entities.Entities;
+import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.EntityQuery;
 import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest;
 import io.anuke.mindustry.entities.traits.Entity;
 import io.anuke.mindustry.entities.traits.SyncTrait;
@@ -33,23 +26,19 @@ import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.gen.RemoteReadServer;
-import io.anuke.mindustry.net.Administration;
+import io.anuke.mindustry.net.*;
 import io.anuke.mindustry.net.Administration.PlayerInfo;
-import io.anuke.mindustry.net.Net;
-import io.anuke.mindustry.net.NetConnection;
-import io.anuke.mindustry.net.NetworkIO;
 import io.anuke.mindustry.net.Packets.*;
 import io.anuke.mindustry.world.Tile;
 
-import java.io.ByteArrayInputStream;
+import java.io.*;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.zip.DeflaterOutputStream;
 
 import static io.anuke.mindustry.Vars.*;
 
+import java.lang.StringBuilder;
+
 public class NetServer implements ApplicationListener{
     public final static int maxSnapshotSize = 430;
     private final static float serverSyncTime = 30, kickDuration = 30 * 1000;

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

@@ -12,12 +12,14 @@ import static io.anuke.mindustry.Vars.mobile;
 
 public abstract class Platform{
     /** Each separate game platform should set this instance to their own implementation. */
-    public static Platform instance = new Platform() {};
+    public static Platform instance = new Platform(){
+    };
 
     /** Add a text input dialog that should show up after the field is tapped. */
     public void addDialog(TextField field){
         addDialog(field, 16);
     }
+
     /** See addDialog(). */
     public void addDialog(TextField field, int maxLength){
         if(!mobile) return; //this is mobile only, desktop doesn't need dialogs
@@ -35,12 +37,16 @@ public abstract class Platform {
             Core.input.getTextInput(input);
         });
     }
+
     /** Update discord RPC. */
-    public void updateRPC(){}
+    public void updateRPC(){
+    }
+
     /** Whether donating is supported. */
     public boolean canDonate(){
         return false;
     }
+
     /** Must be a base64 string 8 bytes in length. */
     public String getUUID(){
         String uuid = Core.settings.getString("uuid", "");
@@ -54,25 +60,31 @@ public abstract class Platform {
         }
         return uuid;
     }
-    /**Only used for iOS or android: open the share menu for a map or save.*/
-    public void shareFile(FileHandle file){}
 
-    /**Show a file chooser. Desktop only.
+    /** Only used for iOS or android: open the share menu for a map or save. */
-     *
+    public void shareFile(FileHandle file){
+    }
+
+    /**
+     * Show a file chooser. Desktop only.
      * @param text File chooser title text
      * @param content Description of the type of files to be loaded
      * @param cons Selection listener
      * @param open Whether to open or save files
      * @param filetype File extension to filter
      */
-    public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, String filetype){}
+    public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, String filetype){
+    }
 
     /** Hide the app. Android only. */
-    public void hide(){}
+    public void hide(){
+    }
 
     /** Forces the app into landscape mode. Currently Android only. */
-    public void beginForceLandscape(){}
+    public void beginForceLandscape(){
+    }
 
     /** Stops forcing the app into landscape orientation. Currently Android only. */
-    public void endForceLandscape(){}
+    public void endForceLandscape(){
+    }
 }

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

@@ -5,37 +5,22 @@ import io.anuke.arc.Core;
 import io.anuke.arc.files.FileHandle;
 import io.anuke.arc.function.Consumer;
 import io.anuke.arc.function.Predicate;
-import io.anuke.arc.graphics.Camera;
+import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.Color;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.Pixmap;
-import io.anuke.arc.graphics.PixmapIO;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.arc.graphics.g2d.SpriteBatch;
 import io.anuke.arc.graphics.glutils.FrameBuffer;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Rectangle;
 import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.util.BufferUtils;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.ScreenUtils;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.Tmp;
 import io.anuke.arc.util.pooling.Pools;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.entities.Effects;
+import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.EntityDraw;
-import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
 import io.anuke.mindustry.entities.impl.EffectEntity;
-import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
+import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.traits.DrawTrait;
+import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.traits.Entity;
-import io.anuke.mindustry.entities.type.BaseUnit;
-import io.anuke.mindustry.entities.type.Player;
-import io.anuke.mindustry.entities.type.TileEntity;
-import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity;

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

@@ -1,8 +1,6 @@
 package io.anuke.mindustry.core;
 
-import io.anuke.arc.ApplicationListener;
+import io.anuke.arc.*;
-import io.anuke.arc.Core;
-import io.anuke.arc.Events;
 import io.anuke.arc.Graphics.Cursor;
 import io.anuke.arc.Graphics.Cursor.SystemCursor;
 import io.anuke.arc.freetype.FreeTypeFontGenerator;
@@ -13,19 +11,13 @@ import io.anuke.arc.graphics.Colors;
 import io.anuke.arc.graphics.g2d.BitmapFont;
 import io.anuke.arc.input.KeyCode;
 import io.anuke.arc.math.Interpolation;
-import io.anuke.arc.scene.Group;
+import io.anuke.arc.scene.*;
-import io.anuke.arc.scene.Scene;
-import io.anuke.arc.scene.Skin;
 import io.anuke.arc.scene.actions.Actions;
-import io.anuke.arc.scene.ui.Dialog;
+import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.TextField;
 import io.anuke.arc.scene.ui.TextField.TextFieldFilter;
-import io.anuke.arc.scene.ui.TooltipManager;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.scene.ui.layout.Unit;
-import io.anuke.arc.util.Align;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Strings;
-import io.anuke.arc.util.Time;
 import io.anuke.mindustry.editor.MapEditorDialog;
 import io.anuke.mindustry.game.EventType.ResizeEvent;
 import io.anuke.mindustry.graphics.Pal;

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

@@ -1,20 +1,14 @@
 package io.anuke.mindustry.core;
 
 import io.anuke.annotations.Annotations.Nullable;
-import io.anuke.arc.ApplicationListener;
+import io.anuke.arc.*;
-import io.anuke.arc.Core;
-import io.anuke.arc.Events;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.IntArray;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
 import io.anuke.arc.math.geom.Point2;
-import io.anuke.arc.util.Log;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Structs;
+import io.anuke.mindustry.ai.*;
-import io.anuke.arc.util.Tmp;
-import io.anuke.mindustry.ai.BlockIndexer;
-import io.anuke.mindustry.ai.Pathfinder;
-import io.anuke.mindustry.ai.WaveSpawner;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.EntityQuery;
@@ -22,16 +16,10 @@ import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadEvent;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.io.MapIO;
-import io.anuke.mindustry.maps.Map;
+import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.maps.MapException;
-import io.anuke.mindustry.maps.Maps;
 import io.anuke.mindustry.maps.generators.Generator;
-import io.anuke.mindustry.type.ContentType;
+import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.type.ItemStack;
+import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.type.Zone;
-import io.anuke.mindustry.world.Block;
-import io.anuke.mindustry.world.Pos;
-import io.anuke.mindustry.world.Tile;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -97,11 +85,13 @@ public class World implements ApplicationListener{
         return tiles == null ? 0 : tiles[0].length;
     }
 
-    public @Nullable Tile tile(int pos){
+    public @Nullable
+    Tile tile(int pos){
         return tiles == null ? null : tile(Pos.x(pos), Pos.y(pos));
     }
 
-    public @Nullable Tile tile(int x, int y){
+    public @Nullable
+    Tile tile(int x, int y){
         if(tiles == null){
             return null;
         }
@@ -113,7 +103,8 @@ public class World implements ApplicationListener{
         return tiles[x][y];
     }
 
-    public @Nullable Tile tileWorld(float x, float y){
+    public @Nullable
+    Tile tileWorld(float x, float y){
         return tile(Math.round(x / tilesize), Math.round(y / tilesize));
     }
 
@@ -354,7 +345,6 @@ public class World implements ApplicationListener{
 
     /**
      * Input is in block coordinates, not world coordinates.
-     *
      * @return null if no collisions found, block position otherwise.
      */
     public Point2 raycast(int x0f, int y0f, int x1, int y1){
@@ -471,10 +461,12 @@ public class World implements ApplicationListener{
         }
     }
 
-    /**'Prepares' a tile array by:<br>
+    /**
+     * 'Prepares' a tile array by:<br>
      * - setting up multiblocks<br>
      * - updating occlusion<br>
-     * Usually used before placing structures on a tile array.*/
+     * Usually used before placing structures on a tile array.
+     */
     public void prepareTiles(Tile[][] tiles){
 
         //find multiblocks

core/src/io/anuke/mindustry/editor/EditorTile.java

@@ -8,10 +8,7 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.Floor;
 import io.anuke.mindustry.world.blocks.OreBlock;
-import io.anuke.mindustry.world.modules.ConsumeModule;
+import io.anuke.mindustry.world.modules.*;
-import io.anuke.mindustry.world.modules.ItemModule;
-import io.anuke.mindustry.world.modules.LiquidModule;
-import io.anuke.mindustry.world.modules.PowerModule;
 
 import static io.anuke.mindustry.Vars.ui;
 

core/src/io/anuke/mindustry/editor/EditorTool.java

@@ -7,12 +7,8 @@ import io.anuke.arc.input.KeyCode;
 import io.anuke.arc.util.Pack;
 import io.anuke.arc.util.Structs;
 import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.Pos;
+import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.BlockPart;
-import io.anuke.mindustry.world.blocks.Floor;
-import io.anuke.mindustry.world.blocks.OreBlock;
 
 public enum EditorTool{
     pick{

core/src/io/anuke/mindustry/editor/MapLoadDialog.java

@@ -1,14 +1,12 @@
 package io.anuke.mindustry.editor;
 
+import io.anuke.arc.function.Consumer;
+import io.anuke.arc.scene.ui.*;
+import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.util.Scaling;
 import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.ui.BorderImage;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
-import io.anuke.arc.function.Consumer;
-import io.anuke.arc.scene.ui.ButtonGroup;
-import io.anuke.arc.scene.ui.ScrollPane;
-import io.anuke.arc.scene.ui.TextButton;
-import io.anuke.arc.scene.ui.layout.Table;
 
 import static io.anuke.mindustry.Vars.world;
 

core/src/io/anuke/mindustry/editor/MapSaveDialog.java

@@ -1,11 +1,11 @@
 package io.anuke.mindustry.editor;
 
-import io.anuke.mindustry.core.Platform;
-import io.anuke.mindustry.maps.Map;
-import io.anuke.mindustry.ui.dialogs.FloatingDialog;
 import io.anuke.arc.function.Consumer;
 import io.anuke.arc.scene.ui.TextButton;
 import io.anuke.arc.scene.ui.TextField;
+import io.anuke.mindustry.core.Platform;
+import io.anuke.mindustry.maps.Map;
+import io.anuke.mindustry.ui.dialogs.FloatingDialog;
 
 import static io.anuke.mindustry.Vars.ui;
 import static io.anuke.mindustry.Vars.world;

core/src/io/anuke/mindustry/editor/MapView.java

@@ -3,18 +3,14 @@ package io.anuke.mindustry.editor;
 import io.anuke.arc.Core;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.arc.graphics.g2d.ScissorStack;
 import io.anuke.arc.input.GestureDetector;
 import io.anuke.arc.input.GestureDetector.GestureListener;
 import io.anuke.arc.input.KeyCode;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.scene.Element;
-import io.anuke.arc.scene.event.InputEvent;
+import io.anuke.arc.scene.event.*;
-import io.anuke.arc.scene.event.InputListener;
-import io.anuke.arc.scene.event.Touchable;
 import io.anuke.arc.scene.ui.TextField;
 import io.anuke.arc.scene.ui.layout.Unit;
 import io.anuke.arc.util.Tmp;
@@ -69,6 +65,7 @@ public class MapView extends Element implements GestureListener{
 
                 return false;
             }
+
             @Override
             public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
                 if(pointer != 0){

core/src/io/anuke/mindustry/editor/WaveInfoDialog.java

@@ -7,9 +7,7 @@ import io.anuke.arc.input.KeyCode;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.scene.ui.TextField.TextFieldFilter;
 import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.arc.util.Align;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Strings;
-import io.anuke.arc.util.Time;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.StatusEffects;
 import io.anuke.mindustry.content.UnitTypes;
@@ -100,7 +98,8 @@ public class WaveInfoDialog extends FloatingDialog{
         cont.table("clear", m -> {
             m.add("$waves.preview").color(Color.LIGHT_GRAY).growX().center().get().setAlignment(Align.center, Align.center);
             m.row();
-            m.addButton("-", () -> {}).update(t -> {
+            m.addButton("-", () -> {
+            }).update(t -> {
                 if(t.getClickListener().isPressed()){
                     updateTimer += Time.delta();
                     if(updateTimer >= updatePeriod){
@@ -113,7 +112,8 @@ public class WaveInfoDialog extends FloatingDialog{
             m.row();
             m.pane(t -> preview = t).grow().get().setScrollingDisabled(true, false);
             m.row();
-            m.addButton("+", () -> {}).update(t -> {
+            m.addButton("+", () -> {
+            }).update(t -> {
                 if(t.getClickListener().isPressed()){
                     updateTimer += Time.delta();
                     if(updateTimer >= updatePeriod){

core/src/io/anuke/mindustry/editor/generation/FilterOption.java

@@ -20,7 +20,9 @@ public abstract class FilterOption{
     public static final Predicate<Block> oresOnly = b -> b instanceof OreBlock && Core.atlas.isFound(b.icon(Icon.full));
 
     public abstract void build(Table table);
-    public Runnable changed = () -> {};
+
+    public Runnable changed = () -> {
+    };
 
     static class SliderOption extends FilterOption{
         final String name;

core/src/io/anuke/mindustry/editor/generation/OreFilter.java

@@ -4,7 +4,8 @@ import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.editor.generation.FilterOption.SliderOption;
 import io.anuke.mindustry.world.Block;
 
-import static io.anuke.mindustry.editor.generation.FilterOption.*;
+import static io.anuke.mindustry.editor.generation.FilterOption.BlockOption;
+import static io.anuke.mindustry.editor.generation.FilterOption.oresOnly;
 
 public class OreFilter extends GenerateFilter{
     float scl = 40, threshold = 0.8f, octaves = 3f, falloff = 0.5f;

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

@@ -7,10 +7,7 @@ import io.anuke.arc.function.Consumer;
 import io.anuke.arc.function.Predicate;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Geometry;
+import io.anuke.arc.math.geom.*;
-import io.anuke.arc.math.geom.Point2;
-import io.anuke.arc.math.geom.Rectangle;
-import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Bullets;
 import io.anuke.mindustry.content.Fx;

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

@@ -3,10 +3,7 @@ package io.anuke.mindustry.entities;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.IntSet;
 import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Geometry;
+import io.anuke.arc.math.geom.*;
-import io.anuke.arc.math.geom.QuadTree;
-import io.anuke.arc.math.geom.Rectangle;
-import io.anuke.arc.math.geom.Vector2;
 import io.anuke.mindustry.entities.traits.Entity;
 import io.anuke.mindustry.entities.traits.SolidTrait;
 

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

@@ -14,7 +14,6 @@ public class Predict{
 
     /**
      * Calculates of intercept of a stationary and moving target. Do not call from multiple threads!
-     *
      * @param srcx X of shooter
      * @param srcy Y of shooter
      * @param dstx X of target

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

@@ -7,10 +7,7 @@ import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
 import io.anuke.arc.math.geom.Rectangle;
 import io.anuke.mindustry.entities.traits.TargetTrait;
-import io.anuke.mindustry.entities.type.Player;
+import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.TileEntity;
-import io.anuke.mindustry.entities.type.BaseUnit;
-import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
@@ -29,7 +26,6 @@ public class Units{
 
     /**
      * Validates a target.
-     *
      * @param target The target to validate
      * @param team The team of the thing doing tha targeting
      * @param x The X position of the thing doign the targeting

core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.entities.bullet;
 
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.Effects.Effect;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.mindustry.content.Fx;
+import io.anuke.mindustry.entities.Effects;
+import io.anuke.mindustry.entities.Effects.Effect;
 
 //TODO scale velocity depending on fslope()
 public class ArtilleryBulletType extends BasicBulletType{

core/src/io/anuke/mindustry/entities/bullet/Bullet.java

@@ -5,9 +5,7 @@ import io.anuke.annotations.Annotations.Remote;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Rectangle;
 import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.util.Interval;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.Tmp;
 import io.anuke.arc.util.pooling.Pool.Poolable;
 import io.anuke.arc.util.pooling.Pools;
 import io.anuke.mindustry.entities.EntityGroup;
@@ -18,9 +16,7 @@ import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.world.Tile;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 
 import static io.anuke.mindustry.Vars.*;
 

core/src/io/anuke/mindustry/entities/bullet/BulletType.java

@@ -4,10 +4,8 @@ import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.content.StatusEffects;
-import io.anuke.mindustry.entities.Damage;
+import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.Effects.Effect;
-import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.effect.Lightning;
 import io.anuke.mindustry.entities.traits.TargetTrait;
 import io.anuke.mindustry.game.Content;

core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.entities.bullet;
 
 import io.anuke.arc.math.geom.Rectangle;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.entities.Units;
-import io.anuke.arc.util.Time;
 
 public abstract class FlakBulletType extends BasicBulletType{
     protected static Rectangle rect = new Rectangle();

core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java

@@ -1,6 +1,5 @@
 package io.anuke.mindustry.entities.bullet;
 
-import io.anuke.mindustry.entities.Effects;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.graphics.g2d.Fill;
@@ -8,6 +7,7 @@ import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
 import io.anuke.arc.math.geom.Point2;
 import io.anuke.mindustry.content.Fx;
+import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.effect.Fire;
 import io.anuke.mindustry.entities.effect.Puddle;
 import io.anuke.mindustry.type.Liquid;

core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java

@@ -1,11 +1,11 @@
 package io.anuke.mindustry.entities.bullet;
 
-import io.anuke.mindustry.entities.Effects;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 import io.anuke.mindustry.content.Fx;
+import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.graphics.Pal;
 import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData;
 

core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java

@@ -1,11 +1,11 @@
 package io.anuke.mindustry.entities.bullet;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.mindustry.content.Fx;
-import io.anuke.mindustry.graphics.Pal;
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.arc.util.Time;
 import io.anuke.arc.math.Mathf;
+import io.anuke.arc.util.Time;
+import io.anuke.mindustry.content.Fx;
+import io.anuke.mindustry.entities.Effects;
+import io.anuke.mindustry.graphics.Pal;
 
 public class MissileBulletType extends BasicBulletType{
     protected Color trailColor = Pal.missileYellowBack;

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

@@ -1,12 +1,12 @@
 package io.anuke.mindustry.entities.effect;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.impl.TimedEntity;
-import io.anuke.mindustry.entities.traits.DrawTrait;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.math.Mathf;
+import io.anuke.mindustry.entities.EntityGroup;
+import io.anuke.mindustry.entities.impl.TimedEntity;
+import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
+import io.anuke.mindustry.entities.traits.DrawTrait;
 
 import static io.anuke.mindustry.Vars.groundEffectGroup;
 

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

@@ -3,9 +3,6 @@ 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.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.impl.TimedEntity;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
 import io.anuke.arc.math.geom.Point2;
@@ -13,22 +10,17 @@ import io.anuke.arc.util.Structs;
 import io.anuke.arc.util.Time;
 import io.anuke.arc.util.pooling.Pool.Poolable;
 import io.anuke.arc.util.pooling.Pools;
-import io.anuke.mindustry.content.Bullets;
+import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.content.StatusEffects;
+import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.content.Fx;
+import io.anuke.mindustry.entities.impl.TimedEntity;
-import io.anuke.mindustry.entities.Damage;
-import io.anuke.mindustry.entities.type.TileEntity;
 import io.anuke.mindustry.entities.traits.SaveTrait;
 import io.anuke.mindustry.entities.traits.SyncTrait;
+import io.anuke.mindustry.entities.type.TileEntity;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
-import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.Pos;
-import io.anuke.mindustry.world.Tile;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -43,7 +35,8 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{
     private float lifetime;
 
     /** Deserialization use only! */
-    public Fire(){}
+    public Fire(){
+    }
 
     /** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */
     public static void create(Tile tile){

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

@@ -1,12 +1,12 @@
 package io.anuke.mindustry.entities.effect;
 
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.util.Time;
+import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.Effects.Effect;
 import io.anuke.mindustry.entities.Effects.EffectRenderer;
 import io.anuke.mindustry.entities.impl.EffectEntity;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Time;
-import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.world.Tile;
 
 /**

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

@@ -2,18 +2,16 @@ package io.anuke.mindustry.entities.effect;
 
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
-import io.anuke.mindustry.entities.EntityGroup;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.mindustry.entities.impl.TimedEntity;
-import io.anuke.mindustry.entities.traits.DrawTrait;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.Fill;
-import io.anuke.arc.graphics.g2d.Lines;
 import io.anuke.arc.math.Interpolation;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Position;
 import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.util.Time;
 import io.anuke.arc.util.pooling.Pools;
+import io.anuke.mindustry.entities.EntityGroup;
+import io.anuke.mindustry.entities.impl.TimedEntity;
+import io.anuke.mindustry.entities.traits.DrawTrait;
 import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.graphics.Pal;
 import io.anuke.mindustry.type.Item;

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

@@ -4,27 +4,18 @@ import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.IntSet;
-import io.anuke.arc.graphics.g2d.Fill;
-import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.impl.TimedEntity;
-import io.anuke.mindustry.entities.traits.DrawTrait;
-import io.anuke.mindustry.entities.traits.TimeTrait;
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.Angles;
+import io.anuke.arc.math.*;
-import io.anuke.arc.math.Mathf;
+import io.anuke.arc.math.geom.*;
-import io.anuke.arc.math.RandomXS128;
-import io.anuke.arc.math.geom.Geometry;
-import io.anuke.arc.math.geom.Position;
-import io.anuke.arc.math.geom.Rectangle;
-import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.util.pooling.Pools;
 import io.anuke.mindustry.content.Bullets;
-import io.anuke.mindustry.entities.type.Unit;
+import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.bullet.Bullet;
-import io.anuke.mindustry.entities.traits.SyncTrait;
+import io.anuke.mindustry.entities.impl.TimedEntity;
+import io.anuke.mindustry.entities.traits.*;
+import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Pal;
@@ -106,10 +97,12 @@ public class Lightning extends TimedEntity implements DrawTrait, SyncTrait, Time
     }
 
     @Override
-    public void write(DataOutput data){}
+    public void write(DataOutput data){
+    }
 
     @Override
-    public void read(DataInput data){}
+    public void read(DataInput data){
+    }
 
     @Override
     public float lifetime(){

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

@@ -3,36 +3,25 @@ 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.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.impl.SolidEntity;
-import io.anuke.mindustry.entities.traits.DrawTrait;
 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.arc.math.geom.Geometry;
+import io.anuke.arc.math.geom.*;
-import io.anuke.arc.math.geom.Point2;
-import io.anuke.arc.math.geom.Rectangle;
 import io.anuke.arc.util.Time;
 import io.anuke.arc.util.pooling.Pool.Poolable;
 import io.anuke.arc.util.pooling.Pools;
-import io.anuke.mindustry.content.Liquids;
+import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.content.Blocks;
+import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.content.Bullets;
+import io.anuke.mindustry.entities.impl.SolidEntity;
-import io.anuke.mindustry.content.Fx;
+import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.Units;
-import io.anuke.mindustry.entities.traits.SaveTrait;
-import io.anuke.mindustry.entities.traits.SyncTrait;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 
 import static io.anuke.mindustry.Vars.*;
 

core/src/io/anuke/mindustry/entities/impl/DestructibleEntity.java

@@ -1,9 +1,7 @@
 package io.anuke.mindustry.entities.impl;
 
 
-import io.anuke.mindustry.entities.traits.DamageTrait;
+import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.traits.HealthTrait;
-import io.anuke.mindustry.entities.traits.SolidTrait;
 
 public abstract class DestructibleEntity extends SolidEntity implements HealthTrait{
     public transient boolean dead;

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

@@ -5,9 +5,7 @@ import io.anuke.arc.Events;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.Queue;
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.g2d.Fill;
-import io.anuke.arc.graphics.g2d.Lines;
 import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Vector2;
@@ -16,29 +14,23 @@ import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.type.Player;
+import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.TileEntity;
-import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.game.EventType.BuildSelectEvent;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Pal;
 import io.anuke.mindustry.graphics.Shapes;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.Item;
-import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.Build;
-import io.anuke.mindustry.world.Pos;
-import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.BuildBlock;
 import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 import java.util.Arrays;
 
 import static io.anuke.mindustry.Vars.*;
-import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.*;
+import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.removal;
+import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.tmptr;
 
 /**
  * Interface for units that build, break or mine things.

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

@@ -1,8 +1,6 @@
 package io.anuke.mindustry.entities.traits;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 
 public interface Saveable{
     void writeSave(DataOutput stream) throws IOException;

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

@@ -1,11 +1,9 @@
 package io.anuke.mindustry.entities.traits;
 
 
-import io.anuke.mindustry.entities.EntityQuery;
+import io.anuke.arc.math.geom.*;
-import io.anuke.arc.math.geom.Position;
 import io.anuke.arc.math.geom.QuadTree.QuadTreeObject;
-import io.anuke.arc.math.geom.Rectangle;
+import io.anuke.mindustry.entities.EntityQuery;
-import io.anuke.arc.math.geom.Vector2;
 
 public interface SolidTrait extends QuadTreeObject, MoveTrait, VelocityTrait, Entity, Position{
 
@@ -35,7 +33,8 @@ public interface SolidTrait extends QuadTreeObject, MoveTrait, VelocityTrait, En
         return true;
     }
 
-    default void collision(SolidTrait other, float x, float y){}
+    default void collision(SolidTrait other, float x, float y){
+    }
 
     default void move(float x, float y){
         EntityQuery.collisions().move(this, x, y);

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

@@ -1,13 +1,11 @@
 package io.anuke.mindustry.entities.traits;
 
-import io.anuke.mindustry.core.NetClient;
-import io.anuke.mindustry.net.Interpolator;
 import io.anuke.arc.Core;
 import io.anuke.arc.util.Tmp;
+import io.anuke.mindustry.core.NetClient;
+import io.anuke.mindustry.net.Interpolator;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 
 public interface SyncTrait extends Entity, TypeTrait{
 

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

@@ -451,7 +451,8 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
                 for(int i = 0; i < 4; i++){
                     Point2 p = Geometry.d8edge[i];
                     float offset = -Math.max(request.block.size - 1, 0) / 2f * tilesize;
-                    if(i % 2 == 0) Draw.rect("block-select", request.x * tilesize + request.block.offset() + offset * p.x, request.y * tilesize + request.block.offset() + offset * p.y, i * 90);
+                    if(i % 2 == 0)
+                        Draw.rect("block-select", request.x * tilesize + request.block.offset() + offset * p.x, request.y * tilesize + request.block.offset() + offset * p.y, i * 90);
                 }
                 Draw.color();
 

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

@@ -20,18 +20,11 @@ import io.anuke.mindustry.entities.traits.TargetTrait;
 import io.anuke.mindustry.game.EventType.BlockDestroyEvent;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
-import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.Edges;
-import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.defense.Wall;
-import io.anuke.mindustry.world.modules.ConsumeModule;
+import io.anuke.mindustry.world.modules.*;
-import io.anuke.mindustry.world.modules.ItemModule;
-import io.anuke.mindustry.world.modules.LiquidModule;
-import io.anuke.mindustry.world.modules.PowerModule;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 
 import static io.anuke.mindustry.Vars.tileGroup;
 import static io.anuke.mindustry.Vars.world;
@@ -126,13 +119,17 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
         return dead || tile.entity != this;
     }
 
-    public void write(DataOutput stream) throws IOException{}
+    public void write(DataOutput stream) throws IOException{
+    }
 
-    public void writeConfig(DataOutput stream) throws IOException{}
+    public void writeConfig(DataOutput stream) throws IOException{
+    }
 
-    public void read(DataInput stream) throws IOException{}
+    public void read(DataInput stream) throws IOException{
+    }
 
-    public void readConfig(DataInput stream) throws IOException{}
+    public void readConfig(DataInput stream) throws IOException{
+    }
 
     public boolean collide(Bullet other){
         return true;

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

@@ -24,17 +24,12 @@ import io.anuke.mindustry.game.Teams.TeamData;
 import io.anuke.mindustry.graphics.Pal;
 import io.anuke.mindustry.net.Interpolator;
 import io.anuke.mindustry.net.Net;
-import io.anuke.mindustry.type.Item;
+import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.type.ItemStack;
-import io.anuke.mindustry.type.StatusEffect;
-import io.anuke.mindustry.type.Weapon;
 import io.anuke.mindustry.world.Pos;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.Floor;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -304,7 +299,8 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
         return tile == null ? (Floor)Blocks.air : tile.floor();
     }
 
-    public void onRespawn(Tile tile){}
+    public void onRespawn(Tile tile){
+    }
 
     /** Updates velocity and status effects. */
     public void updateVelocityStatus(){

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

@@ -2,31 +2,24 @@ package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.arc.Events;
 import io.anuke.arc.collection.Queue;
-import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
 import io.anuke.arc.util.Structs;
 import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.entities.type.Player;
+import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.type.TileEntity;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.traits.BuilderTrait;
-import io.anuke.mindustry.entities.type.BaseUnit;
+import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.FlyingUnit;
 import io.anuke.mindustry.entities.units.UnitState;
 import io.anuke.mindustry.game.EventType.BuildSelectEvent;
 import io.anuke.mindustry.gen.Call;
-import io.anuke.mindustry.type.Item;
+import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.type.ItemStack;
-import io.anuke.mindustry.type.ItemType;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.BuildBlock;
 import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity;
 import io.anuke.mindustry.world.meta.BlockFlag;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 
 import static io.anuke.mindustry.Vars.unitGroups;
 import static io.anuke.mindustry.Vars.world;

core/src/io/anuke/mindustry/entities/units/Statuses.java

@@ -12,11 +12,10 @@ import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.StatusEffect;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 
 import static io.anuke.mindustry.Vars.content;
+
 /** Class for controlling status effects on an entity. */
 public class Statuses implements Saveable{
     private static final StatusEntry globalResult = new StatusEntry();

core/src/io/anuke/mindustry/entities/units/UnitDrops.java

@@ -1,12 +1,12 @@
 package io.anuke.mindustry.entities.units;
 
+import io.anuke.arc.math.Mathf;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.entities.type.BaseUnit;
 import io.anuke.mindustry.entities.type.TileEntity;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.type.Item;
-import io.anuke.arc.math.Mathf;
 
 public class UnitDrops{
     private static Item[] dropTable;
@@ -37,7 +37,8 @@ public class UnitDrops{
                 if(Mathf.chance(0.03)){
                     int amount = Mathf.random(20, 40);
                     amount = core.tile.block().acceptStack(item, amount, core.tile, null);
-                    if (amount > 0) Call.transferItemTo(item, amount, unit.x + Mathf.range(2f), unit.y + Mathf.range(2f), core.tile);
+                    if(amount > 0)
+                        Call.transferItemTo(item, amount, unit.x + Mathf.range(2f), unit.y + Mathf.range(2f), core.tile);
                 }
             }
         }

core/src/io/anuke/mindustry/game/DefaultWaves.java

@@ -1,9 +1,7 @@
 package io.anuke.mindustry.game;
 
 import io.anuke.arc.collection.Array;
-import io.anuke.mindustry.content.Items;
+import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.content.StatusEffects;
-import io.anuke.mindustry.content.UnitTypes;
 import io.anuke.mindustry.type.ItemStack;
 
 public class DefaultWaves{

core/src/io/anuke/mindustry/game/Difficulty.java

@@ -2,8 +2,10 @@ package io.anuke.mindustry.game;
 
 import io.anuke.arc.Core;
 
-/**Presets for time between waves.
+/**
- * TODO specify correct time*/
+ * Presets for time between waves.
+ * TODO specify correct time
+ */
 public enum Difficulty{
     easy(1.4f),
     normal(1f),

core/src/io/anuke/mindustry/game/EventType.java

@@ -2,8 +2,8 @@ package io.anuke.mindustry.game;
 
 import io.anuke.arc.Events.Event;
 import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.entities.traits.BuilderTrait;
+import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.type.Zone;
 import io.anuke.mindustry.world.Tile;
 
@@ -84,8 +84,10 @@ public class EventType{
         }
     }
 
-    /**Called when block building begins by placing down the BuildBlock.
+    /**
-     * The tile's block will nearly always be a BuildBlock.*/
+     * Called when block building begins by placing down the BuildBlock.
+     * The tile's block will nearly always be a BuildBlock.
+     */
     public static class BlockBuildBeginEvent implements Event{
         public final Tile tile;
         public final Team team;
@@ -110,8 +112,10 @@ public class EventType{
         }
     }
 
-    /**Called when a player or drone begins building something.
+    /**
-     * This does not necessarily happen when a new BuildBlock is created.*/
+     * Called when a player or drone begins building something.
+     * This does not necessarily happen when a new BuildBlock is created.
+     */
     public static class BuildSelectEvent implements Event{
         public final Tile tile;
         public final Team team;

core/src/io/anuke/mindustry/game/GlobalData.java

@@ -2,15 +2,11 @@ package io.anuke.mindustry.game;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.Events;
-import io.anuke.arc.collection.ObjectIntMap;
+import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.ObjectMap;
-import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.game.EventType.UnlockEvent;
-import io.anuke.mindustry.type.ContentType;
+import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.type.Item;
-import io.anuke.mindustry.type.ItemStack;
 
 import static io.anuke.mindustry.Vars.content;
 import static io.anuke.mindustry.Vars.state;

core/src/io/anuke/mindustry/game/Rules.java

@@ -3,8 +3,10 @@ package io.anuke.mindustry.game;
 import io.anuke.annotations.Annotations.Serialize;
 import io.anuke.arc.collection.Array;
 
-/**Defines current rules on how the game should function.
+/**
- * Does not store game state, just configuration.*/
+ * Defines current rules on how the game should function.
+ * Does not store game state, just configuration.
+ */
 @Serialize
 public class Rules{
     /** Whether the player has infinite resources. */

core/src/io/anuke/mindustry/game/Saves.java

@@ -2,9 +2,7 @@ package io.anuke.mindustry.game;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.Events;
-import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.IntArray;
-import io.anuke.arc.collection.IntMap;
 import io.anuke.arc.files.FileHandle;
 import io.anuke.arc.util.Strings;
 import io.anuke.arc.util.Time;

core/src/io/anuke/mindustry/game/SpawnGroup.java

@@ -4,10 +4,7 @@ import io.anuke.arc.util.serialization.Json;
 import io.anuke.arc.util.serialization.Json.Serializable;
 import io.anuke.arc.util.serialization.JsonValue;
 import io.anuke.mindustry.entities.type.BaseUnit;
-import io.anuke.mindustry.type.ContentType;
+import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.type.ItemStack;
-import io.anuke.mindustry.type.StatusEffect;
-import io.anuke.mindustry.type.UnitType;
 
 import static io.anuke.mindustry.Vars.content;
 

core/src/io/anuke/mindustry/game/Stats.java

@@ -4,9 +4,7 @@ import io.anuke.annotations.Annotations.Serialize;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.ObjectIntMap;
 import io.anuke.arc.math.Mathf;
-import io.anuke.mindustry.type.Item;
+import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.type.ItemType;
-import io.anuke.mindustry.type.Zone;
 
 @Serialize
 public class Stats{

core/src/io/anuke/mindustry/game/Teams.java

@@ -1,8 +1,6 @@
 package io.anuke.mindustry.game;
 
-import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.EnumSet;
-import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.world.Tile;
 
@@ -12,7 +10,6 @@ public class Teams{
 
     /**
      * Register a team.
-     *
      * @param team The team type enum.
      * @param enemies The array of enemies of this team. Any team not in this array is considered neutral.
      */

core/src/io/anuke/mindustry/graphics/FloorRenderer.java

@@ -2,20 +2,13 @@ package io.anuke.mindustry.graphics;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.Events;
-import io.anuke.arc.collection.IntArray;
+import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.IntSet;
 import io.anuke.arc.collection.IntSet.IntSetIterator;
-import io.anuke.arc.collection.ObjectSet;
 import io.anuke.arc.graphics.Camera;
 import io.anuke.arc.graphics.GL20;
-import io.anuke.arc.graphics.g2d.CacheBatch;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.SpriteBatch;
-import io.anuke.arc.graphics.g2d.SpriteCache;
 import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Log;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Structs;
-import io.anuke.arc.util.Time;
 import io.anuke.mindustry.game.EventType.WorldLoadEvent;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.Floor;

core/src/io/anuke/mindustry/graphics/MinimapRenderer.java

@@ -3,13 +3,9 @@ package io.anuke.mindustry.graphics;
 import io.anuke.arc.Core;
 import io.anuke.arc.Events;
 import io.anuke.arc.collection.Array;
-import io.anuke.arc.graphics.Pixmap;
+import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.Pixmap.Format;
-import io.anuke.arc.graphics.Pixmaps;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.Texture;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.Fill;
-import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Rectangle;
 import io.anuke.arc.util.Disposable;

core/src/io/anuke/mindustry/graphics/Shapes.java

@@ -1,10 +1,7 @@
 package io.anuke.mindustry.graphics;
 
 import io.anuke.arc.Core;
-import io.anuke.arc.graphics.g2d.CapStyle;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Tmp;
 

core/src/io/anuke/mindustry/input/Binding.java

@@ -2,9 +2,7 @@ package io.anuke.mindustry.input;
 
 import io.anuke.arc.Application.ApplicationType;
 import io.anuke.arc.Core;
-import io.anuke.arc.KeyBinds.Axis;
+import io.anuke.arc.KeyBinds.*;
-import io.anuke.arc.KeyBinds.KeyBind;
-import io.anuke.arc.KeyBinds.KeybindValue;
 import io.anuke.arc.input.InputDevice.DeviceType;
 import io.anuke.arc.input.KeyCode;
 
@@ -37,9 +35,22 @@ public enum Binding implements KeyBind{
     private final KeybindValue defaultValue;
     private final String category;
 
-    Binding(KeybindValue defaultValue, String category){ this.defaultValue = defaultValue; this.category = category; }
+    Binding(KeybindValue defaultValue, String category){
-    Binding(KeybindValue defaultValue){ this(defaultValue, null); }
+        this.defaultValue = defaultValue;
+        this.category = category;
+    }
 
-    @Override public KeybindValue defaultValue(DeviceType type){ return defaultValue; }
+    Binding(KeybindValue defaultValue){
-    @Override public String category(){ return category; }
+        this(defaultValue, null);
+    }
+
+    @Override
+    public KeybindValue defaultValue(DeviceType type){
+        return defaultValue;
+    }
+
+    @Override
+    public String category(){
+        return category;
+    }
 }

core/src/io/anuke/mindustry/input/DesktopInput.java

@@ -48,7 +48,8 @@ public class DesktopInput extends InputHandler{
             for(int i = 0; i < 4; i++){
                 Point2 p = Geometry.d8edge[i];
                 float offset = -Math.max(block.size - 1, 0) / 2f * tilesize;
-                if(i % 2 == 0)Draw.rect("block-select", x * tilesize + block.offset() + offset * p.x, y * tilesize + block.offset() + offset * p.y, i * 90);
+                if(i % 2 == 0)
+                    Draw.rect("block-select", x * tilesize + block.offset() + offset * p.x, y * tilesize + block.offset() + offset * p.y, i * 90);
             }
             Draw.color();
         }else{

core/src/io/anuke/mindustry/input/InputHandler.java

@@ -29,9 +29,7 @@ import io.anuke.mindustry.net.ValidateException;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.ui.fragments.OverlayFragment;
-import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.Build;
-import io.anuke.mindustry.world.Tile;
 
 import static io.anuke.mindustry.Vars.*;
 

core/src/io/anuke/mindustry/input/MobileInput.java

@@ -4,24 +4,17 @@ import io.anuke.arc.Core;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.function.BooleanProvider;
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
+import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.input.GestureDetector;
 import io.anuke.arc.input.GestureDetector.GestureListener;
 import io.anuke.arc.input.KeyCode;
 import io.anuke.arc.math.Interpolation;
 import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Geometry;
+import io.anuke.arc.math.geom.*;
-import io.anuke.arc.math.geom.Point2;
-import io.anuke.arc.math.geom.Rectangle;
-import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.scene.actions.Actions;
 import io.anuke.arc.scene.event.Touchable;
 import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.arc.util.Align;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.Tmp;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.core.GameState.State;
@@ -224,7 +217,8 @@ public class MobileInput extends InputHandler implements GestureListener{
                 Point2 p = Geometry.d8edge[i];
                 float poffset = -Math.max(request.block.size - 1, 0) / 2f * tilesize;
                 TextureRegion find = Core.atlas.find("block-select");
-                if(i%2 == 0) Draw.rect("block-select", request.tile().x * tilesize + request.block.offset() + poffset * p.x, request.tile().y * tilesize + request.block.offset() + poffset * p.y,
+                if(i % 2 == 0)
+                    Draw.rect("block-select", request.tile().x * tilesize + request.block.offset() + poffset * p.x, request.tile().y * tilesize + request.block.offset() + poffset * p.y,
                     find.getWidth() * Draw.scl * request.scale, find.getHeight() * Draw.scl * request.scale, i * 90);
             }
             Draw.color();
@@ -256,7 +250,8 @@ public class MobileInput extends InputHandler implements GestureListener{
             for(int i = 0; i < 4; i++){
                 Point2 p = Geometry.d8edge[i];
                 float offset = -Math.max(block.size - 1, 0) / 2f * tilesize;
-                if(i % 2 == 0)Draw.rect("block-select", x * tilesize + block.offset() + offset * p.x, y * tilesize + block.offset() + offset * p.y, i * 90);
+                if(i % 2 == 0)
+                    Draw.rect("block-select", x * tilesize + block.offset() + offset * p.x, y * tilesize + block.offset() + offset * p.y, i * 90);
             }
             Draw.color();
         }else{

core/src/io/anuke/mindustry/input/PlaceUtils.java

@@ -43,7 +43,6 @@ public class PlaceUtils{
     /**
      * Normalizes a placement area and returns the result, ready to be used for drawing a rectangle.
      * Returned x2 and y2 will <i>always</i> be greater than x and y.
-     *
      * @param block block that will be drawn
      * @param startx starting X coordinate
      * @param starty starting Y coordinate
@@ -80,7 +79,6 @@ public class PlaceUtils{
     /**
      * Normalizes a placement area and returns the result.
      * Returned x2 and y2 will <i>always</i> be greater than x and y.
-     *
      * @param tilex starting X coordinate
      * @param tiley starting Y coordinate
      * @param endx ending X coordinate

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

@@ -2,10 +2,8 @@ package io.anuke.mindustry.io;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.util.I18NBundle;
+import io.anuke.arc.util.*;
 import io.anuke.mindustry.Vars;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.Log;
 import io.anuke.mindustry.input.Binding;
 
 import java.util.Locale;

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

@@ -8,22 +8,14 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.Pixmap;
 import io.anuke.arc.graphics.Pixmap.Format;
 import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Pack;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Strings;
-import io.anuke.arc.util.Structs;
-import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.game.MappableContent;
+import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Item;
-import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.CachedTile;
-import io.anuke.mindustry.world.LegacyColorMapper;
 import io.anuke.mindustry.world.LegacyColorMapper.LegacyBlock;
-import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.BlockPart;
 import io.anuke.mindustry.world.blocks.Floor;
 
@@ -84,7 +76,8 @@ public class MapIO{
 
             @Override
             public void setOreByte(byte b){
-                if(b != 0) floors.drawPixel(x, floors.getHeight() - 1 - y, colorFor(floor(), Blocks.air, content.block(b), getTeam()));
+                if(b != 0)
+                    floors.drawPixel(x, floors.getHeight() - 1 - y, colorFor(floor(), Blocks.air, content.block(b), getTeam()));
             }
 
             @Override

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

@@ -5,21 +5,14 @@ import io.anuke.arc.util.Pack;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.entities.Entities;
 import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.traits.Entity;
+import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.traits.SaveTrait;
+import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.entities.traits.TypeTrait;
-import io.anuke.mindustry.game.Content;
-import io.anuke.mindustry.game.MappableContent;
-import io.anuke.mindustry.game.Rules;
-import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Serialization;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 
-import java.io.DataInputStream;
+import java.io.*;
-import java.io.DataOutputStream;
-import java.io.IOException;
 
 import static io.anuke.mindustry.Vars.content;
 import static io.anuke.mindustry.Vars.world;

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

@@ -1,8 +1,6 @@
 package io.anuke.mindustry.io;
 
-import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.IntArray;
-import io.anuke.arc.collection.IntMap;
 import io.anuke.arc.files.FileHandle;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.io.versions.Save16;

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

@@ -10,23 +10,14 @@ import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.entities.bullet.BulletType;
 import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest;
 import io.anuke.mindustry.entities.traits.ShooterTrait;
-import io.anuke.mindustry.entities.type.BaseUnit;
+import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.Player;
-import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.net.Packets.AdminAction;
 import io.anuke.mindustry.net.Packets.KickReason;
-import io.anuke.mindustry.type.ContentType;
+import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.type.Item;
+import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.type.Liquid;
-import io.anuke.mindustry.type.Mech;
-import io.anuke.mindustry.world.Block;
-import io.anuke.mindustry.world.Pos;
-import io.anuke.mindustry.world.Tile;
 
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import static io.anuke.mindustry.Vars.*;

core/src/io/anuke/mindustry/io/versions/Save16.java

@@ -7,9 +7,7 @@ import io.anuke.mindustry.gen.Serialization;
 import io.anuke.mindustry.io.SaveFileVersion;
 import io.anuke.mindustry.maps.Map;
 
-import java.io.DataInputStream;
+import java.io.*;
-import java.io.DataOutputStream;
-import java.io.IOException;
 
 import static io.anuke.mindustry.Vars.*;
 

core/src/io/anuke/mindustry/maps/Maps.java

@@ -81,8 +81,10 @@ public class Maps implements Disposable{
         load();
     }
 
-    /** Save a custom map to the directory. This updates all values and stored data necessary.
+    /**
-     * The tags are copied to prevent mutation later.*/
+     * Save a custom map to the directory. This updates all values and stored data necessary.
+     * The tags are copied to prevent mutation later.
+     */
     public void saveMap(ObjectMap<String, String> baseTags, Tile[][] data){
 
         try{