Better caching

 Conflicts:

	core/src/mindustry/net/ArcNetProvider.java

	gradle.properties

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,30 +0,0 @@
----
-name: Bug report
-about: Create a report to help fix an issue.
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Platform**: *Android/iOS/Mac/Windows/Linux*
-
-**Build**: *The build number under the title in the main menu. Required. "LATEST" IS NOT A VERSION, I NEED THE EXACT BUILD NUMBER OF YOUR GAME.*
-
-**Issue**: *Explain your issue in detail.*
-
-**Steps to reproduce**: *How you happened across the issue, and what exactly you did to make the bug happen.*
-
-**Link(s) to mod(s) used**: *The mod repositories or zip files that are related to the issue, if applicable.*
-
-**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME. IF YOU DO NOT HAVE A SAVE, DON'T WASTE TIME OPENING THIS ISSUE.*
-
-If you remove the line above without reading it properly and understanding what it means, I will reap your soul. Even if you're playing on someone's server, you can still save the game to a slot.
-
-**(Crash) logs**: *Either crash reports from the crash folder, or the file you get when you go into Settings -> Game Data -> Export Crash logs. REQUIRED if you are reporting a crash.*
-
----
-
-*Place an X (no spaces) between the brackets to confirm that you have read the line below.*  
-- [ ] **I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.**
-- [ ] **I have searched the closed and open issues to make sure that this problem has not already been reported.**

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,74 @@
+name: Bug report
+description: The type of device you were playing on
+labels: ["bug"]
+
+body:
+  - type: dropdown
+    id: platform
+    attributes:
+      label: Platforms
+      description: On what platforms do you know the bug happens?
+      multiple: false
+      options:
+        - Android
+        - iOS
+        - Mac
+        - Windows
+        - Linux
+    validations:
+      required: true
+  - type: input
+    id: build
+    attributes:
+      label: Build
+      description: The build number under the title in the main menu.
+      placeholder: LATEST IS NOT A VERSION, I NEED THE EXACT BUILD NUMBER OF YOUR GAME.
+    validations:
+      required: true
+  - type: textarea
+    id: issue
+    attributes:
+      label: Issue
+      description: Explain your issue in detail.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps to reproduce
+      description: How you happened across the issue, and what exactly you did to make the bug happen.
+    validations:
+      required: true
+  - type: textarea
+    id: mods
+    attributes:
+      label: Mods used
+      description: The mod repositories or zip files that are related to the issue, if applicable.
+    validations:
+      required: false
+  - type: textarea
+    id: save-file
+    attributes:
+      label: Save file
+      description: The (zipped) save file you were playing on when the bug happened. If this happened in the campaign, specify the sector, and attach the file you get from Settings -> Game Data -> Export Data. For custom games, attach the .msav file exported from the save dialog, zipped.
+      placeholder: THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME. IF YOU DO NOT HAVE A SAVE, DON'T WASTE TIME OPENING THIS ISSUE.
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: (Crash) logs
+      description: Either crash reports from the crash folder, or the file you get when you go into Settings -> Game Data -> Export Crash logs.
+      placeholder: REQUIRED if you are reporting a crash.
+    validations:
+      required: false
+  - type: checkboxes
+    id: agreement
+    attributes:
+      label: Submission
+      description: Check the boxes to confirm that you have read the lines below.
+      options:
+        - label: I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.
+          required: true
+        - label: I have searched the closed and open issues to make sure that this problem has not already been reported.
+          required: true

.github/workflows/deployment.yml

@@ -5,8 +5,12 @@ on:
     tags:
       - 'v*'
 
+permissions: {}
 jobs:
   deploy:
+    permissions:
+      contents: write # for release creation (svenstaro/upload-release-action)
+
     runs-on: ubuntu-latest
 
     steps:
@@ -19,6 +23,8 @@ jobs:
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
     - name: Add Arc release
       run: |
+        git config --global user.email "actions@github.com"
+        git config --global user.name "Github Actions"
         git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
         cd ../Arc
         git tag ${RELEASE_VERSION}
@@ -38,7 +44,7 @@ jobs:
         rm -rf .github
         rm README.md
         git add .
-        git commit --allow-empty -m "${GITHUB_SHA}"
+        git commit --allow-empty -m "Updating"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
         git tag ${RELEASE_VERSION}
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack

.github/workflows/pr.yml

@@ -2,6 +2,9 @@ name: Pull Request Tests
 
 on: [pull_request, workflow_dispatch]
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   testPR:
     runs-on: ubuntu-latest
@@ -14,8 +17,10 @@ jobs:
         java-version: 17
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
+    - name: Run unit tests
+      run: ./gradlew clean cleanTest test --stacktrace
     - 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

@@ -2,8 +2,12 @@ name: Tests
 
 on: [push, workflow_dispatch]
 
+permissions: {}
 jobs:
   runPush:
+    permissions:
+      contents: write # for Update bundles
+
     runs-on: ubuntu-latest
 
     steps:
@@ -29,6 +33,7 @@ jobs:
         ./gradlew updateBundles
 
         if [ -n "$(git status --porcelain)" ]; then
+          git config --global user.name "Github Actions"
           git add core/assets/bundles/*
           git commit -m "Automatic bundle update"
           git push
@@ -36,6 +41,8 @@ jobs:
     - name: Update JITpack repo
       if: ${{ github.repository == 'Anuken/Mindustry' }}
       run: |
+        git config --global user.name "Github Actions"
+        git config --global user.email "cli@github.com"
         cd ../
         cp -r ./Mindustry ./MindustryJitpack
         cd MindustryJitpack
@@ -46,7 +53,7 @@ jobs:
         rm -rf .github
         rm README.md
         git add .
-        git commit --allow-empty -m "${GITHUB_SHA}"
+        git commit --allow-empty -m "Updating"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
         cd ../Mindustry
     - name: Run unit tests

.gitignore

@@ -6,6 +6,7 @@ logs/
 /core/assets/.gifimages/
 /deploy/
 /out/
+ios/libs/
 /desktop/packr-out/
 /desktop/packr-export/
 /desktop/mindustry-saves/
@@ -43,6 +44,7 @@ steam_appid.txt
 ios/robovm.properties
 packr-out/
 config/
+buildSrc/
 *.gif
 /tests/out
 

LICENSE

@@ -617,58 +617,3 @@ reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -39,10 +39,13 @@ 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#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`.
+2. In the unzipped Android SDK folder, find the cmdline-tools directory. Then create a folder inside of it called `latest` and put all of its contents into the newly created folder.
+3. In the same directory run the command `sdkmanager --licenses` (or `./sdkmanager --licenses` if on linux/mac)
+4. Set the `ANDROID_HOME` environment variable to point to your unzipped Android SDK directory.
+5. Enable developer mode on your device/emulator. If you are on testing on a phone you can follow [these instructions](https://developer.android.com/studio/command-line/adb#Enabling), otherwise you need to google how to enable your emulator's developer mode specifically.
+6. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`.
 
-To debug the application on a connected phone, run `gradlew android:installDebug android:run`.
+To debug the application on a connected device/emulator, run `gradlew android:installDebug android:run`.
 
 ### Troubleshooting
 

SERVERLIST.md

@@ -1,7 +1,7 @@
 ### Adding a server to the list
 
 Mindustry now has a public list of servers that everyone can see and connect to. 
-This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers_v6.json) in this repository.
+This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers_v7.json) in this repository.
 
 You may want to add your server to this list. The steps for getting this done are as follows:
 
@@ -9,20 +9,22 @@ You may want to add your server to this list. The steps for getting this done ar
 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.
-2. Make sure that your server is able to handle inappropriate content - this includes NSFW display/sorter art and abusive messages. **Servers that allow such content will be removed immediately.** Consider banning display blocks if it is a problem for your server: `rules add bannedBlocks ["logic-display", "large-logic-display"]`.
+2. Make sure that your server is able to handle inappropriate content - this includes NSFW display/sorter art and abusive messages. **Servers that allow such content will be removed immediately.** Consider banning display blocks if it is a problem for your server: `rules add bannedBlocks ["canvas", "logic-display", "large-logic-display"]`.
 3. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that:
-  - Your name or description must reflect the type of server you're hosting. 
-  Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt.
-  - Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you.
-  - Try to be professional in your text; use common sense.
+   - Your name or description must reflect the type of server you're hosting. 
+   Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt.
+   - Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you.
+   - Try to be professional in your text; use common sense.
 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_v6.json), then add a JSON object with a single key, indicating your server address.
-For example, if your server address is `google.com`, you would add a comma after the last entry and insert:
-```json
-  {
-    "address": "google.com"
-  }
-```
-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.
+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:
+    ```json
+      {
+        "address": "example.com:6000"
+      }
+    ```
+    > 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/build.gradle

@@ -29,8 +29,8 @@ task deploy(type: Copy){
 }
 
 android{
-    buildToolsVersion '31.0.0'
-    compileSdkVersion 31
+    buildToolsVersion '33.0.2'
+    compileSdkVersion 33
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -56,7 +56,7 @@ android{
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 31
+        targetSdkVersion 33
         
         versionName versionNameResult
         versionCode = vcode
@@ -119,11 +119,17 @@ dependencies{
     implementation arcModule("backends:backend-android")
     implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
 
-    natives "com.github.Anuken.Arc:natives-android:${getArcHash()}"
-    natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}"
+    natives "com.github.Anuken.Arc:natives-android:$arcHash"
+    natives "com.github.Anuken.Arc:natives-freetype-android:$arcHash"
 
-    //TODO dynamically find best android platform jar instead of hard-coding to 30
-    def sdkFile = new File((String)findSdkDir(), "/platforms/android-30/android.jar")
+    def version;
+    def highestVersion;
+    new File((String)findSdkDir(), "/platforms").eachFileMatch ~/android-\d+/, {
+        version = it.name.find(/\d+/).toInteger();
+        highestVersion = version > highestVersion ? version : highestVersion;
+    }
+
+    def sdkFile = new File((String)findSdkDir(), "/platforms/android-${highestVersion}/android.jar")
     if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
 }
 

annotations/src/main/java/mindustry/annotations/Annotations.java

@@ -8,14 +8,12 @@ public class Annotations{
     /** Indicates that a method overrides other methods. */
     @Target({ElementType.METHOD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Replace{
-    }
+    public @interface Replace{}
 
     /** Indicates that a method should be final in all implementing classes. */
     @Target({ElementType.METHOD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Final{
-    }
+    public @interface Final{}
 
     /** Indicates that a field will be interpolated when synced. */
     @Target({ElementType.FIELD})
@@ -30,15 +28,18 @@ public class Annotations{
     /** Indicates that a field will not be read from the server when syncing the local player state. */
     @Target({ElementType.FIELD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface SyncLocal{
+    public @interface SyncLocal{}
+
+    /** Indicates that a field should not be synced to clients (but may still be non-transient) */
+    @Target({ElementType.FIELD})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface NoSync{}
 
-    }
 
     /** Indicates that a component field is imported from other components. This means it doesn't actually exist. */
     @Target({ElementType.FIELD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Import{
-    }
+    public @interface Import{}
 
     /** Indicates that a component field is read-only. */
     @Target({ElementType.FIELD, ElementType.METHOD})
@@ -105,8 +106,7 @@ public class Annotations{
     /** Indicates an internal interface for entity components. */
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface EntityInterface{
-    }
+    public @interface EntityInterface{}
 
     //endregion
     //region misc. utility
@@ -145,15 +145,12 @@ public class Annotations{
     /** Indicates that a method should always call its super version. */
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface CallSuper{
-
-    }
+    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{
-    }
+    public @interface OverrideCallSuper{}
 
     //endregion
     //region struct
@@ -161,9 +158,7 @@ public class Annotations{
     /** Marks a class as a special value type struct. Class name must end in 'Struct'. */
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Struct{
-
-    }
+    public @interface Struct{}
 
     /** Marks a field of a struct. Optional. */
     @Target(ElementType.FIELD)
@@ -251,8 +246,7 @@ public class Annotations{
 
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface TypeIOHandler{
-    }
+    public @interface TypeIOHandler{ }
 
     //endregion
 }

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

@@ -118,13 +118,16 @@ public class EntityIO{
         }
     }
 
-    void writeSync(MethodSpec.Builder method, boolean write, Seq<Svar> syncFields, Seq<Svar> allFields) throws Exception{
+    void writeSync(MethodSpec.Builder method, boolean write, Seq<Svar> allFields) throws Exception{
         this.method = method;
         this.write = write;
 
         if(write){
             //write uses most recent revision
             for(RevisionField field : revisions.peek().fields){
+                Svar var = allFields.find(s -> s.name().equals(field.name));
+                if(var == null || var.has(NoSync.class)) continue;
+
                 io(field.type, "this." + field.name, true);
             }
         }else{
@@ -138,6 +141,7 @@ public class EntityIO{
             //add code for reading revision
             for(RevisionField field : rev.fields){
                 Svar var = allFields.find(s -> s.name().equals(field.name));
+                if(var == null || var.has(NoSync.class)) continue;
                 boolean sf = var.has(SyncField.class), sl = var.has(SyncLocal.class);
 
                 if(sl) cont("if(!islocal)");
@@ -223,7 +227,7 @@ public class EntityIO{
 
         if(BaseProcessor.isPrimitive(type)){
             s(type.equals("boolean") ? "bool" : type.charAt(0) + "", field);
-        }else if(instanceOf(type, "mindustry.ctype.Content")){
+        }else if(instanceOf(type, "mindustry.ctype.Content") && !type.equals("mindustry.ai.UnitStance") && !type.equals("mindustry.ai.UnitCommand")){
             if(write){
                 s("s", field + ".id");
             }else{

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

@@ -42,6 +42,7 @@ public class EntityProcess extends BaseProcessor{
     Seq<Selement> allDefs = new Seq<>();
     Seq<Stype> allInterfaces = new Seq<>();
     Seq<TypeSpec.Builder> baseClasses = new Seq<>();
+    ObjectSet<TypeSpec.Builder> baseClassIndexers = new ObjectSet<>();
     ClassSerializer serializer;
 
     {
@@ -232,9 +233,15 @@ public class EntityProcess extends BaseProcessor{
                 Stype repr = types.first();
                 String groupType = repr.annotation(Component.class).base() ? baseName(repr) : interfaceName(repr);
 
+                String name = group.name().startsWith("g") ? group.name().substring(1) : group.name();
+
                 boolean collides = an.collide();
-                groupDefs.add(new GroupDefinition(group.name().startsWith("g") ? group.name().substring(1) : group.name(),
+                groupDefs.add(new GroupDefinition(name,
                     ClassName.bestGuess(packageName + "." + groupType), types, an.spatial(), an.mapping(), collides));
+
+                TypeSpec.Builder accessor = TypeSpec.interfaceBuilder("IndexableEntity__" + name);
+                accessor.addMethod(MethodSpec.methodBuilder("setIndex__" + name).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC).addParameter(int.class, "index").returns(void.class).build());
+                write(accessor);
             }
 
             ObjectMap<String, Selement> usedNames = new ObjectMap<>();
@@ -260,6 +267,8 @@ public class EntityProcess extends BaseProcessor{
                 //get base class type name for extension
                 Stype baseClassType = baseClasses.any() ? baseClasses.first() : null;
                 @Nullable TypeName baseClass = baseClasses.any() ? tname(packageName + "." + baseName(baseClassType)) : null;
+                @Nullable TypeSpec.Builder baseClassBuilder = baseClassType == null ? null : this.baseClasses.find(b -> Reflect.<String>get(b, "name").equals(baseName(baseClassType)));
+                boolean addIndexToBase = baseClassBuilder != null && baseClassIndexers.add(baseClassBuilder);
                 //whether the main class is the base itself
                 boolean typeIsBase = baseClassType != null && type.has(Component.class) && type.annotation(Component.class).base();
 
@@ -381,17 +390,30 @@ public class EntityProcess extends BaseProcessor{
 
                 syncedFields.sortComparing(Selement::name);
 
-                //override toString method
-                builder.addMethod(MethodSpec.methodBuilder("toString")
+                if(!methods.containsKey("toString()")){
+                    //override toString method
+                    builder.addMethod(MethodSpec.methodBuilder("toString")
                     .addAnnotation(Override.class)
                     .returns(String.class)
                     .addModifiers(Modifier.PUBLIC)
                     .addStatement("return $S + $L", name + "#", "id").build());
+                }
 
                 EntityIO io = new EntityIO(type.name(), builder, allFieldSpecs, serializer, rootDirectory.child("annotations/src/main/resources/revisions").child(type.name()));
                 //entities with no sync comp and no serialization gen no code
                 boolean hasIO = ann.genio() && (components.contains(s -> s.name().contains("Sync")) || ann.serialize());
 
+                TypeSpec.Builder indexBuilder = baseClassBuilder == null ? builder : baseClassBuilder;
+
+                if(baseClassBuilder == null || addIndexToBase){
+                    //implement indexable interfaces.
+                    for(GroupDefinition def : groups){
+                        indexBuilder.addSuperinterface(tname(packageName + ".IndexableEntity__" + def.name));
+                        indexBuilder.addMethod(MethodSpec.methodBuilder("setIndex__" + def.name).addParameter(int.class, "index").addModifiers(Modifier.PUBLIC).addAnnotation(Override.class)
+                        .addCode("index__$L = index;", def.name).build());
+                    }
+                }
+
                 //add all methods from components
                 for(ObjectMap.Entry<String, Seq<Smethod>> entry : methods){
                     if(entry.value.contains(m -> m.has(Replace.class))){
@@ -444,8 +466,15 @@ public class EntityProcess extends BaseProcessor{
                         mbuilder.addStatement("if(added == $L) return", first.name().equals("add"));
 
                         for(GroupDefinition def : groups){
-                            //remove/add from each group, assume imported
-                            mbuilder.addStatement("Groups.$L.$L(this)", def.name, first.name());
+                            if(first.name().equals("add")){
+                                //remove/add from each group, assume imported
+                                mbuilder.addStatement("index__$L = Groups.$L.addIndex(this)", def.name, def.name);
+                            }else{
+                                //remove/add from each group, assume imported
+                                mbuilder.addStatement("Groups.$L.removeIndex(this, index__$L);", def.name, def.name);
+
+                                mbuilder.addStatement("index__$L = -1", def.name);
+                            }
                         }
                     }
 
@@ -461,7 +490,7 @@ public class EntityProcess extends BaseProcessor{
 
                         //SPECIAL CASE: sync I/O code
                         if((first.name().equals("readSync") || first.name().equals("writeSync"))){
-                            io.writeSync(mbuilder, first.name().equals("writeSync"), syncedFields, allFields);
+                            io.writeSync(mbuilder, first.name().equals("writeSync"), allFields);
                         }
 
                         //SPECIAL CASE: sync I/O code for writing to/from a manual buffer
@@ -575,6 +604,16 @@ public class EntityProcess extends BaseProcessor{
 
                 skipDeprecated(builder);
 
+                if(!legacy){
+                    TypeSpec.Builder fieldBuilder = baseClassBuilder != null ? baseClassBuilder : builder;
+                    if(addIndexToBase || baseClassBuilder == null){
+                        //add group index int variables
+                        for(GroupDefinition def : groups){
+                            fieldBuilder.addField(FieldSpec.builder(int.class, "index__" + def.name, Modifier.PROTECTED, Modifier.TRANSIENT).initializer("-1").build());
+                        }
+                    }
+                }
+
                 definitions.add(new EntityDefinition(packageName + "." + name, builder, type, typeIsBase ? null : baseClass, components, groups, allFieldSpecs, legacy));
             }
 
@@ -590,7 +629,7 @@ public class EntityProcess extends BaseProcessor{
                 groupsBuilder.addField(ParameterizedTypeName.get(
                     ClassName.bestGuess("mindustry.entities.EntityGroup"), itype), group.name, Modifier.PUBLIC, Modifier.STATIC);
 
-                groupInit.addStatement("$L = new $T<>($L.class, $L, $L)", group.name, groupc, itype, group.spatial, group.mapping);
+                groupInit.addStatement("$L = new $T<>($L.class, $L, $L, (e, pos) -> { if(e instanceof $L.IndexableEntity__$L ix) ix.setIndex__$L(pos); })", group.name, groupc, itype, group.spatial, group.mapping, packageName, group.name, group.name);
             }
 
             //write the groups
@@ -853,7 +892,7 @@ public class EntityProcess extends BaseProcessor{
 
                 for(Smethod method : methods){
                     String signature = method.toString();
-                    if(signatures.contains(signature)) continue;
+                    if(!signatures.add(signature)) continue;
 
                     Stype compType = interfaceToComp(method.type());
                     MethodSpec.Builder builder = MethodSpec.overriding(method.e).addModifiers(Modifier.PUBLIC, Modifier.FINAL);
@@ -864,25 +903,29 @@ public class EntityProcess extends BaseProcessor{
                     builder.addAnnotation(OverrideCallSuper.class); //just in case
 
                     if(!method.isVoid()){
-                        if(method.name().equals("isNull")){
-                            builder.addStatement("return true");
-                        }else if(method.name().equals("id")){
+                        String methodName = method.name();
+                        switch(methodName){
+                            case "isNull":
+                                builder.addStatement("return true");
+                                break;
+                            case "id":
                                 builder.addStatement("return -1");
-                        }else{
-                            Svar variable = compType == null || method.params().size > 0 ? null : compType.fields().find(v -> v.name().equals(method.name()));
-                            String desc = variable == null ? null : variable.descString();
-                            if(variable == null || !varInitializers.containsKey(desc)){
-                                builder.addStatement("return " + getDefault(method.ret().toString()));
-                            }else{
-                                String init = varInitializers.get(desc);
-                                builder.addStatement("return " + (init.equals("{}") ? "new " + variable.mirror().toString() : "") + init);
-                            }
+                                break;
+                            case "toString":
+                                builder.addStatement("return $S", className);
+                                break;
+                            default:
+                                Svar variable = compType == null || method.params().size > 0 ? null : compType.fields().find(v -> v.name().equals(methodName));
+                                String desc = variable == null ? null : variable.descString();
+                                if(variable == null || !varInitializers.containsKey(desc)){
+                                    builder.addStatement("return " + getDefault(method.ret().toString()));
+                                }else{
+                                    String init = varInitializers.get(desc);
+                                    builder.addStatement("return " + (init.equals("{}") ? "new " + variable.mirror().toString() : "") + init);
+                                }
                         }
                     }
-
                     nullBuilder.addMethod(builder.build());
-
-                    signatures.add(signature);
                 }
 
                 nullsBuilder.addField(FieldSpec.builder(type, Strings.camelize(baseName)).initializer("new " + className + "()").addModifiers(Modifier.FINAL, Modifier.STATIC, Modifier.PUBLIC).build());

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

@@ -97,14 +97,14 @@ public class StructProcess extends BaseProcessor{
                     }
 
                     //[setter] + [constructor building]
-                    if(varType == TypeName.BOOLEAN){
+                    if(isBool){
                         cons.append(" | (").append(varName).append(" ? ").append("1L << ").append(offset).append("L : 0)");
 
                         //bools: single bit, needs special case to clear things
                         setter.beginControlFlow("if(value)");
-                        setter.addStatement("return ($T)(($L & ~(1L << $LL)))", structType, structParam, offset);
-                        setter.nextControlFlow("else");
                         setter.addStatement("return ($T)(($L & ~(1L << $LL)) | (1L << $LL))", structType, structParam, offset, offset);
+                        setter.nextControlFlow("else");
+                        setter.addStatement("return ($T)(($L & ~(1L << $LL)))", structType, structParam, offset);
                         setter.endControlFlow();
                     }else if(varType == TypeName.FLOAT){
                         cons.append(" | (").append("(").append(structType).append(")").append("Float.floatToIntBits(").append(varName).append(") << ").append(offset).append("L)");

annotations/src/main/java/mindustry/annotations/remote/CallGenerator.java

@@ -60,7 +60,13 @@ public class CallGenerator{
             register.addStatement("mindustry.net.Net.registerPacket($L.$L::new)", packageName, ent.packetClassName);
 
             //add fields to the type
-            for(Svar param : ent.element.params()){
+            Seq<Svar> params = ent.element.params();
+            for(int i = 0; i < params.size; i++){
+                if(!ent.where.isServer && i == 0){
+                    continue;
+                }
+
+                Svar param = params.get(i);
                 packet.addField(param.tname(), param.name(), Modifier.PUBLIC);
             }
 

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

@@ -0,0 +1 @@
+{version:1,fields:[{name:admin,type:boolean},{name:boosting,type:boolean},{name:color,type:arc.graphics.Color},{name:lastCommand,type:mindustry.ai.UnitCommand},{name:mouseX,type:float},{name:mouseY,type:float},{name:name,type:java.lang.String},{name:shooting,type:boolean},{name:team,type:mindustry.game.Team},{name:typing,type:boolean},{name:unit,type:Unit},{name:x,type:float},{name:y,type:float}]}

build.gradle

@@ -1,10 +1,14 @@
 buildscript{
     ext{
-        getArcHash = {
-            return new Properties().with{ p -> p.load(file('gradle.properties').newReader()); return p }["archash"]
-        }
+        arcHash = property("archash")
 
-        arcHash = getArcHash()
+        localArc = !project.hasProperty("release") && new File(rootDir.parent, 'Arc').exists() && !project.hasProperty("noLocalArc")
+
+        arcModule = { String name ->
+            //skip to last submodule
+            name = name.substring(name.lastIndexOf(':') + 1)
+            return "com.github.Anuken${localArc ? "" : ".Arc"}:$name:$arcHash"
+        }
     }
     
     repositories{
@@ -16,8 +20,8 @@ buildscript{
     }
 
     dependencies{
-        classpath "com.github.Anuken.Arc:packer:$arcHash"
-        classpath "com.github.Anuken.Arc:arc-core:$arcHash"
+        classpath arcModule(":extensions:packer")
+        classpath arcModule(":arc-core")
     }
 }
 
@@ -34,7 +38,7 @@ allprojects{
 
     ext{
         versionNumber = '7'
-        if(!project.hasProperty("versionModifier")) versionModifier = 'alpha'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'release'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'
@@ -48,20 +52,6 @@ allprojects{
             return new File(projectDir.parent, '../Mindustry-Debug').exists() && !project.hasProperty("release") && project.hasProperty("args")
         }
 
-        localArc = {
-            return !project.hasProperty("release") && new File(projectDir.parent, '../Arc').exists()
-        }
-
-        arcModule = { String name ->
-            if(localArc()){
-                return project(":Arc:$name")
-            }else{
-                //skip to last submodule
-                if(name.contains(':')) name = name.split(':').last()
-                return "com.github.Anuken.Arc:$name:${getArcHash()}"
-            }
-        }
-
         generateDeployName = { String platform ->
             if(platform == "windows"){
                 platform += "64"
@@ -116,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 = {
@@ -195,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
@@ -231,6 +221,7 @@ configure(subprojects - project(":annotations")){
         options{
             addStringOption('Xdoclint:none', '-quiet')
             addStringOption('-release', '16')
+            encoding('UTF-8')
         }
     }
 }
@@ -319,11 +310,6 @@ project(":core"){
         }
     }
 
-    artifacts{
-        archives sourcesJar
-        archives assetsJar
-    }
-
     dependencies{
         compileJava.dependsOn(preGen)
 
@@ -335,12 +321,12 @@ project(":core"){
         api arcModule("extensions:fx")
         api arcModule("extensions:arcnet")
         api "com.github.Anuken:rhino:$rhinoVersion"
-        if(localArc() && debugged()) api arcModule("extensions:recorder")
-        if(localArc()) api arcModule(":extensions:packer")
+        if(localArc && debugged()) api arcModule("extensions:recorder")
+        if(localArc) api arcModule(":extensions:packer")
 
         annotationProcessor 'com.github.Anuken:jabel:0.9.0'
         compileOnly project(":annotations")
-        kapt project(":annotations")
+        if(!project.hasProperty("noKapt")) kapt project(":annotations")
     }
 
     afterEvaluate{
@@ -395,6 +381,7 @@ project(":tests"){
         testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.1"
         testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
         testImplementation arcModule("backends:backend-headless")
+        testImplementation "org.json:json:20230618"
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
     }
 
@@ -427,7 +414,7 @@ project(":annotations"){
 
     dependencies{
         implementation 'com.squareup:javapoet:1.12.1'
-        implementation "com.github.Anuken.Arc:arc-core:$arcHash"
+        implementation arcModule("arc-core")
     }
 }
 
@@ -441,6 +428,9 @@ configure([":core", ":server"].collect{project(it)}){
         publications{
             maven(MavenPublication){
                 from components.java
+                if(project.name == "core"){
+                    artifact(tasks.named("assetsJar"))
+                }
             }
         }
     }

core/assets-raw/fontgen/config.json

@@ -1055,6 +1055,20 @@
       "search": [
         "defense"
       ]
+    },
+    {
+      "uid": "99aa5c8f6bbe4d96a3f422a60ff065a9",
+      "css": "planet",
+      "code": 59443,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M343.8 0L312.5 31.3 281.3 62.5 218.8 62.5 187.5 93.8 156.3 125 125 156.3 93.8 187.5 62.5 218.8 62.5 281.3 31.3 312.5 0 343.8 0 406.3 0 468.8 0 531.3 0 593.8 0 656.3 31.3 687.5 62.5 718.8 62.5 781.3 93.8 812.5 125 843.8 156.3 875 187.5 906.3 218.8 937.5 281.3 937.5 312.5 968.8 343.8 1000 406.3 1000 468.8 1000 531.3 1000 593.8 1000 656.3 1000 687.5 968.8 718.8 937.5 781.3 937.5 812.5 906.3 843.8 875 875 843.8 906.3 812.5 937.5 781.3 937.5 718.8 968.8 687.5 1000 656.3 1000 593.8 1000 531.3 1000 468.8 1000 406.3 1000 343.8 968.8 312.5 937.5 281.3 937.5 218.8 906.3 187.5 875 156.3 843.8 125 812.5 93.8 781.3 62.5 718.8 62.5 687.5 31.3 656.3 0 593.8 0 531.3 0 468.8 0 406.3 0 343.8 0ZM406.3 62.5L437.5 93.8 468.8 125 531.3 125 562.5 156.3 562.5 218.8 593.8 250 625 281.3 656.3 312.5 687.5 343.8 718.8 375 781.3 375 843.8 375 906.3 375 937.5 406.3 937.5 468.8 937.5 531.3 937.5 593.8 906.3 625 875 656.3 875 718.8 843.8 750 812.5 781.3 781.3 812.5 750 843.8 718.8 875 656.3 875 625 906.3 593.8 937.5 531.3 937.5 500 906.3 468.8 875 437.5 843.8 437.5 781.3 468.8 750 500 718.8 531.3 687.5 562.5 656.3 562.5 593.8 562.5 531.3 531.3 500 500 468.8 468.8 437.5 406.3 437.5 343.8 437.5 281.3 437.5 250 468.8 218.8 500 187.5 531.3 156.3 562.5 125 593.8 93.8 625 62.5 593.8 62.5 531.3 62.5 468.8 62.5 406.3 93.8 375 125 343.8 125 281.3 156.3 250 187.5 218.8 218.8 187.5 250 156.3 281.3 125 343.8 125 375 93.8 406.3 62.5ZM718.8 562.5L687.5 593.8 687.5 656.3 718.8 687.5 781.3 687.5 812.5 656.3 812.5 593.8 781.3 562.5 718.8 562.5Z",
+        "width": 1000
+      },
+      "search": [
+        "planet"
+      ]
     }
   ]
 }

core/assets-raw/fontgen/extra/admin.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="12"
-   height="12"
-   version="1.1"
-   id="svg380"
-   sodipodi:docname="admin.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="12"
+        height="12"
+        version="1.1"
+        id="svg380"
+        sodipodi:docname="admin.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata386">
     <rdf:RDF>

core/assets-raw/fontgen/extra/distribution.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="10"
-   height="10"
-   version="1.1"
-   id="svg192"
-   sodipodi:docname="distribution.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
+        height="10"
+        version="1.1"
+        id="svg192"
+        sodipodi:docname="distribution.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata198">
     <rdf:RDF>

core/assets-raw/fontgen/extra/effect.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="10"
-   height="10"
-   version="1.1"
-   id="svg252"
-   sodipodi:docname="effect.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
+        height="10"
+        version="1.1"
+        id="svg252"
+        sodipodi:docname="effect.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata258">
     <rdf:RDF>

core/assets-raw/fontgen/extra/file-image.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="10"
-   height="13"
-   version="1.1"
-   id="svg310"
-   sodipodi:docname="file-image.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
+        height="13"
+        version="1.1"
+        id="svg310"
+        sodipodi:docname="file-image.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata316">
     <rdf:RDF>

core/assets-raw/fontgen/extra/info.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="12"
-   height="12"
-   version="1.1"
-   id="svg300"
-   sodipodi:docname="info.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="12"
+        height="12"
+        version="1.1"
+        id="svg300"
+        sodipodi:docname="info.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata306">
     <rdf:RDF>

core/assets-raw/fontgen/extra/logic.svg

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="logic.svg"
-   inkscape:version="1.0 (9f2f71dc58, 2020-08-02)"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 128 128">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        sodipodi:docname="logic.svg"
+        inkscape:version="1.0 (9f2f71dc58, 2020-08-02)"
+        id="svg8"
+        version="1.1"
+        viewBox="0 0 128 128">
   <defs
      id="defs2" />
   <sodipodi:namedview

core/assets-raw/fontgen/extra/planet.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg542"
-   sodipodi:docname="planet.svg"
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="16"
+        height="16"
+        version="1.1"
+        id="svg542"
+        sodipodi:docname="planet.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata548">
     <rdf:RDF>