sync 2024/9/8

Author: way-zer

patches/client/0003-CS-Version.patch

@@ -2,19 +2,24 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: way-zer <[email protected]>
 Date: Tue, 9 Apr 2024 18:21:14 +0800
 Subject: [PATCH] CS: Version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
+不再发送ARC标识
+way-zer <[email protected]> on 2024/9/8
 ---
  .gitignore                             |  1 +
  android/build.gradle                   |  4 ++--
  android/res/values/strings.xml         |  2 +-
  build.gradle                           |  2 +-
  core/build.gradle.kts                  |  2 +-
  core/src/mindustry/Vars.java           |  2 +-
- core/src/mindustry/core/NetClient.java |  2 ++
+ core/src/mindustry/core/NetClient.java |  1 +
  core/src/mindustry/core/Version.java   | 16 +++++++++++++++-
  core/src/mindustry/net/NetworkIO.java  |  2 +-
  gradle.properties                      |  2 ++
- 10 files changed, 27 insertions(+), 8 deletions(-)
+ 10 files changed, 26 insertions(+), 8 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index 7d91d3191096c431b739d2d5ecd951a764feead3..ba271e6bd0dd06971fff6fa2314254149cc90087 100644
@@ -100,14 +105,13 @@ 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 d0e444a4a7a9ced372a2c93102860991ac922112..72db086039f01b7358023c494a3355db24433117 100644
+index d0e444a4a7a9ced372a2c93102860991ac922112..0948c4a880fe17643171857951722cd798248892 100644
 --- a/core/src/mindustry/core/NetClient.java
 +++ b/core/src/mindustry/core/NetClient.java
-@@ -135,6 +135,8 @@ public class NetClient implements ApplicationListener{
+@@ -135,6 +135,7 @@ public class NetClient implements ApplicationListener{
              Log.info("Received world data: @ bytes.", data.stream.available());
              NetworkIO.loadWorld(new InflaterInputStream(data.stream));
 
-+            Call.serverPacketReliable("ARC", Version.mdtXBuild);
 +            Call.serverPacketReliable("MDTX", Version.mdtXBuild);
              finishConnecting();
          });

patches/client/0013-C.patch patches/client/0013-C-dynamic-Window-title.patch

@@ -1,18 +1,18 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: way-zer <[email protected]>
 Date: Wed, 24 Jan 2024 21:40:17 +0800
-Subject: [PATCH] =?UTF-8?q?C:=20=E5=8A=A8=E6=80=81=E6=B8=B8=E6=88=8F?=
- =?UTF-8?q?=E6=A0=87=E9=A2=98?=
+Subject: [PATCH] =?UTF-8?q?C:=20dynamic=20Window=20title=20/=20=E5=8A=A8?=
+ =?UTF-8?q?=E6=80=81=E6=B8=B8=E6=88=8F=E6=A0=87=E9=A2=98?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 ---
- core/src/mindustry/ClientLauncher.java | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ core/src/mindustry/ClientLauncher.java | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
 
 diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
-index e3bf01fb63b179f4669e99c43891b842bcae66a6..b4c83b0e03a421e9f4d738944dca1873f6a27c82 100644
+index e3bf01fb63b179f4669e99c43891b842bcae66a6..dffbb9df1312c2c7842c533bb2801b4810328747 100644
 --- a/core/src/mindustry/ClientLauncher.java
 +++ b/core/src/mindustry/ClientLauncher.java
 @@ -238,6 +238,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
@@ -24,16 +24,17 @@ index e3bf01fb63b179f4669e99c43891b842bcae66a6..b4c83b0e03a421e9f4d738944dca1873
              asyncCore.begin();
 
              super.update();
-@@ -254,6 +256,18 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+@@ -254,6 +256,19 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
          }
      }
 
 +    private String lastTitle = "";
 +    private void updateTitle(){
++        if(graphics == null) return;
 +        var mod = mods.orderedMods();
 +        var title = "MindustryX | 版本号 " + Version.mdtXBuild +
 +        " | mod启用" + mod.count(Mods.LoadedMod::enabled) + "/" + mod.size +
-+        " | " + (Core.graphics != null ? Core.graphics.getWidth() + "x" + Core.graphics.getHeight() : "");
++        " | " + graphics.getWidth() + "x" + graphics.getHeight();
 +        if(!title.equals(lastTitle)){
 +            lastTitle = title;
 +            graphics.setTitle(title);

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

@@ -9,10 +9,10 @@ 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 72db086039f01b7358023c494a3355db24433117..3b4f8e8ee03f9ec4c95e085739af1d10454a0813 100644
+index 0948c4a880fe17643171857951722cd798248892..c6f8015a4616cb845c091c88425fd1cb33e0c8f4 100644
 --- a/core/src/mindustry/core/NetClient.java
 +++ b/core/src/mindustry/core/NetClient.java
-@@ -198,6 +198,8 @@ public class NetClient implements ApplicationListener{
+@@ -197,6 +197,8 @@ public class NetClient implements ApplicationListener{
 
      @Remote(targets = Loc.server, variants = Variant.both)
      public static void sendMessage(String message, @Nullable String unformatted, @Nullable Player playersender){
@@ -21,7 +21,7 @@ index 72db086039f01b7358023c494a3355db24433117..3b4f8e8ee03f9ec4c95e085739af1d10
          if(Vars.ui != null){
              Vars.ui.chatfrag.addMessage(message);
              Sounds.chatMessage.play();
-@@ -215,6 +217,8 @@ public class NetClient implements ApplicationListener{
+@@ -214,6 +216,8 @@ public class NetClient implements ApplicationListener{
      //equivalent to above method but there's no sender and no console log
      @Remote(called = Loc.server, targets = Loc.server)
      public static void sendMessage(String message){

patches/client/0030-API-ui.Format.patch

@@ -18,7 +18,7 @@ way-zer <[email protected]> on 2024/6/14
 
 diff --git a/core/src/mindustryX/features/ui/Format.kt b/core/src/mindustryX/features/ui/Format.kt
 new file mode 100644
-index 0000000000000000000000000000000000000000..293e186b306383f1a87f6916dd51cc16688a6698
+index 0000000000000000000000000000000000000000..63dc96567e610f20f1244b90fc2fb731549cc989
 --- /dev/null
 +++ b/core/src/mindustryX/features/ui/Format.kt
 @@ -0,0 +1,123 @@
@@ -34,7 +34,7 @@ index 0000000000000000000000000000000000000000..293e186b306383f1a87f6916dd51cc16
 +data class Format @JvmOverloads constructor(var decimal: Int = 2, var fixDecimals: Boolean = false) {
 +    /**以固定的有效位数输出*/
 +    fun fixedPrecision(v: Float): String {
-+        val exponent = Mathf.floor(Mathf.log(10f, abs(v)))
++        val exponent = Mathf.floor(Mathf.log(10f, abs(v))).coerceAtLeast(0)
 +        if (exponent >= decimal) return v.toInt().toString()
 +        return Strings.fixed(v, decimal - exponent)
 +    }
@@ -106,7 +106,7 @@ index 0000000000000000000000000000000000000000..293e186b306383f1a87f6916dd51cc16
 +    @JvmOverloads
 +    fun percent(cur: Float, max: Float, percent: Float = cur / max, showPercent: Boolean = percent < 0.95f): String {
 +        return buildString {
-+            if (Mathf.zero(percent, 0.1f)) append('\uE815') else append(format(cur))
++            append(format(cur))
 +            if (percent < 0.99f) {
 +                append('/')
 +                append(format(max))

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 3b4f8e8ee03f9ec4c95e085739af1d10454a0813..cd9ef6e4832961bef095ed8deec2b69d88b14d28 100644
+index c6f8015a4616cb845c091c88425fd1cb33e0c8f4..096f637032d6ad33967d62732ba2732a054b5e22 100644
 --- a/core/src/mindustry/core/NetClient.java
 +++ b/core/src/mindustry/core/NetClient.java
 @@ -24,6 +24,7 @@ import mindustry.net.*;

patches/client/0040-ARC-bundle-and-settings.patch

@@ -11,13 +11,13 @@ way-zer <[email protected]> on 2024/4/20 at 21:59
 ---
  core/assets/bundles/bundle-mdtx.properties    | 237 ++++++++++++++++++
  .../ui/dialogs/SettingsMenuDialog.java        |  28 +--
- core/src/mindustryX/features/ArcOld.java      | 221 ++++++++++++++++
+ core/src/mindustryX/features/ArcOld.java      | 219 ++++++++++++++++
  core/src/mindustryX/features/Settings.java    |   1 +
- 4 files changed, 472 insertions(+), 15 deletions(-)
+ 4 files changed, 470 insertions(+), 15 deletions(-)
  create mode 100644 core/src/mindustryX/features/ArcOld.java
 
 diff --git a/core/assets/bundles/bundle-mdtx.properties b/core/assets/bundles/bundle-mdtx.properties
-index 623d778207282303a60e9efc99981131a99eb253..70ed79fdf385216999a98244f5128f6c47e29d78 100644
+index 623d778207282303a60e9efc99981131a99eb253..9d9cbc07ea828ebbcc4557994b36328cf9764e45 100644
 --- a/core/assets/bundles/bundle-mdtx.properties
 +++ b/core/assets/bundles/bundle-mdtx.properties
 @@ -77,3 +77,240 @@ category.developerMode.name = 特殊设置
@@ -156,7 +156,7 @@ index 623d778207282303a60e9efc99981131a99eb253..70ed79fdf385216999a98244f5128f6c
 +schematic.preview = 预览
 +setting.AuxiliaryTable.name = [acid]辅助器     [orange][重启生效]
 +setting.ShowInfoPopup.name = [acid]服务器信息版
-+setting.allBlocksReveal.name = [cyan]显示并允许建造所有物品
++setting.allUnlocked.name = [cyan]显示所有内容(含隐藏)
 +setting.alwaysShowPlayerUnit.name = [cyan]强制显示[white]:玩家本体及带领的单位
 +setting.alwaysShowUnitRTSAi.name = [acid]单位[white]：执行的RTS命令
 +setting.alwaysshowdropzone.name = [cyan]刷怪点
@@ -243,7 +243,7 @@ index 623d778207282303a60e9efc99981131a99eb253..70ed79fdf385216999a98244f5128f6c
 +setting.unitWeaponTargetLine.name = [acid]单位武器目标
 +setting.unitbuildplan.name = [acid]单位[white]：建造序列显示
 +setting.unithitbox.name = [acid]单位碰撞箱
-+setting.worldCreator.name = [cyan]创世神   [gray]可放置与删除地形
++setting.worldCreator.name = [cyan]创世神   [gray]无视限制，可编辑地形
 +settings.arc = [cyan]学术端！
 +settings.cheating = [red]作弊功能
 +settings.forcehide = [orange]帧率重调装置
@@ -330,10 +330,10 @@ index b93dced65be5c1eea38adc80f8dc2d84c2b3864d..b71452eca5b3527f0c2ee15edd8d6ef0
 
 diff --git a/core/src/mindustryX/features/ArcOld.java b/core/src/mindustryX/features/ArcOld.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ad69511c62759552d9611ed901d0ef8bc4accbc8
+index 0000000000000000000000000000000000000000..47ea958a84d4e7f33241ad98da20db3d061eab78
 --- /dev/null
 +++ b/core/src/mindustryX/features/ArcOld.java
-@@ -0,0 +1,221 @@
+@@ -0,0 +1,219 @@
 +package mindustryX.features;
 +
 +import arc.func.*;
@@ -498,10 +498,8 @@ index 0000000000000000000000000000000000000000..ad69511c62759552d9611ed901d0ef8b
 +            c.addCategory("arcWeakCheat");
 +            c.checkPref("save_more_map", false);
 +            c.checkPref("forceIgnoreAttack", false);
-+            c.checkPref("allBlocksReveal", false, b -> AdvanceToolTable.allBlocksReveal = b);
-+            AdvanceToolTable.allBlocksReveal = settings.getBool("allBlocksReveal");
-+            c.checkPref("worldCreator", false, b -> AdvanceToolTable.worldCreator = b);
-+            AdvanceToolTable.worldCreator = settings.getBool("worldCreator");
++            c.checkPref("allUnlocked", false);
++            c.checkPref("worldCreator", false);
 +            c.checkPref("overrideSkipWave", false);
 +            c.checkPref("forceConfigInventory", false);
 +            c.addCategory("arcStrongCheat");

patches/client/0042-C-misc-patch.patch

@@ -4,6 +4,7 @@ Date: Sun, 18 Feb 2024 15:58:00 +0800
 Subject: [PATCH] C: misc patch
 
 ---
+ core/src/mindustry/ClientLauncher.java        |  2 +-
  core/src/mindustry/core/Control.java          |  3 ++-
  core/src/mindustry/core/NetClient.java        |  4 ++++
  core/src/mindustry/core/Renderer.java         |  6 +++---
@@ -13,9 +14,24 @@ Subject: [PATCH] C: misc patch
  core/src/mindustry/net/ArcNetProvider.java    |  2 +-
  .../mindustry/ui/dialogs/KeybindDialog.java   |  9 ++++++---
  .../ui/fragments/BlockInventoryFragment.java  |  2 +-
+ .../mindustry/world/blocks/defense/Radar.java |  9 +++++++++
  .../world/blocks/distribution/Router.java     |  3 ++-
- 10 files changed, 29 insertions(+), 33 deletions(-)
+ .../world/blocks/production/BeamDrill.java    | 12 ++++-------
+ 13 files changed, 43 insertions(+), 42 deletions(-)
 
+diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
+index dffbb9df1312c2c7842c533bb2801b4810328747..1eaf2eb3ccbc433068d421d48963441c359c566b 100644
+--- a/core/src/mindustry/ClientLauncher.java
++++ b/core/src/mindustry/ClientLauncher.java
+@@ -252,7 +252,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+             if(nextFrame > current){
+                 long toSleep = nextFrame - current;
+                 Threads.sleep(toSleep / 1000000, (int)(toSleep % 1000000));
+-            }
++            }else nextFrame = current;
+         }
+     }
+ 
 diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
 index bc730c44c41cbda85f46acc6990824f6985bc369..0af94a29e5013a51a98cdfe6a5f62bdb340566af 100644
 --- a/core/src/mindustry/core/Control.java
@@ -31,7 +47,7 @@ index bc730c44c41cbda85f46acc6990824f6985bc369..0af94a29e5013a51a98cdfe6a5f62bdb
                      Core.settings.put("uiscale", 100);
                      Core.settings.put("uiscalechanged", false);
 diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
-index cd9ef6e4832961bef095ed8deec2b69d88b14d28..5bef0c490bf785c3ca1cb41d5206a0df4cb53053 100644
+index 096f637032d6ad33967d62732ba2732a054b5e22..6fd5f42c966fcb10c68fd54c0e2a6498556e87fb 100644
 --- a/core/src/mindustry/core/NetClient.java
 +++ b/core/src/mindustry/core/NetClient.java
 @@ -62,6 +62,10 @@ public class NetClient implements ApplicationListener{
@@ -224,6 +240,39 @@ index 84f5bc221c2f1846d831acf4abf902b15bfc1c59..4a8ef62fb82970df299159e53687f4c8
          int row = 0;
 
          table.margin(4f);
+diff --git a/core/src/mindustry/world/blocks/defense/Radar.java b/core/src/mindustry/world/blocks/defense/Radar.java
+index e24a3368d190f64fdaf002130a76f4799834c9a5..0811c4520865cff648084cbc743a141367a103c5 100644
+--- a/core/src/mindustry/world/blocks/defense/Radar.java
++++ b/core/src/mindustry/world/blocks/defense/Radar.java
+@@ -3,12 +3,14 @@ package mindustry.world.blocks.defense;
+ import arc.graphics.*;
+ import arc.graphics.g2d.*;
+ import arc.math.*;
++import arc.math.geom.*;
+ import arc.struct.*;
+ import arc.util.io.*;
+ import mindustry.*;
+ import mindustry.annotations.Annotations.*;
+ import mindustry.gen.*;
+ import mindustry.graphics.*;
++import mindustry.input.*;
+ import mindustry.world.*;
+ import mindustry.world.meta.*;
+ 
+@@ -45,6 +47,13 @@ public class Radar extends Block{
+         Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, fogRadius * tilesize, Pal.accent);
+     }
+ 
++    //MDTX: 自动控制放置距离
++    @Override
++    public void changePlacementPath(Seq<Point2> points, int rotation){
++        var placeRadius2 = Mathf.pow(fogRadius, 2f) * 3;//*2/sqrt(3)/2
++        Placement.calculateNodes(points, this, rotation, (point, other) -> point.dst2(other) <= placeRadius2);
++    }
++
+     public class RadarBuild extends Building{
+         public float progress;
+         public float lastRadius = 0f;
 diff --git a/core/src/mindustry/world/blocks/distribution/Router.java b/core/src/mindustry/world/blocks/distribution/Router.java
 index 1e4a9399aac99d771d201d6ac01055295da686d4..fd1ef350517446c74427f85d27372bdd1a63cf22 100644
 --- a/core/src/mindustry/world/blocks/distribution/Router.java
@@ -238,3 +287,26 @@ index 1e4a9399aac99d771d201d6ac01055295da686d4..fd1ef350517446c74427f85d27372bdd
          }
 
          @Override
+diff --git a/core/src/mindustry/world/blocks/production/BeamDrill.java b/core/src/mindustry/world/blocks/production/BeamDrill.java
+index 163019c9c2562301984912c212e5d5558a028e36..85ec19d8a4d07d7c02245226b5ce39589edf01b4 100644
+--- a/core/src/mindustry/world/blocks/production/BeamDrill.java
++++ b/core/src/mindustry/world/blocks/production/BeamDrill.java
+@@ -171,14 +171,10 @@ public class BeamDrill extends Block{
+         }
+ 
+         if(item != null){
+-            float width = drawPlaceText(Core.bundle.formatFloat("bar.drillspeed", 60f / getDrillTime(item) * count, 2), x, y, valid);
+-            if(!multiple){
+-                float dx = x * tilesize + offset - width/2f - 4f, dy = y * tilesize + offset + size * tilesize / 2f + 5, s = iconSmall / 4f;
+-                Draw.mixcol(Color.darkGray, 1f);
+-                Draw.rect(item.fullIcon, dx, dy - 1, s, s);
+-                Draw.reset();
+-                Draw.rect(item.fullIcon, dx, dy, s, s);
+-            }
++            //MDTX 增加加液速度显示
++            float speed = 60f / getDrillTime(item) * count;
++            String msg = Strings.format("@ [white]@@[] @[white]([cyan]@[])", Iconc.production, item.emoji(), item.localizedName, Strings.autoFixed(speed, 2), Strings.autoFixed(speed * optionalBoostIntensity, 2));
++            drawPlaceText(msg, x, y, valid);
+         }else if(invalidItem != null){
+             drawPlaceText(Core.bundle.get("bar.drilltierreq"), x, y, false);
+         }