Skip to content

Commit b8b2330

Browse files
way-zerway-zer
committed
🔥 清理快捷设置，移除ShowInfoPopup设置
1 parent c83b844 commit b8b2330

10 files changed

+7
-42
lines changed

‎assets/bundles/bundle-mdtx.properties

-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ rules.title.arcExperimental = 隐藏设置[red](实验性功能，可能影响
232232
rules.unitPayloadUpdate = [acid]单位携带的方块会工作
233233
rules.winWave = [acid]胜利波次 [gray](到达指定波次后自动停止)
234234
schematic.preview = 预览
235-
setting.ShowInfoPopup.name = [acid]服务器信息版
236235
setting.allUnlocked.name = [cyan]显示所有内容(含隐藏)
237236
setting.unitHideExcludePlayers.name = 隐藏单位，始终显示玩家
238237
setting.alwaysShowUnitRTSAi.name = [acid]单位[white]：执行的RTS命令

‎assets/bundles/bundle-mdtx_en.properties

-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ rules.title.arcExperimental = Hidden Settings red
214214
rules.unitPayloadUpdate = [acid]Units Carrying Blocks Will Work
215215
rules.winWave = [acid]Victory Wave gray
216216
schematic.preview = Preview
217-
setting.ShowInfoPopup.name = [acid]Server Info Board
218217
setting.allUnlocked.name = [cyan]Show All Content (Including Hidden)
219218
setting.alwaysShowUnitRTSAi.name = [acid]Units [white]: Executing RTS Commands
220219
setting.alwaysshowdropzone.name = [cyan]Spawn Points

‎patches/client/0029-H-misc.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ index cabc19671d3393a933e64a5f451a0079beafa2b3..88308fb7d5b39c82207ea4b19f58705b
128128
}
129129

130130
diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
131-
index c5b749e3802b85e30de6eb10dc470455700aa5ba..182bbc6a26564ba516fe442889615ad1fc338482 100644
131+
index c5b749e3802b85e30de6eb10dc470455700aa5ba..7bf9cf271e2bdb6afc0fdba422f588c17ec7f8cc 100644
132132
--- a/core/src/mindustry/core/UI.java
133133
+++ b/core/src/mindustry/core/UI.java
134134
@@ -586,7 +586,7 @@ public class UI implements ApplicationListener, Loadable{
@@ -161,7 +161,7 @@ index c5b749e3802b85e30de6eb10dc470455700aa5ba..182bbc6a26564ba516fe442889615ad1
161161
- }else{
162162
- return number + "";
163163
- }
164-
+ return FormatDefault.format(number);
164+
+ return mindustryX.features.ui.FormatDefault.format(number);
165165
}
166166

167167
public static int roundAmount(int number){

‎patches/client/0056-OC-Fonts.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ index a91ea8917a6c687d728e5d6fe1e39f2db53f2c87..06733410b5fb4a809c4d1043acee7774
4343
add(netServer = new NetServer());
4444
add(netClient = new NetClient());
4545
diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
46-
index 182bbc6a26564ba516fe442889615ad1fc338482..190d52b2fdd8c651b6949bd8575f56d23d2371ed 100644
46+
index 7bf9cf271e2bdb6afc0fdba422f588c17ec7f8cc..d9fdf6b7b03f288926ad343be9045aaa863e6e3a 100644
4747
--- a/core/src/mindustry/core/UI.java
4848
+++ b/core/src/mindustry/core/UI.java
4949
@@ -82,10 +82,6 @@ public class UI implements ApplicationListener, Loadable{

‎patches/client/0063-ARC-merged.patch

+1-22
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ way-zer <[email protected]> on 2024/7/28
9494
way-zer <[email protected]> on 2024/9/8
9595
---
9696
core/src/mindustry/ai/BlockIndexer.java | 116 ++++++
97-
core/src/mindustry/core/UI.java | 2 +
9897
core/src/mindustry/editor/MapInfoDialog.java | 135 ++++++-
9998
.../mindustry/entities/comp/BuildingComp.java | 18 +-
10099
.../mindustry/entities/comp/ShieldComp.java | 6 +
@@ -123,7 +122,7 @@ way-zer <[email protected]> on 2024/9/8
123122
.../ui/fragments/PlacementFragment.java | 151 +++++--
124123
.../ui/fragments/PlayerListFragment.java | 93 ++---
125124
core/src/mindustry/world/Block.java | 7 +-
126-
30 files changed, 1757 insertions(+), 284 deletions(-)
125+
29 files changed, 1755 insertions(+), 284 deletions(-)
127126

128127
diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java
129128
index 60bcca661ec27bbd5dc718ab9b4d7e1fc69d40dc..0b5de3b1215c9fdfd25e207e4491f792cc8b11a8 100644
@@ -290,26 +289,6 @@ index 60bcca661ec27bbd5dc718ab9b4d7e1fc69d40dc..0b5de3b1215c9fdfd25e207e4491f792
290289
private void process(Tile tile){
291290
var team = tile.team();
292291
//only process entity changes with centered tiles
293-
diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
294-
index 190d52b2fdd8c651b6949bd8575f56d23d2371ed..6a6594082421155178eb6468f06b24258172fc3a 100644
295-
--- a/core/src/mindustry/core/UI.java
296-
+++ b/core/src/mindustry/core/UI.java
297-
@@ -28,6 +28,7 @@ import mindustry.logic.*;
298-
import mindustry.ui.*;
299-
import mindustry.ui.dialogs.*;
300-
import mindustry.ui.fragments.*;
301-
+import mindustryX.features.ui.*;
302-
303-
import static arc.scene.actions.Actions.*;
304-
import static mindustry.Vars.*;
305-
@@ -377,6 +378,7 @@ public class UI implements ApplicationListener, Loadable{
306-
307-
/** Shows a label at some position on the screen. Does not fade. */
308-
public void showInfoPopup(String info, float duration, int align, int top, int left, int bottom, int right){
309-
+ if (!Core.settings.getBool("ShowInfoPopup")) return;
310-
Table table = new Table();
311-
table.setFillParent(true);
312-
table.touchable = Touchable.disabled;
313292
diff --git a/core/src/mindustry/editor/MapInfoDialog.java b/core/src/mindustry/editor/MapInfoDialog.java
314293
index 2c7e4e46ab46b6634ee9d6cca90e9c19784cadaf..cf8f998b4775197891fde1bc98e307136558530a 100644
315294
--- a/core/src/mindustry/editor/MapInfoDialog.java

‎src/mindustryX/features/ArcOld.java

+1
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ public static void init(Seq<LazySettingsCategory> categories){
121121

122122

123123
c.addCategory("arcShareinfo");
124+
c.checkPref("arcAlwaysTeamColor", false);
124125

125126
c.addCategory("arcWeakCheat");
126127
c.checkPref("save_more_map", false);

‎src/mindustryX/features/PicToMindustry.java

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import mindustry.content.*;
1414
import mindustry.game.*;
1515
import mindustry.graphics.*;
16-
import mindustry.type.*;
1716
import mindustry.ui.*;
1817
import mindustry.ui.dialogs.*;
1918
import mindustry.world.blocks.logic.*;

‎src/mindustryX/features/RenderExt.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class RenderExt{
5151
public static float unitHideMinHealth;
5252
public static boolean unitWeaponTargetLine, unitItemCarried;
5353

54-
public static boolean unitHide = false, alwaysShowPlayerUnit;
54+
public static boolean unitHide = false;
5555
public static Color massDriverLineColor = Color.clear;
5656
public static Color playerEffectColor = Color.clear;
5757

@@ -70,7 +70,6 @@ public static void init(){
7070
});
7171

7272
Events.run(Trigger.update, () -> {
73-
alwaysShowPlayerUnit = Core.settings.getBool("alwaysShowPlayerUnit");
7473
bulletShow = Core.settings.getBool("bulletShow");
7574
displayAllMessage = Core.settings.getBool("displayallmessage");
7675
arcChoiceUiIcon = Core.settings.getBool("arcchoiceuiIcon");

‎src/mindustryX/features/ui/toolTable/AdvanceToolTable.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class AdvanceToolTable : ToolTableBase(Iconc.wrench.toString()) {
4545
cloneUnit[Vars.player.x + Mathf.range(8f)] = Vars.player.y + Mathf.range(8f)
4646
cloneUnit.add()
4747
}.width(40f).tooltip("[acid]克隆")
48-
button(UnitTypes.gamma.emoji() + "[red]×", Styles.cleart) { Vars.player.unit().kill() }.width(40f).tooltip("[red]自杀")
48+
button(UnitTypes.gamma.emoji() + "[red]×", Styles.cleart) { if (!Vars.player.dead()) Vars.player.unit().kill() }.width(40f).tooltip("[red]自杀")
4949
button(Icon.waves, Styles.clearNonei) { factoryDialog.show() }.width(40f).tooltip("[acid]单位工厂-ARC")
5050
}
5151

‎src/mindustryX/features/ui/toolTable/HudSettingsTable.java

-11
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ protected void rebuild(){
3636
t.button("[cyan]资", Styles.flatTogglet, () -> Settings.toggle("showOtherTeamResource")).tooltip("多队伍资源信息显示(左侧)").checked(a -> Core.settings.getBool("showOtherTeamResource"));
3737
t.button("[cyan]S", Styles.flatBordert, () -> Call.sendChatMessage("/sync")).tooltip("同步一波");
3838
t.button("[cyan]观", Styles.flatBordert, () -> Call.sendChatMessage("/ob")).tooltip("观察者模式");
39-
t.button("[cyan]技", Styles.flatBordert, () -> Call.sendChatMessage("/skill")).tooltip("技能！");
4039
t.button("[cyan]版", Styles.flatBordert, () -> Call.sendChatMessage("/broad")).tooltip("服务器信息版");
4140
t.button("[cyan]雾", Styles.flatTogglet, () -> state.rules.fog ^= true).checked(a -> state.rules.fog).tooltip("战争迷雾").disabled((_t) -> state.rules.pvp && player.team().id != 255);
42-
t.button("[red]版", Styles.flatTogglet, () -> Settings.toggle("ShowInfoPopup")).checked(a -> !Core.settings.getBool("ShowInfoPopup")).tooltip("关闭所有信息版");
4341
t.button("[white]法", Styles.flatBordert, () -> ui.showConfirm("受不了，直接投降？", () -> Call.sendChatMessage("/vote gameover"))).tooltip("法国军礼");
4442
t.row();
4543
t.button("[cyan]块", Styles.flatTogglet, () -> Settings.cycle("blockRenderLevel", 3))
@@ -48,18 +46,10 @@ protected void rebuild(){
4846
.checked(a -> !RenderExt.unitHide).tooltip("兵种显示");
4947
t.button("[cyan]弹", Styles.flatTogglet, () -> Settings.toggle("bulletShow"))
5048
.checked(a -> Core.settings.getBool("bulletShow")).tooltip("子弹显示");
51-
t.button("[cyan]灯", Styles.flatTogglet, () -> Settings.toggle("drawlight"))
52-
.checked(a -> renderer.drawLight).name("灯光").tooltip("[cyan]开灯啊！");
5349
t.button("[cyan]效", Styles.flatTogglet, () -> Settings.toggle("effects"))
5450
.checked(a -> Core.settings.getBool("effects")).tooltip("特效显示");
55-
t.button("[cyan]光", Styles.flatTogglet, () -> {
56-
Settings.toggle("bloom");
57-
renderer.toggleBloom(settings.getBool("bloom"));
58-
}).checked(a -> Core.settings.getBool("bloom")).tooltip("光效显示");
5951
t.button("[cyan]墙", Styles.flatTogglet, () -> enableDarkness ^= true)
6052
.checked(a -> enableDarkness).tooltip("墙体阴影显示");
61-
t.button("[cyan]天", Styles.flatTogglet, () -> Settings.toggle("showweather"))
62-
.checked(a -> Core.settings.getBool("showweather")).tooltip("天气显示");
6353
t.button("[cyan]" + Iconc.map, Styles.flatTogglet, () -> Settings.toggle("minimap"))
6454
.checked(a -> Core.settings.getBool("minimap")).tooltip("小地图显示");
6555
t.row();
@@ -103,7 +93,6 @@ protected void rebuild(){
10393
case 3 -> "全部";
10494
default -> s + "";
10595
});
106-
checkPref("unitHealthBar");
10796
sliderPref("unitDrawMinHealth", 0, 2500, 50, i -> i + "[red]HP");
10897
sliderPref("unitWeaponRange", 0, 100, 1, i -> i > 0 ? i + "%" : "关闭");
10998

0 commit comments

Comments
 (0)