Merge branch 'master' into pr-readwrite

Author: Anuken

.github/workflows/pr.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Run unit tests and build JAR
       run: ./gradlew desktop:dist
     - name: Upload desktop JAR for testing
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Desktop JAR (zipped)
         path: desktop/build/libs/Mindustry.jar

README.md

@@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState){
         UncaughtExceptionHandler handler = Thread.getDefaultUncaughtExceptionHandler();
 
         Thread.setDefaultUncaughtExceptionHandler((thread, error) -> {
-            CrashSender.log(error);
+            CrashHandler.log(error);
 
             //try to forward exception to system handler
             if(handler != null){
@@ -110,6 +110,7 @@ void showFileChooser(boolean open, String title, Cons<Fi> cons, String... extens
                         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" : "*/*");
+                        intent.putExtra(Intent.EXTRA_TITLE, "export." + extension);
 
                         addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
                             if(code == Activity.RESULT_OK && in != null && in.getData() != null){

SERVERLIST.md

@@ -182,18 +182,16 @@ public enum PacketPriority{
 
     /** A set of two booleans, one specifying server and one specifying client. */
     public enum Loc{
-        /** Method can only be invoked on the client from the server. */
+        /** Server only. */
         server(true, false),
-        /** Method can only be invoked on the server from the client. */
+        /** Client only. */
         client(false, true),
-        /** Method can be invoked from anywhere */
+        /** Both server and client. */
         both(true, true),
         /** Neither server nor client. */
         none(false, false);
 
-        /** If true, this method can be invoked ON clients FROM servers. */
         public final boolean isServer;
-        /** If true, this method can be invoked ON servers FROM clients. */
         public final boolean isClient;
 
         Loc(boolean server, boolean client){
@@ -222,16 +220,16 @@ public enum Variant{
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.SOURCE)
     public @interface Remote{
-        /** Specifies the locations from which this method can be invoked. */
+        /** Specifies the locations from which this method can cause remote invocations (This -> Remote) [Default: Server -> Client]. */
         Loc targets() default Loc.server;
 
-        /** Specifies which methods are generated. Only affects server-to-client methods. */
+        /** Specifies which methods are generated. Only affects server-to-client methods (Server -> Client(s)) [Default: Server -> Client & Server -> All Clients]. */
         Variant variants() default Variant.all;
 
-        /** The local locations where this method is called locally, when invoked. */
+        /** The locations where this method is called locally, when invoked locally (This -> This) [Default: No local invocations]. */
         Loc called() default Loc.none;
 
-        /** Whether to forward this packet to all other clients upon receival. Client only. */
+        /** Whether the server should forward this packet to all other clients upon receival from a client (Client -> Server -> Other Clients). [Default: Don't Forward Client Invocations] */
         boolean forward() default false;
 
         /**

android/src/mindustry/android/AndroidLauncher.java

@@ -445,6 +445,7 @@ public void process(RoundEnvironment env) throws Exception{
                     MethodSpec.Builder mbuilder = MethodSpec.methodBuilder(first.name()).addModifiers(first.is(Modifier.PRIVATE) ? Modifier.PRIVATE : Modifier.PUBLIC);
                     //if(isFinal || entry.value.contains(s -> s.has(Final.class))) mbuilder.addModifiers(Modifier.FINAL);
                     if(entry.value.contains(s -> s.has(CallSuper.class))) mbuilder.addAnnotation(CallSuper.class); //add callSuper here if necessary
+                    if(first.has(Nullable.class)) mbuilder.addAnnotation(Nullable.class);
                     if(first.is(Modifier.STATIC)) mbuilder.addModifiers(Modifier.STATIC);
                     mbuilder.addTypeVariables(first.typeVariables().map(TypeVariableName::get));
                     mbuilder.returns(first.retn());

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

@@ -10,7 +10,7 @@ buildscript{
             return "com.github.Anuken${localArc ? "" : ".Arc"}:$name:$arcHash"
         }
     }
-    
+
     repositories{
         mavenLocal()
         mavenCentral()
@@ -32,7 +32,7 @@ plugins{
 
 allprojects{
     apply plugin: 'maven-publish'
-    
+
     version = project.hasProperty("packageVersion") ? project.getProperty("packageVersion") : 'release'
     group = 'com.github.Anuken'
 
@@ -89,6 +89,10 @@ allprojects{
             return project.getProperties()["buildversion"]
         }
 
+        getCommitHash = {
+            return 'git rev-parse --verify --short HEAD'.execute().text.trim()
+        }
+
         getPackage = {
             return project.ext.mainClassName.substring(0, project.ext.mainClassName.indexOf("desktop") - 1)
         }
@@ -133,6 +137,10 @@ allprojects{
                 props["number"] = versionNumber
                 props["modifier"] = versionModifier
                 props["build"] = buildid
+                props["commitHash"] = "unknown"
+                if(project.hasProperty("showCommitHash")){
+                    props["commitHash"] = getCommitHash()
+                }
 
                 props.store(pfile.newWriter(), "Autogenerated file. Do not modify.")
             }
@@ -220,7 +228,7 @@ configure(subprojects - project(":annotations")){
     tasks.withType(Javadoc){
         options{
             addStringOption('Xdoclint:none', '-quiet')
-            addStringOption('-release', '16')
+            addStringOption('-release', '17')
             encoding('UTF-8')
         }
     }
@@ -243,6 +251,7 @@ project(":desktop"){
         implementation "com.github.Anuken:steamworks4j:$steamworksVersion"
 
         implementation arcModule("backends:backend-sdl")
+        annotationProcessor 'com.github.Anuken:jabel:0.9.0'
     }
 }
 
@@ -253,7 +262,7 @@ project(":core"){
 
     kapt{
         javacOptions{
-            option("-source", "16")
+            option("-source", "17")
             option("-target", "1.8")
         }
     }
@@ -300,7 +309,7 @@ project(":core"){
     task assetsJar(type: Jar, dependsOn: ":tools:pack"){
         archiveClassifier = 'assets'
         from files("assets"){
-            exclude "config", "cache", "music", "sounds"
+            exclude "config", "cache", "music", "sounds", "sprites/fallback"
         }
     }
 
@@ -372,6 +381,7 @@ project(":server"){
     dependencies{
         implementation project(":core")
         implementation arcModule("backends:backend-headless")
+        annotationProcessor 'com.github.Anuken:jabel:0.9.0'
     }
 }
 
@@ -408,6 +418,9 @@ project(":tools"){
         implementation arcModule("natives:natives-desktop")
         implementation arcModule("natives:natives-freetype-desktop")
         implementation arcModule("backends:backend-headless")
+
+        implementation("com.google.guava:guava:33.3.1-jre")
+        annotationProcessor 'com.github.Anuken:jabel:0.9.0'
     }
 }
 

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

@@ -1,2 +1,3 @@
-msch
x�E��
-�0�����`{�>T�A��*�����g�@���.�Ơ�=o�n)��v쎣	��A�l�M�,���S��&���N���s�/��jO1!�q`�K���,&�[��R���(O���6E�	*?�ʻ.���>hRSɖ-�TQBTP5P�A����(�
+msch
x�E��
+�0D�$FA(����ê�
+1Jb)��R�J��a��B-�-=�m�c n�MX-y��c5�l�v{T�;�څ���ܓ5����e��M��f��m}�7n�ĺ��Ds1a}��
\�"C�M�T�$�
Q$�H�������!q����DG��J䲌"�!��oȔ�"�2�
1�0[

build.gradle

@@ -0,0 +1,2 @@
+msch
x��A
+� F�_�ڴm7�D��raRѠ뗾������ތ�R����rz�PL��8�W	�	)�Ğ,z?��Ls��?Ph��p;

core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-light.png

@@ -0,0 +1,2 @@
+msch
x�%�A
+� @��Em;��D���#�i��������m��0ZS|tAL��S�-�a��eV�"��J(�yQ_���W��

core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-pod.png

@@ -0,0 +1,4 @@
+msch
x�-��
+@0F�)�G��H.���fӬ��Q����|hM��.4�II���`��ʹ��H[�@��,�D��������
+�.��w�(�޽h�
+�g�

core/assets-raw/sprites/blocks/campaign/advanced-launch-pad.png

@@ -0,0 +1,4 @@
+msch
x�MQ˒�0��/�Γ�q���7��(���Hq��ZNj"�d;a?�o��
�p�bM���H���3ꞡm"��<(z�^��3��lv�d�*�{;�/��T6��]w:k�(��Z鞖�~}���r�Q��/(�>YZ{��P��ִj�MS��z����UGi������ZG�Μ�TS��(E"�
+���h{�Z9(��)b4�J\R�������J�k�5����g$�J}��A�ўq`l�z�������r��r�`sP�^����j\;�}����,�������ʗ.�������
�FW+t�>���E!J�Ds�_F�>�GW̙15���`�#q��*
+@LCBQH=� �C%`N~�K�5�Zb�
+��xz�Q�7���)��4M�iz�Akls���Opzɶbֻ�R�	�!�B%�YO!x��D�ٸo��OH9
���(Y�&D0!�	���H�?ЏVL�8�N�م�z�Ł��A�ﱩܺ(��桩yhj~i�5<������Y�,��t�W��a��u������

core/assets-raw/sprites/blocks/campaign/landing-pad.png

@@ -0,0 +1,2 @@
+msch
x�-PKN�0}��N�Bp�.X�-'`��%b��&
+r��qZz���8
*3Ie93~�ޛ�`�M�ܩ��ݳr�w��E����Iu�	h�����@i���Wo��?�&���kԓ�^i\w�ON��FN�U4A��f�NEBN��UA�+)���;=�b�GR9���Uc�:�֢�˔$Ӹ�?9�if�f��JF6@�G����Bkh�{�H��N�\��W@F�
r�_1-E��8��4#�8!+�l�!�������,��Č�9��M>5����)႓�ɂ�D���Ԕф�� T�/��%�Q��e82��3� X'.{Ra��5��e]�����J�4�gs�%]XA

core/assets-raw/sprites/blocks/drills/cliff-crusher-top.png

@@ -0,0 +1,2 @@
+msch
x�-P;R�0}�Ŏ��g\Q���@I�%C�X�cF�<����p�	��kedk��{��b����;��gi�`��E���}�}�}��v��B{�F���g
���j3�������U�q6�}�j��I�=.{�f���;��A��
+~���f�k܁�e笚��r+鎨G&�uJ��9��`'�TT��	Zmp��ړh���ݧ�m��wbr��4~K?R ��'g�����4R$Q���0'�fm�(�l89CVe�?�N'��3h��/c}A��%
�S�)�f�3]S<g�`/����^����@����|yҒ�t��I�,W1�>?��5�]K�:�^v@���ixA;�?�1Y�