Source reformat

ios/build.gradle

@@ -1,10 +1,10 @@
-sourceSets.main.java.srcDirs = [ "src/" ]
+sourceSets.main.java.srcDirs = ["src/"]
 
 sourceCompatibility = '1.8'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
-ext {
-	mainClassName = "io.anuke.mindustry.IOSLauncher"
+ext{
+    mainClassName = "io.anuke.mindustry.IOSLauncher"
 }
 
 launchIPhoneSimulator.dependsOn build
@@ -12,6 +12,6 @@ launchIPadSimulator.dependsOn build
 launchIOSDevice.dependsOn build
 createIPA.dependsOn build
 
-robovm {
-	archs = "thumbv7:arm64"
+robovm{
+    archs = "thumbv7:arm64"
 }

ios/data/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,116 +1,116 @@
 {
-  "images" : [
+  "images": [
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "icon-40.png",
-      "scale" : "2x"
+      "size": "20x20",
+      "idiom": "iphone",
+      "filename": "icon-40.png",
+      "scale": "2x"
     },
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "icon-60.png",
-      "scale" : "3x"
+      "size": "20x20",
+      "idiom": "iphone",
+      "filename": "icon-60.png",
+      "scale": "3x"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "icon-58.png",
-      "scale" : "2x"
+      "size": "29x29",
+      "idiom": "iphone",
+      "filename": "icon-58.png",
+      "scale": "2x"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "icon-87.png",
-      "scale" : "3x"
+      "size": "29x29",
+      "idiom": "iphone",
+      "filename": "icon-87.png",
+      "scale": "3x"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "icon-80.png",
-      "scale" : "2x"
+      "size": "40x40",
+      "idiom": "iphone",
+      "filename": "icon-80.png",
+      "scale": "2x"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "icon-120.png",
-      "scale" : "3x"
+      "size": "40x40",
+      "idiom": "iphone",
+      "filename": "icon-120.png",
+      "scale": "3x"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "icon-120.png",
-      "scale" : "2x"
+      "size": "60x60",
+      "idiom": "iphone",
+      "filename": "icon-120.png",
+      "scale": "2x"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "icon-180.png",
-      "scale" : "3x"
+      "size": "60x60",
+      "idiom": "iphone",
+      "filename": "icon-180.png",
+      "scale": "3x"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "icon-20.png",
-      "scale" : "1x"
+      "size": "20x20",
+      "idiom": "ipad",
+      "filename": "icon-20.png",
+      "scale": "1x"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "icon-40.png",
-      "scale" : "2x"
+      "size": "20x20",
+      "idiom": "ipad",
+      "filename": "icon-40.png",
+      "scale": "2x"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "icon-29.png",
-      "scale" : "1x"
+      "size": "29x29",
+      "idiom": "ipad",
+      "filename": "icon-29.png",
+      "scale": "1x"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "icon-58.png",
-      "scale" : "2x"
+      "size": "29x29",
+      "idiom": "ipad",
+      "filename": "icon-58.png",
+      "scale": "2x"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "icon-40.png",
-      "scale" : "1x"
+      "size": "40x40",
+      "idiom": "ipad",
+      "filename": "icon-40.png",
+      "scale": "1x"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "icon-80.png",
-      "scale" : "2x"
+      "size": "40x40",
+      "idiom": "ipad",
+      "filename": "icon-80.png",
+      "scale": "2x"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "icon-76.png",
-      "scale" : "1x"
+      "size": "76x76",
+      "idiom": "ipad",
+      "filename": "icon-76.png",
+      "scale": "1x"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "icon-152.png",
-      "scale" : "2x"
+      "size": "76x76",
+      "idiom": "ipad",
+      "filename": "icon-152.png",
+      "scale": "2x"
     },
     {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "icon-167.png",
-      "scale" : "2x"
+      "size": "83.5x83.5",
+      "idiom": "ipad",
+      "filename": "icon-167.png",
+      "scale": "2x"
     },
     {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "icon-main.png",
-      "scale" : "1x"
+      "size": "1024x1024",
+      "idiom": "ios-marketing",
+      "filename": "icon-main.png",
+      "scale": "1x"
     }
   ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
+  "info": {
+    "version": 1,
+    "author": "xcode"
   }
 }

ios/data/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
+  "info": {
+    "version": 1,
+    "author": "xcode"
   }
 }

ios/robovm.xml

@@ -1,49 +1,49 @@
 <config>
-  <executableName>${app.executable}</executableName>
-  <mainClass>${app.mainclass}</mainClass>
-  <os>ios</os>
-  <arch>thumbv7</arch>
-  <target>ios</target>
-  <iosInfoPList>Info.plist.xml</iosInfoPList>
-  <resources>
-    <resource>
-      <directory>../core/assets</directory>
-      <includes>
-        <include>**</include>
-      </includes>
-      <skipPngCrush>true</skipPngCrush>
-    </resource>
-    <resource>
-      <directory>data</directory>
-    </resource>
-  </resources>
-  <forceLinkClasses>
-    <pattern>net.jpountz.lz4.**</pattern>
-    <pattern>io.anuke.arc.scene.**</pattern>
-    <pattern>io.anuke.mindustry.gen.Call</pattern>
-    <pattern>io.anuke.mindustry.net.**</pattern>
-    <pattern>com.android.okhttp.HttpHandler</pattern>
-    <pattern>com.android.okhttp.HttpsHandler</pattern>
-    <pattern>com.android.org.conscrypt.**</pattern>
-    <pattern>com.android.org.bouncycastle.jce.provider.BouncyCastleProvider</pattern>
-    <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.BC$Mappings</pattern>
-    <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi</pattern>
-    <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std</pattern>
-    <pattern>com.android.org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi</pattern>
-    <pattern>com.android.org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL</pattern>
-    <pattern>org.apache.harmony.security.provider.cert.DRLCertFactory</pattern>
-    <pattern>org.apache.harmony.security.provider.crypto.CryptoProvider</pattern>
-  </forceLinkClasses>
-  <libs>
-      <lib>z</lib>   
-  </libs>
-  <frameworks>
-    <framework>UIKit</framework>
-    <framework>OpenGLES</framework>
-    <framework>QuartzCore</framework>
-    <framework>CoreGraphics</framework>
-    <framework>OpenAL</framework>
-    <framework>AudioToolbox</framework>
-    <framework>AVFoundation</framework>
-  </frameworks>
+    <executableName>${app.executable}</executableName>
+    <mainClass>${app.mainclass}</mainClass>
+    <os>ios</os>
+    <arch>thumbv7</arch>
+    <target>ios</target>
+    <iosInfoPList>Info.plist.xml</iosInfoPList>
+    <resources>
+        <resource>
+            <directory>../core/assets</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+            <skipPngCrush>true</skipPngCrush>
+        </resource>
+        <resource>
+            <directory>data</directory>
+        </resource>
+    </resources>
+    <forceLinkClasses>
+        <pattern>net.jpountz.lz4.**</pattern>
+        <pattern>io.anuke.arc.scene.**</pattern>
+        <pattern>io.anuke.mindustry.gen.Call</pattern>
+        <pattern>io.anuke.mindustry.net.**</pattern>
+        <pattern>com.android.okhttp.HttpHandler</pattern>
+        <pattern>com.android.okhttp.HttpsHandler</pattern>
+        <pattern>com.android.org.conscrypt.**</pattern>
+        <pattern>com.android.org.bouncycastle.jce.provider.BouncyCastleProvider</pattern>
+        <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.BC$Mappings</pattern>
+        <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi</pattern>
+        <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std</pattern>
+        <pattern>com.android.org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi</pattern>
+        <pattern>com.android.org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL</pattern>
+        <pattern>org.apache.harmony.security.provider.cert.DRLCertFactory</pattern>
+        <pattern>org.apache.harmony.security.provider.crypto.CryptoProvider</pattern>
+    </forceLinkClasses>
+    <libs>
+        <lib>z</lib>
+    </libs>
+    <frameworks>
+        <framework>UIKit</framework>
+        <framework>OpenGLES</framework>
+        <framework>QuartzCore</framework>
+        <framework>CoreGraphics</framework>
+        <framework>OpenAL</framework>
+        <framework>AudioToolbox</framework>
+        <framework>AVFoundation</framework>
+    </frameworks>
 </config>

ios/src/io/anuke/mindustry/IOSLauncher.java

@@ -6,12 +6,12 @@ import io.anuke.arc.Core;
 import io.anuke.arc.files.FileHandle;
 import io.anuke.arc.scene.ui.layout.Unit;
 import io.anuke.arc.util.Strings;
-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.net.KryoClient;
+import io.anuke.net.KryoServer;
 import org.robovm.apple.foundation.NSAutoreleasePool;
 import org.robovm.apple.foundation.NSURL;
 import org.robovm.apple.uikit.*;
@@ -22,11 +22,11 @@ import java.util.Collections;
 import static io.anuke.mindustry.Vars.*;
 import static org.robovm.apple.foundation.NSPathUtilities.getDocumentsDirectory;
 
-public class IOSLauncher extends IOSApplication.Delegate {
+public class IOSLauncher extends IOSApplication.Delegate{
     private boolean forced;
 
     @Override
-    protected IOSApplication createApplication() {
+    protected IOSApplication createApplication(){
         Net.setClientProvider(new KryoClient());
         Net.setServerProvider(new KryoServer());
 
@@ -36,7 +36,7 @@ public class IOSLauncher extends IOSApplication.Delegate {
             Unit.dp.addition = -0.5f;
         }
 
-        Platform.instance = new Platform() {
+        Platform.instance = new Platform(){
 
             @Override
             public void shareFile(FileHandle file){
@@ -72,14 +72,14 @@ public class IOSLauncher extends IOSApplication.Delegate {
     }
 
     @Override
-    public boolean openURL(UIApplication app, NSURL url, UIApplicationOpenURLOptions options) {
+    public boolean openURL(UIApplication app, NSURL url, UIApplicationOpenURLOptions options){
         System.out.println("Opened URL: " + url.getPath());
         openURL(url);
         return false;
     }
 
     @Override
-    public boolean didFinishLaunching(UIApplication application, UIApplicationLaunchOptions options) {
+    public boolean didFinishLaunching(UIApplication application, UIApplicationLaunchOptions options){
         boolean b = super.didFinishLaunching(application, options);
 
         if(options != null && options.has(UIApplicationLaunchOptions.Keys.URL())){
@@ -102,7 +102,7 @@ public class IOSLauncher extends IOSApplication.Delegate {
                     try{
                         SaveSlot slot = control.saves.importSave(file);
                         ui.load.runLoadSave(slot);
-                    }catch (IOException e){
+                    }catch(IOException e){
                         ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, false)));
                     }
                 }else{
@@ -111,7 +111,7 @@ public class IOSLauncher extends IOSApplication.Delegate {
 
             }else if(file.extension().equalsIgnoreCase(mapExtension)){ //open map
                 Core.app.post(() -> {
-                    if (!ui.editor.isShown()) {
+                    if(!ui.editor.isShown()){
                         ui.editor.show();
                     }
 
@@ -121,7 +121,7 @@ public class IOSLauncher extends IOSApplication.Delegate {
         });
     }
 
-    public static void main(String[] argv) {
+    public static void main(String[] argv){
         NSAutoreleasePool pool = new NSAutoreleasePool();
         UIApplication.main(argv, null, IOSLauncher.class);
         pool.close();