Update HEAD -> BE25486(da5f2f2)

patches/client/0002-BUILD-MindustryX.patch

@@ -59,7 +59,7 @@ index 52d6972f5111e55502e3187e3c600e1843f2ec3f..6dfb14b6bb9401ec083a0f6994ed9bab
  sourceSets.main {
      java.setSrcDirs(listOf("src/", "../../src/", layout.buildDirectory.dir("/generated/sources/annotationProcessor/java/main")))
 diff --git a/gradle.properties b/gradle.properties
-index f65d8c10f045cc393e011653effd94d05af93403..54214068e822e8f5caa33973aae18d3d61e23894 100644
+index 32b6a7e75474544bd77094113c7c1e6590dabe67..cc6b77df6b6fa7c0e8024fc782c28f741d375a9d 100644
 --- a/gradle.properties
 +++ b/gradle.properties
 @@ -18,7 +18,7 @@ kapt.use.worker.api=true

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

@@ -182,14 +182,14 @@ index 2500d18e59a325d6f1a6286d4f0d214d65a78402..eba453ade66d5e72f44726f64a28a057
          }catch(Throwable e){
              handleCrash(e);
 diff --git a/gradle.properties b/gradle.properties
-index 54214068e822e8f5caa33973aae18d3d61e23894..32381dee582832f898efc83c6221b052e441af8d 100644
+index cc6b77df6b6fa7c0e8024fc782c28f741d375a9d..0d99195c83a247ee47bd4eb3858d67f358860226 100644
 --- a/gradle.properties
 +++ b/gradle.properties
 @@ -27,3 +27,6 @@ org.gradle.internal.http.socketTimeout=100000
  org.gradle.internal.http.connectionTimeout=100000
  android.enableR8.fullMode=false
- archash=ae657a7db3
+ archash=124ba82104
 +
-+upstreamBuild=25465
++upstreamBuild=25486
 +versionType=bleeding-edge
 \ No newline at end of file

patches/client/0004-HG-Hooks.patch

@@ -11,10 +11,10 @@ Subject: [PATCH] HG: Hooks
  4 files changed, 7 insertions(+)
 
 diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
-index a0fe9fbdb1fe03fdcc72a284895fdccd12b581b0..fe713c0a0579627d2fca31826ff553ef76882dde 100644
+index 3e2fbca7df76607c76f27133d60686e4d4833cb5..655d2b09e7cfc011efd194b2b65bc85584c8f7d8 100644
 --- a/core/src/mindustry/ClientLauncher.java
 +++ b/core/src/mindustry/ClientLauncher.java
-@@ -173,6 +173,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+@@ -176,6 +176,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
          add(ui = new UI());
          add(netServer = new NetServer());
          add(netClient = new NetClient());

patches/client/0020-HC-StatExt.patch

@@ -31,8 +31,8 @@ way-zer <himc.wicp@gmail.com> on 2024/5/4 at 22:17
  .../consumers/ConsumePayloadDynamic.java      |   2 +-
  core/src/mindustry/world/meta/Stat.java       |  21 +-
  core/src/mindustry/world/meta/StatCat.java    |   5 +-
- core/src/mindustry/world/meta/StatValues.java | 261 ++++++++++++++----
- 23 files changed, 346 insertions(+), 80 deletions(-)
+ core/src/mindustry/world/meta/StatValues.java | 259 ++++++++++++++----
+ 23 files changed, 345 insertions(+), 79 deletions(-)
 
 diff --git a/core/src/mindustry/type/Item.java b/core/src/mindustry/type/Item.java
 index 5d81790919f016776eff80c6d241b1d034f76d11..ff81bc3b9d0a54e7aa0e8dae9e12d48612a9d2ab 100644
@@ -581,7 +581,7 @@ index 416df5a20af4767cdfdc2646bce19468ad11cd28..239311eea91980f2c3e0facd6613b237
      public final String name;
      public final int id;
 diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java
-index e05c129ea3de18c95f74e731b0f01fdfdb508040..dcaad1248422b9e3ab62d5ffb28bc76cea00a558 100644
+index d0be047ebc253c362a7939d1c96b244b24bdf872..a77bd271f7a40df23e96fbe280e0e6cff6ddd3f6 100644
 --- a/core/src/mindustry/world/meta/StatValues.java
 +++ b/core/src/mindustry/world/meta/StatValues.java
 @@ -16,7 +16,7 @@ import mindustry.*;
@@ -852,16 +852,7 @@ index e05c129ea3de18c95f74e731b0f01fdfdb508040..dcaad1248422b9e3ab62d5ffb28bc76c
                      }
 
                      if(type.pierceArmor){
-@@ -619,7 +712,7 @@ public class StatValues{
-                     }
-
-                     if(type.maxDamageFraction > 0){
--                        sep(bt, Core.bundle.format("bullet.maxdamagefraction", (int)(type.maxDamageFraction * 100))); 
-+                        sep(bt, Core.bundle.format("bullet.maxdamagefraction", (int)(type.maxDamageFraction * 100)));
-                     }
-
-                     if(type.suppressionRange > 0){
-@@ -645,26 +738,54 @@ public class StatValues{
+@@ -653,26 +746,54 @@ public class StatValues{
                              it.add(Core.bundle.format("bullet.interval", Strings.autoFixed(type.intervalBullets / type.bulletInterval * 60, 2)));
                              it.button(Icon.downOpen, Styles.emptyi, () -> coll.toggle(false)).update(i -> i.getStyle().imageUp = (!coll.isCollapsed() ? Icon.upOpen : Icon.downOpen)).size(8).padLeft(16f).expandX();
                          });
@@ -930,7 +921,7 @@ index e05c129ea3de18c95f74e731b0f01fdfdb508040..dcaad1248422b9e3ab62d5ffb28bc76c
                      }
                  }).padLeft(indent * 5).padTop(5).padBottom(compact ? 0 : 5).growX().margin(compact ? 0 : 10);
                  table.row();
-@@ -672,17 +793,61 @@ public class StatValues{
+@@ -680,17 +801,61 @@ public class StatValues{
          };
      }
 

patches/client/0029-H-misc.patch

@@ -27,7 +27,7 @@ Content-Transfer-Encoding: 8bit
  16 files changed, 81 insertions(+), 51 deletions(-)
 
 diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
-index fe713c0a0579627d2fca31826ff553ef76882dde..4d688f0c6ef1a48df309dc2db04a661c56e75cf4 100644
+index 655d2b09e7cfc011efd194b2b65bc85584c8f7d8..3af35def3785958e05ab0b8a668e721ab4d4dfbf 100644
 --- a/core/src/mindustry/ClientLauncher.java
 +++ b/core/src/mindustry/ClientLauncher.java
 @@ -36,6 +36,10 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
@@ -41,7 +41,7 @@ index fe713c0a0579627d2fca31826ff553ef76882dde..4d688f0c6ef1a48df309dc2db04a661c
          if(dataDir != null){
              Core.settings.setDataDirectory(files.absolute(dataDir));
          }
-@@ -252,6 +256,9 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+@@ -255,6 +259,9 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
              if(nextFrame > current){
                  long toSleep = nextFrame - current;
                  Threads.sleep(toSleep / 1000000, (int)(toSleep % 1000000));

patches/client/0031-FR-ARC-setBars.patch

@@ -265,7 +265,7 @@ index 92038694598090f098af6ac10f41c286e195e0d7..6b692dea2d5098c18a6632efb4b2fec0
      }
  }
 diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
-index 8c58f51a633cc5314a99bf30bda2b52d2f0a8715..fc64bc181d9c1ef73d325de51f7d814206a77c47 100644
+index 426d03891261431796c04aa17000e7c35dc055c8..f61b739b56ffd9947abe71cd6882b1565e782d0f 100644
 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
 +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
 @@ -7,6 +7,7 @@ import arc.graphics.*;
@@ -276,7 +276,7 @@ index 8c58f51a633cc5314a99bf30bda2b52d2f0a8715..fc64bc181d9c1ef73d325de51f7d8142
  import arc.struct.*;
  import arc.util.*;
  import arc.util.io.*;
-@@ -692,6 +693,14 @@ public class Turret extends ReloadTurret{
+@@ -713,6 +714,14 @@ public class Turret extends ReloadTurret{
              rotation = oldRot;
              reloadCounter = oldReload;
          }
@@ -511,10 +511,10 @@ index 5af67c37c74871553a35e9b5ff9757869072b6da..8c7ef00a68c89b1b82d8a1dbfbf63ad6
              () -> entity.heat / heatRequirement));
      }
 diff --git a/core/src/mindustry/world/blocks/production/WallCrafter.java b/core/src/mindustry/world/blocks/production/WallCrafter.java
-index d499f2cfe3a8592171323d40b638d5ccd0121dcb..8a3ea96bf8a7e7acd146d16f05fbb61a9b1f6f08 100644
+index 22f621c613b79e68c49af98ac326eebe09f84ee5..238275ed91fe1784701817bbd630373730502b0b 100644
 --- a/core/src/mindustry/world/blocks/production/WallCrafter.java
 +++ b/core/src/mindustry/world/blocks/production/WallCrafter.java
-@@ -57,7 +57,7 @@ public class WallCrafter extends Block{
+@@ -68,7 +68,7 @@ public class WallCrafter extends Block{
          super.setBars();
 
          addBar("drillspeed", (WallCrafterBuild e) ->

patches/client/0033-OG-lambda.patch

@@ -68,18 +68,18 @@ index d3346510927f3b567c93f9998ec2ab18b3d6b344..219b36a19a6930cd82d78f5193121b9d
                  result = e;
                  cdist = cost;
 diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
-index 977f16c0e38237b775024ad2c71802bb85d51381..6e0d5482b416709d1ae52b2efff61ddbd6e7ba1b 100644
+index 71329a947fb4d014cb4ca2aee7b0f4552f1dd24c..78dc179a34106566b02428f66f20a9680ba87414 100644
 --- a/core/src/mindustry/entities/bullet/BulletType.java
 +++ b/core/src/mindustry/entities/bullet/BulletType.java
-@@ -628,6 +628,7 @@ public class BulletType extends Content implements Cloneable{
+@@ -632,6 +632,7 @@ public class BulletType extends Content implements Cloneable{
          }
      }
 
 +    private static Bullet argBullet;
      public void updateHoming(Bullet b){
          if(homingPower > 0.0001f && b.time >= homingDelay){
              float realAimX = b.aimX < 0 ? b.x : b.aimX;
-@@ -635,20 +636,22 @@ public class BulletType extends Content implements Cloneable{
+@@ -639,20 +640,22 @@ public class BulletType extends Content implements Cloneable{
 
              Teamc target;
              //home in on allies if possible

patches/client/0034-API-C-DebugUtil.patch

@@ -15,10 +15,10 @@ way-zer <himc.wicp@gmail.com> on 2024/7/21
  3 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
-index 4d688f0c6ef1a48df309dc2db04a661c56e75cf4..3694df477c8f1a51d623922cdc93273625c87873 100644
+index 3af35def3785958e05ab0b8a668e721ab4d4dfbf..b5546786a0eb2de89f88f4fefa14827e7aaaa0df 100644
 --- a/core/src/mindustry/ClientLauncher.java
 +++ b/core/src/mindustry/ClientLauncher.java
-@@ -76,7 +76,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+@@ -79,7 +79,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
          });
 
          UI.loadColors();

patches/client/0041-FC-LogicExt-worldCreator-allUnlocked.patch

@@ -47,7 +47,7 @@ index c4ed0bf7081ef5c074baf1dd10339ad888bce6a3..2ce391f57a863b97823bf6e839522803
 
      public boolean unlocked(){
 diff --git a/core/src/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/mindustry/ui/dialogs/DatabaseDialog.java
-index e8ffe187781f3bc5624e48a42c53aae2adc71713..9180f253d8daafc61d30a2f4f3dff8a109c1c644 100644
+index 10e2ab9ddb54812a53ed26d2e765c860f6b09000..95d70aef09bd16aa26e1add85ba6c6ed1a5bf8de 100644
 --- a/core/src/mindustry/ui/dialogs/DatabaseDialog.java
 +++ b/core/src/mindustry/ui/dialogs/DatabaseDialog.java
 @@ -18,6 +18,8 @@ import mindustry.graphics.*;
@@ -69,7 +69,7 @@ index e8ffe187781f3bc5624e48a42c53aae2adc71713..9180f253d8daafc61d30a2f4f3dff8a1
 +            rebuild();
 +        }).checked((b) -> LogicExt.allUnlocked);
 +
-         all.margin(20).marginTop(0f);
+         all.margin(20).marginTop(0f).marginRight(30f);
 
          cont.top();
 @@ -101,7 +109,9 @@ public class DatabaseDialog extends BaseDialog{

patches/client/0048-UI-ARC-logic-Support.patch

@@ -125,7 +125,7 @@ index b78908ef6fcc26c8f7770da8135527c6d6d66867..e40b426a3c3ec656f9364c25ac762ed3
 
                  float maxX = Math.max(x, x2) + len;
 diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
-index c4b45c674c1a10a287dcded6fe431bfffc726151..7779a23a88015aa92bc4f334584ce1e19ad154c7 100644
+index 0cdcd5381f0f044f29261ee2d08ea59cc3910c26..07b2fe9cbbcb2dd7aa1f05176915ab2dc2766f73 100644
 --- a/core/src/mindustry/logic/LExecutor.java
 +++ b/core/src/mindustry/logic/LExecutor.java
 @@ -45,9 +45,9 @@ public class LExecutor{

patches/client/0051-OC-no-MapPreviewLoader.setupLoaders.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] OC: no MapPreviewLoader.setupLoaders
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
-index 3694df477c8f1a51d623922cdc93273625c87873..0d4dace1bb102560301be35a21d7d54a206623f4 100644
+index b5546786a0eb2de89f88f4fefa14827e7aaaa0df..b3b534965d8197c0633237dd54ab40926c611fe2 100644
 --- a/core/src/mindustry/ClientLauncher.java
 +++ b/core/src/mindustry/ClientLauncher.java
-@@ -143,7 +143,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+@@ -146,7 +146,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
          assets.load("sprites/error.png", Texture.class);
          atlas = TextureAtlas.blankAtlas();
          Vars.net = new Net(platform.getNet());

patches/client/0052-OC-no-bullet-create-when-hidden.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] OC: no bullet create when hidden
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
-index 6e0d5482b416709d1ae52b2efff61ddbd6e7ba1b..0fa5a69dab8157df057937292b4dccf2fca2dae2 100644
+index 78dc179a34106566b02428f66f20a9680ba87414..b83101758afbd2655a2da0ad0afd937564d3a04c 100644
 --- a/core/src/mindustry/entities/bullet/BulletType.java
 +++ b/core/src/mindustry/entities/bullet/BulletType.java
 @@ -22,6 +22,7 @@ import mindustry.graphics.*;
@@ -20,7 +20,7 @@ index 6e0d5482b416709d1ae52b2efff61ddbd6e7ba1b..0fa5a69dab8157df057937292b4dccf2
 
  import static mindustry.Vars.*;
 
-@@ -782,6 +783,7 @@ public class BulletType extends Content implements Cloneable{
+@@ -786,6 +787,7 @@ public class BulletType extends Content implements Cloneable{
          @Nullable Entityc owner, @Nullable Entityc shooter, Team team, float x, float y, float angle, float damage, float velocityScl,
          float lifetimeScl, Object data, @Nullable Mover mover, float aimX, float aimY, @Nullable Teamc target
      ){

patches/client/0054-OC-Fonts.patch

@@ -14,10 +14,10 @@ Content-Transfer-Encoding: 8bit
  3 files changed, 18 insertions(+), 22 deletions(-)
 
 diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
-index 0d4dace1bb102560301be35a21d7d54a206623f4..beecf6fe85396641a7efa9bfe1fe35668c3df728 100644
+index b3b534965d8197c0633237dd54ab40926c611fe2..4db49bd58a9d6c688fa6d17846ec79f642d30deb 100644
 --- a/core/src/mindustry/ClientLauncher.java
 +++ b/core/src/mindustry/ClientLauncher.java
-@@ -152,10 +152,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+@@ -155,10 +155,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
 
          assets.load(new Vars());
 
@@ -29,7 +29,7 @@ index 0d4dace1bb102560301be35a21d7d54a206623f4..beecf6fe85396641a7efa9bfe1fe3566
          assets.loadRun("maps", Map.class, () -> maps.loadPreviews());
 
          Musics.load();
-@@ -170,11 +168,11 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
+@@ -173,11 +171,11 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
          });
 
          assets.load(mods);

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

@@ -221,10 +221,10 @@ index eced3dc7581a4916970634e600d0f5cd86f6ee7e..58e315a6d9ec8c4c32df8a8220a9ccbb
 
          public float estimateDps(){
 diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
-index fc64bc181d9c1ef73d325de51f7d814206a77c47..9234713a0313b89d856db1cd70da9a8f752ebd58 100644
+index f61b739b56ffd9947abe71cd6882b1565e782d0f..3dcf22a47dbf506e4d7d2782c6b40369be58b05f 100644
 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
 +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
-@@ -367,6 +367,18 @@ public class Turret extends ReloadTurret{
+@@ -376,6 +376,18 @@ public class Turret extends ReloadTurret{
              drawer.draw(this);
          }
 

patches/client/0061-ARC-merged.patch

@@ -1171,7 +1171,7 @@ index 20490ccd5c3ee675f7c3456de6713a47818a8a10..c226fbac494963a34eda11b9b35db812
          unit.movePref(movement);
 
 diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
-index 7779a23a88015aa92bc4f334584ce1e19ad154c7..17e443cb75deed54645863f0df306885f1604f95 100644
+index 07b2fe9cbbcb2dd7aa1f05176915ab2dc2766f73..6d8feb67b14e0ee4fa838e510e1228c549e7685b 100644
 --- a/core/src/mindustry/logic/LExecutor.java
 +++ b/core/src/mindustry/logic/LExecutor.java
 @@ -10,6 +10,7 @@ import arc.util.*;
@@ -1451,7 +1451,7 @@ index 916b2ba5102ef670704e64a1f058c477c992d6dc..749c2180b6682361b568ca6d171675bc
 
      public static Font def, outline, icon, iconLarge, tech, logic;
 diff --git a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
-index 701ea7a21ce2d67e9170b5ba0d33ce1f25a17a21..62f3396a0fb48dddb9553a7dad7cf2de97134231 100644
+index b0e2bfb3ea7e795ddf219838bf084fe67513a774..d5a7d2d7dde20696179fd49cf4c1cdea797ebb6b 100644
 --- a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
 +++ b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
 @@ -9,8 +9,10 @@ import arc.util.*;
@@ -1502,8 +1502,8 @@ index 701ea7a21ce2d67e9170b5ba0d33ce1f25a17a21..62f3396a0fb48dddb9553a7dad7cf2de
 +        }).fillX().padLeft(10);
 +
          ScrollPane pane = new ScrollPane(table);
-         cont.add(pane);
-
+         table.marginRight(30f);
+         //TODO: some things (e.g. reconstructor requirements) are too long and screw up the layout
 diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
 index 9c2dd9475996987afa16085a3bb5debac262acc1..e3d86b9a466b0e433d1a7cb06e3748b98ea2f5ac 100644
 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -1747,7 +1747,7 @@ index 9c2dd9475996987afa16085a3bb5debac262acc1..e3d86b9a466b0e433d1a7cb06e3748b9
          current.row();
      }
 diff --git a/core/src/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/mindustry/ui/dialogs/DatabaseDialog.java
-index 9180f253d8daafc61d30a2f4f3dff8a109c1c644..ae2186a73a5ee7b1ede6f7c06d886adcb5406557 100644
+index 95d70aef09bd16aa26e1add85ba6c6ed1a5bf8de..0079479bdef517afe0c2d4b5abf5d4de9f99214b 100644
 --- a/core/src/mindustry/ui/dialogs/DatabaseDialog.java
 +++ b/core/src/mindustry/ui/dialogs/DatabaseDialog.java
 @@ -21,7 +21,6 @@ import mindustry.world.*;

patches/picked/0001-FIX.G-Revert-Removing-Nulls.unit.patch

@@ -136,7 +136,7 @@ index 55961ae9661cd54ef2e7cbea92984219c2b4b9c4..33b794176e6fb58858d180ec508db142
                      unit.dockedType = before.type;
                  }else if(before.dockedType != null && before.dockedType.coreUnitDock){
 diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
-index 0c4a4eb66232dd619ceeebc47ef310352960b53f..c4b45c674c1a10a287dcded6fe431bfffc726151 100644
+index 2333fdc344fae943513cf5d58ff075208e5ca909..0cdcd5381f0f044f29261ee2d08ea59cc3910c26 100644
 --- a/core/src/mindustry/logic/LExecutor.java
 +++ b/core/src/mindustry/logic/LExecutor.java
 @@ -1241,7 +1241,7 @@ public class LExecutor{