Update HEAD -> BE25701(fd59708)

patches/client/0003-CS-MindustryX-Version-Icon.patch

@@ -19,8 +19,8 @@ way-zer <himc.wicp@gmail.com> on 2024/9/8
  core/src/mindustry/core/Version.java               | 6 +++++-
  core/src/mindustry/net/NetworkIO.java              | 2 +-
  desktop/src/mindustry/desktop/DesktopLauncher.java | 2 +-
- gradle.properties                                  | 3 +++
- 11 files changed, 19 insertions(+), 9 deletions(-)
+ gradle.properties                                  | 5 ++++-
+ 11 files changed, 20 insertions(+), 10 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index 7d91d3191096c431b739d2d5ecd951a764feead3..ba271e6bd0dd06971fff6fa2314254149cc90087 100644
@@ -156,10 +156,10 @@ index b4415862b13522a275b74b01405e812db95f1b4a..74dc9fde3061f2a524612c064120270b
      }
  }
 diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java
-index 779d832c728cea9af3e0cd8f88deae6649a11510..cf02a7065ef114a1a6a3d01ac6d9f8d5c69e3ddb 100644
+index 20cd69cf4ba622d94986578c68800a5ca8de9493..fd0cdbaf51638cb37552b6e23ce4f11d25c56a56 100644
 --- a/core/src/mindustry/net/NetworkIO.java
 +++ b/core/src/mindustry/net/NetworkIO.java
-@@ -109,7 +109,7 @@ public class NetworkIO{
+@@ -108,7 +108,7 @@ public class NetworkIO{
          buffer.putInt(Core.settings.getInt("totalPlayers", Groups.player.size()));
          buffer.putInt(state.wave);
          buffer.putInt(Version.build);
@@ -182,14 +182,16 @@ index 2500d18e59a325d6f1a6286d4f0d214d65a78402..eba453ade66d5e72f44726f64a28a057
          }catch(Throwable e){
              handleCrash(e);
 diff --git a/gradle.properties b/gradle.properties
-index af6835d8a565e794b8fabb25f65584d2f71164ba..359fc27efbf5228c1301aceeab3f2f8fbdc55d41 100644
+index af6835d8a565e794b8fabb25f65584d2f71164ba..3e8fc8cdb8c7d73d47d29a4a4a3fe0ca85e444d4 100644
 --- a/gradle.properties
 +++ b/gradle.properties
-@@ -27,3 +27,6 @@ org.gradle.internal.http.socketTimeout=100000
+@@ -26,4 +26,7 @@ org.gradle.caching=true
+ org.gradle.internal.http.socketTimeout=100000
  org.gradle.internal.http.connectionTimeout=100000
  android.enableR8.fullMode=false
- archash=deacd9c98e
+-archash=deacd9c98e
++archash=39e83948b4
 +
-+upstreamBuild=25696
++upstreamBuild=25701
 +versionType=bleeding-edge
 \ No newline at end of file

patches/client/0059-FR-ARC-drawPlace-and-drawSelect.patch

@@ -29,7 +29,7 @@ index 33fcc893c17585aef5f24f0282db5788410a5237..4012377fec3fb9161645e7d76616b2f7
      private @Nullable Schematic lastLoadout;
      private ItemSeq lastLaunchResources = new ItemSeq();
 diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java
-index 9d0cd7a47e280243d65e4ffd27491ff4b0a547e0..11ef2f9a52ed82aef9a9845f932af0b979a6e09b 100644
+index fcecf4805e48cac201968b1caf61f58abad1dd97..3e9eb8ebf52ec2e1dee594e976b49ba200a69959 100644
 --- a/core/src/mindustry/world/blocks/ConstructBlock.java
 +++ b/core/src/mindustry/world/blocks/ConstructBlock.java
 @@ -3,14 +3,17 @@ package mindustry.world.blocks;

patches/client/0065-HC-v146-protocol-compatible-mode-v146.patch

@@ -13,10 +13,10 @@ Content-Transfer-Encoding: 8bit
  core/src/mindustry/core/NetClient.java        |  2 +
  core/src/mindustry/io/TypeIO.java             | 12 +++++-
  core/src/mindustry/net/Net.java               | 38 +++++++++++++++++--
- core/src/mindustry/net/NetworkIO.java         | 11 ++++++
+ core/src/mindustry/net/NetworkIO.java         | 13 ++++++-
  core/src/mindustry/net/Packets.java           |  2 +-
  .../world/blocks/units/UnitFactory.java       |  3 +-
- 7 files changed, 78 insertions(+), 7 deletions(-)
+ 7 files changed, 79 insertions(+), 8 deletions(-)
 
 diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java
 index 4e2f86410a33f8189976a143d0cd697ec7c56de5..67b051c81d5ce7f0f134ab5cd99d4aa7ad9c7b92 100644
@@ -207,18 +207,26 @@ index 48c4d6749bd6f0776547fd633d7ac18c76af2452..14e2f7fc8790a36b7293334f7311b75f
 
          if(object instanceof StreamBegin b){
 diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java
-index cf02a7065ef114a1a6a3d01ac6d9f8d5c69e3ddb..4434429e656efc8fd663bd0917ee4beba686b0e3 100644
+index fd0cdbaf51638cb37552b6e23ce4f11d25c56a56..4befd1b7fcb160ddc66eda4f2519ecf199b0885f 100644
 --- a/core/src/mindustry/net/NetworkIO.java
 +++ b/core/src/mindustry/net/NetworkIO.java
-@@ -14,6 +14,7 @@ import mindustry.logic.*;
+@@ -4,6 +4,7 @@ import arc.*;
+ import arc.util.*;
+ import arc.util.io.*;
+ import mindustry.*;
++import mindustry.content.*;
+ import mindustry.core.*;
+ import mindustry.ctype.*;
+ import mindustry.game.*;
+@@ -13,6 +14,7 @@ import mindustry.logic.*;
  import mindustry.maps.Map;
  import mindustry.net.Administration.*;
  import mindustry.type.*;
 +import mindustryX.features.*;
 
  import java.io.*;
  import java.nio.*;
-@@ -61,11 +62,19 @@ public class NetworkIO{
+@@ -60,12 +62,19 @@ public class NetworkIO{
          }
      }
 
@@ -228,17 +236,18 @@ index cf02a7065ef114a1a6a3d01ac6d9f8d5c69e3ddb..4434429e656efc8fd663bd0917ee4beb
          try(DataInputStream stream = new DataInputStream(is)){
              Time.clear();
              state.rules = JsonIO.read(Rules.class, stream.readUTF());
+-            state.mapLocales = JsonIO.read(MapLocales.class, stream.readUTF());
 +            if(LogicExt.v146Mode){
 +                //noinspection deprecation
 +                if(!state.rules.hiddenBuildItems.contains(Items.beryllium) && !state.rules.hiddenBuildItems.contains(Items.copper)){
 +                    state.rules.planet = Planets.sun;
 +                }
 +            }
-+            if(!LogicExt.v146Mode)
-             state.mapLocales = JsonIO.read(MapLocales.class, stream.readUTF());
++            if(!LogicExt.v146Mode) state.mapLocales = JsonIO.read(MapLocales.class, stream.readUTF());
              state.map = new Map(SaveIO.getSaveWriter().readStringMap(stream));
 
-@@ -87,11 +96,13 @@ public class NetworkIO{
+             state.wave = stream.readInt();
+@@ -86,11 +95,13 @@ public class NetworkIO{
              SaveIO.getSaveWriter().readContentHeader(stream);
              SaveIO.getSaveWriter().readMap(stream, world.context);
              SaveIO.getSaveWriter().readTeamBlocks(stream);