🔥🔥🔥🔥🔥🔥maximum breakage

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

@@ -4,7 +4,7 @@ import io.anuke.arc.utils.Array;
 import io.anuke.arc.utils.ObjectMap;
 import io.anuke.arc.utils.ObjectSet;
 import io.anuke.annotations.Annotations.Serialize;
-import io.anuke.ucore.core.Settings;
+import io.anuke.arc.core.Settings;
 
 import static io.anuke.mindustry.Vars.headless;
 
@@ -15,7 +15,7 @@ public class Administration{
     private Array<String> bannedIPs = new Array<>();
 
     public Administration(){
-        Settings.defaultList(
+        Core.settings.defaultList(
             "strict", true
         );
 
@@ -23,21 +23,21 @@ public class Administration{
     }
 
     public void setStrict(boolean on){
-        Settings.putBool("strict", on);
-        Settings.save();
+        Core.settings.putBool("strict", on);
+        Core.settings.save();
     }
 
     public boolean getStrict(){
-        return Settings.getBool("strict");
+        return Core.settings.getBool("strict");
     }
 
     public boolean allowsCustomClients(){
-        return Settings.getBool("allow-custom", !headless);
+        return Core.settings.getBool("allow-custom", !headless);
     }
 
     public void setCustomClients(boolean allowed){
-        Settings.putBool("allow-custom", allowed);
-        Settings.save();
+        Core.settings.putBool("allow-custom", allowed);
+        Core.settings.save();
     }
 
     /**Call when a player joins to update their information here.*/
@@ -256,15 +256,15 @@ public class Administration{
     }
 
     public void save(){
-        Settings.putObject("player-info", playerInfo);
-        Settings.putObject("banned-ips", bannedIPs);
-        Settings.save();
+        Core.settings.putObject("player-info", playerInfo);
+        Core.settings.putObject("banned-ips", bannedIPs);
+        Core.settings.save();
     }
 
     @SuppressWarnings("unchecked")
     private void load(){
-        playerInfo = Settings.getObject("player-info", ObjectMap.class, ObjectMap::new);
-        bannedIPs = Settings.getObject("banned-ips", Array.class, Array::new);
+        playerInfo = Core.settings.getObject("player-info", ObjectMap.class, ObjectMap::new);
+        bannedIPs = Core.settings.getObject("banned-ips", Array.class, Array::new);
     }
 
     @Serialize

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

@@ -3,7 +3,7 @@ package io.anuke.mindustry.net;
 
 import io.anuke.arc.math.Vector2;
 import io.anuke.arc.utils.TimeUtils;
-import io.anuke.ucore.util.Mathf;
+import io.anuke.arc.util.Mathf;
 
 public class Interpolator{
     //used for movement

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

@@ -14,12 +14,12 @@ import io.anuke.mindustry.net.Packets.KickReason;
 import io.anuke.mindustry.net.Packets.StreamBegin;
 import io.anuke.mindustry.net.Packets.StreamChunk;
 import io.anuke.mindustry.net.Streamable.StreamBuilder;
-import io.anuke.ucore.core.Timers;
-import io.anuke.ucore.function.BiConsumer;
-import io.anuke.ucore.function.Consumer;
-import io.anuke.ucore.util.Bundles;
-import io.anuke.ucore.util.Log;
-import io.anuke.ucore.util.Pooling;
+import io.anuke.arc.core.Timers;
+import io.anuke.arc.function.BiConsumer;
+import io.anuke.arc.function.Consumer;
+import io.anuke.arc.util.Bundles;
+import io.anuke.arc.util.Log;
+import io.anuke.arc.util.Pooling;
 
 import java.io.IOException;
 
@@ -60,20 +60,20 @@ public class Net{
             String type = t.getClass().toString().toLowerCase();
 
             if(error.equals("mismatch")){
-                error = Bundles.get("text.error.mismatch");
+                error = Core.bundle.get("text.error.mismatch");
             }else if(error.contains("port out of range") || error.contains("invalid argument") || (error.contains("invalid") && error.contains("address"))){
-                error = Bundles.get("text.error.invalidaddress");
+                error = Core.bundle.get("text.error.invalidaddress");
             }else if(error.contains("connection refused") || error.contains("route to host") || type.contains("unknownhost")){
-                error = Bundles.get("text.error.unreachable");
+                error = Core.bundle.get("text.error.unreachable");
             }else if(type.contains("timeout")){
-                error = Bundles.get("text.error.timedout");
+                error = Core.bundle.get("text.error.timedout");
             }else if(error.equals("alreadyconnected")){
-                error = Bundles.get("text.error.alreadyconnected");
+                error = Core.bundle.get("text.error.alreadyconnected");
             }else if(!error.isEmpty()){
-                error = Bundles.get("text.error.any");
+                error = Core.bundle.get("text.error.any");
             }
 
-            ui.showText("", Bundles.format("text.connectfail", error));
+            ui.showText("", Core.bundle.format("text.connectfail", error));
             ui.loadfrag.hide();
 
             if(Net.client()){
@@ -126,7 +126,7 @@ public class Net{
         active = true;
         server = true;
 
-        Timers.runTask(60f, Platform.instance::updateRPC);
+        Time.runTask(60f, Platform.instance::updateRPC);
     }
 
     /**

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

@@ -14,10 +14,10 @@ import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.maps.MapMeta;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.BlockPart;
-import io.anuke.ucore.core.Core;
-import io.anuke.ucore.core.Timers;
-import io.anuke.ucore.entities.Entities;
-import io.anuke.ucore.util.Bits;
+import io.anuke.arc.core.Core;
+import io.anuke.arc.core.Timers;
+import io.anuke.arc.entities.Entities;
+import io.anuke.arc.util.Bits;
 
 import java.io.*;
 import java.nio.ByteBuffer;
@@ -151,7 +151,7 @@ public class NetworkIO{
         Player player = players[0];
 
         try(DataInputStream stream = new DataInputStream(is)){
-            Timers.clear();
+            Time.clear();
 
             //general state
             byte mode = stream.readByte();

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

@@ -3,7 +3,7 @@ package io.anuke.mindustry.net;
 import io.anuke.arc.utils.Base64Coder;
 import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.io.TypeIO;
-import io.anuke.ucore.util.Bundles;
+import io.anuke.arc.util.Bundles;
 
 import java.nio.ByteBuffer;
 
@@ -28,11 +28,11 @@ public class Packets{
 
         @Override
         public String toString(){
-            return Bundles.get("text.server.kicked." + name());
+            return Core.bundle.get("text.server.kicked." + name());
         }
 
         public String extraText(){
-            return Bundles.getOrNull("text.server.kicked." + name() + ".text");
+            return Core.bundle.getOrNull("text.server.kicked." + name() + ".text");
         }
     }
 

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

@@ -2,7 +2,7 @@ package io.anuke.mindustry.net;
 
 import io.anuke.arc.utils.ObjectIntMap;
 import io.anuke.mindustry.net.Packets.*;
-import io.anuke.ucore.function.Supplier;
+import io.anuke.arc.function.Supplier;
 
 public class Registrator{
     private static ClassEntry[] classes = {