sync 2024/7/2

Author: way-zer

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

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: way-zer <[email protected]>
 Date: Sun, 17 Sep 2023 11:55:29 +0800
-Subject: [PATCH] SO: Early release #Anuken:9065
+Subject: [PATCH] SC: Early release #Anuken:9065
 
 ---
  core/src/mindustry/game/SpawnGroup.java | 2 +-

patches/client/0005-API-Hooks.patch

@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: way-zer <[email protected]>
+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(+)
+ 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
+--- a/core/src/mindustry/ClientLauncher.java
++++ b/core/src/mindustry/ClientLauncher.java
+@@ -170,6 +170,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+         add(ui = new UI());
+         add(netServer = new NetServer());
+         add(netClient = new NetClient());
++        add(new mindustryX.Hooks());
+ 
+         assets.load(schematics);
+ 
+diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
+index ec34503e16c87ab34dcdba33e7e89d8f644048c6..ae716151e019fa61af85b99583d3bc8dba9a3e18 100644
+--- a/core/src/mindustry/Vars.java
++++ b/core/src/mindustry/Vars.java
+@@ -259,6 +259,7 @@ public class Vars implements Loadable{
+     }
+ 
+     public static void init(){
++        mindustryX.Hooks.beforeInit();
+         Groups.init();
+ 
+         if(loadLocales){
+diff --git a/core/src/mindustryX/Hooks.java b/core/src/mindustryX/Hooks.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..499a9f3403c6769288ad44e7fb4a68ffb36bc591
+--- /dev/null
++++ b/core/src/mindustryX/Hooks.java
+@@ -0,0 +1,17 @@
++package mindustryX;
++
++import arc.*;
++import arc.util.*;
++
++public class Hooks implements ApplicationListener{
++    /** invoke before `Vars.init`. Note that may be executed from `Vars.loadAsync` */
++    public static void beforeInit(){
++        Log.infoTag("MindustryX", "Hooks.beforeInit");
++    }
++
++    /** invoke after loading, just before `Mod::init` */
++    @Override
++    public void init(){
++        Log.infoTag("MindustryX", "Hooks.init");
++    }
++}

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

@@ -5,36 +5,54 @@ Subject: [PATCH] CS: Bundle Extend
 
 ---
  core/assets/bundles/bundle-mdtx.properties |  0
- core/src/mindustry/Vars.java               | 16 ++++++++++++++++
- 2 files changed, 16 insertions(+)
+ core/src/mindustryX/Hooks.java             | 22 ++++++++++++++++++++++
+ 2 files changed, 22 insertions(+)
  create mode 100644 core/assets/bundles/bundle-mdtx.properties
 
 diff --git a/core/assets/bundles/bundle-mdtx.properties b/core/assets/bundles/bundle-mdtx.properties
 new file mode 100644
 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
-index ec34503e16c87ab34dcdba33e7e89d8f644048c6..498e222893f7e224cf87ba4d983df99efd181ae1 100644
---- a/core/src/mindustry/Vars.java
-+++ b/core/src/mindustry/Vars.java
-@@ -482,5 +482,21 @@ public class Vars implements Loadable{
-                 bundle.debug("router");
-             }
-         }
+diff --git a/core/src/mindustryX/Hooks.java b/core/src/mindustryX/Hooks.java
+index 499a9f3403c6769288ad44e7fb4a68ffb36bc591..ca6144798666f96ee074838e489b51df1a10d19d 100644
+--- a/core/src/mindustryX/Hooks.java
++++ b/core/src/mindustryX/Hooks.java
+@@ -1,12 +1,16 @@
+ package mindustryX;
+ 
+ import arc.*;
++import arc.files.*;
+ import arc.util.*;
+ 
++import java.util.*;
 +
+ public class Hooks implements ApplicationListener{
+     /** invoke before `Vars.init`. Note that may be executed from `Vars.loadAsync` */
+     public static void beforeInit(){
+         Log.infoTag("MindustryX", "Hooks.beforeInit");
++        registerBundle();
+     }
+ 
+     /** invoke after loading, just before `Mod::init` */
+@@ -14,4 +18,22 @@ public class Hooks implements ApplicationListener{
+     public void init(){
+         Log.infoTag("MindustryX", "Hooks.init");
+     }
++
++    private static void registerBundle(){
 +        //MDTX: bundle overwrite
 +        try{
-+            I18NBundle originBundle = bundle;
++            I18NBundle originBundle = Core.bundle;
 +            Fi handle = Core.files.internal("bundles/bundle-mdtx");
 +            Core.bundle = I18NBundle.createBundle(handle, Locale.getDefault());
-+            Reflect.set(bundle, "locale", originBundle.getLocale());
++            Reflect.set(Core.bundle, "locale", originBundle.getLocale());
 +            Log.info("MDTX: bundle has been loaded.");
-+            var rootBundle = bundle;
-+            while(rootBundle.getParent()!=null){
++            var rootBundle = Core.bundle;
++            while(rootBundle.getParent() != null){
 +                rootBundle = rootBundle.getParent();
 +            }
 +            Reflect.set(rootBundle, "parent", originBundle);
 +        }catch(Throwable e){
-+            e.printStackTrace();
++            Log.err(e);
 +        }
-     }
++    }
  }

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

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: way-zer <[email protected]>
 Date: Fri, 23 Jun 2023 16:21:59 +0800
-Subject: [PATCH] SO: improve ControlPathfinder.java (limit memory use)
+Subject: [PATCH] SC: improve ControlPathfinder.java (limit memory use)
 
 ---
  core/src/mindustry/ai/ControlPathfinder.java | 21 +++++++++++++++++---

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

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: way-zer <[email protected]>
 Date: Mon, 26 Dec 2022 15:29:10 +0800
-Subject: [PATCH] SO: Fix #6
+Subject: [PATCH] SC: Fix #6
 
 ---
  .../mindustry/world/blocks/payloads/PayloadConveyor.java   | 7 ++++++-

patches/client/0008-API-add-SendPacketEvent.patch patches/client/0009-API-add-SendPacketEvent.patch

@@ -12,10 +12,10 @@ Content-Transfer-Encoding: 8bit
  1 file changed, 14 insertions(+)
 
 diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
-index 7e0757047006ed5d6e8b1165124b7de90a8e037d..f195945461e87f5a3353ef0d5e8d229d163c8f2e 100644
+index 87c1dfce278bdc123ee761d8e1e16c2b883d2c8a..91e7514c34ce5748998b14b98b799cf1bf572f0d 100644
 --- a/core/src/mindustry/ClientLauncher.java
 +++ b/core/src/mindustry/ClientLauncher.java
-@@ -236,6 +236,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+@@ -237,6 +237,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
                  }))));
              }
          }else{
@@ -24,7 +24,7 @@ index 7e0757047006ed5d6e8b1165124b7de90a8e037d..f195945461e87f5a3353ef0d5e8d229d
              asyncCore.begin();
 
              super.update();
-@@ -252,6 +254,18 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+@@ -253,6 +255,18 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
          }
      }
 

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

@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: way-zer <[email protected]>
+Date: Tue, 9 Apr 2024 18:23:19 +0800
+Subject: [PATCH] API(Hooks) onHttp
+
+---
+ core/src/mindustryX/Hooks.java | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/core/src/mindustryX/Hooks.java b/core/src/mindustryX/Hooks.java
+index ca6144798666f96ee074838e489b51df1a10d19d..7cace088409de5b701577465f38ae01eb8b87a1c 100644
+--- a/core/src/mindustryX/Hooks.java
++++ b/core/src/mindustryX/Hooks.java
+@@ -4,6 +4,7 @@ import arc.*;
+ import arc.files.*;
+ import arc.util.*;
+ 
++import java.net.*;
+ import java.util.*;
+ 
+ public class Hooks implements ApplicationListener{
+@@ -19,6 +20,22 @@ public class Hooks implements ApplicationListener{
+         Log.infoTag("MindustryX", "Hooks.init");
+     }
+ 
++    @SuppressWarnings("unused")//call before arc.util.Http$HttpRequest.block
++    public static void onHttp(Http.HttpRequest req){
++        if(Core.settings.getBool("githubMirror")){
++            try{
++                String url = req.url;
++                String host = new URL(url).getHost();
++                if(host.contains("github.com") || host.contains("raw.githubusercontent.com")){
++                    url = "https://gh.tinylake.tech/" + url;
++                    req.url = url;
++                }
++            }catch(Exception e){
++                //ignore
++            }
++        }
++    }
++
+     private static void registerBundle(){
+         //MDTX: bundle overwrite
+         try{

patches/client/0010-S-add-Config.locale-for-localizedName.patch patches/client/0011-S-add-Config.locale-for-localizedName.patch

@@ -54,19 +54,19 @@ index aec39b666137666976321336b698e80177b05f84..5c57b1309660e500c38099d362b46a62
                  Draw.z(Layer.block);
 
 diff --git a/core/src/mindustryX/Hooks.java b/core/src/mindustryX/Hooks.java
-index ddb597d4389659c823a28f965434ed5be233215b..c399832fd28e50e3f6464380fca916cf5539d213 100644
+index 7cace088409de5b701577465f38ae01eb8b87a1c..1548f3d6ae0d362575a05ef38ea1575af65f5afc 100644
 --- a/core/src/mindustryX/Hooks.java
 +++ b/core/src/mindustryX/Hooks.java
-@@ -2,6 +2,8 @@ package mindustryX;
- 
+@@ -3,6 +3,8 @@ package mindustryX;
  import arc.*;
+ import arc.files.*;
  import arc.util.*;
 +import mindustry.*;
 +import mindustryX.features.*;
 
  import java.net.*;
- 
-@@ -9,6 +11,9 @@ public class Hooks implements ApplicationListener{
+ import java.util.*;
+@@ -18,6 +20,9 @@ public class Hooks implements ApplicationListener{
      @Override
      public void init(){
          Log.infoTag("MindustryX", "Hooks.init");

patches/client/0011-SO-improve-ControlPathfinder.java-limit-memory-use.patch patches/client/0012-SC-improve-ControlPathfinder.java-limit-memory-use.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: way-zer <[email protected]>
 Date: Fri, 23 Feb 2024 01:05:54 +0800
-Subject: [PATCH] API: Hooks.onHandleSendMessage
+Subject: [PATCH] API(Hooks) onHandleSendMessage
 
 ---
  core/src/mindustry/core/NetClient.java | 4 ++++
@@ -31,24 +31,26 @@ index 6eaa704296d197c2bcd722c78e2c770a543aec27..dcca3b910e100d508955cf96681a793f
              Vars.ui.chatfrag.addMessage(message);
              Sounds.chatMessage.play();
 diff --git a/core/src/mindustryX/Hooks.java b/core/src/mindustryX/Hooks.java
-index c399832fd28e50e3f6464380fca916cf5539d213..8e17b92678d8f8a844dc0395af6cbefbc20ca70e 100644
+index 1548f3d6ae0d362575a05ef38ea1575af65f5afc..b4687306b3fe782e096db1943e72cecc566e5e46 100644
 --- a/core/src/mindustryX/Hooks.java
 +++ b/core/src/mindustryX/Hooks.java
-@@ -3,6 +3,7 @@ package mindustryX;
- import arc.*;
+@@ -4,6 +4,7 @@ import arc.*;
+ import arc.files.*;
  import arc.util.*;
  import mindustry.*;
 +import mindustry.gen.*;
  import mindustryX.features.*;
 
  import java.net.*;
-@@ -31,4 +32,9 @@ public class Hooks implements ApplicationListener{
-             }
+@@ -41,6 +42,11 @@ public class Hooks implements ApplicationListener{
          }
      }
-+
+ 
 +    public static @Nullable String onHandleSendMessage(String message, @Nullable Player sender){
 +        if(message == null) return null;
 +        return message;
 +    }
- }
++
+     private static void registerBundle(){
+         //MDTX: bundle overwrite
+         try{

patches/client/0012-SO-Fix-6.patch patches/client/0013-SC-Fix-6.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: way-zer <[email protected]>
 Date: Fri, 23 Feb 2024 16:37:59 +0800
-Subject: [PATCH] API: InternalMods
+Subject: [PATCH] F: InternalMods
 
 ---
  core/src/mindustry/mod/Mods.java              |  2 +-

patches/client/0013-API-add-LogicAssembledEvent.patch patches/client/0014-API-add-LogicAssembledEvent.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: way-zer <[email protected]>
 Date: Fri, 23 Feb 2024 21:31:47 +0800
-Subject: [PATCH] =?UTF-8?q?C:=20claj=E5=8A=9F=E8=83=BD?=
+Subject: [PATCH] =?UTF-8?q?C(InternalMods):=20claj=E5=8A=9F=E8=83=BD?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

patches/client/0014-C.patch patches/client/0015-C.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: way-zer <[email protected]>
 Date: Thu, 29 Feb 2024 18:48:33 +0800
-Subject: [PATCH] C: TimeControl
+Subject: [PATCH] FC: TimeControl
 
 ---
  core/src/mindustryX/Hooks.java                |  1 +
@@ -10,10 +10,10 @@ Subject: [PATCH] C: TimeControl
  create mode 100644 core/src/mindustryX/features/TimeControl.java
 
 diff --git a/core/src/mindustryX/Hooks.java b/core/src/mindustryX/Hooks.java
-index 8e17b92678d8f8a844dc0395af6cbefbc20ca70e..5f15cc3b9f470523c214adfdd8d1f5f6e332cc55 100644
+index b4687306b3fe782e096db1943e72cecc566e5e46..9b7e280fb96aa4e5ffd26f432ecf938df542880e 100644
 --- a/core/src/mindustryX/Hooks.java
 +++ b/core/src/mindustryX/Hooks.java
-@@ -14,6 +14,7 @@ public class Hooks implements ApplicationListener{
+@@ -23,6 +23,7 @@ public class Hooks implements ApplicationListener{
          Log.infoTag("MindustryX", "Hooks.init");
          if(!Vars.headless){
              RenderExt.init();