Automatic bundle update

https://github.com/Anuken/Mindustry/commit/4628b294d584ff04dbe7898a679411db561ee5e0

.github/workflows/deployment.yml

@@ -45,13 +45,12 @@ jobs:
         rm README.md
         git add .
         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
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack ${RELEASE_VERSION}
         cd ../Mindustry
     - name: Create artifacts
       run: |
-        ./gradlew desktop:dist server:dist core:mergedJavadoc -Pbuildversion=${RELEASE_VERSION:1}
+        ./gradlew desktop:dist server:dist core:depsJar core:mergedJavadoc -Pbuildversion=${RELEASE_VERSION:1}
     - name: Update docs
       run: |
         cd ../
@@ -91,3 +90,10 @@ jobs:
         file: server/build/libs/server-release.jar
         tag: ${{ github.ref }}
 
+    - name: Upload dependency JAR
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: core/build/libs/core-release-deps.jar
+        asset_name: dependencies.jar
+        tag: ${{ github.ref }}

.github/workflows/pr.yml

@@ -15,6 +15,8 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 17
+    - name: Fetch latest Arc
+      run: git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
     - name: Run unit tests

.github/workflows/push.yml

@@ -25,6 +25,8 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 17
+    - name: Fetch latest Arc
+      run: git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
     - name: Update bundles
@@ -39,6 +41,18 @@ jobs:
           git commit -m "Automatic bundle update"
           git push
         fi
+    - name: Update scripts and class mappings
+      if: ${{ github.repository == 'Anuken/Mindustry' }}
+      run: |
+        ./gradlew updateScripts
+
+        if [ -n "$(git status --porcelain)" ]; then
+          git config --global user.name "Github Actions"
+          git config --global user.email "actions@github.com"
+          git add core/assets/scripts/* core/src/mindustry/mod/ClassMap.java
+          git commit -m "Automatic class mapping update"
+          git push
+        fi
     - name: Update JITpack repo
       if: ${{ github.repository == 'Anuken/Mindustry' }}
       run: |

CONTRIBUTING.md

@@ -20,6 +20,12 @@ Yes, there are occurrences of trailing spaces, extra newlines, empty indents, an
 
 I **especially** do not want to see PRs that apply any kind of automated analysis to the source code to "optimize" anything - my IDE can do that already. If the PR doesn't actually change anything useful, I'm not going to review or merge it.
 
+### Do not make AI "contributions".
+
+If I see a PR with significant amounts of code that's obviously written by AI, I will reject your PR, and you will be blocked. Don't waste my time with slop.
+
+Asking AI questions, and using that information to help you write code? Fine. Using it to actually write code? No.
+
 ## Style Guidelines
 
 ### Follow the formatting guidelines.

README.md

@@ -11,7 +11,9 @@ _[Javadoc](https://mindustrygame.github.io/docs/)_
 
 ## Contributing
 
-See [CONTRIBUTING](CONTRIBUTING.md).
+See [CONTRIBUTING](CONTRIBUTING.md) for general code style and PR guidelines.
+
+If you are a first-time contributor looking for features to implement or bugs to fix, see the issues tagged with 'candidate' [in the Mindustry-Suggestions repostiory](https://github.com/Anuken/Mindustry-Suggestions/issues?q=is%3Aissue%20state%3Aopen%20label%3Acandidate).
 
 ## Building
 

SERVERLIST.md

@@ -1,37 +1,3 @@
-# Note: The v7 server list is frozen. No new servers will be accepted. All v8 server PRs should be made [here](https://github.com/Anuken/MindustryServerList/blob/main/servers_v8.json).
+# Note: The v7 server list is frozen. No new servers will be accepted. All v8 server PRs should be made [here](https://github.com/Anuken/MindustryServerList).
 
 *PRs to edit addresses of existing servers will still be accepted, although very infrequently.*
-
-### 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_v7.json) in this repository.
-
-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.
-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.
-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 the following format:
-    ```json
-      {
-        "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/AndroidManifest.xml

@@ -14,7 +14,6 @@
             android:roundIcon="@mipmap/ic_launcher_round"
             android:isGame="true"
             android:theme="@style/ArcTheme"
-            android:usesCleartextTraffic="true"
             android:appCategory="game"
             android:label="@string/app_name"
             android:fullBackupContent="@xml/backup_rules"
@@ -32,13 +31,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:mimeType="application/octet-stream" />
-                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msav"/>
-            </intent-filter>
         </activity>
 
     </application>

android/build.gradle

@@ -3,7 +3,6 @@ buildscript{
         mavenLocal()
         mavenCentral()
         google()
-        maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
 
     dependencies{
@@ -17,7 +16,7 @@ configurations{ natives }
 
 repositories{
     mavenCentral()
-    maven{ url "https://maven.google.com" }
+    maven{ url = "https://maven.google.com" }
 }
 
 task deploy(type: Copy){
@@ -30,8 +29,8 @@ task deploy(type: Copy){
 
 android{
     namespace = "io.anuke.mindustry"
-    buildToolsVersion = '34.0.0'
-    compileSdk = 34
+    buildToolsVersion = '36.0.0'
+    compileSdk = 36
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -40,7 +39,12 @@ android{
             renderscript.srcDirs = ['src']
             res.srcDirs = ['res']
             assets.srcDirs = ['assets', 'src/main/assets', '../core/assets/']
-            jniLibs.srcDirs = ['libs']
+
+            if(localArc){
+                jniLibs.srcDirs += ['../../Arc/natives/natives-android/libs', '../../Arc/natives/natives-freetype-android/libs']
+            }else{
+                jniLibs.srcDirs = ['libs']
+            }
         }
 
         androidTest.setRoot('tests')
@@ -57,8 +61,8 @@ android{
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 34
-        
+        targetSdkVersion 36
+
         versionName versionNameResult
         versionCode = vcode
 
@@ -67,7 +71,7 @@ android{
         }
         props.store(file('../core/assets/version.properties').newWriter(), null)
 
-        multiDexEnabled true
+        multiDexEnabled = true
     }
 
     compileOptions{
@@ -110,7 +114,7 @@ android{
     if(project.hasProperty("RELEASE_STORE_FILE") || System.getenv("CI") == "true"){
         buildTypes{
             release{
-                signingConfig signingConfigs.release
+                signingConfig = signingConfigs.release
             }
         }
     }
@@ -122,14 +126,15 @@ dependencies{
     implementation arcModule("backends:backend-android")
     implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
 
-    natives "com.github.Anuken.Arc:natives-android:$arcHash"
-    natives "com.github.Anuken.Arc:natives-freetype-android:$arcHash"
+    if(!localArc){
+        natives "com.github.Anuken.Arc:natives-android:$arcHash"
+        natives "com.github.Anuken.Arc:natives-freetype-android:$arcHash"
+    }
 
-    def version;
-    def highestVersion;
+    def version, highestVersion
     new File((String)findSdkDir(), "/platforms").eachFileMatch ~/android-\d+/, {
-        version = it.name.find(/\d+/).toInteger();
-        highestVersion = version > highestVersion ? version : highestVersion;
+        version = it.name.find(/\d+/).toInteger()
+        highestVersion = version > highestVersion ? version : highestVersion
     }
 
     def sdkFile = new File((String)findSdkDir(), "/platforms/android-${highestVersion}/android.jar")
@@ -137,11 +142,13 @@ dependencies{
 }
 
 task copyAndroidNatives(){
-    configurations.natives.files.each{ jar ->
-        copy{
-            from zipTree(jar)
-            into file("libs/")
-            include "**"
+    if(!localArc){
+        configurations.natives.files.each{ jar ->
+            copy{
+                from zipTree(jar)
+                into file("libs/")
+                include "**"
+            }
         }
     }
 }

android/proguard-rules.pro

@@ -5,6 +5,7 @@
 -keep class net.jpountz.** { *; }
 -keep class rhino.** { *; }
 -keep class com.android.dex.** { *; }
+-keep class com.android.dx.** { *; }
 -keepattributes Signature,*Annotation*,InnerClasses,EnclosingMethod
 
 -dontwarn javax.naming.**

android/src/mindustry/android/AndroidLauncher.java

@@ -160,7 +160,7 @@ public class AndroidLauncher extends AndroidApplication{
                                     @Override
                                     public OutputStream write(boolean append){
                                         try{
-                                            return getContentResolver().openOutputStream(uri);
+                                            return getContentResolver().openOutputStream(uri, "rwt");
                                         }catch(IOException e){
                                             throw new ArcRuntimeException(e);
                                         }

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

@@ -229,7 +229,7 @@ public class EntityIO{
             s(type.equals("boolean") ? "bool" : type.charAt(0) + "", field);
         }else if(instanceOf(type, "mindustry.ctype.Content") && !type.equals("mindustry.ai.UnitStance") && !type.equals("mindustry.ai.UnitCommand")){
             if(write){
-                s("s", field + ".id");
+                s("s", field + " == null ? -1 : " + field + ".id");
             }else{
                 st(field + "mindustry.Vars.content.getByID(mindustry.ctype.ContentType.$L, read.s())", BaseProcessor.simpleName(type).toLowerCase().replace("type", ""));
             }

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

@@ -183,7 +183,11 @@ public class AssetsProcess extends BaseProcessor{
         }
 
         if(classname.equals("Sounds")){
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()").build());
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()")
+            .addJavadoc("Does not play anything.").build());
+
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "unset", Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()")
+            .addJavadoc("Used a placeholder value for unset default values. This is usually reassigned in init() of the relevant block or unit. Does not play anything.").build());
         }
 
         type.addMethod(loadBegin.build());

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

@@ -56,6 +56,15 @@ public class CallGenerator{
                 packet.addMethod(writeHandleMethod(ent, true));
             }
 
+            if(!(ent.where.isClient && ent.where.isServer)){
+                packet.addMethod( MethodSpec.methodBuilder("allow")
+                .addModifiers(Modifier.PUBLIC)
+                .addParameter(boolean.class, "server")
+                .addAnnotation(Override.class)
+                .returns(boolean.class)
+                .addCode("return " + (ent.where.isClient ? "server" : "!server") + ";").build());
+            }
+
             //register packet
             register.addStatement("mindustry.net.Net.registerPacket($L.$L::new)", packageName, ent.packetClassName);
 

annotations/src/main/resources/classids.properties

@@ -19,6 +19,7 @@ mindustry.entities.comp.DecalComp=8
 mindustry.entities.comp.EffectStateComp=9
 mindustry.entities.comp.FireComp=10
 mindustry.entities.comp.LaunchCoreComp=11
+mindustry.entities.comp.LocationPingComp=48
 mindustry.entities.comp.PlayerComp=12
 mindustry.entities.comp.PosTeam=27
 mindustry.entities.comp.PosTeamDef=28

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

@@ -0,0 +1 @@
+{version:2,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:selectedBlock,type:mindustry.world.Block},{name:selectedRotation,type:int},{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}]}

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

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

build.gradle

@@ -4,7 +4,7 @@ buildscript{
     ext{
         arcHash = property("archash")
 
-        localArc = !project.hasProperty("release") && new File(rootDir.parent, 'Arc').exists() && !project.hasProperty("noLocalArc")
+        localArc = new File(rootDir.parent, 'Arc').exists() && !project.hasProperty("noLocalArc")
 
         arcModule = { String name ->
             //skip to last submodule
@@ -17,8 +17,7 @@ buildscript{
         mavenLocal()
         mavenCentral()
         google()
-        maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        maven{ url 'https://jitpack.io' }
+        maven{ url = 'https://jitpack.io' }
     }
 
     dependencies{
@@ -28,8 +27,8 @@ buildscript{
 }
 
 plugins{
-    id "org.jetbrains.kotlin.jvm" version "2.1.10"
-    id "org.jetbrains.kotlin.kapt" version "2.1.10"
+    id "org.jetbrains.kotlin.jvm" version "2.3.20"
+    id "org.jetbrains.kotlin.kapt" version "2.3.20"
 }
 
 allprojects{
@@ -44,7 +43,7 @@ allprojects{
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'
-        rhinoVersion = '73a812444ac388ac2d94013b5cadc8f70b7ea027'
+        rhinoVersion = '54b75cbd1207ef1fd5cff517cbd188e763c85baa'
 
         loadVersionProps = {
             return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
@@ -113,7 +112,7 @@ allprojects{
             def output = 'en\n'
             def bundles = new File(project(':core').projectDir, 'assets/bundles/')
             bundles.list().sort().each{ name ->
-                if(name == "bundle.properties") return
+                if(name == "bundle.properties" || name == "global.properties") return
                 output += name.substring("bundle".length() + 1, name.lastIndexOf('.')) + "\n"
             }
             new File(project(':core').projectDir, 'assets/locales').text = output
@@ -181,9 +180,8 @@ allprojects{
     repositories{
         mavenLocal()
         mavenCentral()
-        maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        maven{ url "https://oss.sonatype.org/content/repositories/releases/" }
-        maven{ url 'https://jitpack.io' }
+        maven{ url = "https://central.sonatype.com/repository/maven-snapshots" }
+        maven{ url = 'https://jitpack.io' }
     }
 
     task clearCache{
@@ -223,7 +221,7 @@ configure(project(":annotations")){
 }
 
 //compile with java 8 compatibility for everything except the annotation project
-configure(subprojects - project(":annotations")){
+configure(subprojects - project(":annotations") - project(":tests")){
     tasks.withType(JavaCompile){
         options.compilerArgs.addAll(['--release', '8'])
     }
@@ -247,6 +245,7 @@ project(":desktop"){
         implementation arcModule("extensions:profiling")
         implementation arcModule("extensions:discord")
         implementation arcModule("natives:natives-filedialogs")
+        implementation arcModule("extensions:filedialogs")
         implementation arcModule("natives:natives-desktop")
         implementation arcModule("natives:natives-freetype-desktop")
 
@@ -305,6 +304,27 @@ project(":core"){
         }
     }
 
+    task depsJar(type: Jar, dependsOn: [classes, ":server:dist"]){
+        archiveClassifier = 'deps'
+        from files(sourceSets.main.output.classesDirs)
+        from{ configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) } }
+        from zipTree("../server/build/libs/server-release.jar")
+        from files("src/")
+        from files("../../Arc/arc-core/src/")
+        from files("../../Arc/extensions/arcnet/src/")
+        from files("../../Arc/extensions/g3d/src/")
+        from files("../../Arc/extensions/flabel/src/")
+        from files("../../Arc/extensions/freetype/src/")
+        from files("../server/src/")
+
+        exclude("META-INF/**")
+        exclude("vfxshaders/**")
+        exclude("maps/**")
+        exclude("baseparts/**")
+        exclude("vfxshaders/**")
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+
     task sourcesJar(type: Jar, dependsOn: classes){
         archiveClassifier = 'sources'
         from sourceSets.main.allSource
@@ -327,14 +347,13 @@ project(":core"){
     dependencies{
         compileJava.dependsOn(preGen)
 
-        api "org.lz4:lz4-java:1.8.0"
+        api "at.yawk.lz4:lz4-java:1.10.2"
         api arcModule("arc-core")
         api arcModule("extensions:flabel")
         api arcModule("extensions:freetype")
         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")
@@ -398,11 +417,19 @@ project(":tests"){
         testImplementation arcModule("backends:backend-headless")
         testImplementation "org.json:json:20230618"
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
+        testRuntimeOnly "org.junit.platform:junit-platform-launcher"
+    }
+
+    tasks.withType(JavaCompile){
+        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
+        options.compilerArgs.addAll(['--release', '17'])
     }
 
     test{
         //fork every test so mods don't interact with each other
         forkEvery = 1
+        jvmArgs = ["-XX:+HeapDumpOnOutOfMemoryError"]
         useJUnitPlatform()
         workingDir = new File("../core/assets")
         testLogging{
@@ -446,9 +473,6 @@ configure([":core", ":server"].collect{project(it)}){
         publications{
             maven(MavenPublication){
                 from components.java
-                if(project.name == "core"){
-                    artifact(tasks.named("assetsJar"))
-                }
             }
         }
     }
@@ -469,7 +493,6 @@ task deployAll{
     dependsOn cleanDeployOutput
     dependsOn "desktop:packrLinux64"
     dependsOn "desktop:packrWindows64"
-    dependsOn "desktop:packrWindows32"
     dependsOn "desktop:packrMacOS"
     if(versionModifier != "steam"){
         dependsOn "server:deploy"

core/assets-raw/fontgen/config.json

@@ -1069,6 +1069,20 @@
       "search": [
         "planet"
       ]
+    },
+    {
+      "uid": "ec43f846ca53702f30310718d627f2b5",
+      "css": "arrow-note",
+      "code": 59444,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M50 0L0 50V150 250 350 450 550 650L50 700H150 250 350 450 550 650 750L800 750 750 800 700 850V950L750 1000H850L900 950 950 900 1000 850 1050 800 1100 750 1150 700 1200 650V550L1150 500 1100 450 1050 400 1000 350 950 300 900 250 850 200H750L700 250V350L750 400 800 450 750 500H650 550 450 350 250L200 450V350 250 150 50L150 0Z",
+        "width": 1200
+      },
+      "search": [
+        "arrow-note"
+      ]
     }
   ]
 }