sync 2024/7/12

* 适配BE，修复兼容性
* 合并服务端发布
* 分离 处理器编辑增强

Author: way-zer

patches/client/0001-BUILD-build.gradle.kts-and-clear.patch

@@ -7,7 +7,7 @@ clear and replce jabel(Support record)
 way-zer <[email protected]> on 2024/6/9
 ---
  .gitignore                                    |   2 +-
- android/build.gradle                          |  73 +++--
+ android/build.gradle                          |  80 +++--
  android/proguard-rules.pro                    |   5 +
  .../com/github/bsideup/jabel/Desugar.java     |  13 +
  .../javax.annotation.processing.Processor     |   6 +
@@ -21,11 +21,11 @@ way-zer <[email protected]> on 2024/6/9
  gradlew                                       | 282 +++++++++++-------
  gradlew.bat                                   |  35 ++-
  ios/build.gradle                              |   2 +-
- server/build.gradle                           |  42 +--
+ server/build.gradle                           |  44 +--
  settings.gradle                               |  10 +-
  tools/build.gradle                            |  44 ++-
  tools/src/mindustry/tools/Generators.java     |   2 +-
- 19 files changed, 384 insertions(+), 607 deletions(-)
+ 19 files changed, 389 insertions(+), 611 deletions(-)
  create mode 100644 annotations/src/main/java/com/github/bsideup/jabel/Desugar.java
  create mode 100644 annotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor
  delete mode 100644 core/build.gradle
@@ -52,7 +52,7 @@ index dd3f2a0f065d3f774ea84fbc932e337160e4b307..7d91d3191096c431b739d2d5ecd951a7
  /core/assets/locales
  /core/assets/cache/
 diff --git a/android/build.gradle b/android/build.gradle
-index f7f1ce377bb162249e8034db9ab712a75e96bc17..136f657fb1187dd5c4e9ff49352964bb917c6eed 100644
+index f7f1ce377bb162249e8034db9ab712a75e96bc17..8b9676e3f124728d59ee80367d14f433853c0c40 100644
 --- a/android/build.gradle
 +++ b/android/build.gradle
 @@ -1,18 +1,19 @@
@@ -107,17 +107,34 @@ index f7f1ce377bb162249e8034db9ab712a75e96bc17..136f657fb1187dd5c4e9ff49352964bb
      sourceSets{
          main{
              manifest.srcFile 'AndroidManifest.xml'
-@@ -63,8 +57,8 @@ android{
+@@ -50,8 +44,6 @@ android{
+     }
+ 
+     defaultConfig{
+-        Properties props = loadVersionProps()
+-        Integer vcode = props['androidBuildCode']?.toInteger() ?: 1
+         def versionNameResult = "$versionNumber-$versionType-${getBuildVersion().replace(" ", "-")}"
+ 
+         applicationId "io.anuke.mindustry"
+@@ -59,12 +51,15 @@ android{
+         targetSdkVersion 33
+         
+         versionName versionNameResult
+-        versionCode = vcode
++        versionCode = 1
 
          if(project.hasProperty("release")){
++            Properties props = loadVersionProps()
++            Integer vcode = props['androidBuildCode']?.toInteger() ?: 1
++            versionCode = vcode
              props['androidBuildCode'] = (vcode + 1).toString()
 +            props.store(file('../core/assets/version.properties').newWriter(), null)
          }
 -        props.store(file('../core/assets/version.properties').newWriter(), null)
      }
 
      compileOptions{
-@@ -72,7 +66,7 @@ android{
+@@ -72,7 +67,7 @@ android{
          targetCompatibility JavaVersion.VERSION_1_8
      }
 
@@ -126,7 +143,7 @@ index f7f1ce377bb162249e8034db9ab712a75e96bc17..136f657fb1187dd5c4e9ff49352964bb
 
      signingConfigs{
          release{
-@@ -119,8 +113,8 @@ dependencies{
+@@ -119,8 +114,8 @@ dependencies{
      implementation arcModule("backends:backend-android")
      implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
 
@@ -137,7 +154,7 @@ index f7f1ce377bb162249e8034db9ab712a75e96bc17..136f657fb1187dd5c4e9ff49352964bb
 
      def version;
      def highestVersion;
-@@ -133,24 +127,25 @@ dependencies{
+@@ -133,24 +128,25 @@ dependencies{
      if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
  }
 
@@ -3096,7 +3113,7 @@ index d0ec38f0a9c9f7d07c240a3d0c8c24bd0f6c1ebf..44d6d24b5b4d43514c8c5bf535bf7077
  launchIPhoneSimulator.dependsOn build
  launchIPadSimulator.dependsOn build
 diff --git a/server/build.gradle b/server/build.gradle
-index 7359fdac3cb101aec25a7be9e8b9813ed1afd547..0ea1b05d6928c1d16ffb5f48a6ac0c1eb8d66bd8 100644
+index 7359fdac3cb101aec25a7be9e8b9813ed1afd547..badc019ded25d495a139efe134085184640eb500 100644
 --- a/server/build.gradle
 +++ b/server/build.gradle
 @@ -3,10 +3,6 @@ sourceSets.main.java.srcDirs = ["src/"]
@@ -3110,14 +3127,19 @@ index 7359fdac3cb101aec25a7be9e8b9813ed1afd547..0ea1b05d6928c1d16ffb5f48a6ac0c1e
  task run(dependsOn: classes, type: JavaExec){
      mainClass = project.mainClassName
      classpath = sourceSets.main.runtimeClasspath
-@@ -31,6 +27,7 @@ task debug(dependsOn: classes, type: JavaExec){
+@@ -31,10 +27,11 @@ task debug(dependsOn: classes, type: JavaExec){
  }
 
  task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
 +    dependsOn classes
      from files(sourceSets.main.output.classesDirs)
      from files(sourceSets.main.output.resourcesDir)
      from {configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) }}
+-    from files(project.assetsDir)
++    from files(tasks.getByPath(":core:allAssets"))
+     exclude("sprites/**")
+     exclude("music/**")
+     exclude("sounds/**")
 @@ -51,40 +48,3 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
          attributes 'Main-Class': project.mainClassName
      }

patches/client/0003-CS-Version.patch

@@ -11,11 +11,11 @@ Subject: [PATCH] CS: Version
  build.gradle                           |  4 ++--
  core/build.gradle.kts                  |  2 +-
  core/src/mindustry/Vars.java           |  2 +-
- core/src/mindustry/core/NetClient.java |  4 +++-
- core/src/mindustry/core/NetServer.java | 11 ++++++++---
+ core/src/mindustry/core/NetClient.java |  2 ++
  core/src/mindustry/core/Version.java   | 16 +++++++++++++++-
+ core/src/mindustry/net/NetworkIO.java  |  2 +-
  gradle.properties                      |  2 ++
- 11 files changed, 37 insertions(+), 14 deletions(-)
+ 11 files changed, 29 insertions(+), 11 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index 7d91d3191096c431b739d2d5ecd951a764feead3..ba271e6bd0dd06971fff6fa2314254149cc90087 100644
@@ -42,7 +42,7 @@ index 8cae20eee7a480cef6a14576fc72b096d38271e1..25602c4ab4070b7db9b31803c88281c7
      <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
      <uses-feature android:name="android.hardware.type.pc" android:required="false" />
 diff --git a/android/build.gradle b/android/build.gradle
-index 136f657fb1187dd5c4e9ff49352964bb917c6eed..6f3e8ee3b7b21265a4638ad3b5f09af790619c76 100644
+index 8b9676e3f124728d59ee80367d14f433853c0c40..c39484bf6b00b8031b7ae8862cc172f8946f12cc 100644
 --- a/android/build.gradle
 +++ b/android/build.gradle
 @@ -18,7 +18,7 @@ configurations{ natives }
@@ -54,8 +54,8 @@ index 136f657fb1187dd5c4e9ff49352964bb917c6eed..6f3e8ee3b7b21265a4638ad3b5f09af7
  }
 
  android{
-@@ -48,7 +48,7 @@ android{
-         Integer vcode = props['androidBuildCode']?.toInteger() ?: 1
+@@ -46,7 +46,7 @@ android{
+     defaultConfig{
          def versionNameResult = "$versionNumber-$versionType-${getBuildVersion().replace(" ", "-")}"
 
 -        applicationId "io.anuke.mindustry"
@@ -119,18 +119,9 @@ index bc4c6a494aec88af73f001906598ba91a50ac6a3..d08d04a6f0e8107cec995876b2072c46
      public static final Seq<ServerGroup> defaultServers = Seq.with();
      /** maximum size of any block, do not change unless you know what you're doing */
 diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
-index 8171a89797a0d1cb29fb50364a94b6d3130698ae..76736b9f6bc44d040bdfc2cc717702d1c3eca839 100644
+index 8171a89797a0d1cb29fb50364a94b6d3130698ae..6b05845bad6eb3862dea511563e099085d15b479 100644
 --- a/core/src/mindustry/core/NetClient.java
 +++ b/core/src/mindustry/core/NetClient.java
-@@ -92,7 +92,7 @@ public class NetClient implements ApplicationListener{
-             c.locale = locale;
-             c.mods = mods.getModStrings();
-             c.mobile = mobile;
--            c.versionType = Version.type;
-+            c.versionType = "official";
-             c.color = player.color.rgba();
-             c.usid = getUsid(packet.addressTCP);
-             c.uuid = platform.getUUID();
 @@ -135,6 +135,8 @@ public class NetClient implements ApplicationListener{
              Log.info("Received world data: @ bytes.", data.stream.available());
              NetworkIO.loadWorld(new InflaterInputStream(data.stream));
@@ -140,28 +131,6 @@ index 8171a89797a0d1cb29fb50364a94b6d3130698ae..76736b9f6bc44d040bdfc2cc717702d1
              finishConnecting();
          });
      }
-diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
-index b80f828362676bdad9cffa982b2544f845441c74..80149612e037bd9ec6368c1b4c3a5d067fd184f1 100644
---- a/core/src/mindustry/core/NetServer.java
-+++ b/core/src/mindustry/core/NetServer.java
-@@ -210,9 +210,14 @@ public class NetServer implements ApplicationListener{
-                 return;
-             }
- 
--            if(packet.versionType == null || ((packet.version == -1 || !packet.versionType.equals(Version.type)) && Version.build != -1 && !admins.allowsCustomClients())){
--                con.kick(!Version.type.equals(packet.versionType) ? KickReason.typeMismatch : KickReason.customClient);
--                return;
-+            if(Version.build != -1 && !admins.allowsCustomClients()){
-+                if(packet.versionType == null || packet.version == -1){
-+                    con.kick(KickReason.customClient);
-+                    return;
-+                }else if((!Version.type.equals("MindustryX") || !"official".equals(packet.versionType)) && !Version.type.equals(packet.versionType)){
-+                    con.kick(KickReason.typeMismatch);
-+                    return;
-+                }
-             }
- 
-             boolean preventDuplicates = headless && netServer.admins.isStrict();
 diff --git a/core/src/mindustry/core/Version.java b/core/src/mindustry/core/Version.java
 index 73bbd59416cc8e1b64bcb5538fdd73886a455451..8698103654e40dd4e85451e1020563ca562ed2d2 100644
 --- a/core/src/mindustry/core/Version.java
@@ -209,6 +178,19 @@ index 73bbd59416cc8e1b64bcb5538fdd73886a455451..8698103654e40dd4e85451e1020563ca
 +        "\nMindustryX " + mdtXBuild;
      }
  }
+diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java
+index 48599c6b96474117057e7ca2b87b545873a0ea31..4366eeef830845fb13132a0ae3534129b7a859dc 100644
+--- a/core/src/mindustry/net/NetworkIO.java
++++ b/core/src/mindustry/net/NetworkIO.java
+@@ -107,7 +107,7 @@ public class NetworkIO{
+         buffer.putInt(Core.settings.getInt("totalPlayers", Groups.player.size()));
+         buffer.putInt(state.wave);
+         buffer.putInt(Version.build);
+-        writeString(buffer, Version.type);
++        writeString(buffer, "MindustryX");
+ 
+         buffer.put((byte)state.rules.mode().ordinal());
+         buffer.putInt(netServer.admins.getPlayerLimit());
 diff --git a/gradle.properties b/gradle.properties
 index f43e22ea642fe0dcd62cf970a518de025db65ea4..b1921b8ac0d8d0ca7ac86e4d551a694d1ae38ed9 100644
 --- a/gradle.properties

patches/client/0004-API-Hooks.patch

@@ -4,10 +4,11 @@ Date: Wed, 3 Apr 2024 21:57:24 +0800
 Subject: [PATCH] API: Hooks
 
 ---
- core/src/mindustry/ClientLauncher.java |  1 +
- core/src/mindustry/Vars.java           |  1 +
- core/src/mindustryX/Hooks.java         | 17 +++++++++++++++++
- 3 files changed, 19 insertions(+)
+ core/src/mindustry/ClientLauncher.java          |  1 +
+ core/src/mindustry/Vars.java                    |  1 +
+ core/src/mindustryX/Hooks.java                  | 17 +++++++++++++++++
+ server/src/mindustry/server/ServerLauncher.java |  1 +
+ 4 files changed, 20 insertions(+)
  create mode 100644 core/src/mindustryX/Hooks.java
 
 diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
@@ -57,3 +58,15 @@ index 0000000000000000000000000000000000000000..499a9f3403c6769288ad44e7fb4a68ff
 +        Log.infoTag("MindustryX", "Hooks.init");
 +    }
 +}
+diff --git a/server/src/mindustry/server/ServerLauncher.java b/server/src/mindustry/server/ServerLauncher.java
+index 1aea11b2cc877ef9a35280575e6419d9fab16f01..1799c999b2affdc0de392841212edc1f544e4751 100644
+--- a/server/src/mindustry/server/ServerLauncher.java
++++ b/server/src/mindustry/server/ServerLauncher.java
+@@ -76,6 +76,7 @@ public class ServerLauncher implements ApplicationListener{
+         Core.app.addListener(netServer = new NetServer());
+         Core.app.addListener(new ServerControl(args));
+         Core.app.addListener(new ApplicationListener(){public void update(){ asyncCore.end(); }});
++        Core.app.addListener(new mindustryX.Hooks());
+ 
+         mods.eachClass(Mod::init);
+ 

patches/client/0009-S-Add-icons.properties-bundles-block_colors.png-to-s.patch

@@ -10,14 +10,14 @@ Subject: [PATCH] S: Add icons.properties,bundles,block_colors.png to server
  2 files changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/server/build.gradle b/server/build.gradle
-index 0ea1b05d6928c1d16ffb5f48a6ac0c1eb8d66bd8..8e6276a74b8b2b26d19da562abd5ca2420e15aa6 100644
+index badc019ded25d495a139efe134085184640eb500..f212b7bf9d8a3e46179ba62d8987fcb15efa5568 100644
 --- a/server/build.gradle
 +++ b/server/build.gradle
 @@ -31,18 +31,18 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
      from files(sourceSets.main.output.classesDirs)
      from files(sourceSets.main.output.resourcesDir)
      from {configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) }}
--    from files(project.assetsDir)
+-    from files(tasks.getByPath(":core:allAssets"))
 -    exclude("sprites/**")
 -    exclude("music/**")
 -    exclude("sounds/**")
@@ -29,7 +29,7 @@ index 0ea1b05d6928c1d16ffb5f48a6ac0c1eb8d66bd8..8e6276a74b8b2b26d19da562abd5ca24
 -    exclude("icons/icon.icns")
 -    exclude("icons/icon.ico")
 -    exclude("icons/icon_64.png")
-+    from (files(project.assetsDir)){
++    from (files(tasks.getByPath(":core:allAssets"))){
 +        include "baseparts/**"
 +        include "bundles/**"
 +        include "icons/icons.properties"
@@ -45,7 +45,7 @@ index 0ea1b05d6928c1d16ffb5f48a6ac0c1eb8d66bd8..8e6276a74b8b2b26d19da562abd5ca24
      manifest{
          attributes 'Main-Class': project.mainClassName
 diff --git a/server/src/mindustry/server/ServerLauncher.java b/server/src/mindustry/server/ServerLauncher.java
-index 1aea11b2cc877ef9a35280575e6419d9fab16f01..167be582ef387471f31c252a7732881d1d22ac87 100644
+index 1799c999b2affdc0de392841212edc1f544e4751..81683e05cc3f38d943ae94f00621da01e09a1f31 100644
 --- a/server/src/mindustry/server/ServerLauncher.java
 +++ b/server/src/mindustry/server/ServerLauncher.java
 @@ -41,7 +41,7 @@ public class ServerLauncher implements ApplicationListener{

patches/client/0012-API-add-LogicAssembledEvent.patch patches/client/0011-API-add-LogicAssembledEvent.patch

@@ -4,22 +4,14 @@ Date: Mon, 26 Dec 2022 15:29:10 +0800
 Subject: [PATCH] SC: Fix #6
 
 ---
- .../mindustry/world/blocks/payloads/PayloadConveyor.java   | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ .../src/mindustry/world/blocks/payloads/PayloadConveyor.java | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
-index e6c368d97eec75f27d68d681fec480defe7e8218..d80217d66403bfd962594deb73642f053f3e403d 100644
+index e6c368d97eec75f27d68d681fec480defe7e8218..f9064cdc0773a76860f6d1873901083c4ccd07ce 100644
 --- a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
 +++ b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
-@@ -11,6 +11,7 @@ import mindustry.entities.*;
- import mindustry.gen.*;
- import mindustry.graphics.*;
- import mindustry.world.*;
-+import mindustry.world.blocks.payloads.PayloadRouter.*;
- import mindustry.world.meta.*;
- 
- import static mindustry.Vars.*;
-@@ -154,7 +155,10 @@ public class PayloadConveyor extends Block{
+@@ -154,7 +154,10 @@ public class PayloadConveyor extends Block{
                  if(valid && stepAccepted != curStep && item != null){
                      if(next != null){
                          //trigger update forward
@@ -31,11 +23,3 @@ index e6c368d97eec75f27d68d681fec480defe7e8218..d80217d66403bfd962594deb73642f05
 
                          //TODO add self to queue of next conveyor, then check if this conveyor was selected next frame - selection happens deterministically
                          if(next != null && next.acceptPayload(this, item)){
-@@ -267,6 +271,7 @@ public class PayloadConveyor extends Block{
- 
-         @Override
-         public boolean acceptPayload(Building source, Payload payload){
-+            //Note: using progress there seems very bad thing.(for E/S and low TPS)
-             return this.item == null
-                 && payload.fits(payloadLimit)
-                 && (source == this || this.enabled && progress <= 5f);

patches/client/0011-SC-Fix-6.patch patches/client/0012-SC-Fix-6.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] API(Hooks) onHandleSendMessage
  2 files changed, 10 insertions(+)
 
 diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
-index 76736b9f6bc44d040bdfc2cc717702d1c3eca839..138ba396e44b98d60031369f1d063f3465b382c8 100644
+index 6b05845bad6eb3862dea511563e099085d15b479..c0960a878e6831e746499bdf13444c2e6ab42f9a 100644
 --- a/core/src/mindustry/core/NetClient.java
 +++ b/core/src/mindustry/core/NetClient.java
 @@ -198,6 +198,8 @@ public class NetClient implements ApplicationListener{

patches/client/0024-API-Hooks-onHandleSendMessage.patch

@@ -51,14 +51,13 @@ index 1ce00d17c712d417383a3d61f13e6f62e5d91adc..67e4cde70b0dbdc197cf8e9d5f12b5ae
 
 diff --git a/core/src/mindustryX/mods/claj/Claj.java b/core/src/mindustryX/mods/claj/Claj.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ef0deaffdc749b0dc501a0a4b5ae79608f3f2230
+index 0000000000000000000000000000000000000000..fd2d5ad910433779dc0324a5f86e3d28e9f6832c
 --- /dev/null
 +++ b/core/src/mindustryX/mods/claj/Claj.java
 @@ -0,0 +1,31 @@
 +package mindustryX.mods.claj;
 +
 +import arc.scene.ui.layout.*;
-+import arc.struct.*;
 +import mindustry.*;
 +import mindustry.gen.*;
 +import mindustry.mod.*;
@@ -70,6 +69,7 @@ index 0000000000000000000000000000000000000000..ef0deaffdc749b0dc501a0a4b5ae7960
 +
 +    @Override
 +    public void init(){
++        if(Vars.headless) return;
 +        ClajIntegration.load();
 +        joinViaClaj = new JoinViaClajDialog();
 +        manageRooms = new ManageRoomsDialog();