Update 76e24f7 -> 0425408

Author: way-zer

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

@@ -7,8 +7,8 @@ clear and replce jabel(Support record)
 way-zer <[email protected]> on 2024/6/9
 ---
  .gitignore                                    |   2 +-
- android/build.gradle                          |  80 +++--
- android/proguard-rules.pro                    |   5 +
+ android/build.gradle                          |  78 +++--
+ android/proguard-rules.pro                    |   4 +
  .../com/github/bsideup/jabel/Desugar.java     |  13 +
  .../javax.annotation.processing.Processor     |   6 +
  build.gradle                                  | 241 ++-------------
@@ -17,15 +17,14 @@ way-zer <[email protected]> on 2024/6/9
  desktop/build.gradle                          | 162 +---------
  gradle.properties                             |   2 +
  gradle/wrapper/gradle-wrapper.jar             | Bin 59203 -> 43462 bytes
- gradle/wrapper/gradle-wrapper.properties      |   4 +-
  gradlew                                       | 282 +++++++++++-------
  gradlew.bat                                   |  35 ++-
  ios/build.gradle                              |   2 +-
  server/build.gradle                           |  44 +--
  settings.gradle                               |  10 +-
  tools/build.gradle                            |  44 ++-
  tools/src/mindustry/tools/Generators.java     |   2 +-
- 19 files changed, 389 insertions(+), 611 deletions(-)
+ 18 files changed, 383 insertions(+), 610 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 +51,7 @@ index dd3f2a0f065d3f774ea84fbc932e337160e4b307..7d91d3191096c431b739d2d5ecd951a7
  /core/assets/locales
  /core/assets/cache/
 diff --git a/android/build.gradle b/android/build.gradle
-index f7f1ce377bb162249e8034db9ab712a75e96bc17..8b9676e3f124728d59ee80367d14f433853c0c40 100644
+index f1dc45aa74b149babea9cce2535ed7dca8d49a1f..093c328edc2719aa86bb212e1abb1f500044b08a 100644
 --- a/android/build.gradle
 +++ b/android/build.gradle
 @@ -1,18 +1,19 @@
@@ -68,7 +67,7 @@ index f7f1ce377bb162249e8034db9ab712a75e96bc17..8b9676e3f124728d59ee80367d14f433
 +}
 
 -    dependencies{
--        classpath 'com.android.tools.build:gradle:7.2.1'
+-        classpath 'com.android.tools.build:gradle:8.2.2'
 +ext{
 +    findSdkDir = {
 +        //null because IntelliJ doesn't get env variables
@@ -86,7 +85,7 @@ index f7f1ce377bb162249e8034db9ab712a75e96bc17..8b9676e3f124728d59ee80367d14f433
  configurations{ natives }
 
  repositories{
-@@ -20,17 +21,10 @@ repositories{
+@@ -20,16 +21,8 @@ repositories{
      maven{ url "https://maven.google.com" }
  }
 
@@ -99,15 +98,12 @@ index f7f1ce377bb162249e8034db9ab712a75e96bc17..8b9676e3f124728d59ee80367d14f433
 -}
 -
  android{
--    buildToolsVersion '33.0.2'
--    compileSdkVersion 33
+-    namespace = "io.anuke.mindustry"
 +    namespace = "com.github.tinylake.mindustryX"
-+    buildToolsVersion = '33.0.2'
-+    compileSdk = 33
+     buildToolsVersion = '34.0.0'
+     compileSdk = 34
      sourceSets{
-         main{
-             manifest.srcFile 'AndroidManifest.xml'
-@@ -50,8 +44,6 @@ android{
+@@ -51,8 +44,6 @@ android{
      }
 
      defaultConfig{
@@ -116,12 +112,13 @@ index f7f1ce377bb162249e8034db9ab712a75e96bc17..8b9676e3f124728d59ee80367d14f433
          def versionNameResult = "$versionNumber-$versionType-${getBuildVersion().replace(" ", "-")}"
 
          applicationId "io.anuke.mindustry"
-@@ -59,12 +51,15 @@ android{
-         targetSdkVersion 33
+@@ -60,14 +51,16 @@ android{
+         targetSdkVersion 34
 
          versionName versionNameResult
 -        versionCode = vcode
 +        versionCode = 1
++        multiDexEnabled true
 
          if(project.hasProperty("release")){
 +            Properties props = loadVersionProps()
@@ -131,19 +128,12 @@ index f7f1ce377bb162249e8034db9ab712a75e96bc17..8b9676e3f124728d59ee80367d14f433
 +            props.store(file('../core/assets/version.properties').newWriter(), null)
          }
 -        props.store(file('../core/assets/version.properties').newWriter(), null)
+-
+-        multiDexEnabled true
      }
 
      compileOptions{
-@@ -72,7 +67,7 @@ android{
-         targetCompatibility JavaVersion.VERSION_1_8
-     }
- 
--    flavorDimensions "google"
-+    flavorDimensions = ["google"]
- 
-     signingConfigs{
-         release{
-@@ -119,8 +114,8 @@ dependencies{
+@@ -122,8 +115,8 @@ dependencies{
      implementation arcModule("backends:backend-android")
      implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
 
@@ -154,7 +144,7 @@ index f7f1ce377bb162249e8034db9ab712a75e96bc17..8b9676e3f124728d59ee80367d14f433
 
      def version;
      def highestVersion;
-@@ -133,24 +128,25 @@ dependencies{
+@@ -136,24 +129,25 @@ dependencies{
      if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
  }
 
@@ -196,25 +186,20 @@ index f7f1ce377bb162249e8034db9ab712a75e96bc17..8b9676e3f124728d59ee80367d14f433
 +}
 \ No newline at end of file
 diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
-index 368b7f4e1e14f4f6cd83f3390fb33899552235fc..7977507301e2bb020346409539c54f8c87e4b320 100644
+index ebda968ae6947db76031a6d37bc74f049e2e3db4..6f53c442978ee6a880dfd05a81a69fde596a783b 100644
 --- a/android/proguard-rules.pro
 +++ b/android/proguard-rules.pro
-@@ -3,9 +3,14 @@
- #these are essential packages that should not be "optimized" in any way
- #the main purpose of d8 here is to shrink the absurdly-large google play games libraries
- -keep class mindustry.** { *; }
-+-keep class mindustryX.** { *; }
- -keep class arc.** { *; }
+@@ -5,6 +5,10 @@
  -keep class net.jpountz.** { *; }
  -keep class rhino.** { *; }
  -keep class com.android.dex.** { *; }
++-keep class mindustryX.** { *; }
 +-keep class kotlin.** { *; }
 +-keep class org.jetbrains.annotations.** { *; }
 +-keep class org.intellij.lang.annotations.** { *; }
+ -keepattributes Signature,*Annotation*,InnerClasses,EnclosingMethod
 
-+-dontwarn javax.naming.**
- #-printusage out.txt
-\ No newline at end of file
+ -dontwarn javax.naming.**
 diff --git a/annotations/src/main/java/com/github/bsideup/jabel/Desugar.java b/annotations/src/main/java/com/github/bsideup/jabel/Desugar.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..dcea5cdf03b366f9f59e20511dafee3601e15fb6
@@ -858,7 +843,7 @@ index 7f4ecdcf0a6407ffce7181234527dc6cbc4d484b..ecb36e1a2a501040d3adee3203eacef2
 +}
 \ No newline at end of file
 diff --git a/gradle.properties b/gradle.properties
-index 087025418f6b5419bcf23f6354c18f53a7eef0dc..f43e22ea642fe0dcd62cf970a518de025db65ea4 100644
+index 827c8445c4ac9ea773041bba50235598c3604fe1..16ce1c54512959ff201113c746e222291fdb11ff 100644
 --- a/gradle.properties
 +++ b/gradle.properties
 @@ -21,6 +21,8 @@ kapt.include.compile.classpath=false
@@ -2655,19 +2640,6 @@ z9CObS!0m)Tgg`K#xBM8B(|Z)Wb&DYL{WTYv`;A=q6~Nnx2+!lTIXtj8J7dZE!P_{z
 z#f8w6F}^!?^KE#+ZDv+xd5O&3EmomZzsv?>E-~ygGum45fk!SBN&|eo1rKw^?aZJ4
 E2O(~oYXATM
 
-diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
-index 3994438e229201828cf0e387c24a7c12d78b3972..a80b22ce5cffec8b48ee79b11c67945e91f99d5f 100644
---- a/gradle/wrapper/gradle-wrapper.properties
-+++ b/gradle/wrapper/gradle-wrapper.properties
-@@ -1,5 +1,7 @@
- distributionBase=GRADLE_USER_HOME
- distributionPath=wrapper/dists
--distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
-+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-+networkTimeout=10000
-+validateDistributionUrl=true
- zipStoreBase=GRADLE_USER_HOME
- zipStorePath=wrapper/dists
 diff --git a/gradlew b/gradlew
 index 4f906e0c811fc9e230eb44819f509cd0627f2600..1aa94a4269074199e6ed2c37e8db3e0826030965 100755
 --- a/gradlew

patches/client/0003-CS-Version.patch

@@ -5,7 +5,6 @@ Subject: [PATCH] CS: Version
 
 ---
  .gitignore                             |  1 +
- android/AndroidManifest.xml            |  3 +--
  android/build.gradle                   |  4 ++--
  android/res/values/strings.xml         |  2 +-
  build.gradle                           |  4 ++--
@@ -15,7 +14,7 @@ Subject: [PATCH] CS: Version
  core/src/mindustry/core/Version.java   | 16 +++++++++++++++-
  core/src/mindustry/net/NetworkIO.java  |  2 +-
  gradle.properties                      |  2 ++
- 11 files changed, 29 insertions(+), 11 deletions(-)
+ 10 files changed, 28 insertions(+), 9 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index 7d91d3191096c431b739d2d5ecd951a764feead3..ba271e6bd0dd06971fff6fa2314254149cc90087 100644
@@ -29,20 +28,8 @@ index 7d91d3191096c431b739d2d5ecd951a764feead3..ba271e6bd0dd06971fff6fa231425414
  /deploy/
  /out/
  ios/libs/
-diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
-index 8cae20eee7a480cef6a14576fc72b096d38271e1..25602c4ab4070b7db9b31803c88281c7e4aa449e 100644
---- a/android/AndroidManifest.xml
-+++ b/android/AndroidManifest.xml
-@@ -1,6 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<manifest xmlns:android="http://schemas.android.com/apk/res/android"
--          package="io.anuke.mindustry">
-+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
- 
-     <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 8b9676e3f124728d59ee80367d14f433853c0c40..c39484bf6b00b8031b7ae8862cc172f8946f12cc 100644
+index 093c328edc2719aa86bb212e1abb1f500044b08a..fc719ba8aaa918185c1bba016ba83d7ad975e402 100644
 --- a/android/build.gradle
 +++ b/android/build.gradle
 @@ -18,7 +18,7 @@ configurations{ natives }
@@ -61,7 +48,7 @@ index 8b9676e3f124728d59ee80367d14f433853c0c40..c39484bf6b00b8031b7ae8862cc172f8
 -        applicationId "io.anuke.mindustry"
 +        applicationId "com.github.tinylake.mindustryX"
          minSdkVersion 14
-         targetSdkVersion 33
+         targetSdkVersion 34
 
 diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
 index d42ffe6d4a318ce558f1010eae46140f88ed5c99..bf44ead5c58abfb79c500e6daae30c3e7c322bed 100644
@@ -119,7 +106,7 @@ 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..6b05845bad6eb3862dea511563e099085d15b479 100644
+index 8d3ac0bd19be8caca3aa95ab48adda63c3c317a1..5cbdf0a613c067f662a3c7dd4511bb33e35657ae 100644
 --- a/core/src/mindustry/core/NetClient.java
 +++ b/core/src/mindustry/core/NetClient.java
 @@ -135,6 +135,8 @@ public class NetClient implements ApplicationListener{
@@ -192,13 +179,13 @@ index 48599c6b96474117057e7ca2b87b545873a0ea31..4366eeef830845fb13132a0ae3534129
          buffer.put((byte)state.rules.mode().ordinal());
          buffer.putInt(netServer.admins.getPlayerLimit());
 diff --git a/gradle.properties b/gradle.properties
-index f43e22ea642fe0dcd62cf970a518de025db65ea4..b1921b8ac0d8d0ca7ac86e4d551a694d1ae38ed9 100644
+index 16ce1c54512959ff201113c746e222291fdb11ff..81861490f166f3f5af54997d6bb1ac8adedff122 100644
 --- a/gradle.properties
 +++ b/gradle.properties
-@@ -28,3 +28,5 @@ org.gradle.caching=true
- org.gradle.internal.http.socketTimeout=100000
+@@ -29,3 +29,5 @@ org.gradle.internal.http.socketTimeout=100000
  org.gradle.internal.http.connectionTimeout=100000
- archash=7d6e89dffd
+ android.enableR8.fullMode=false
+ archash=96cd86d08a
 +
-+upstreamBuild=25087
++upstreamBuild=25136
 \ No newline at end of file

patches/client/0006-S-update-TypeIO.writeRequest.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] S: update TypeIO.writeRequest
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java
-index 70d1543c366b4eeef80c67f4eaeb05643c93451e..fe9682663342ccd1f3537cf82ea4c74996655440 100644
+index c02ceb4ae69d9f7e5bea93df94c546d7a06cd1e2..c8de9a61012e3362c3f4a06af1c0237f5de120ac 100644
 --- a/core/src/mindustry/io/TypeIO.java
 +++ b/core/src/mindustry/io/TypeIO.java
-@@ -414,8 +414,9 @@ public class TypeIO{
+@@ -413,8 +413,9 @@ public class TypeIO{
          if(!plan.breaking){
              write.s(plan.block.id);
              write.b((byte)plan.rotation);

patches/client/0016-C-RenderExt-bulletShow-showMineBeam-displayAllMessag.patch

@@ -11,7 +11,7 @@ Subject: [PATCH] C(RenderExt) bulletShow showMineBeam displayAllMessage
  3 files changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
-index 34c3b537df9075827b24df0f26c83de1cc805bf6..939924880db520a918cc51cf5cace817000fb28d 100644
+index 3408948807b1bc145fa5effb4cd77b9f5ff4a29d..d8999d2001071b91a9976921f66a71562c215e09 100644
 --- a/core/src/mindustry/type/UnitType.java
 +++ b/core/src/mindustry/type/UnitType.java
 @@ -37,6 +37,7 @@ import mindustry.world.blocks.payloads.*;

patches/client/0023-C-StatExt.patch

@@ -148,7 +148,7 @@ index 79d0177b41b7480488f6131935dbf345b9f4598a..2e67b422063355deac7aecb7dd93b3ed
          if(damage < 0) stats.add(Stat.healing, -damage * 60f, StatUnit.perSecond);
 
 diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
-index 939924880db520a918cc51cf5cace817000fb28d..998caed117d2eeef7f74ad0527c2f01f76f60650 100644
+index d8999d2001071b91a9976921f66a71562c215e09..682d2cdb951823b61c7951c8c19ed8a0a976f396 100644
 --- a/core/src/mindustry/type/UnitType.java
 +++ b/core/src/mindustry/type/UnitType.java
 @@ -612,29 +612,47 @@ public class UnitType extends UnlockableContent implements Senseable{
@@ -480,7 +480,7 @@ index 97aedf43b5595bcfb63ea9ecce91dc6e57967e92..cd30d93b35b0547658c39c0b0f6e5ef0
 
      public class PointDefenseBuild extends ReloadTurretBuild{
 diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
-index 0baea25f9367d45ad3384bbbc69bd4299b9a19a8..df8ecaa3537b0fb9d1ffad0226695af9596b9b81 100644
+index e9f5331bbef3b2110eeeed5934ec10b5f5fc9e12..cf350df9ea21f3654672c99a70c5c9f2ea439413 100644
 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
 +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
 @@ -26,6 +26,7 @@ import mindustry.ui.*;
@@ -491,7 +491,7 @@ index 0baea25f9367d45ad3384bbbc69bd4299b9a19a8..df8ecaa3537b0fb9d1ffad0226695af9
 
  import static mindustry.Vars.*;
 
-@@ -152,7 +153,8 @@ public class Turret extends ReloadTurret{
+@@ -153,7 +154,8 @@ public class Turret extends ReloadTurret{
          super.setStats();
 
          stats.add(Stat.inaccuracy, (int)inaccuracy, StatUnit.degrees);

patches/client/0024-API-Hooks-onHandleSendMessage.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 6b05845bad6eb3862dea511563e099085d15b479..c0960a878e6831e746499bdf13444c2e6ab42f9a 100644
+index 5cbdf0a613c067f662a3c7dd4511bb33e35657ae..3a5b36fd03f48d2c1265884c21b70bb3cdb772bb 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/0029-BUILD-Kotlin-1.9.20.patch

@@ -60,7 +60,7 @@ index 67e4cde70b0dbdc197cf8e9d5f12b5ae26172f08..609d7414566c6c5e860196d564941209
      }
 
 diff --git a/gradle.properties b/gradle.properties
-index b1921b8ac0d8d0ca7ac86e4d551a694d1ae38ed9..8f52954bc94a027e5116e7d06a79ad1ca4358f83 100644
+index 81861490f166f3f5af54997d6bb1ac8adedff122..85ffb7703a2f41e9ec9d7c4681158d00e12add6c 100644
 --- a/gradle.properties
 +++ b/gradle.properties
 @@ -18,7 +18,7 @@ kapt.use.worker.api=true

patches/client/0037-C-ReplayController.patch

@@ -20,7 +20,7 @@ way-zer <[email protected]> on 2024/4/22 at 20:15
  create mode 100644 core/src/mindustryX/features/ReplayController.java
 
 diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
-index c0960a878e6831e746499bdf13444c2e6ab42f9a..0a904cfeb92b230e7d52fff7a16e1104fe5415fa 100644
+index 3a5b36fd03f48d2c1265884c21b70bb3cdb772bb..2e9a8c337ae1182dfa5527a23c50afb6da42f834 100644
 --- a/core/src/mindustry/core/NetClient.java
 +++ b/core/src/mindustry/core/NetClient.java
 @@ -24,6 +24,7 @@ import mindustry.net.*;