Cleanup (1)

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

@@ -3,7 +3,6 @@ package io.anuke.mindustry.ai;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.mindustry.content.*;

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

@@ -4,7 +4,6 @@ import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.ArcAnnotate.*;

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

@@ -2,7 +2,6 @@ package io.anuke.mindustry.core;
 
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.content.*;

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

@@ -5,7 +5,6 @@ import io.anuke.arc.Input.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.files.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.util.serialization.*;

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

@@ -3,7 +3,6 @@ package io.anuke.mindustry.core;
 import io.anuke.arc.*;
 import io.anuke.arc.files.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.graphics.glutils.*;

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

@@ -13,7 +13,6 @@ import io.anuke.arc.freetype.*;
 import io.anuke.arc.freetype.FreeTypeFontGenerator.*;
 import io.anuke.arc.freetype.FreetypeFontLoader.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.Texture.*;
 import io.anuke.arc.graphics.g2d.*;

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

@@ -2,7 +2,6 @@ package io.anuke.mindustry.editor;
 
 import io.anuke.arc.collection.IntArray;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Bresenham2;
 import io.anuke.arc.util.Structs;

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

@@ -4,7 +4,6 @@ import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.files.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.input.*;

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

@@ -3,7 +3,6 @@ package io.anuke.mindustry.editor;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.Pixmap.*;
 import io.anuke.arc.math.*;

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

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.editor;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;

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

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.editor;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.mindustry.gen.*;

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

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.editor;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.maps.*;

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

@@ -3,7 +3,6 @@ package io.anuke.mindustry.entities;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.mindustry.entities.traits.*;

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

@@ -2,7 +2,6 @@ package io.anuke.mindustry.game;
 
 import io.anuke.arc.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.mindustry.maps.*;
 
 import static io.anuke.mindustry.Vars.waveTeam;

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

@@ -3,7 +3,6 @@ package io.anuke.mindustry.game;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.scene.*;

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

@@ -4,7 +4,6 @@ import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.input.*;

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

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.io.versions;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.mindustry.entities.traits.*;
 
 import java.io.*;

core/src/io/anuke/mindustry/maps/filters/FilterOption.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.maps.filters;
 
 import io.anuke.arc.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.scene.style.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;

core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.maps.filters;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.scene.ui.*;

core/src/io/anuke/mindustry/mod/ContentParser.java

@@ -7,7 +7,6 @@ import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.files.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.arc.util.*;

core/src/io/anuke/mindustry/mod/Mods.java

@@ -5,7 +5,6 @@ import io.anuke.arc.assets.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.files.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.Pixmap.*;
 import io.anuke.arc.graphics.Texture.*;

core/src/io/anuke/mindustry/net/CrashSender.java

@@ -5,7 +5,6 @@ import io.anuke.arc.Net.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.files.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.io.*;
 import io.anuke.arc.util.serialization.*;

core/src/io/anuke/mindustry/net/Net.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.net;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.arc.util.pooling.*;

core/src/io/anuke/mindustry/type/TypeID.java

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.type;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.mindustry.ctype.*;
 import io.anuke.mindustry.entities.traits.*;
 

core/src/io/anuke/mindustry/type/UnitType.java

@@ -4,7 +4,6 @@ import io.anuke.arc.*;
 import io.anuke.arc.audio.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.ArcAnnotate.*;

core/src/io/anuke/mindustry/type/Zone.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.type;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.ArcAnnotate.*;

core/src/io/anuke/mindustry/ui/Bar.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.ui;
 
 import io.anuke.arc.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;

core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.input.*;
 import io.anuke.arc.scene.ui.*;

core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.ui.dialogs;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.scene.style.*;
 import io.anuke.arc.scene.ui.*;

core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.ui.dialogs;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.input.*;

core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java

@@ -4,7 +4,6 @@ import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.input.*;
 import io.anuke.arc.math.*;

core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.ui.fragments;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.scene.Group;
 import io.anuke.arc.scene.actions.*;

core/src/io/anuke/mindustry/world/Block.java

@@ -8,7 +8,6 @@ import io.anuke.arc.audio.*;
 import io.anuke.arc.collection.EnumSet;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.graphics.g2d.TextureAtlas.*;

core/src/io/anuke/mindustry/world/Tile.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.world;
 
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.ArcAnnotate.*;

core/src/io/anuke/mindustry/world/blocks/Autotiler.java

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.world.blocks;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.ArcAnnotate.*;

core/src/io/anuke/mindustry/world/blocks/ItemSelection.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.world.blocks;
 
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.scene.style.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;

core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.world.blocks.defense;
 
 import io.anuke.arc.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;

core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.world.blocks.distribution;
 
 import io.anuke.arc.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;

core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.world.blocks.distribution;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;

core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java

@@ -4,7 +4,6 @@ import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.collection.IntSet.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;

core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.world.blocks.distribution;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.scene.ui.layout.*;

core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.world.blocks.power;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;

core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.world.blocks.production;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.util.*;

core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.world.blocks.sandbox;
 
 import io.anuke.arc.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;

core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.world.blocks.sandbox;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.scene.style.*;
 import io.anuke.arc.scene.ui.*;

core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java

@@ -4,7 +4,6 @@ import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;

core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.world.blocks.storage;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.scene.ui.layout.*;

core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.world.consumers;
 
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.entities.type.*;

core/src/io/anuke/mindustry/world/meta/BuildVisibility.java

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.world.meta;
 
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.mindustry.*;
 
 public enum BuildVisibility{

core/src/io/anuke/mindustry/world/meta/values/BoosterListValue.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.world.meta.values;
 
 import io.anuke.arc.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.gen.*;

desktop/src/io/anuke/mindustry/desktop/steam/SNet.java

@@ -7,7 +7,6 @@ import com.codedisaster.steamworks.SteamNetworking.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.pooling.*;
 import io.anuke.mindustry.core.GameState.*;

desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java

@@ -7,7 +7,6 @@ import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.files.*;
 import io.anuke.arc.func.*;
-import io.anuke.arc.function.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.game.*;

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=45ccffb159cce2ba17687e81c14853efa647b102
+archash=1ef49d3d5414dee434425f71b4cbf80c3f2ba19e