diff --git a/patches/client/0029-H-misc.patch b/patches/client/0029-H-misc.patch index 487ba272bf65..079191ce8cff 100644 --- a/patches/client/0029-H-misc.patch +++ b/patches/client/0029-H-misc.patch @@ -19,12 +19,12 @@ Content-Transfer-Encoding: 8bit core/src/mindustry/ui/dialogs/JoinDialog.java | 19 ++++++++++-------- .../mindustry/ui/dialogs/KeybindDialog.java | 9 ++++++--- .../ui/fragments/BlockInventoryFragment.java | 2 +- - .../mindustry/ui/fragments/ChatFragment.java | 3 +++ + .../mindustry/ui/fragments/ChatFragment.java | 7 +++++-- .../mindustry/world/blocks/defense/Radar.java | 9 +++++++++ .../world/blocks/distribution/Router.java | 3 ++- .../world/blocks/production/BeamDrill.java | 12 ++++------- .../mindustry/desktop/DesktopLauncher.java | 12 ++++++++++- - 16 files changed, 79 insertions(+), 49 deletions(-) + 16 files changed, 81 insertions(+), 51 deletions(-) diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index 1b5a25a7cbbd00c5a8e463ec722fb3b3ac5da9d6..4f88b9fd412f09073bdb1e9aff277650a4bbde09 100644 @@ -301,7 +301,7 @@ index 54a36cde6eee102c9c8f3bfd5e4c76a2f4d0f1e1..bd810004301a4534c6568fb0bcd85f4a table.margin(4f); diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java -index 30c344478857c5d20db41f89bc2358cee2c1c8e5..7a968f1c21275eb4a571350adfcf59df1fa37df9 100644 +index 30c344478857c5d20db41f89bc2358cee2c1c8e5..89b9a23ce2bb850df5c7ae99a5f964753a807662 100644 --- a/core/src/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/mindustry/ui/fragments/ChatFragment.java @@ -5,6 +5,7 @@ import arc.Input.*; @@ -312,6 +312,15 @@ index 30c344478857c5d20db41f89bc2358cee2c1c8e5..7a968f1c21275eb4a571350adfcf59df import arc.math.*; import arc.scene.*; import arc.scene.ui.*; +@@ -29,7 +30,7 @@ public class ChatFragment extends Table{ + private boolean shown = false; + private TextField chatfield; + private Label fieldlabel = new Label(">"); +- private ChatMode mode = ChatMode.normal; ++ public ChatMode mode = ChatMode.normal; + private Font font; + private GlyphLayout layout = new GlyphLayout(); + private float offsetx = Scl.scl(4), offsety = Scl.scl(4), fontoffsetx = Scl.scl(2), chatspace = Scl.scl(50); @@ -73,6 +74,8 @@ public class ChatFragment extends Table{ historyPos--; updateChat(); @@ -321,6 +330,15 @@ index 30c344478857c5d20db41f89bc2358cee2c1c8e5..7a968f1c21275eb4a571350adfcf59df if(input.keyTap(Binding.chat_mode)){ nextMode(); } +@@ -287,7 +290,7 @@ public class ChatFragment extends Table{ + if(scrollPos > 0) scrollPos++; + } + +- private enum ChatMode{ ++ public enum ChatMode{ + normal(""), + team("/t"), + admin("/a", player::admin) 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 diff --git a/patches/client/0033-FC-MarkerType.patch b/patches/client/0033-FC-MarkerType.patch deleted file mode 100644 index ea4f430ae8fb..000000000000 --- a/patches/client/0033-FC-MarkerType.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: way-zer -Date: Tue, 16 Apr 2024 21:44:18 +0800 -Subject: [PATCH] =?UTF-8?q?FC:=20MarkerType=20=E6=A0=87=E8=AE=B0=E5=8A=9F?= - =?UTF-8?q?=E8=83=BD(=E9=87=8D=E5=88=B6)?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -支持\t前缀 -way-zer on 2024/6/10 ---- - core/src/mindustry/ui/fragments/ChatFragment.java | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java -index 7a968f1c21275eb4a571350adfcf59df1fa37df9..89b9a23ce2bb850df5c7ae99a5f964753a807662 100644 ---- a/core/src/mindustry/ui/fragments/ChatFragment.java -+++ b/core/src/mindustry/ui/fragments/ChatFragment.java -@@ -30,7 +30,7 @@ public class ChatFragment extends Table{ - private boolean shown = false; - private TextField chatfield; - private Label fieldlabel = new Label(">"); -- private ChatMode mode = ChatMode.normal; -+ public ChatMode mode = ChatMode.normal; - private Font font; - private GlyphLayout layout = new GlyphLayout(); - private float offsetx = Scl.scl(4), offsety = Scl.scl(4), fontoffsetx = Scl.scl(2), chatspace = Scl.scl(50); -@@ -290,7 +290,7 @@ public class ChatFragment extends Table{ - if(scrollPos > 0) scrollPos++; - } - -- private enum ChatMode{ -+ public enum ChatMode{ - normal(""), - team("/t"), - admin("/a", player::admin) diff --git a/patches/client/0034-OSC-lambda.patch b/patches/client/0033-OG-lambda.patch similarity index 99% rename from patches/client/0034-OSC-lambda.patch rename to patches/client/0033-OG-lambda.patch index 12fa682f768c..0912f3bc331f 100644 --- a/patches/client/0034-OSC-lambda.patch +++ b/patches/client/0033-OG-lambda.patch @@ -1,8 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: way-zer Date: Sat, 20 Apr 2024 19:35:22 +0800 -Subject: [PATCH] =?UTF-8?q?OSC:=20=E5=87=8F=E5=B0=91=E9=83=A8=E5=88=86lamb?= - =?UTF-8?q?da=E5=86=85=E5=AD=98=E5=88=86=E9=85=8D?= +Subject: [PATCH] =?UTF-8?q?OG:=20=E5=87=8F=E5=B0=91=E9=83=A8=E5=88=86lambd?= + =?UTF-8?q?a=E5=86=85=E5=AD=98=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/patches/client/0035-API-C-DebugUtil.patch b/patches/client/0034-API-C-DebugUtil.patch similarity index 100% rename from patches/client/0035-API-C-DebugUtil.patch rename to patches/client/0034-API-C-DebugUtil.patch diff --git a/patches/client/0036-OC-Batch.patch b/patches/client/0035-OC-Batch.patch similarity index 100% rename from patches/client/0036-OC-Batch.patch rename to patches/client/0035-OC-Batch.patch diff --git a/patches/client/0037-H-UI-HudFragment.patch b/patches/client/0036-H-UI-HudFragment.patch similarity index 100% rename from patches/client/0037-H-UI-HudFragment.patch rename to patches/client/0036-H-UI-HudFragment.patch diff --git a/patches/client/0038-CS-PointDefenseWeapon.patch b/patches/client/0037-CS-PointDefenseWeapon.patch similarity index 100% rename from patches/client/0038-CS-PointDefenseWeapon.patch rename to patches/client/0037-CS-PointDefenseWeapon.patch diff --git a/patches/client/0039-UI-Mod-Mod.patch b/patches/client/0038-UI-Mod-Mod.patch similarity index 100% rename from patches/client/0039-UI-Mod-Mod.patch rename to patches/client/0038-UI-Mod-Mod.patch diff --git a/patches/client/0040-FC-LogicExt-limitUpdate.patch b/patches/client/0039-FC-LogicExt-limitUpdate.patch similarity index 100% rename from patches/client/0040-FC-LogicExt-limitUpdate.patch rename to patches/client/0039-FC-LogicExt-limitUpdate.patch diff --git a/patches/client/0041-FC-LogicExt-terrainSchematic.patch b/patches/client/0040-FC-LogicExt-terrainSchematic.patch similarity index 100% rename from patches/client/0041-FC-LogicExt-terrainSchematic.patch rename to patches/client/0040-FC-LogicExt-terrainSchematic.patch diff --git a/patches/client/0042-FC-LogicExt-worldCreator-allUnlocked.patch b/patches/client/0041-FC-LogicExt-worldCreator-allUnlocked.patch similarity index 100% rename from patches/client/0042-FC-LogicExt-worldCreator-allUnlocked.patch rename to patches/client/0041-FC-LogicExt-worldCreator-allUnlocked.patch diff --git a/patches/client/0043-FC-LogicExt-invertMapClick.patch b/patches/client/0042-FC-LogicExt-invertMapClick.patch similarity index 100% rename from patches/client/0043-FC-LogicExt-invertMapClick.patch rename to patches/client/0042-FC-LogicExt-invertMapClick.patch diff --git a/patches/client/0044-C-Editor.patch b/patches/client/0043-C-Editor.patch similarity index 100% rename from patches/client/0044-C-Editor.patch rename to patches/client/0043-C-Editor.patch diff --git a/patches/client/0045-HC-ARC-arcScanMode.patch b/patches/client/0044-HC-ARC-arcScanMode.patch similarity index 100% rename from patches/client/0045-HC-ARC-arcScanMode.patch rename to patches/client/0044-HC-ARC-arcScanMode.patch diff --git a/patches/client/0046-FC-noPlayerHitBox.patch b/patches/client/0045-FC-noPlayerHitBox.patch similarity index 100% rename from patches/client/0046-FC-noPlayerHitBox.patch rename to patches/client/0045-FC-noPlayerHitBox.patch diff --git a/patches/client/0048-FC-Icon.patch b/patches/client/0046-FC-MindustryX-Icon-for-android.patch similarity index 99% rename from patches/client/0048-FC-Icon.patch rename to patches/client/0046-FC-MindustryX-Icon-for-android.patch index c310f9297e78..2829e1f2f7ad 100644 --- a/patches/client/0048-FC-Icon.patch +++ b/patches/client/0046-FC-MindustryX-Icon-for-android.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: way-zer Date: Sun, 9 Jun 2024 20:05:22 +0800 -Subject: [PATCH] FC: Icon +Subject: [PATCH] FC: MindustryX Icon for android --- android/AndroidManifest.xml | 3 +-- diff --git a/patches/client/0049-API-add-PlayerTeamChangedEvent.patch b/patches/client/0047-API-add-PlayerTeamChangedEvent.patch similarity index 100% rename from patches/client/0049-API-add-PlayerTeamChangedEvent.patch rename to patches/client/0047-API-add-PlayerTeamChangedEvent.patch diff --git a/patches/client/0047-OC-SDL_SetHint-SDL_WINDOWS_DPI_SCALING.patch b/patches/client/0047-OC-SDL_SetHint-SDL_WINDOWS_DPI_SCALING.patch deleted file mode 100644 index 622965ea0706..000000000000 --- a/patches/client/0047-OC-SDL_SetHint-SDL_WINDOWS_DPI_SCALING.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: way-zer -Date: Sun, 2 Jun 2024 13:10:51 +0800 -Subject: [PATCH] OC: SDL_SetHint SDL_WINDOWS_DPI_SCALING - ---- - desktop/src/mindustry/desktop/DesktopLauncher.java | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java -index c3d08e2db1c3e28bad6a34dbe41b49d850ad7cf5..1c7157388cabd77e0a6efdcbe41d5e87ac88eacf 100644 ---- a/desktop/src/mindustry/desktop/DesktopLauncher.java -+++ b/desktop/src/mindustry/desktop/DesktopLauncher.java -@@ -71,6 +71,7 @@ public class DesktopLauncher extends ClientLauncher{ - } - - public DesktopLauncher(String[] args){ -+ arc.backend.sdl.jni.SDL.SDL_SetHint("SDL_WINDOWS_DPI_SCALING", "1"); - Version.init(); - //MDTX, auto discover steam - String steamJar = "addon_steam.jar"; diff --git a/patches/client/0050-UI-ARC-logic-Support.patch b/patches/client/0048-UI-ARC-logic-Support.patch similarity index 100% rename from patches/client/0050-UI-ARC-logic-Support.patch rename to patches/client/0048-UI-ARC-logic-Support.patch diff --git a/patches/client/0051-UI-forceJoin.patch b/patches/client/0049-UI-forceJoin.patch similarity index 100% rename from patches/client/0051-UI-forceJoin.patch rename to patches/client/0049-UI-forceJoin.patch diff --git a/patches/client/0052-O-Building.updatePowerGraph.patch b/patches/client/0050-O-Building.updatePowerGraph.patch similarity index 100% rename from patches/client/0052-O-Building.updatePowerGraph.patch rename to patches/client/0050-O-Building.updatePowerGraph.patch diff --git a/patches/client/0053-OC-no-MapPreviewLoader.setupLoaders.patch b/patches/client/0051-OC-no-MapPreviewLoader.setupLoaders.patch similarity index 100% rename from patches/client/0053-OC-no-MapPreviewLoader.setupLoaders.patch rename to patches/client/0051-OC-no-MapPreviewLoader.setupLoaders.patch diff --git a/patches/client/0054-OC-no-bullet-create-when-hidden.patch b/patches/client/0052-OC-no-bullet-create-when-hidden.patch similarity index 100% rename from patches/client/0054-OC-no-bullet-create-when-hidden.patch rename to patches/client/0052-OC-no-bullet-create-when-hidden.patch diff --git a/patches/client/0055-OC-Multithreading-Schematics-load.patch b/patches/client/0053-OC-Multithreading-Schematics-load.patch similarity index 100% rename from patches/client/0055-OC-Multithreading-Schematics-load.patch rename to patches/client/0053-OC-Multithreading-Schematics-load.patch diff --git a/patches/client/0056-OC-Fonts.patch b/patches/client/0054-OC-Fonts.patch similarity index 100% rename from patches/client/0056-OC-Fonts.patch rename to patches/client/0054-OC-Fonts.patch diff --git a/patches/client/0057-OC-speedup-SchematicsDialog-showing.patch b/patches/client/0055-OC-speedup-SchematicsDialog-showing.patch similarity index 100% rename from patches/client/0057-OC-speedup-SchematicsDialog-showing.patch rename to patches/client/0055-OC-speedup-SchematicsDialog-showing.patch diff --git a/patches/client/0058-OC-fix-slow-of-LCanvas.patch b/patches/client/0056-OC-fix-slow-of-LCanvas.patch similarity index 100% rename from patches/client/0058-OC-fix-slow-of-LCanvas.patch rename to patches/client/0056-OC-fix-slow-of-LCanvas.patch diff --git a/patches/client/0059-FC-reliableSync.patch b/patches/client/0057-FC-reliableSync.patch similarity index 100% rename from patches/client/0059-FC-reliableSync.patch rename to patches/client/0057-FC-reliableSync.patch diff --git a/patches/client/0060-API-more-error-log.patch b/patches/client/0058-API-more-error-log.patch similarity index 100% rename from patches/client/0060-API-more-error-log.patch rename to patches/client/0058-API-more-error-log.patch diff --git a/patches/client/0061-OC-optimize-Weather-render.patch b/patches/client/0059-OC-optimize-Weather-render.patch similarity index 100% rename from patches/client/0061-OC-optimize-Weather-render.patch rename to patches/client/0059-OC-optimize-Weather-render.patch diff --git a/patches/client/0062-FR-ARC-drawPlace-and-drawSelect.patch b/patches/client/0060-FR-ARC-drawPlace-and-drawSelect.patch similarity index 100% rename from patches/client/0062-FR-ARC-drawPlace-and-drawSelect.patch rename to patches/client/0060-FR-ARC-drawPlace-and-drawSelect.patch diff --git a/patches/client/0063-ARC-merged.patch b/patches/client/0061-ARC-merged.patch similarity index 100% rename from patches/client/0063-ARC-merged.patch rename to patches/client/0061-ARC-merged.patch diff --git a/patches/client/0064-FC-allow-change-type-in-BlockInventoryFragment.patch b/patches/client/0062-FC-allow-change-type-in-BlockInventoryFragment.patch similarity index 100% rename from patches/client/0064-FC-allow-change-type-in-BlockInventoryFragment.patch rename to patches/client/0062-FC-allow-change-type-in-BlockInventoryFragment.patch diff --git a/patches/client/0065-FC-extend-WaveInfoDialog.patch b/patches/client/0063-FC-extend-WaveInfoDialog.patch similarity index 100% rename from patches/client/0065-FC-extend-WaveInfoDialog.patch rename to patches/client/0063-FC-extend-WaveInfoDialog.patch diff --git a/patches/client/0066-OC-limit-pingExecutor-Ping.patch b/patches/client/0064-OC-limit-pingExecutor-Ping.patch similarity index 100% rename from patches/client/0066-OC-limit-pingExecutor-Ping.patch rename to patches/client/0064-OC-limit-pingExecutor-Ping.patch diff --git a/patches/client/0067-HC-placeShiftReplacement.patch b/patches/client/0065-HC-placeShiftReplacement.patch similarity index 100% rename from patches/client/0067-HC-placeShiftReplacement.patch rename to patches/client/0065-HC-placeShiftReplacement.patch diff --git a/patches/client/0068-HC-v146-protocol-compatible-mode-v146.patch b/patches/client/0066-HC-v146-protocol-compatible-mode-v146.patch similarity index 100% rename from patches/client/0068-HC-v146-protocol-compatible-mode-v146.patch rename to patches/client/0066-HC-v146-protocol-compatible-mode-v146.patch diff --git a/patches/client/0069-FC-paste-logicCode-from-schematic.patch b/patches/client/0067-FC-paste-logicCode-from-schematic.patch similarity index 100% rename from patches/client/0069-FC-paste-logicCode-from-schematic.patch rename to patches/client/0067-FC-paste-logicCode-from-schematic.patch