Update Contributors (#6689)

Translation, I would also like to translate later versions of game :)

.github/pull_request_template.md

@@ -0,0 +1,5 @@
+If your pull request is **not** translation or serverlist-related, read the list of requirements below and check each box:
+
+- [ ] I have read the [contribution guidelines](https://github.com/Anuken/Mindustry/blob/master/CONTRIBUTING.md).
+- [ ] I have ensured that my code compiles, if applicable.
+- [ ] I have ensured that any new features in this PR function correctly in-game, if applicable.

.github/workflows/deployment.yml

@@ -39,7 +39,7 @@ jobs:
         cp -a Mindustry/core/build/javadoc/. docs/
         cd docs
         git add .
-        git commit -m "Update ${RELEASE_VERSION:1}"
+        git commit --allow-empty -m "Update ${RELEASE_VERSION:1}"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs
         cd ../Mindustry
     - name: Update F-Droid build string

.github/workflows/pr.yml

@@ -8,10 +8,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 16
+        java-version: 17
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
     - name: Run unit tests and build JAR
       run: ./gradlew test desktop:dist
     - name: Upload desktop JAR for testing

.github/workflows/push.yml

@@ -15,11 +15,23 @@ jobs:
         cd ../MindustryBuilds
         BNUM=$(($GITHUB_RUN_NUMBER + 20000))
         git tag ${BNUM}
-        git config --global user.name "Build Uploader"
+        git config --global user.name "Github Actions"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds ${BNUM}
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 16
+        java-version: 17
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+    - name: Update bundles
+      if: ${{ github.repository == 'Anuken/Mindustry' }}
+      run: |
+        ./gradlew updateBundles
+
+        if [ -n "$(git status --porcelain)" ]; then
+          git add core/assets/bundles/*
+          git commit -m "Automatic bundle update"
+          git push
+        fi
     - name: Run unit tests
-      run: ./gradlew clean cleanTest test
+      run: ./gradlew clean cleanTest test --stacktrace

.gitignore

@@ -162,3 +162,7 @@ gradle-app.setting
 .DS_Store
 Thumbs.db
 android/libs/
+
+# ignored due to frequent branch conflicts.
+core/assets/logicids.dat
+core/assets/icons/icons.properties

CONTRIBUTING.md

@@ -12,9 +12,11 @@ Do not submit something without at least running the game to see if it compiles.
 If you are submitting a new block, make sure it has a name and description, and that it works correctly in-game. If you are changing existing block mechanics, test them out first.
 
 ### Do not make large changes before discussing them first.
-If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) (preferred method) or via e-mail (*anukendev@gmail.com*).  
+If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) - either via PM or by posting in the `#pulls` channel.
 For most changes, this should not be necessary. I just want to know if you're doing something big so I can offer advice and/or make sure you're not wasting your time on it.
 
+### Do not make formatting PRs.
+Yes, there are occurrences of trailing spaces, extra newlines, empty indents, and other tiny errors. No, I don't want to merge, view, or get notified by your 1-line PR fixing it. If you're implementing a PR with modification of *actual code*, feel free to fix formatting in the general vicinity of your changes, but please don't waste everyone's time with pointless changes.
 
 ## Style Guidelines
 

README.md

@@ -18,7 +18,7 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 Bleeding-edge builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases).
 
 If you'd rather compile on your own, follow these instructions.
-First, make sure you have [JDK 16](https://adoptopenjdk.net/archive.html?variant=openjdk16&jvmVariant=hotspot) installed. **Other JDK versions will not work.** Open a terminal in the Mindustry directory and run the following commands:
+First, make sure you have [JDK 16-17](https://adoptium.net/archive.html?variant=openjdk17&jvmVariant=hotspot) installed. **Other JDK versions will not work.** Open a terminal in the Mindustry directory and run the following commands:
 
 ### Windows
 
@@ -38,7 +38,7 @@ Server builds are bundled with each released build (in Releases). If you'd rathe
 
 ### Android
 
-1. Install the Android SDK [here.](https://developer.android.com/studio#downloads) Make sure you're downloading the "Command line tools only", as Android Studio is not required.
+1. Install the Android SDK [here.](https://developer.android.com/studio#command-tools) Make sure you're downloading the "Command line tools only", as Android Studio is not required.
 2. Set the `ANDROID_HOME` environment variable to point to your unzipped Android SDK directory.
 3. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`.
 

SERVERLIST.md

@@ -5,6 +5,7 @@ This is done by letting clients `GET` a [JSON list of servers](https://github.co
 
 You may want to add your server to this list. The steps for getting this done are as follows:
 
+0. **Take note of the fact that modded servers are not allowed on this list.** Such servers confuse users, and there's currently no easy way to fix mod incompatibilities after a failed connection.
 1. **Ensure your server is properly moderated.** For the most part, this applies to survival servers, but PvP servers can be affected as well.
 You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins.
 *Consider enabling a rate limit:* `config messageRateLimit 2` will make it so that players can only send messages every 2 seconds, for example.

TRANSLATING.md

@@ -31,9 +31,11 @@ There are two ways to test the translation bundle:
 1) Assuming you have the PC version downloaded, download your bundle file, name it `bundle.properties`, then place it in the same folder as the Mindustry desktop executable and run it. *You should get a popup message in-game confirming that you have loaded an external translation.*
 2) For advanced users: simply download your fork of mindustry and compile/run the game.
 
-#### Translating for stores (Steam, Google Play)
+#### Translating for stores (Steam, ~~Google Play~~)
 
-If you would like to translate the descriptions for Google Play or Steam, see the [Fastlane Metadata folder](https://github.com/Anuken/Mindustry/tree/master/fastlane/metadata) and submit a pull request for files there. On Google Play, you would create or edit the folder with the correct local code; for Steam, I have to update the translations manually, so just name the folder with the language name, and include the same files as the English folder does.
+NOTE: The Google Play description is in the process of being re-written, please do not translate it.
+
+If you would like to translate the descriptions for ~~Google Play~~ or Steam, see the [Fastlane Metadata folder](https://github.com/Anuken/Mindustry/tree/master/fastlane/metadata) and submit a pull request for files there. On Google Play, you would create or edit the folder with the correct local code; for Steam, I have to update the translations manually, so just name the folder with the language name, and include the same files as the English folder does.
 
 **And that's it.**  
 

android/build.gradle

@@ -7,7 +7,7 @@ buildscript{
     }
 
     dependencies{
-        classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
+        classpath 'com.android.tools.build:gradle:7.0.3'
     }
 }
 
@@ -18,7 +18,6 @@ configurations{ natives }
 repositories{
     mavenCentral()
     maven{ url "https://maven.google.com" }
-    jcenter() //remove later once google/JetBrains fixes the dependency
 }
 
 task deploy(type: Copy){
@@ -30,7 +29,7 @@ task deploy(type: Copy){
 }
 
 android{
-    buildToolsVersion '30.0.2'
+    buildToolsVersion '30.0.3'
     compileSdkVersion 30
     sourceSets{
         main{
@@ -140,8 +139,8 @@ dependencies{
     gpImplementation "com.google.android.gms:play-services-games:21.0.0"
     gpImplementation "com.google.android.gms:play-services-auth:19.0.0"
 
-    //android dependencies magically disappear during compilation, thanks gradle!
+    //TODO dynamically find best android platform jar instead of hard-coding to 30
-    def sdkFile = new File((String)findSdkDir(), "/platforms/android-29/android.jar")
+    def sdkFile = new File((String)findSdkDir(), "/platforms/android-30/android.jar")
     if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
 }
 

annotations/src/main/java/mindustry/annotations/BaseProcessor.java

@@ -91,7 +91,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
     }
 
     public static TypeName tname(String pack, String simple){
-        return ClassName.get(pack, simple );
+        return ClassName.get(pack, simple);
     }
 
     public static TypeName tname(String name){

annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java

@@ -101,6 +101,8 @@ public class EntityProcess extends BaseProcessor{
 
                 inter.addJavadoc("Interface for {@link $L}", component.fullName());
 
+                skipDeprecated(inter);
+
                 //implement extra interfaces these components may have, e.g. position
                 for(Stype extraInterface : component.interfaces().select(i -> !isCompInterface(i))){
                     //javapoet completely chokes on this if I add `addSuperInterface` or create the type name with TypeName.get
@@ -570,6 +572,8 @@ public class EntityProcess extends BaseProcessor{
                 .returns(tname(packageName + "." + name))
                 .addStatement(ann.pooled() ? "return Pools.obtain($L.class, " +name +"::new)" : "return new $L()", name).build());
 
+                skipDeprecated(builder);
+
                 definitions.add(new EntityDefinition(packageName + "." + name, builder, type, typeIsBase ? null : baseClass, components, groups, allFieldSpecs, legacy));
             }
 
@@ -837,6 +841,8 @@ public class EntityProcess extends BaseProcessor{
                 TypeSpec.Builder nullBuilder = TypeSpec.classBuilder(className)
                 .addModifiers(Modifier.FINAL);
 
+                skipDeprecated(nullBuilder);
+
                 nullBuilder.addSuperinterface(interf.tname());
                 if(superclass != null) nullBuilder.superclass(tname(baseName(superclass)));
 
@@ -872,7 +878,7 @@ public class EntityProcess extends BaseProcessor{
 
                 nullsBuilder.addField(FieldSpec.builder(type, Strings.camelize(baseName)).initializer("new " + className + "()").addModifiers(Modifier.FINAL, Modifier.STATIC, Modifier.PUBLIC).build());
 
-                write(nullBuilder);
+                write(nullBuilder, imports.asArray());
             }
 
             write(nullsBuilder);
@@ -980,6 +986,11 @@ public class EntityProcess extends BaseProcessor{
         throw new IllegalArgumentException("Missing types.");
     }
 
+    void skipDeprecated(TypeSpec.Builder builder){
+        //deprecations are irrelevant in generated code
+        builder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"deprecation\"").build());
+    }
+
     class GroupDefinition{
         final String name;
         final ClassName baseType;

annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java

@@ -1,5 +1,7 @@
 package mindustry.annotations.impl;
 
+import arc.*;
+import arc.audio.*;
 import arc.files.*;
 import arc.scene.style.*;
 import arc.struct.*;
@@ -20,8 +22,8 @@ public class AssetsProcess extends BaseProcessor{
 
     @Override
     public void process(RoundEnvironment env) throws Exception{
-        processSounds("Sounds", rootDirectory + "/core/assets/sounds", "arc.audio.Sound");
+        processSounds("Sounds", rootDirectory + "/core/assets/sounds", "arc.audio.Sound", true);
-        processSounds("Musics", rootDirectory + "/core/assets/music", "arc.audio.Music");
+        processSounds("Musics", rootDirectory + "/core/assets/music", "arc.audio.Music", false);
         processUI(env.getElementsAnnotatedWith(StyleDefaults.class));
     }
 
@@ -115,12 +117,36 @@ public class AssetsProcess extends BaseProcessor{
         JavaFile.builder(packageName, type.build()).build().writeTo(BaseProcessor.filer);
     }
 
-    void processSounds(String classname, String path, String rtype) throws Exception{
+    void processSounds(String classname, String path, String rtype, boolean genid) throws Exception{
         TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC);
         MethodSpec.Builder loadBegin = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        CodeBlock.Builder staticb = CodeBlock.builder();
+
+        if(genid){
+            type.addField(FieldSpec.builder(IntMap.class, "idToSound", Modifier.STATIC, Modifier.PRIVATE).initializer("new IntMap()").build());
+            type.addField(FieldSpec.builder(ObjectIntMap.class, "soundToId", Modifier.STATIC, Modifier.PRIVATE).initializer("new ObjectIntMap()").build());
+
+            type.addMethod(MethodSpec.methodBuilder("getSoundId")
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+            .addParameter(Sound.class, "sound")
+            .returns(int.class)
+            .addStatement("return soundToId.get(sound, -1)").build());
+
+            type.addMethod(MethodSpec.methodBuilder("getSound")
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+            .addParameter(int.class, "id")
+            .returns(Sound.class)
+            .addStatement("return (Sound)idToSound.get(id, () -> Sounds.none)").build());
+        }
 
         HashSet<String> names = new HashSet<>();
-        Fi.get(path).walk(p -> {
+        Seq<Fi> files = new Seq<>();
+        Fi.get(path).walk(files::add);
+
+        files.sortComparing(Fi::name);
+        int id = 0;
+
+        for(Fi p : files){
             String name = p.nameWithoutExtension();
 
             if(names.contains(name)){
@@ -133,14 +159,26 @@ public class AssetsProcess extends BaseProcessor{
 
             String filepath =  path.substring(path.lastIndexOf("/") + 1) + p.path().substring(p.path().lastIndexOf(path) + path.length());
 
-            String filename = "\"" + filepath + "\"";
+            if(genid){
-            loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3"));
+                staticb.addStatement("soundToId.put($L, $L)", name, id);
 
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build());
+                loadBegin.addStatement("$T.assets.load($S, $L.class).loaded = a -> { $L = ($L)a; soundToId.put(a, $L); idToSound.put($L, a); }",
-        });
+                Core.class, filepath, rtype, name, rtype, id, id);
+            }else{
+                loadBegin.addStatement("$T.assets.load($S, $L.class).loaded = a -> { $L = ($L)a; }", Core.class, filepath, rtype, name, rtype);
+            }
+
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()").build());
+
+            id ++;
+        }
+
+        if(genid){
+            type.addStaticBlock(staticb.build());
+        }
 
         if(classname.equals("Sounds")){
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build());
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()").build());
         }
 
         type.addMethod(loadBegin.build());

annotations/src/main/java/mindustry/annotations/util/AnnotationProxyMaker.java

@@ -7,6 +7,7 @@ import com.sun.tools.javac.code.Attribute.Enum;
 import com.sun.tools.javac.code.Attribute.Error;
 import com.sun.tools.javac.code.Attribute.Visitor;
 import com.sun.tools.javac.code.Attribute.*;
+import com.sun.tools.javac.code.Scope.*;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Type.ArrayType;
@@ -64,36 +65,13 @@ public class AnnotationProxyMaker{
         LinkedHashMap map = new LinkedHashMap();
         ClassSymbol cl = (ClassSymbol)this.anno.type.tsym;
 
-        //try to use Java 8 API for this if possible
+        for(Symbol s : cl.members().getSymbols(LookupKind.NON_RECURSIVE)){
-        try{
+            if(s.getKind() == ElementKind.METHOD){
-            Class entryClass = Class.forName("com.sun.tools.javac.code.Scope$Entry");
+                MethodSymbol var4 = (MethodSymbol)s;
-            Object members = cl.members();
+                Attribute var5 = var4.getDefaultValue();
-            Field field = members.getClass().getField("elems");
+                if(var5 != null){
-            Object elems = field.get(members);
+                    map.put(var4, var5);
-            Field siblingField = entryClass.getField("sibling");
-            Field symField = entryClass.getField("sym");
-            for(Object currEntry = elems; currEntry != null; currEntry = siblingField.get(currEntry)){
-                handleSymbol((Symbol)symField.get(currEntry), map);
-            }
-
-        }catch(Throwable e){
-            //otherwise try other API
-
-            try{
-                Class lookupClass = Class.forName("com.sun.tools.javac.code.Scope$LookupKind");
-                Field nonRecField = lookupClass.getField("NON_RECURSIVE");
-                Object nonRec = nonRecField.get(null);
-                Scope scope = cl.members();
-                Method getSyms = scope.getClass().getMethod("getSymbols", lookupClass);
-                Iterable<Symbol> it = (Iterable<Symbol>)getSyms.invoke(scope, nonRec);
-                Iterator<Symbol> i = it.iterator();
-                while(i.hasNext()){
-                    handleSymbol(i.next(), map);
                 }
-
-            }catch(Throwable death){
-                //I tried
-                throw new RuntimeException(death);
             }
         }
 
@@ -104,17 +82,6 @@ public class AnnotationProxyMaker{
         return map;
     }
 
-    private void handleSymbol(Symbol sym, LinkedHashMap map){
-
-        if(sym.getKind() == ElementKind.METHOD){
-            MethodSymbol var4 = (MethodSymbol)sym;
-            Attribute var5 = var4.getDefaultValue();
-            if(var5 != null){
-                map.put(var4, var5);
-            }
-        }
-    }
-
     private Object generateValue(MethodSymbol var1, Attribute var2){
         AnnotationProxyMaker.ValueVisitor var3 = new AnnotationProxyMaker.ValueVisitor(var1);
         return var3.getValue(var2);

annotations/src/main/java/mindustry/annotations/util/Selement.java

@@ -12,6 +12,10 @@ import java.lang.Class;
 import java.lang.annotation.*;
 import java.lang.reflect.*;
 
+/**
+ * Wrapper over Element with added utility functions.
+ * I would have preferred to use extension methods for this, but Java doesn't have any.
+ * */
 public class Selement<T extends Element>{
     public final T e;
 

annotations/src/main/resources/classids.properties

@@ -20,6 +20,7 @@ mindustry.entities.comp.PlayerComp=12
 mindustry.entities.comp.PosTeam=27
 mindustry.entities.comp.PosTeamDef=28
 mindustry.entities.comp.PuddleComp=13
+mindustry.entities.comp.WorldLabelComp=35
 mindustry.type.Weather.WeatherStateComp=14
 mindustry.world.blocks.campaign.LaunchPad.LaunchPayloadComp=15
 mindustry.world.blocks.campaign.PayloadLaunchPad.LargeLaunchPayloadComp=34

annotations/src/main/resources/revisions/EffectStateComp/6.json

@@ -0,0 +1 @@
+{version:6,fields:[{name:color,type:arc.graphics.Color},{name:data,type:java.lang.Object},{name:effect,type:mindustry.entities.Effect},{name:lifetime,type:float},{name:offsetPos,type:float},{name:offsetRot,type:float},{name:offsetX,type:float},{name:offsetY,type:float},{name:parent,type:mindustry.gen.Posc},{name:rotWithParent,type:boolean},{name:rotation,type:float},{name:time,type:float},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/PuddleComp/1.json

@@ -0,0 +1 @@
+{version:1,fields:[{name:amount,type:float},{name:liquid,type:mindustry.type.Liquid},{name:tile,type:mindustry.world.Tile},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/WorldLabelComp/0.json

@@ -0,0 +1 @@
+{fields:[{name:flags,type:byte},{name:fontSize,type:float},{name:text,type:java.lang.String},{name:x,type:float},{name:y,type:float},{name:z,type:float}]}

build.gradle

@@ -13,36 +13,18 @@ buildscript{
         google()
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven{ url 'https://jitpack.io' }
-
-        //fake repository to download my patched robovm jar from
-        ivy{
-            url 'https://github.com/'
-
-            patternLayout {
-                artifact '/[organisation]/[module]/raw/a-single-jar-file/[revision].jar'
-            }
-
-            // This is required in Gradle 6.0+ as metadata file (ivy.xml)
-            // is mandatory. Docs linked below this code section
-            metadataSources { artifact() }
-        }
     }
 
     dependencies{
-        //use local, patched robovm gradle plugin until my PR for gradle 7.0 support is merged
+        classpath "com.mobidevelop.robovm:robovm-gradle-plugin:2.3.14"
-        //https://github.com/Anuken/robovm/raw/a-single-jar-file/robovm-gradle-plugin-2.3.14-SNAPSHOT.jar
-        classpath "Anuken:robovm:robovm-gradle-plugin-2.3.14-SNAPSHOT"
-        //needed for plugin above
-        classpath "com.mobidevelop.robovm:robovm-dist-compiler:2.3.13"
-
         classpath "com.github.Anuken.Arc:packer:$arcHash"
         classpath "com.github.Anuken.Arc:arc-core:$arcHash"
     }
 }
 
 plugins{
-    id 'org.jetbrains.kotlin.jvm' version '1.4.32'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.0-RC'
-    id "org.jetbrains.kotlin.kapt" version "1.4.32"
+    id "org.jetbrains.kotlin.kapt" version "1.6.0-RC"
 }
 
 allprojects{
@@ -57,7 +39,7 @@ allprojects{
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'
-        rhinoVersion = '55bf0dac1cfa7770672fd26112512c733ca9d5dc'
+        rhinoVersion = '3c6bbadf73a904eefcc28b6fd8aa742ac575e878'
 
         loadVersionProps = {
             return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
@@ -219,10 +201,16 @@ allprojects{
         options.compilerArgs += ["-Xlint:deprecation"]
         dependsOn clearCache
 
-        options.forkOptions.jvmArgs.addAll([
+        options.forkOptions.jvmArgs += [
+            '--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED',
             '--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
-            '--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED'
+            '--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED',
-        ])
+            '--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED',
+            '--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
+            '--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED',
+            '--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
+            '--add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED'
+        ]
     }
 }
 
@@ -279,7 +267,7 @@ project(":ios"){
             props.load(new FileInputStream(vfile))
         }else{
             props['app.id'] = 'io.anuke.mindustry'
-            props['app.version'] = '6.0'
+            props['app.version'] = '7.0'
             props['app.mainclass'] = 'mindustry.IOSLauncher'
             props['app.executable'] = 'IOSLauncher'
             props['app.name'] = 'Mindustry'
@@ -341,7 +329,11 @@ project(":core"){
                 }
             }
             def changelogs = file("../fastlane/metadata/android/en-US/changelogs/")
-            new File(changelogs, androidVersion + ".txt").text = (result)
+            changelogs.mkdirs()
+            try{
+                new File(changelogs, androidVersion + ".txt").text = (result)
+            }catch(Exception ignored){
+            }
         }
     }
 
@@ -383,7 +375,7 @@ project(":core"){
         if(localArc() && debugged()) api arcModule("extensions:recorder")
         if(localArc()) api arcModule(":extensions:packer")
 
-        annotationProcessor 'com.github.Anuken:jabel:34e4c172e65b3928cd9eabe1993654ea79c409cd'
+        annotationProcessor 'com.github.Anuken:jabel:0.6.0'
         compileOnly project(":annotations")
         kapt project(":annotations")
     }