Browse Source

Fix bug. Make the default config more useful.

ZRY 10 months ago
parent
commit
8d103f2ea0

+ 2 - 2
src/main/java/com/zjinja/mcmod/zry_client_utils_mod/utils/ConfigMgr.java

@@ -214,8 +214,8 @@ public class ConfigMgr {
                 keyBind = 0;
             }
             Integer width = i.getOrElse("width", this.WEPanelFunctionDefaultButtonWidth);
-            if(keyBind <= 0) {
-                keyBind = this.WEPanelFunctionDefaultButtonWidth;
+            if(width <= 0) {
+                width = this.WEPanelFunctionDefaultButtonWidth;
             }
             Boolean isClientCommand = i.getOrElse("clientCmd", false);
             WEPanelFunctionItem pfi = new WEPanelFunctionItem(name, willTranslate, command, keyBind, width, isClientCommand);

+ 86 - 78
src/main/resources/assets/zry_client_utils_mod/data/config.default.toml

@@ -93,119 +93,47 @@ command = "unstuck"
 keybind = 61
 width = 56
 
-[[we_panel.item]]
-name = "gui.zry_client_utils.we_panel.func.name.tomark"
-willTranslate = true
-command = "zcu-marker from-we"
-keybind = 77
-width = 56
-clientCmd = true
-
-[[we_panel.item]]
-name = "gui.zry_client_utils.we_panel.func.name.clmark"
-willTranslate = true
-command = "zcu-marker clear"
-keybind = 78
-width = 56
-clientCmd = true
-
-[[we_panel.item]]
-name = "gui.zry_client_utils.we_panel.func.name.outset"
-willTranslate = true
-command = "/outset 1"
-keybind = 334
-width = 56
-
-[[we_panel.item]]
-name = "gui.zry_client_utils.we_panel.func.name.inset"
-willTranslate = true
-command = "/inset 1"
-keybind = 333
-width = 56
-
-[[we_panel.item]]
-name = "gui.zry_client_utils.we_panel.func.name.st1nor"
-willTranslate = true
-command = "/stack 1 north"
-keybind = 328
-width = 56
-
-[[we_panel.item]]
-name = "gui.zry_client_utils.we_panel.func.name.st1sou"
-willTranslate = true
-command = "/stack 1 south"
-keybind = 322
-width = 56
-
-[[we_panel.item]]
-name = "gui.zry_client_utils.we_panel.func.name.st1we"
-willTranslate = true
-command = "/stack 1 west"
-keybind = 324
-width = 56
-
-[[we_panel.item]]
-name = "gui.zry_client_utils.we_panel.func.name.st1ea"
-willTranslate = true
-command = "/stack 1 east"
-keybind = 326
-width = 56
-
-[[we_panel.item]]
-name = "gui.zry_client_utils.we_panel.func.name.st1up"
-willTranslate = true
-command = "/stack 1 up"
-keybind = 332
-width = 56
-
-[[we_panel.item]]
-name = "gui.zry_client_utils.we_panel.func.name.st1dn"
-willTranslate = true
-command = "/stack 1 down"
-keybind = 331
-width = 56
-
 [[we_panel.item]]
 name = "gui.zry_client_utils.we_panel.func.name.sh1nor"
 willTranslate = true
 command = "/shift 1 north"
 keybind = 265
-width = 56
+width = 64
 
 [[we_panel.item]]
 name = "gui.zry_client_utils.we_panel.func.name.sh1sou"
 willTranslate = true
 command = "/shift 1 south"
 keybind = 264
-width = 56
+width = 64
 
 [[we_panel.item]]
 name = "gui.zry_client_utils.we_panel.func.name.sh1we"
 willTranslate = true
 command = "/shift 1 west"
 keybind = 263
-width = 56
+width = 64
 
 [[we_panel.item]]
 name = "gui.zry_client_utils.we_panel.func.name.sh1ea"
 willTranslate = true
 command = "/shift 1 east"
 keybind = 262
-width = 56
+width = 64
 
 [[we_panel.item]]
 name = "gui.zry_client_utils.we_panel.func.name.sh1up"
 willTranslate = true
 command = "/shift 1 up"
 keybind = 268
-width = 56
+width = 72
 
 [[we_panel.item]]
 name = "gui.zry_client_utils.we_panel.func.name.sh1dn"
 willTranslate = true
 command = "/shift 1 down"
 keybind = 269
-width = 56
+width = 72
 
 [[we_panel.item]]
 name = "gui.zry_client_utils.we_panel.func.name.ex1up"
@@ -264,6 +192,14 @@ command = "/contract 1 east"
 keybind = 0
 width = 48
 
+[[we_panel.item]]
+name = "选区信息"
+willTranslate = false
+command = "get-we-sel-pos"
+keybind = 0
+width = 48
+clientCmd = true
+
 [[we_panel.item]]
 name = "gui.zry_client_utils.we_panel.func.name.ex1nor"
 willTranslate = true
@@ -335,6 +271,78 @@ command = "/move 1 down"
 keybind = 0
 width = 56
 
+[[we_panel.item]]
+name = "gui.zry_client_utils.we_panel.func.name.st1nor"
+willTranslate = true
+command = "/stack 1 north"
+keybind = 328
+width = 48
+
+[[we_panel.item]]
+name = "gui.zry_client_utils.we_panel.func.name.st1sou"
+willTranslate = true
+command = "/stack 1 south"
+keybind = 322
+width = 48
+
+[[we_panel.item]]
+name = "gui.zry_client_utils.we_panel.func.name.st1we"
+willTranslate = true
+command = "/stack 1 west"
+keybind = 324
+width = 48
+
+[[we_panel.item]]
+name = "gui.zry_client_utils.we_panel.func.name.st1ea"
+willTranslate = true
+command = "/stack 1 east"
+keybind = 326
+width = 48
+
+[[we_panel.item]]
+name = "gui.zry_client_utils.we_panel.func.name.st1up"
+willTranslate = true
+command = "/stack 1 up"
+keybind = 332
+width = 48
+
+[[we_panel.item]]
+name = "gui.zry_client_utils.we_panel.func.name.st1dn"
+willTranslate = true
+command = "/stack 1 down"
+keybind = 331
+width = 48
+
+[[we_panel.item]]
+name = "gui.zry_client_utils.we_panel.func.name.tomark"
+willTranslate = true
+command = "zcu-marker from-we"
+keybind = 77
+width = 56
+clientCmd = true
+
+[[we_panel.item]]
+name = "gui.zry_client_utils.we_panel.func.name.clmark"
+willTranslate = true
+command = "zcu-marker clear"
+keybind = 78
+width = 56
+clientCmd = true
+
+[[we_panel.item]]
+name = "gui.zry_client_utils.we_panel.func.name.outset"
+willTranslate = true
+command = "/outset 1"
+keybind = 334
+width = 72
+
+[[we_panel.item]]
+name = "gui.zry_client_utils.we_panel.func.name.inset"
+willTranslate = true
+command = "/inset 1"
+keybind = 333
+width = 72
+
 # Appendix A: Key Code Reference
 #GLFW_KEY_SPACE         = 32,
 #GLFW_KEY_APOSTROPHE    = 39,

+ 39 - 1
src/main/resources/assets/zry_client_utils_mod/lang/zh_cn.json

@@ -18,5 +18,43 @@
     "gui.zry_client_utils.we_panel.back": "返回",
     "gui.zry_client_utils.we_panel.func.name.distr": "选区统计",
     "gui.zry_client_utils.we_panel.func.name.desel": "取消选择",
-    "gui.zry_client_utils.we_panel.func.name.clear": "清空选区"
+    "gui.zry_client_utils.we_panel.func.name.clear": "删除",
+    "gui.zry_client_utils.we_panel.func.name.copy": "复制",
+    "gui.zry_client_utils.we_panel.func.name.paste": "粘贴",
+    "gui.zry_client_utils.we_panel.func.name.undo": "撤销",
+    "gui.zry_client_utils.we_panel.func.name.redo": "重做",
+    "gui.zry_client_utils.we_panel.func.name.tomark": "标记选区",
+    "gui.zry_client_utils.we_panel.func.name.clmark": "清空标记",
+    "gui.zry_client_utils.we_panel.func.name.outset": "选区外扩",
+    "gui.zry_client_utils.we_panel.func.name.inset": "选区内缩",
+    "gui.zry_client_utils.we_panel.func.name.st1nor": "北叠",
+    "gui.zry_client_utils.we_panel.func.name.st1sou": "南叠",
+    "gui.zry_client_utils.we_panel.func.name.st1we": "西叠",
+    "gui.zry_client_utils.we_panel.func.name.st1ea": "东叠",
+    "gui.zry_client_utils.we_panel.func.name.st1up": "上叠",
+    "gui.zry_client_utils.we_panel.func.name.st1dn": "下叠",
+    "gui.zry_client_utils.we_panel.func.name.sh1nor": "选区北移",
+    "gui.zry_client_utils.we_panel.func.name.sh1sou": "选区南移",
+    "gui.zry_client_utils.we_panel.func.name.sh1we": "选区西移",
+    "gui.zry_client_utils.we_panel.func.name.sh1ea": "选区东移",
+    "gui.zry_client_utils.we_panel.func.name.sh1up": "选区上移",
+    "gui.zry_client_utils.we_panel.func.name.sh1dn": "选区下移",
+    "gui.zry_client_utils.we_panel.func.name.ex1nor": "选区北扩",
+    "gui.zry_client_utils.we_panel.func.name.ex1sou": "选区南扩",
+    "gui.zry_client_utils.we_panel.func.name.ex1we": "选区西扩",
+    "gui.zry_client_utils.we_panel.func.name.ex1ea": "选区东扩",
+    "gui.zry_client_utils.we_panel.func.name.ex1up": "选区上扩",
+    "gui.zry_client_utils.we_panel.func.name.ex1dn": "选区下扩",
+    "gui.zry_client_utils.we_panel.func.name.ct1nor": "选区北缩",
+    "gui.zry_client_utils.we_panel.func.name.ct1sou": "选区南缩",
+    "gui.zry_client_utils.we_panel.func.name.ct1we": "选区西缩",
+    "gui.zry_client_utils.we_panel.func.name.ct1ea": "选区东缩",
+    "gui.zry_client_utils.we_panel.func.name.ct1up": "选区上缩",
+    "gui.zry_client_utils.we_panel.func.name.ct1dn": "选区下缩",
+    "gui.zry_client_utils.we_panel.func.name.mv1nor": "内容北移",
+    "gui.zry_client_utils.we_panel.func.name.mv1sou": "内容南移",
+    "gui.zry_client_utils.we_panel.func.name.mv1we": "内容西移",
+    "gui.zry_client_utils.we_panel.func.name.mv1ea": "内容东移",
+    "gui.zry_client_utils.we_panel.func.name.mv1up": "内容上移",
+    "gui.zry_client_utils.we_panel.func.name.mv1dn": "内容下移"
 }