Merge branch 'master' into patch-12

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -72,3 +72,5 @@ body:
           required: true
         - label: I have searched the closed and open issues to make sure that this problem has not already been reported.
           required: true
+        - label: "I am not using Foo's Client, and have made sure the bug is not caused by mods I have installed."
+          required: true

.github/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2

.github/workflows/pr.yml

@@ -17,8 +17,10 @@ jobs:
         java-version: 17
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
+    - name: Run unit tests
+      run: ./gradlew tests:test --stacktrace --rerun
     - name: Run unit tests and build JAR
-      run: ./gradlew test desktop:dist
+      run: ./gradlew desktop:dist
     - name: Upload desktop JAR for testing
       uses: actions/upload-artifact@v2
       with:

.github/workflows/push.yml

@@ -33,6 +33,8 @@ jobs:
         ./gradlew updateBundles
 
         if [ -n "$(git status --porcelain)" ]; then
+          git config --global user.name "Github Actions"
+          git config --global user.email "[email protected]"
           git add core/assets/bundles/*
           git commit -m "Automatic bundle update"
           git push
@@ -41,7 +43,7 @@ jobs:
       if: ${{ github.repository == 'Anuken/Mindustry' }}
       run: |
         git config --global user.name "Github Actions"
-        git config --global user.email "cli@github.com"
+        git config --global user.email "actions@github.com"
         cd ../
         cp -r ./Mindustry ./MindustryJitpack
         cd MindustryJitpack
@@ -56,4 +58,4 @@ jobs:
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
         cd ../Mindustry
     - name: Run unit tests
-      run: ./gradlew clean cleanTest test --stacktrace
+      run: ./gradlew tests:test --rerun --stacktrace

SERVERLIST.md

@@ -18,13 +18,16 @@ You'll need to either hire some moderators, or make use of (currently non-existe
 4. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option.
 5. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`).
 6. Finally, **submit a pull request** to add your server's IP to the list. 
-This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers_v7.json), then add a JSON object with a single key, indicating your server address.
-For example, if your server address is `example.com:6000`, you would add a comma after the last entry and insert:
+This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers_v7.json), then add a JSON object with the following format:
     ```json
       {
-        "address": "example.com:6000"
+        "name": "Your Server Group Name",
+        "address": ["your.server.address"]
       }
     ```
+
+    If your group has multiple servers, simply add extra addresses inside the square brackets, separated by commas. For example: `["address1", "address2"]`
+
     > Note that Mindustry also support SRV records. This allows you to use a subdomain for your server address instead of specifying the port. For example, if you want to use `play.example.com` instead of `example.com:6000`, in the dns settings of your domain, add an SRV record with `_mindustry` as the service, `tcp` as the protocol, `play` as the target and `6000` as the port. You can also setup fallback servers by modifying the weight or priority of the record. Although SRV records are very convenient, keep in mind they are slower than regular addresses. Avoid using them in the server list, but rather as an easy way to share your server address.
 
     Then, press the *'submit pull request'* button and I'll take a look at your server. If I have any issues with it, I'll let you know in the PR comments.

android/src/mindustry/android/AndroidLauncher.java

@@ -101,64 +101,68 @@ public void showFileChooser(boolean open, String title, String extension, Cons<F
             }
 
             void showFileChooser(boolean open, String title, Cons<Fi> cons, String... extensions){
-                String extension = extensions[0];
-
-                if(VERSION.SDK_INT >= VERSION_CODES.Q){
-                    Intent intent = new Intent(open ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_CREATE_DOCUMENT);
-                    intent.addCategory(Intent.CATEGORY_OPENABLE);
-                    intent.setType(extension.equals("zip") && !open && extensions.length == 1 ? "application/zip" : "*/*");
-
-                    addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
-                        if(code == Activity.RESULT_OK && in != null && in.getData() != null){
-                            Uri uri = in.getData();
-
-                            if(uri.getPath().contains("(invalid)")) return;
-
-                            Core.app.post(() -> Core.app.post(() -> cons.get(new Fi(uri.getPath()){
-                                @Override
-                                public InputStream read(){
-                                    try{
-                                        return getContentResolver().openInputStream(uri);
-                                    }catch(IOException e){
-                                        throw new ArcRuntimeException(e);
+                try{
+                    String extension = extensions[0];
+
+                    if(VERSION.SDK_INT >= VERSION_CODES.Q){
+                        Intent intent = new Intent(open ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_CREATE_DOCUMENT);
+                        intent.addCategory(Intent.CATEGORY_OPENABLE);
+                        intent.setType(extension.equals("zip") && !open && extensions.length == 1 ? "application/zip" : "*/*");
+
+                        addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
+                            if(code == Activity.RESULT_OK && in != null && in.getData() != null){
+                                Uri uri = in.getData();
+
+                                if(uri.getPath().contains("(invalid)")) return;
+
+                                Core.app.post(() -> Core.app.post(() -> cons.get(new Fi(uri.getPath()){
+                                    @Override
+                                    public InputStream read(){
+                                        try{
+                                            return getContentResolver().openInputStream(uri);
+                                        }catch(IOException e){
+                                            throw new ArcRuntimeException(e);
+                                        }
                                     }
-                                }
-
-                                @Override
-                                public OutputStream write(boolean append){
-                                    try{
-                                        return getContentResolver().openOutputStream(uri);
-                                    }catch(IOException e){
-                                        throw new ArcRuntimeException(e);
+
+                                    @Override
+                                    public OutputStream write(boolean append){
+                                        try{
+                                            return getContentResolver().openOutputStream(uri);
+                                        }catch(IOException e){
+                                            throw new ArcRuntimeException(e);
+                                        }
                                     }
-                                }
-                            })));
-                        }
-                    });
-                }else if(VERSION.SDK_INT >= VERSION_CODES.M && !(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
+                                })));
+                            }
+                        });
+                    }else if(VERSION.SDK_INT >= VERSION_CODES.M && !(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
                     checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
-                    chooser = new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), open, file -> {
-                        if(!open){
-                            cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
-                        }else{
-                            cons.get(file);
-                        }
-                    });
+                        chooser = new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), open, file -> {
+                            if(!open){
+                                cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
+                            }else{
+                                cons.get(file);
+                            }
+                        });
 
-                    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);
-                }else{
-                    if(open){
-                        new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
+                        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);
                     }else{
-                        super.showFileChooser(open, "@open", extension, cons);
+                        if(open){
+                            new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
+                        }else{
+                            super.showFileChooser(open, "@open", extension, cons);
+                        }
                     }
+                }catch(Throwable error){
+                    Core.app.post(() -> Vars.ui.showException(error));
                 }
             }
 
@@ -180,6 +184,7 @@ public void endForceLandscape(){
         }, new AndroidApplicationConfiguration(){{
             useImmersiveMode = true;
             hideStatusBar = true;
+            useGL30 = true;
         }});
         checkFiles(getIntent());
 

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

@@ -57,6 +57,9 @@ void processUI(Set<? extends Element> elements) throws Exception{
         ichtype.addField(FieldSpec.builder(ParameterizedTypeName.get(ObjectIntMap.class, String.class),
             "codes", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("new ObjectIntMap<>()").build());
 
+        ichtype.addField(FieldSpec.builder(ParameterizedTypeName.get(IntMap.class, String.class),
+            "codeToName", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("new IntMap<>()").build());
+
         ObjectSet<String> used = new ObjectSet<>();
 
         for(Jval val : icons.get("glyphs").asArray()){
@@ -67,7 +70,9 @@ void processUI(Set<? extends Element> elements) throws Exception{
             int code = val.getInt("code", 0);
             iconcAll.append((char)code);
             ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).addJavadoc(String.format("\\u%04x", code)).initializer("'" + ((char)code) + "'").build());
+
             ichinit.addStatement("codes.put($S, $L)", name, code);
+            ichinit.addStatement("codeToName.put($L, $S)", code, name);
 
             ictype.addField(TextureRegionDrawable.class, name + "Small", Modifier.PUBLIC, Modifier.STATIC);
             icload.addStatement(name + "Small = mindustry.ui.Fonts.getGlyph(mindustry.ui.Fonts.def, (char)" + code + ")");

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

@@ -102,7 +102,7 @@ public void process(RoundEnvironment env) throws Exception{
 
                         //bools: single bit, needs special case to clear things
                         setter.beginControlFlow("if(value)");
-                        setter.addStatement("return ($T)(($L & ~(1L << $LL)) | (1L << $LL))", structType, structParam, offset, offset);
+                        setter.addStatement("return ($T)($L | (1L << $LL))", structType, structParam, offset);
                         setter.nextControlFlow("else");
                         setter.addStatement("return ($T)(($L & ~(1L << $LL)))", structType, structParam, offset);
                         setter.endControlFlow();

build.gradle

@@ -106,12 +106,12 @@ allprojects{
         generateLocales = {
             def output = 'en\n'
             def bundles = new File(project(':core').projectDir, 'assets/bundles/')
-            bundles.listFiles().each{ other ->
-                if(other.name == "bundle.properties") return
-                output += other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + "\n"
+            bundles.list().sort().each{ name ->
+                if(name == "bundle.properties") return
+                output += name.substring("bundle".length() + 1, name.lastIndexOf('.')) + "\n"
             }
             new File(project(':core').projectDir, 'assets/locales').text = output
-            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().join("\n")
+            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().sort().join("\n")
         }
 
         writeVersion = {
@@ -185,7 +185,7 @@ allprojects{
 
     tasks.withType(JavaCompile){
         targetCompatibility = 8
-        sourceCompatibility = JavaVersion.VERSION_16
+        sourceCompatibility = JavaVersion.VERSION_17
         options.encoding = "UTF-8"
         options.compilerArgs += ["-Xlint:deprecation"]
         dependsOn clearCache
@@ -234,6 +234,7 @@ project(":desktop"){
     dependencies{
         implementation project(":core")
         implementation arcModule("extensions:discord")
+        implementation arcModule("natives:natives-filedialogs")
         implementation arcModule("natives:natives-desktop")
         implementation arcModule("natives:natives-freetype-desktop")
 
@@ -320,6 +321,7 @@ project(":core"){
         api arcModule("extensions:g3d")
         api arcModule("extensions:fx")
         api arcModule("extensions:arcnet")
+        implementation arcModule("extensions:filedialogs")
         api "com.github.Anuken:rhino:$rhinoVersion"
         if(localArc && debugged()) api arcModule("extensions:recorder")
         if(localArc) api arcModule(":extensions:packer")