Update v146 -> BE(25087)76e24f7edc1ba4476aa22397749789a5c33e6689

Author: way-zer

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

@@ -18,7 +18,7 @@ Subject: [PATCH] CS: Version
  11 files changed, 37 insertions(+), 14 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
-index 5dce71d331fd8e76886739d80ba225c9a9ccdef2..511d79c5ece85ef092b12b233450417eaf1e849a 100644
+index 7d91d3191096c431b739d2d5ecd951a764feead3..ba271e6bd0dd06971fff6fa2314254149cc90087 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -4,6 +4,7 @@ logs/
@@ -28,7 +28,7 @@ index 5dce71d331fd8e76886739d80ba225c9a9ccdef2..511d79c5ece85ef092b12b233450417e
 +/core/assets/MindustryX.hjson
  /deploy/
  /out/
- /desktop/packr-out/
+ ios/libs/
 diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
 index 8cae20eee7a480cef6a14576fc72b096d38271e1..25602c4ab4070b7db9b31803c88281c7e4aa449e 100644
 --- a/android/AndroidManifest.xml
@@ -74,7 +74,7 @@ index d42ffe6d4a318ce558f1010eae46140f88ed5c99..bf44ead5c58abfb79c500e6daae30c3e
 +    <string name="app_name">MindustryX</string>
  </resources>
 diff --git a/build.gradle b/build.gradle
-index 2eaad0ed218fdb1994e98a26729cb9341c4dff6d..bcee6551b24137dd1c96aa1f2b5701008bbb0290 100644
+index 0cb5c6337c2d6a41243907d2c34c679b63112d61..fb6808e41d2fbff78c81f3904d01eb4e8e413492 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -21,12 +21,12 @@ allprojects{
@@ -106,10 +106,10 @@ index e2a6d4ede97677940bc6b73de42f6f5ff71fc0be..9d9d170c1fb00fbd4bf35c1a2f04bcff
      processResources.configure {
          dependsOn(generateLocales, generateBasePartNames, writeVersion)
 diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
-index 0dc1cf9e3fdb125b9d8c26c708960d69a4202b0a..ec34503e16c87ab34dcdba33e7e89d8f644048c6 100644
+index bc4c6a494aec88af73f001906598ba91a50ac6a3..d08d04a6f0e8107cec995876b2072c46aa85b3c2 100644
 --- a/core/src/mindustry/Vars.java
 +++ b/core/src/mindustry/Vars.java
-@@ -76,7 +76,7 @@ public class Vars implements Loadable{
+@@ -77,7 +77,7 @@ public class Vars implements Loadable{
      //TODO merge with v6 list upon release
      public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_v7.json";
      /** URL of the github issue report template.*/
@@ -119,7 +119,7 @@ index 0dc1cf9e3fdb125b9d8c26c708960d69a4202b0a..ec34503e16c87ab34dcdba33e7e89d8f
      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 9f6a8bf9227b9f389140236d7b5b20dcecf1a70b..6eaa704296d197c2bcd722c78e2c770a543aec27 100644
+index 8171a89797a0d1cb29fb50364a94b6d3130698ae..76736b9f6bc44d040bdfc2cc717702d1c3eca839 100644
 --- a/core/src/mindustry/core/NetClient.java
 +++ b/core/src/mindustry/core/NetClient.java
 @@ -92,7 +92,7 @@ public class NetClient implements ApplicationListener{
@@ -141,10 +141,10 @@ index 9f6a8bf9227b9f389140236d7b5b20dcecf1a70b..6eaa704296d197c2bcd722c78e2c770a
          });
      }
 diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
-index 52ae9dd382b0ba88549085bd865303bea6d14c35..66a3940ac97f0290632842dd2a37324bc7c988cf 100644
+index b80f828362676bdad9cffa982b2544f845441c74..80149612e037bd9ec6368c1b4c3a5d067fd184f1 100644
 --- a/core/src/mindustry/core/NetServer.java
 +++ b/core/src/mindustry/core/NetServer.java
-@@ -208,9 +208,14 @@ public class NetServer implements ApplicationListener{
+@@ -210,9 +210,14 @@ public class NetServer implements ApplicationListener{
                  return;
              }
 
@@ -210,13 +210,13 @@ index 73bbd59416cc8e1b64bcb5538fdd73886a455451..8698103654e40dd4e85451e1020563ca
      }
  }
 diff --git a/gradle.properties b/gradle.properties
-index 7b12c3c47ea2c2738d1dca24487f5ce4fc81d79f..6da05117a3f4abd7ae82fe2a5d766b1a847f7100 100644
+index f43e22ea642fe0dcd62cf970a518de025db65ea4..b1921b8ac0d8d0ca7ac86e4d551a694d1ae38ed9 100644
 --- a/gradle.properties
 +++ b/gradle.properties
-@@ -27,4 +27,6 @@ org.gradle.caching=true
- #used for slow jitpack builds; TODO see if this actually works
+@@ -28,3 +28,5 @@ org.gradle.caching=true
  org.gradle.internal.http.socketTimeout=100000
  org.gradle.internal.http.connectionTimeout=100000
+ archash=7d6e89dffd
 +
-+upstreamBuild=146
- archash=152e49944a
++upstreamBuild=25087
+\ No newline at end of file

patches/client/0001-SC-Early-release-Anuken-9065.patch

@@ -11,10 +11,10 @@ Subject: [PATCH] API: Hooks
  create mode 100644 core/src/mindustryX/Hooks.java
 
 diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
-index 7e0757047006ed5d6e8b1165124b7de90a8e037d..87c1dfce278bdc123ee761d8e1e16c2b883d2c8a 100644
+index 2a7b133588279145272136f6aa2a02276f34d824..fa6e5c5b52cfdb83de5b50539d57c579aa6e0c95 100644
 --- a/core/src/mindustry/ClientLauncher.java
 +++ b/core/src/mindustry/ClientLauncher.java
-@@ -170,6 +170,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+@@ -171,6 +171,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
          add(ui = new UI());
          add(netServer = new NetServer());
          add(netClient = new NetClient());
@@ -23,10 +23,10 @@ index 7e0757047006ed5d6e8b1165124b7de90a8e037d..87c1dfce278bdc123ee761d8e1e16c2b
          assets.load(schematics);
 
 diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
-index ec34503e16c87ab34dcdba33e7e89d8f644048c6..ae716151e019fa61af85b99583d3bc8dba9a3e18 100644
+index d08d04a6f0e8107cec995876b2072c46aa85b3c2..793c1759060a5e28e1df276bae2fdcf23f78284e 100644
 --- a/core/src/mindustry/Vars.java
 +++ b/core/src/mindustry/Vars.java
-@@ -259,6 +259,7 @@ public class Vars implements Loadable{
+@@ -269,6 +269,7 @@ public class Vars implements Loadable{
      }
 
      public static void init(){

patches/client/0003-API-MindustryXApi.patch patches/client/0002-API-MindustryXApi.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 ca9a6bc239f65b3f229f974dc504dabb306a2727..e925720991eb09aabe3440a879a3ce6a0b959ed1 100644
+index 70d1543c366b4eeef80c67f4eaeb05643c93451e..fe9682663342ccd1f3537cf82ea4c74996655440 100644
 --- a/core/src/mindustry/io/TypeIO.java
 +++ b/core/src/mindustry/io/TypeIO.java
-@@ -403,8 +403,9 @@ public class TypeIO{
+@@ -414,8 +414,9 @@ public class TypeIO{
          if(!plan.breaking){
              write.s(plan.block.id);
              write.b((byte)plan.rotation);

patches/client/0004-CS-Version.patch patches/client/0003-CS-Version.patch

@@ -8,35 +8,35 @@ Subject: [PATCH] API: Add `LogicBlock.running`
  1 file changed, 5 insertions(+)
 
 diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
-index 765186cce1c4aef68cf12a6a0e8b4a6ba3fadd7b..e726a36e0129961c4f10664e0a2277d5b3c377be 100644
+index 655cf48e4f974d2e05cdca66deb361f1ee9f65bf..6f4d08ac40d461d0c41dbb292866add7565ed784 100644
 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java
 +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java
-@@ -23,6 +23,7 @@ import mindustry.ui.*;
+@@ -24,6 +24,7 @@ import mindustry.ui.*;
  import mindustry.world.*;
  import mindustry.world.blocks.ConstructBlock.*;
  import mindustry.world.meta.*;
 +import mindustryX.*;
 
  import java.io.*;
  import java.util.zip.*;
-@@ -30,6 +31,8 @@ import java.util.zip.*;
+@@ -31,6 +32,8 @@ import java.util.zip.*;
  import static mindustry.Vars.*;
 
  public class LogicBlock extends Block{
 +    @MindustryXApi
 +    public static boolean running = false;
      private static final int maxByteLen = 1024 * 100;
+     public static final int maxNameLength = 32;
 
-     public int maxInstructionScale = 5;
-@@ -509,6 +512,7 @@ public class LogicBlock extends Block{
+@@ -531,6 +534,7 @@ public class LogicBlock extends Block{
 
                  if(accumulator > maxInstructionScale * ipt) accumulator = maxInstructionScale * ipt;
 
 +                running = true;
                  for(int i = 0; i < (int)accumulator; i++){
                      executor.runOnce();
                      accumulator --;
-@@ -517,6 +521,7 @@ public class LogicBlock extends Block{
+@@ -539,6 +543,7 @@ public class LogicBlock extends Block{
                          break;
                      }
                  }

patches/client/0005-API-Hooks.patch patches/client/0004-API-Hooks.patch

@@ -11,26 +11,26 @@ Subject: [PATCH] API: add SendPacketEvent
  create mode 100644 core/src/mindustryX/events/SendPacketEvent.java
 
 diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java
-index 3eaeacd1f3ea9436ba8b67b9a04b1a40cad02a5c..80e9b6b7317ac124d936bebce0e4481e2a31721c 100644
+index e7a1a33dd6b4a523900d841d08246d0383ce2f30..23e8b294d646f2835750a1b085ae826032c3c627 100644
 --- a/core/src/mindustry/net/ArcNetProvider.java
 +++ b/core/src/mindustry/net/ArcNetProvider.java
-@@ -15,6 +15,7 @@ import mindustry.game.EventType.*;
+@@ -16,6 +16,7 @@ import mindustry.game.EventType.*;
  import mindustry.net.Administration.*;
  import mindustry.net.Net.*;
  import mindustry.net.Packets.*;
 +import mindustryX.events.*;
  import net.jpountz.lz4.*;
 
  import java.io.*;
-@@ -329,6 +330,7 @@ public class ArcNetProvider implements NetProvider{
+@@ -335,6 +336,7 @@ public class ArcNetProvider implements NetProvider{
 
          @Override
          public void sendStream(Streamable stream){
 +            if(SendPacketEvent.emit(this, null, stream)) return;
              connection.addListener(new InputStreamSender(stream.stream, 1024){
                  int id;
 
-@@ -354,6 +356,7 @@ public class ArcNetProvider implements NetProvider{
+@@ -360,6 +362,7 @@ public class ArcNetProvider implements NetProvider{
 
          @Override
          public void send(Object object, boolean reliable){
@@ -39,18 +39,18 @@ index 3eaeacd1f3ea9436ba8b67b9a04b1a40cad02a5c..80e9b6b7317ac124d936bebce0e4481e
                  if(reliable){
                      connection.sendTCP(object);
 diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java
-index ef69c392b08de46d8994610b3ffb5ebdd64ab41a..6f9b8f9b50079b42f7762c8ee2b1101394b54e33 100644
+index 145238bf8856c7b83da468b89362c3d1df5d5928..7db098b1985ea7df7516f43ab4b0c49f05c723fa 100644
 --- a/core/src/mindustry/net/Net.java
 +++ b/core/src/mindustry/net/Net.java
-@@ -9,6 +9,7 @@ import mindustry.game.EventType.*;
+@@ -10,6 +10,7 @@ import mindustry.game.EventType.*;
  import mindustry.gen.*;
  import mindustry.net.Packets.*;
  import mindustry.net.Streamable.*;
 +import mindustryX.events.*;
  import net.jpountz.lz4.*;
 
  import java.io.*;
-@@ -222,8 +223,10 @@ public class Net{
+@@ -223,8 +224,10 @@ public class Net{
 
      /** Send an object to all connected clients, or to the server if this is a client.*/
      public void send(Object object, boolean reliable){
@@ -61,7 +61,7 @@ index ef69c392b08de46d8994610b3ffb5ebdd64ab41a..6f9b8f9b50079b42f7762c8ee2b11013
                  con.send(object, reliable);
              }
          }else{
-@@ -233,8 +236,9 @@ public class Net{
+@@ -234,8 +237,9 @@ public class Net{
 
      /** Send an object to everyone EXCEPT a certain client. Server-side only.*/
      public void sendExcept(NetConnection except, Object object, boolean reliable){

patches/client/0006-CS-Bundle-Extend.patch patches/client/0005-CS-Bundle-Extend.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] S: add `Config.locale` for localizedName
  1 file changed, 1 insertion(+)
 
 diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java
-index d544531fac41023e5d71ddcbdabb493118dfb35e..1fb21851e5c95530cf549d9a24e3a353c2b1dd7a 100644
+index da453afaa53fd7cc72e073baedb29da31e705bb9..6e17790494961f306260d2b521ce2add39642d93 100644
 --- a/core/src/mindustry/net/Administration.java
 +++ b/core/src/mindustry/net/Administration.java
 @@ -488,6 +488,7 @@ public class Administration{

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

@@ -8,7 +8,7 @@ Subject: [PATCH] SC: Fix #6
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
-index 94a0de3071c6c486fad37876edc5004283756150..036ccf0b629c45ee75cd60294be91e5e3b745124 100644
+index e6c368d97eec75f27d68d681fec480defe7e8218..d80217d66403bfd962594deb73642f053f3e403d 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.*;
@@ -19,7 +19,7 @@ index 94a0de3071c6c486fad37876edc5004283756150..036ccf0b629c45ee75cd60294be91e5e
  import mindustry.world.meta.*;
 
  import static mindustry.Vars.*;
-@@ -153,7 +154,10 @@ public class PayloadConveyor extends Block{
+@@ -154,7 +155,10 @@ public class PayloadConveyor extends Block{
                  if(valid && stepAccepted != curStep && item != null){
                      if(next != null){
                          //trigger update forward
@@ -31,7 +31,7 @@ index 94a0de3071c6c486fad37876edc5004283756150..036ccf0b629c45ee75cd60294be91e5e
 
                          //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)){
-@@ -260,6 +264,7 @@ public class PayloadConveyor extends Block{
+@@ -267,6 +271,7 @@ public class PayloadConveyor extends Block{
 
          @Override
          public boolean acceptPayload(Building source, Payload payload){

patches/client/0008-API-Add-LogicBlock.running.patch patches/client/0007-API-Add-LogicBlock.running.patch

@@ -34,18 +34,18 @@ index 6f65e9981f2291d1c892c23f3ec8603aec8e3a4c..32133826223d3e4fe1be991c8abd3bc2
                  }
                  line ++;
 diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
-index 73ce558eb343b812561f76a65efc795008533a9e..9ca0dca4133fc15af3feb32e5ef770d806f9812d 100644
+index 3ca506e0e0ec45bf4bfbc58029e2db65673a4c60..9884b9846f06a48c4596ffa5f29f59279b3c21b7 100644
 --- a/core/src/mindustry/logic/LStatements.java
 +++ b/core/src/mindustry/logic/LStatements.java
-@@ -18,6 +18,7 @@ import mindustry.logic.LogicFx.*;
+@@ -20,6 +20,7 @@ import mindustry.logic.LogicFx.*;
  import mindustry.type.*;
  import mindustry.ui.*;
  import mindustry.world.meta.*;
 +import mindustryX.*;
 
  import static mindustry.Vars.*;
  import static mindustry.logic.LCanvas.*;
-@@ -43,6 +44,16 @@ public class LStatements{
+@@ -45,6 +46,16 @@ public class LStatements{
 
      @RegisterStatement("noop")
      public static class InvalidStatement extends LStatement{
@@ -63,7 +63,7 @@ index 73ce558eb343b812561f76a65efc795008533a9e..9ca0dca4133fc15af3feb32e5ef770d8
          @Override
          public void build(Table table){
 diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
-index e726a36e0129961c4f10664e0a2277d5b3c377be..753688265a060d519686d49a24eac6627cd21991 100644
+index 6f4d08ac40d461d0c41dbb292866add7565ed784..261b6374360c2cbae88f44aa441f55706c181936 100644
 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java
 +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java
 @@ -1,5 +1,6 @@
@@ -73,15 +73,15 @@ index e726a36e0129961c4f10664e0a2277d5b3c377be..753688265a060d519686d49a24eac662
  import arc.Graphics.*;
  import arc.Graphics.Cursor.*;
  import arc.func.*;
-@@ -24,6 +25,7 @@ import mindustry.world.*;
+@@ -25,6 +26,7 @@ import mindustry.world.*;
  import mindustry.world.blocks.ConstructBlock.*;
  import mindustry.world.meta.*;
  import mindustryX.*;
 +import mindustryX.events.*;
 
  import java.io.*;
  import java.util.zip.*;
-@@ -382,6 +384,8 @@ public class LogicBlock extends Block{
+@@ -404,6 +406,8 @@ public class LogicBlock extends Block{
                      asm.putConst("@thisx", World.conv(x));
                      asm.putConst("@thisy", World.conv(y));