Fixed minimization

* Fixes

* Капіталізація це зло.

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

* .-.

* Gm

Description

* Oof

* ЈҮУКЕНГШҺЗХҸЖДЛОРПАВЫӘЧСМИТҒБӨ

* dada

* Translate new descriptions

* й

* Ukrainian finished. Fixed some errors.

* Translated everything. Maybe.

* /

* 1

* Added tutorial. Thank to Slava0135 and ymomfe.

* 1

* 1

* WATER

WATER

* [[]]

* 1

.gitignore

@@ -10,6 +10,7 @@ logs/
 /desktop/mindustry-maps/
 /desktop/gifexport/
 /core/lib/
+/ios/assets/
 /core/assets-raw/sprites/generated/
 /core/assets-raw/sprites_out/
 /annotations/build/
@@ -20,6 +21,8 @@ logs/
 /server/build/
 /test_files/
 /annotations/build/
+/desktop-sdl/build/
+desktop-sdl/build/
 /android/assets/mindustry-maps/
 /android/assets/mindustry-saves/
 /core/assets/gifexport/

.travis.yml

@@ -1,20 +1,28 @@
 jdk:
-  - openjdk8
+- openjdk8
 script:
-  - "git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc"
+- git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
-  - "./gradlew test"
+- "./gradlew test"
-  - "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
+- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
-  - "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
+- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
 
 deploy:
-  provider: releases
+  - provider: releases
-  skip_cleanup: true
+    skip_cleanup: true
-  draft: false
+    draft: false
-  api_key:
+    api_key:
-    secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
+      secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
-  file:
+    file:
-    - "desktop/build/libs/desktop-release.jar"
+    - desktop/build/libs/desktop-release.jar
-    - "server/build/libs/server-release.jar"
+    - server/build/libs/server-release.jar
-  on:
+    on:
-    repo: Anuken/Mindustry
+      repo: Anuken/Mindustry
-    tags: true
+      tags: true
+  - provider: script
+    script: bash update_wiki.sh
+    on:
+      repo: Anuken/Mindustry
+      tags: true
+env:
+  global:
+    secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=

README.md

@@ -1,4 +1,4 @@
-![Imgur](https://i.imgur.com/w4N0yhv.png)
+![Logo](core/assets/sprites/logo.png)
 
 [![Build Status](https://travis-ci.org/Anuken/Mindustry.svg?branch=master)](https://travis-ci.org/Anuken/Mindustry) 
 [![Discord](https://img.shields.io/discord/391020510269669376.svg)](https://discord.gg/mindustry)
@@ -40,6 +40,6 @@ After building, the output .JAR file should be in `/desktop/build/libs/desktop-r
 
 ### Downloads
 
-<a href="https://anuke.itch.io/mindustry"><img src="https://i.imgur.com/sk26hTV.png" width="auto" height="75"></a>
+<a href="https://anuke.itch.io/mindustry"><img src="https://static.itch.io/images/badge.svg" width="auto" height="75"></a>
 
-<a href="https://play.google.com/store/apps/details?id=io.anuke.mindustry&hl=en"><img src="https://i.imgur.com/8dF6l81.png" width="auto" height="75"></a>
+<a href="https://play.google.com/store/apps/details?id=io.anuke.mindustry&hl=en"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cd/Get_it_on_Google_play.svg/1280px-Get_it_on_Google_play.svg.png" width="auto" height="75"></a>

TRANSLATING.md

@@ -1,8 +1,5 @@
 ## Translating for Mindustry
 
-**DISCLAIMER:** *Currently, 4.0 is far from done, which means that things such as block names, descriptions, and core text will be changing often. If you begin translating now, you might have to re-do large chunks of the bundle before final release.*
-
-
 To begin, log in to your GitHub account, or if you don't have one yet, create it [here](https://github.com/).
 
 Consult [this list](https://www.science.co.il/language/Locale-codes.php) to find the locale code for your language. Once you've found it, 

android/build.gradle

@@ -8,7 +8,7 @@ buildscript{
     }
 
     dependencies{
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.2'
     }
 }
 
@@ -46,7 +46,7 @@ task deploy(type: Copy){
 
     from "build/outputs/apk/release/android-release.apk"
     into "../deploy/"
-    rename("android-release.apk", appName + "-android-" + getVersionString() + ".apk")
+    rename("android-release.apk", "${generateDeployName('android')}.apk")
 }
 
 android{
@@ -113,9 +113,11 @@ android{
         }
     }
 
-    buildTypes{
+    if(project.hasProperty("RELEASE_STORE_FILE")) {
-        release{
+        buildTypes {
-            signingConfig signingConfigs.release
+            release {
+                signingConfig signingConfigs.release
+            }
         }
     }
 }
@@ -167,26 +169,3 @@ task run(type: Exec){
     def adb = path + "/platform-tools/adb"
     commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/io.anuke.mindustry.AndroidLauncher'
 }
-
-// sets up the Android Idea project, using the old Ant based build.
-idea{
-    module{
-        sourceDirs += file("src")
-        scopes = [COMPILE: [plus: [project.configurations.compile]]]
-
-        iml{
-            withXml{
-                def node = it.asNode()
-                def builder = NodeBuilder.newInstance()
-                builder.current = node
-                builder.component(name: "FacetManager"){
-                    facet(type: "android", name: "Android"){
-                        configuration{
-                            option(name: "UPDATE_PROPERTY_FILES", value: "true")
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

android/src/io/anuke/mindustry/AndroidLauncher.java

@@ -15,16 +15,15 @@ import io.anuke.arc.backends.android.surfaceview.AndroidApplication;
 import io.anuke.arc.backends.android.surfaceview.AndroidApplicationConfiguration;
 import io.anuke.arc.files.FileHandle;
 import io.anuke.arc.function.Consumer;
-import io.anuke.arc.scene.ui.layout.Unit;
+import io.anuke.arc.function.Predicate;
+import io.anuke.arc.scene.ui.layout.UnitScl;
 import io.anuke.arc.util.Strings;
 import io.anuke.arc.util.serialization.Base64Coder;
 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.mindustry.net.*;
 import io.anuke.mindustry.ui.dialogs.FileChooser;
-import io.anuke.mindustry.net.ArcNetClient;
-import io.anuke.mindustry.net.ArcNetServer;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -35,6 +34,7 @@ public class AndroidLauncher extends AndroidApplication{
     public static final int PERMISSION_REQUEST_CODE = 1;
     boolean doubleScaleTablets = true;
     FileChooser chooser;
+    Runnable permCallback;
 
     @Override
     protected void onCreate(Bundle savedInstanceState){
@@ -67,15 +67,33 @@ public class AndroidLauncher extends AndroidApplication{
                 }
             }
 
+            @Override
+            public void requestExternalPerms(Runnable callback){
+                if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M || (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
+                    checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
+                    callback.run();
+                }else{
+                    permCallback = callback;
+                    ArrayList<String> perms = new ArrayList<>();
+                    if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
+                        perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+                    }
+                    if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
+                        perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
+                    }
+                    requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
+                }
+            }
+
             @Override
             public void shareFile(FileHandle file){
             }
 
             @Override
-            public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, String filetype){
+            public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, Predicate<String> filetype){
-                chooser = new FileChooser(text, file -> file.extension().equalsIgnoreCase(filetype), open, cons);
+                chooser = new FileChooser(text, file -> filetype.test(file.extension().toLowerCase()), open, cons);
                 if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M || (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
-                checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
+                    checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
                     chooser.show();
                     chooser = null;
                 }else{
@@ -97,7 +115,7 @@ public class AndroidLauncher extends AndroidApplication{
 
             @Override
             public void endForceLandscape(){
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);
             }
 
             @Override
@@ -107,7 +125,7 @@ public class AndroidLauncher extends AndroidApplication{
         };
 
         if(doubleScaleTablets && isTablet(this.getContext())){
-            Unit.dp.addition = 0.5f;
+            UnitScl.dp.addition = 0.5f;
         }
 
         config.hideStatusBar = true;
@@ -124,7 +142,11 @@ public class AndroidLauncher extends AndroidApplication{
                 if(i != PackageManager.PERMISSION_GRANTED) return;
             }
             if(chooser != null){
-                chooser.show();
+                Core.app.post(chooser::show);
+            }
+            if(permCallback != null){
+                Core.app.post(permCallback);
+                permCallback = null;
             }
         }
     }
@@ -147,7 +169,7 @@ public class AndroidLauncher extends AndroidApplication{
                 InputStream inStream;
                 if(myFile != null) inStream = new FileInputStream(myFile);
                 else inStream = getContentResolver().openInputStream(uri);
-                Core.app.post(() -> {
+                Core.app.post(() -> Core.app.post(() -> {
                     if(save){ //open save
                         System.out.println("Opening save.");
                         FileHandle file = Core.files.local("temp-save." + saveExtension);
@@ -157,7 +179,7 @@ public class AndroidLauncher extends AndroidApplication{
                                 SaveSlot slot = control.saves.importSave(file);
                                 ui.load.runLoadSave(slot);
                             }catch(IOException e){
-                                ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, false)));
+                                ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, true)));
                             }
                         }else{
                             ui.showError("$save.import.invalid");
@@ -173,7 +195,7 @@ public class AndroidLauncher extends AndroidApplication{
                             ui.editor.beginEditMap(file);
                         });
                     }
-                });
+                }));
             }
         }catch(IOException e){
             e.printStackTrace();

annotations/src/main/java/io/anuke/annotations/Annotations.java

@@ -4,13 +4,28 @@ import java.lang.annotation.*;
 
 public class Annotations{
 
-    @Target({ElementType.METHOD, ElementType.FIELD})
+    /** Indicates that a method should always call its super version. */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface CallSuper{
+
+    }
+
+    /** Annotation that allows overriding CallSuper annotation. To be used on method that overrides method with CallSuper annotation from parent class.*/
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface OverrideCallSuper {
+    }
+
+    /** Indicates that a method return or field can be null.*/
+    @Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
     @Retention(RetentionPolicy.SOURCE)
     public @interface Nullable{
 
     }
 
-    @Target({ElementType.METHOD, ElementType.FIELD})
+    /** Indicates that a method return or field cannot be null.*/
+    @Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
     @Retention(RetentionPolicy.SOURCE)
     public @interface NonNull{
 

annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java

@@ -0,0 +1,98 @@
+package io.anuke.annotations;
+
+import com.squareup.javapoet.*;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic.Kind;
+import javax.tools.StandardLocation;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+public class AssetsAnnotationProcessor extends AbstractProcessor{
+    /** Name of the base package to put all the generated classes. */
+    private static final String packageName = "io.anuke.mindustry.gen";
+    private int round;
+
+    @Override
+    public synchronized void init(ProcessingEnvironment processingEnv){
+        super.init(processingEnv);
+        //put all relevant utils into utils class
+        Utils.typeUtils = processingEnv.getTypeUtils();
+        Utils.elementUtils = processingEnv.getElementUtils();
+        Utils.filer = processingEnv.getFiler();
+        Utils.messager = processingEnv.getMessager();
+    }
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv){
+        if(round++ != 0) return false; //only process 1 round
+
+        try{
+
+            String path = Paths.get(Utils.filer.createResource(StandardLocation.CLASS_OUTPUT, "no", "no")
+                        .toUri().toURL().toString().substring(System.getProperty("os.name").contains("Windows") ? 6 : "file:".length()))
+                        .getParent().getParent().getParent().getParent().getParent().getParent().toString();
+
+            process("Sounds", path + "/assets/sounds", "io.anuke.arc.audio.Sound", "newSound");
+            process("Musics", path + "/assets/music", "io.anuke.arc.audio.Music", "newMusic");
+
+            return true;
+        }catch(Exception e){
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public Set<String> getSupportedAnnotationTypes() {
+        return Collections.singleton("*");
+    }
+
+    void process(String classname, String path, String rtype, String loadMethod) throws Exception{
+        TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC);
+        MethodSpec.Builder load = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        MethodSpec.Builder dispose = MethodSpec.methodBuilder("dispose").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+
+        HashSet<String> names = new HashSet<>();
+        Files.list(Paths.get(path)).forEach(p -> {
+            String fname = p.getFileName().toString();
+            String name = p.getFileName().toString();
+            name = name.substring(0, name.indexOf("."));
+
+            if(names.contains(name)){
+                Utils.messager.printMessage(Kind.ERROR, "Duplicate file name: " + p.toString() + "!");
+            }else{
+                names.add(name);
+            }
+
+            if(SourceVersion.isKeyword(name)){
+                name = name + "s";
+            }
+
+            load.addStatement(name + " = io.anuke.arc.Core.audio."+loadMethod+"(io.anuke.arc.Core.files.internal(io.anuke.arc.Core.app.getType() != io.anuke.arc.Application.ApplicationType.iOS ? $S : $S))",
+                path.substring(path.lastIndexOf("/") + 1) + "/" + fname, (path.substring(path.lastIndexOf("/") + 1) + "/" + fname).replace(".ogg", ".mp3"));
+            dispose.addStatement(name + ".dispose()");
+            dispose.addStatement(name + " = null");
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new io.anuke.arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
+            //cons.consume(type, fname, name);
+        });
+
+        if(classname.equals("Sounds")){
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new io.anuke.arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
+        }
+
+        type.addMethod(load.build());
+        type.addMethod(dispose.build());
+        JavaFile.builder(packageName, type.build()).build().writeTo(Utils.filer);
+    }
+}

annotations/src/main/java/io/anuke/annotations/CallSuperAnnotationProcessor.java

@@ -0,0 +1,65 @@
+package io.anuke.annotations;
+
+import com.sun.source.util.TreePath;
+import com.sun.source.util.Trees;
+import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.JCTree.JCExpressionStatement;
+import io.anuke.annotations.Annotations.OverrideCallSuper;
+
+import javax.annotation.processing.*;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic.Kind;
+import java.util.List;
+import java.util.Set;
+
+@SupportedAnnotationTypes("java.lang.Override")
+public class CallSuperAnnotationProcessor extends AbstractProcessor{
+    private Trees trees;
+
+    @Override
+    public void init (ProcessingEnvironment pe) {
+        super.init(pe);
+        trees = Trees.instance(pe);
+    }
+
+    public boolean process (Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        for (Element e : roundEnv.getElementsAnnotatedWith(Override.class)) {
+            if (e.getAnnotation(OverrideCallSuper.class) != null) return false;
+
+            CodeAnalyzerTreeScanner codeScanner = new CodeAnalyzerTreeScanner();
+            codeScanner.setMethodName(e.getSimpleName().toString());
+
+            TreePath tp = trees.getPath(e.getEnclosingElement());
+            codeScanner.scan(tp, trees);
+
+            if (codeScanner.isCallSuperUsed()) {
+                List list = codeScanner.getMethod().getBody().getStatements();
+
+                if (!doesCallSuper(list, codeScanner.getMethodName())) {
+                    processingEnv.getMessager().printMessage(Kind.ERROR, "Overriding method '" + codeScanner.getMethodName() + "' must explicitly call super method from its parent class.", e);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private boolean doesCallSuper (List list, String methodName) {
+        for (Object object : list) {
+            if (object instanceof JCTree.JCExpressionStatement) {
+                JCTree.JCExpressionStatement expr = (JCExpressionStatement) object;
+                String exprString = expr.toString();
+                if (exprString.startsWith("super." + methodName) && exprString.endsWith(");")) return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public SourceVersion getSupportedSourceVersion () {
+        return SourceVersion.RELEASE_8;
+    }
+}

annotations/src/main/java/io/anuke/annotations/CodeAnalyzerTreeScanner.java

@@ -0,0 +1,98 @@
+package io.anuke.annotations;
+
+import com.sun.source.tree.*;
+import com.sun.source.util.TreePathScanner;
+import com.sun.source.util.Trees;
+import com.sun.tools.javac.code.Scope;
+import com.sun.tools.javac.code.Symbol;
+import com.sun.tools.javac.code.Symbol.MethodSymbol;
+import com.sun.tools.javac.code.Type.ClassType;
+import com.sun.tools.javac.tree.JCTree.JCIdent;
+import com.sun.tools.javac.tree.JCTree.JCTypeApply;
+import io.anuke.annotations.Annotations.CallSuper;
+
+import java.lang.annotation.Annotation;
+
+class CodeAnalyzerTreeScanner extends TreePathScanner<Object, Trees> {
+	private String methodName;
+	private MethodTree method;
+	private boolean callSuperUsed;
+
+	@Override
+	public Object visitClass (ClassTree classTree, Trees trees) {
+		Tree extendTree = classTree.getExtendsClause();
+
+		if (extendTree instanceof JCTypeApply) { //generic classes case
+			JCTypeApply generic = (JCTypeApply) extendTree;
+			extendTree = generic.clazz;
+		}
+
+		if (extendTree instanceof JCIdent) {
+			JCIdent tree = (JCIdent) extendTree;
+			Scope members = tree.sym.members();
+
+			if (checkScope(members))
+				return super.visitClass(classTree, trees);
+
+			if (checkSuperTypes((ClassType) tree.type))
+				return super.visitClass(classTree, trees);
+
+		}
+		callSuperUsed = false;
+
+		return super.visitClass(classTree, trees);
+	}
+
+	public boolean checkSuperTypes (ClassType type) {
+		if (type.supertype_field != null && type.supertype_field.tsym != null) {
+			if (checkScope(type.supertype_field.tsym.members()))
+				return true;
+			else
+				return checkSuperTypes((ClassType) type.supertype_field);
+		}
+
+		return false;
+	}
+
+	public boolean checkScope (Scope members) {
+		for (Symbol s : members.getElements()) {
+			if (s instanceof MethodSymbol) {
+				MethodSymbol ms = (MethodSymbol) s;
+
+				if (ms.getSimpleName().toString().equals(methodName)) {
+					Annotation annotation = ms.getAnnotation(CallSuper.class);
+					if (annotation != null) {
+						callSuperUsed = true;
+						return true;
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public Object visitMethod (MethodTree methodTree, Trees trees) {
+		if (methodTree.getName().toString().equals(methodName))
+			method = methodTree;
+
+		return super.visitMethod(methodTree, trees);
+	}
+
+	public void setMethodName (String methodName) {
+		this.methodName = methodName;
+	}
+
+	public String getMethodName () {
+		return methodName;
+	}
+
+	public MethodTree getMethod () {
+		return method;
+	}
+
+	public boolean isCallSuperUsed () {
+		return callSuperUsed;
+	}
+}

annotations/src/main/java/io/anuke/annotations/SerializeAnnotationProcessor.java

@@ -13,9 +13,7 @@ import java.util.List;
 import java.util.Set;
 
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
-@SupportedAnnotationTypes({
+@SupportedAnnotationTypes("io.anuke.annotations.Annotations.Serialize")
-"io.anuke.annotations.Annotations.Serialize"
-})
 public class SerializeAnnotationProcessor extends AbstractProcessor{
     /** Target class name. */
     private static final String className = "Serialization";
@@ -44,20 +42,10 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
             TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);
             classBuilder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"unchecked\"").build());
             classBuilder.addJavadoc(RemoteMethodAnnotationProcessor.autogenWarning);
+
+
             MethodSpec.Builder method = MethodSpec.methodBuilder("init").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
 
-            TypeName jsonType = ClassName.bestGuess("io.anuke.arc.util.serialization.Json");
-            TypeName jsonValueType = ClassName.bestGuess("io.anuke.arc.util.serialization.JsonValue");
-            TypeName ubJsonWriterType = ClassName.bestGuess("io.anuke.arc.util.serialization.UBJsonWriter");
-            TypeName ubJsonReaderType = ClassName.bestGuess("io.anuke.arc.util.serialization.UBJsonReader");
-
-            classBuilder.addField(jsonType, "bjson", Modifier.STATIC, Modifier.PRIVATE);
-            classBuilder.addField(ubJsonReaderType, "bjsonReader", Modifier.STATIC, Modifier.PRIVATE);
-            classBuilder.addStaticBlock(CodeBlock.builder()
-            .addStatement("bjson = new " + jsonType + "()")
-            .addStatement("bjsonReader = new " + ubJsonReaderType + "()")
-            .build());
-
             for(TypeElement elem : elements){
                 TypeName type = TypeName.get(elem.asType());
                 String simpleTypeName = type.toString().substring(type.toString().lastIndexOf('.') + 1);
@@ -79,19 +67,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
                 .addException(IOException.class)
                 .addModifiers(Modifier.PUBLIC);
 
-                MethodSpec.Builder jsonWriteMethod = MethodSpec.methodBuilder("write" + simpleTypeName + "Json")
-                .returns(void.class)
-                .addParameter(jsonType, "json")
-                .addParameter(type, "object")
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC);
-
-                MethodSpec.Builder jsonReadMethod = MethodSpec.methodBuilder("read" + simpleTypeName + "Json")
-                .returns(type)
-                .addParameter(jsonValueType, "value")
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC);
-
                 readMethod.addStatement("$L object = new $L()", type, type);
-                jsonReadMethod.addStatement("$L object = new $L()", type, type);
 
                 List<VariableElement> fields = ElementFilter.fieldsIn(Utils.elementUtils.getAllMembers(elem));
                 for(VariableElement field : fields){
@@ -105,9 +81,6 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
                     if(field.asType().getKind().isPrimitive()){
                         writeMethod.addStatement("stream.write" + capName + "(object." + name + ")");
                         readMethod.addStatement("object." + name + "= stream.read" + capName + "()");
-
-                        jsonWriteMethod.addStatement("json.writeValue(\"" + name + "\", object." + name + ")");
-                        jsonReadMethod.addStatement("if(value.has(\"" + name + "\")) object." + name + "= value.get" + capName + "(\"" + name + "\")");
                     }else{
                         writeMethod.addStatement("io.anuke.arc.Core.settings.getSerializer(" + typeName + ".class).write(stream, object." + name + ")");
                         readMethod.addStatement("object." + name + " = (" + typeName + ")io.anuke.arc.Core.settings.getSerializer(" + typeName + ".class).read(stream)");
@@ -115,7 +88,6 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
                 }
 
                 readMethod.addStatement("return object");
-                jsonReadMethod.addStatement("return object");
 
                 serializer.addMethod(writeMethod.build());
                 serializer.addMethod(readMethod.build());
@@ -130,32 +102,6 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
 
                 classBuilder.addMethod(writeMethod.build());
                 classBuilder.addMethod(readMethod.build());
-
-                classBuilder.addMethod(jsonWriteMethod.build());
-                classBuilder.addMethod(jsonReadMethod.build());
-
-                MethodSpec.Builder binaryJsonWriteMethod = MethodSpec.methodBuilder("write" + simpleTypeName + "StreamJson")
-                .returns(void.class)
-                .addParameter(DataOutput.class, "stream")
-                .addParameter(type, "object")
-                .addException(IOException.class)
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .addStatement("java.io.StringWriter output = new java.io.StringWriter()")
-                .addStatement("bjson.setWriter(output)")
-                .addStatement("bjson.writeObjectStart(" + type + ".class, " + type + ".class)")
-                .addStatement("write" + simpleTypeName + "Json(bjson, object)")
-                .addStatement("bjson.writeObjectEnd()")
-                .addStatement("stream.writeUTF(output.toString())");
-
-                MethodSpec.Builder binaryJsonReadMethod = MethodSpec.methodBuilder("read" + simpleTypeName + "StreamJson")
-                .returns(type)
-                .addParameter(DataInput.class, "stream")
-                .addException(IOException.class)
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .addStatement("return read" + simpleTypeName + "Json(bjson.fromJson(null, stream.readUTF()))");
-
-                classBuilder.addMethod(binaryJsonWriteMethod.build());
-                classBuilder.addMethod(binaryJsonReadMethod.build());
             }
 
             classBuilder.addMethod(method.build());

annotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,3 +1,5 @@
 io.anuke.annotations.RemoteMethodAnnotationProcessor
 io.anuke.annotations.SerializeAnnotationProcessor
 io.anuke.annotations.StructAnnotationProcessor
+io.anuke.annotations.CallSuperAnnotationProcessor
+io.anuke.annotations.AssetsAnnotationProcessor

build.gradle

@@ -8,28 +8,26 @@ buildscript{
     }
 
     dependencies{
-        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.6'
+        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7'
-        classpath "com.badlogicgames.gdx:gdx-tools:1.9.9"
+        classpath "com.badlogicgames.gdx:gdx-tools:1.9.10"
         classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
     }
 }
 
 allprojects{
-    apply plugin: "idea"
-
     version = 'release'
 
     ext{
         versionNumber = '4'
-        versionModifier = 'beta'
+        versionModifier = 'release'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
-        gdxVersion = '1.9.9'
+        gdxVersion = '1.9.10'
-        roboVMVersion = '2.3.6'
+        roboVMVersion = '2.3.7'
         arcHash = null
 
         debugged = {
-            return new File(projectDir.parent, '../debug').exists() && !project.hasProperty("release")
+            return new File(projectDir.parent, '../debug').exists() && !project.hasProperty("release") && project.hasProperty("args")
         }
 
         localArc = {
@@ -37,7 +35,7 @@ allprojects{
         }
 
         getArcHash = {
-            //get latest commit hash from gtihub since JITPack's '-snapshot' version doesn't work correctly
+            //get latest commit hash from github since JITPack's '-snapshot' version doesn't work correctly
             if(arcHash == null){
                 try{
                     arcHash = 'git ls-remote https://github.com/Anuken/Arc.git'.execute().text.split("\t")[0]
@@ -59,11 +57,36 @@ allprojects{
             }
         }
 
+        generateDeployName = { String platform ->
+            if(platform == "windows"){
+                platform += "64"
+            }
+            platform = platform.capitalize()
+
+            if(platform.endsWith("64") || platform.endsWith("32")){
+                platform = "${platform.substring(0, platform.length() - 2)}-${platform.substring(platform.length() - 2)}bit"
+            }
+
+            return "[${platform}]${getModifierString()}[${getNeatVersionString()}]${appName}"
+        }
+
         getVersionString = {
             String buildVersion = getBuildVersion()
             return "$versionNumber-$versionModifier-$buildVersion"
         }
 
+        getNeatVersionString = {
+            String buildVersion = getBuildVersion()
+            return "v$buildVersion"
+        }
+
+        getModifierString = {
+            if(versionModifier != "release"){
+                return "[${versionModifier.toUpperCase()}]"
+            }
+            return ""
+        }
+
         getBuildVersion = {
             if(!project.hasProperty("buildversion")) return "custom build"
             return project.getProperties()["buildversion"]
@@ -115,6 +138,8 @@ allprojects{
         maven{ url 'https://jitpack.io' }
         jcenter()
     }
+
+    tasks.withType(Javadoc).all{ enabled = false }
 }
 
 project(":desktop"){
@@ -134,6 +159,23 @@ project(":desktop"){
     }
 }
 
+project(":desktop-sdl"){
+    apply plugin: "java"
+
+    dependencies{
+        compile project(":core")
+        compile project(":net")
+
+        if(debugged()) compile project(":debug")
+
+        compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+        compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+
+        compile arcModule("backends:backend-sdl")
+        compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.2'
+    }
+}
+
 project(":ios"){
     apply plugin: "java"
     apply plugin: "robovm"
@@ -172,11 +214,38 @@ project(":ios"){
 project(":core"){
     apply plugin: "java"
 
-    task finish{
+    task preGen{
         generateLocales()
     }
 
     dependencies{
+        if(System.properties["user.name"] == "anuke"){
+            task cleanGen{
+                doFirst{
+                    delete{
+                        delete "../core/src/io/anuke/mindustry/gen/"
+                    }
+                }
+            }
+
+            task copyGen{
+                doLast{
+                    copy{
+                        from("../core/build/generated/sources/annotationProcessor/java/main/io/anuke/mindustry/gen"){
+                            include "**/*.java"
+                        }
+
+                        into "../core/src/io/anuke/mindustry/gen"
+                    }
+                }
+            }
+
+            compileJava.dependsOn(cleanGen)
+            compileJava.finalizedBy(copyGen)
+        }
+
+        compileJava.dependsOn(preGen)
+
         compile arcModule("arc-core")
         compile arcModule("extensions:freetype")
         compile arcModule("extensions:arcnet")
@@ -219,6 +288,12 @@ project(":tools"){
 
     dependencies{
         compile project(":core")
+
+        //for render tests
+        compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+        compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+
+        compile arcModule("backends:backend-sdl")
     }
 }
 
@@ -227,6 +302,7 @@ project(":annotations"){
 
     dependencies{
         compile 'com.squareup:javapoet:1.11.0'
+        compile files("${System.getProperty('java.home')}/../lib/tools.jar")
     }
 }
 
@@ -236,6 +312,5 @@ project(":net"){
     dependencies{
         compile project(":core")
         compile "org.lz4:lz4-java:1.4.1"
-        compile 'com.github.Anuken:WaifUPnP:05eb46bc577fd7674596946ba288c96c0cedd893'
     }
 }