Moved some interfaces around

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

@@ -223,7 +223,7 @@ public class Maps{
 
     /** Attempts to run the following code;
      * catches any errors and attempts to display them in a readable way.*/
-    public void tryCatchMapError(Urun run){
+    public void tryCatchMapError(UnsafeRunnable run){
         try{
             run.run();
         }catch(Throwable e){

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

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.world.blocks;
 
-import io.anuke.arc.func.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
+import io.anuke.arc.util.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;
 import io.anuke.mindustry.world.*;

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

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.world.blocks.distribution;
 
 import io.anuke.arc.*;
-import io.anuke.arc.func.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
+import io.anuke.arc.util.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.type.*;

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

@@ -2,7 +2,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.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;

core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.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.collection.IntSet.*;
-import io.anuke.arc.func.*;
 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,9 +1,9 @@
 package io.anuke.mindustry.world.blocks.distribution;
 
-import io.anuke.arc.func.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.scene.ui.layout.*;
+import io.anuke.arc.util.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;
 import io.anuke.mindustry.entities.type.*;

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

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.world.blocks.sandbox;
 
 import io.anuke.arc.*;
-import io.anuke.arc.func.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.scene.ui.layout.*;
+import io.anuke.arc.util.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.type.*;

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

@@ -2,11 +2,11 @@ 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.graphics.g2d.*;
 import io.anuke.arc.scene.style.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;
+import io.anuke.arc.util.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;
 import io.anuke.mindustry.entities.type.*;

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

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.world.blocks.storage;
 
-import io.anuke.arc.func.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.scene.ui.layout.*;
+import io.anuke.arc.util.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.type.*;

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=7427c1283c865d3df9e3f76485e70f2d1c7454cd
+archash=aea47cc96715e7b588a9f39eb41f4c288fa1d37d