From b86218b75a69f6f99c4670c038295b4099efe348 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 29 Oct 2019 15:59:53 -0400 Subject: [PATCH] Cleanup (1) --- core/src/io/anuke/mindustry/ai/BlockIndexer.java | 1 - core/src/io/anuke/mindustry/ai/Pathfinder.java | 1 - core/src/io/anuke/mindustry/core/ContentLoader.java | 1 - core/src/io/anuke/mindustry/core/Platform.java | 1 - core/src/io/anuke/mindustry/core/Renderer.java | 1 - core/src/io/anuke/mindustry/core/UI.java | 1 - core/src/io/anuke/mindustry/editor/EditorTool.java | 1 - core/src/io/anuke/mindustry/editor/MapEditorDialog.java | 1 - core/src/io/anuke/mindustry/editor/MapGenerateDialog.java | 1 - core/src/io/anuke/mindustry/editor/MapLoadDialog.java | 1 - core/src/io/anuke/mindustry/editor/MapResizeDialog.java | 1 - core/src/io/anuke/mindustry/editor/MapSaveDialog.java | 1 - core/src/io/anuke/mindustry/entities/EntityGroup.java | 1 - core/src/io/anuke/mindustry/game/Gamemode.java | 1 - core/src/io/anuke/mindustry/game/Tutorial.java | 1 - core/src/io/anuke/mindustry/input/InputHandler.java | 1 - core/src/io/anuke/mindustry/io/versions/Save1.java | 1 - core/src/io/anuke/mindustry/maps/filters/FilterOption.java | 1 - core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java | 1 - core/src/io/anuke/mindustry/mod/ContentParser.java | 1 - core/src/io/anuke/mindustry/mod/Mods.java | 1 - core/src/io/anuke/mindustry/net/CrashSender.java | 1 - core/src/io/anuke/mindustry/net/Net.java | 1 - core/src/io/anuke/mindustry/type/TypeID.java | 1 - core/src/io/anuke/mindustry/type/UnitType.java | 1 - core/src/io/anuke/mindustry/type/Zone.java | 1 - core/src/io/anuke/mindustry/ui/Bar.java | 1 - core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java | 1 - core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java | 1 - core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java | 1 - .../io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java | 1 - core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java | 1 - core/src/io/anuke/mindustry/world/Block.java | 1 - core/src/io/anuke/mindustry/world/Tile.java | 1 - core/src/io/anuke/mindustry/world/blocks/Autotiler.java | 1 - core/src/io/anuke/mindustry/world/blocks/ItemSelection.java | 1 - .../io/anuke/mindustry/world/blocks/defense/ForceProjector.java | 1 - .../io/anuke/mindustry/world/blocks/distribution/Conduit.java | 1 - .../io/anuke/mindustry/world/blocks/distribution/Conveyor.java | 1 - .../anuke/mindustry/world/blocks/distribution/ItemBridge.java | 1 - .../io/anuke/mindustry/world/blocks/distribution/Sorter.java | 1 - core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java | 1 - .../anuke/mindustry/world/blocks/production/GenericCrafter.java | 1 - .../src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java | 1 - .../io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java | 1 - core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java | 1 - core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java | 1 - .../io/anuke/mindustry/world/consumers/ConsumeItemFilter.java | 1 - core/src/io/anuke/mindustry/world/meta/BuildVisibility.java | 1 - .../io/anuke/mindustry/world/meta/values/BoosterListValue.java | 1 - desktop/src/io/anuke/mindustry/desktop/steam/SNet.java | 1 - desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java | 1 - gradle.properties | 2 +- 53 files changed, 1 insertion(+), 53 deletions(-) diff --git a/core/src/io/anuke/mindustry/ai/BlockIndexer.java b/core/src/io/anuke/mindustry/ai/BlockIndexer.java index e43957785b..f6df8f7475 100644 --- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/ai/Pathfinder.java b/core/src/io/anuke/mindustry/ai/Pathfinder.java index f9099ba991..14890b531f 100644 --- a/core/src/io/anuke/mindustry/ai/Pathfinder.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index bfc853a13c..bc4d0dac81 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java index f30ef754a8..50875d426d 100644 --- a/core/src/io/anuke/mindustry/core/Platform.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index b279025743..90a32bd6c5 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index ce6981604f..2e86ba1c33 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java index 3a363de688..c38d91b8ed 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTool.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 6427cc15c9..6c24f387a9 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java index bc469ad3a6..5195d746b4 100644 --- a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java b/core/src/io/anuke/mindustry/editor/MapLoadDialog.java index 4cad68bc32..5fb9ffa982 100644 --- a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/editor/MapResizeDialog.java b/core/src/io/anuke/mindustry/editor/MapResizeDialog.java index e9abddc964..525adcefde 100644 --- a/core/src/io/anuke/mindustry/editor/MapResizeDialog.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/editor/MapSaveDialog.java b/core/src/io/anuke/mindustry/editor/MapSaveDialog.java index 44b118b408..93b189349f 100644 --- a/core/src/io/anuke/mindustry/editor/MapSaveDialog.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/entities/EntityGroup.java b/core/src/io/anuke/mindustry/entities/EntityGroup.java index 3ce94ac968..588bca2709 100644 --- a/core/src/io/anuke/mindustry/entities/EntityGroup.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/game/Gamemode.java b/core/src/io/anuke/mindustry/game/Gamemode.java index 0608e7bb51..f448bb637f 100644 --- a/core/src/io/anuke/mindustry/game/Gamemode.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/game/Tutorial.java b/core/src/io/anuke/mindustry/game/Tutorial.java index cffdb50ff6..99d45d3c2f 100644 --- a/core/src/io/anuke/mindustry/game/Tutorial.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index 9cb1330617..53c224bd49 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/io/versions/Save1.java b/core/src/io/anuke/mindustry/io/versions/Save1.java index efa4723a8f..471c2c2f3f 100644 --- a/core/src/io/anuke/mindustry/io/versions/Save1.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/maps/filters/FilterOption.java b/core/src/io/anuke/mindustry/maps/filters/FilterOption.java index bde2a34f27..f1a63c0a37 100644 --- a/core/src/io/anuke/mindustry/maps/filters/FilterOption.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java index 41520adde0..673d825cc0 100644 --- a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/mod/ContentParser.java b/core/src/io/anuke/mindustry/mod/ContentParser.java index 088e40710d..14121f67ee 100644 --- a/core/src/io/anuke/mindustry/mod/ContentParser.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/mod/Mods.java b/core/src/io/anuke/mindustry/mod/Mods.java index 53584fcfee..c191323eff 100644 --- a/core/src/io/anuke/mindustry/mod/Mods.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/net/CrashSender.java b/core/src/io/anuke/mindustry/net/CrashSender.java index 10d0eef335..21b12bf3d8 100644 --- a/core/src/io/anuke/mindustry/net/CrashSender.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java index 348f7d2d16..a11a9c4089 100644 --- a/core/src/io/anuke/mindustry/net/Net.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/type/TypeID.java b/core/src/io/anuke/mindustry/type/TypeID.java index c546f07169..bd190a7a63 100644 --- a/core/src/io/anuke/mindustry/type/TypeID.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/type/UnitType.java b/core/src/io/anuke/mindustry/type/UnitType.java index 679c1c8a67..b2602a16ad 100644 --- a/core/src/io/anuke/mindustry/type/UnitType.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java index 460dbbdd15..a1daf7f7f5 100644 --- a/core/src/io/anuke/mindustry/type/Zone.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/ui/Bar.java b/core/src/io/anuke/mindustry/ui/Bar.java index 1a84786163..da4fa7eaf8 100644 --- a/core/src/io/anuke/mindustry/ui/Bar.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java index a397ef6a6d..5e26f272d3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java index 13ad72552d..b3bea499c3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java index 7f3470afb2..056d0cfc24 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java index 9c6205eb85..1c663f2b4a 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java b/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java index ac55c24ff1..dec9860e0d 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index d25688a9b1..e8643b8b4a 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index b449d5562b..1127bc92d5 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/Autotiler.java b/core/src/io/anuke/mindustry/world/blocks/Autotiler.java index c7300315bc..f96f4c495a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Autotiler.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/ItemSelection.java b/core/src/io/anuke/mindustry/world/blocks/ItemSelection.java index 7fd51bd30e..26e4a3d5c9 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ItemSelection.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java index f70913f5ad..726ab45f95 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java index 541446be35..4a1b4b0f97 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java index b359111f9a..11d0b07d88 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java index a79b225576..e1bcdd5961 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java index ba0288b6be..362a9861be 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index c9fbd3a635..4ab744a56e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java index 2792671efa..3d3d59686c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java index ba7d107c2c..278af97f4b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java index 696842673d..e0d8f2e4a9 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index 360015e78f..09552c2bef 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java b/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java index 58af624e96..6e2c00d9a5 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java index 1f1f3b240f..93e05c17aa 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java +++ b/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.*; diff --git a/core/src/io/anuke/mindustry/world/meta/BuildVisibility.java b/core/src/io/anuke/mindustry/world/meta/BuildVisibility.java index 111eff2048..9006d51b09 100644 --- a/core/src/io/anuke/mindustry/world/meta/BuildVisibility.java +++ b/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{ diff --git a/core/src/io/anuke/mindustry/world/meta/values/BoosterListValue.java b/core/src/io/anuke/mindustry/world/meta/values/BoosterListValue.java index 673f096ed3..4d1a867904 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/BoosterListValue.java +++ b/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.*; diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java b/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java index 97d1172a98..b2b1abc25c 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java +++ b/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.*; diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java b/desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java index 3b8a9178af..f5f0a25bfa 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java +++ b/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.*; diff --git a/gradle.properties b/gradle.properties index 3e1033435e..7b5dc8dfcb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=45ccffb159cce2ba17687e81c14853efa647b102 +archash=1ef49d3d5414dee434425f71b4cbf80c3f2ba19e