Merge pull request #29 from Ginsway/zh-cn

build.gradle

@@ -29,7 +29,7 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-	modImplementation "fi.dy.masa.malilib:malilib-fabric-1.19.3:${project.malilib_version}"
+	modImplementation "fi.dy.masa.malilib:malilib-fabric-1.19.4:${project.malilib_version}"
 	modImplementation "com.github.DarkKronicle:AdvancedChatCore:${project.advancedchat_version}"
 }
 

gradle.properties

@@ -1,15 +1,15 @@
-minecraft_version=1.19.3
-yarn_mappings=1.19.3+build.2
+minecraft_version=1.19.4
+yarn_mappings=1.19.4+build.1
 loader_version=0.14.11
-fabric_api_version=0.68.1+1.19.3
+fabric_api_version=0.76.0+1.19.4
 
-mod_version=1.3.7
+mod_version=1.3.8
 maven_group=io.github.darkkronicle
 archives_base_name=AdvancedChatHUD
 
-malilib_version = 0.14.0
+malilib_version = 0.15.2
 org.gradle.jvmargs=-Xmx1G
-advancedchat_version=v1.5.9
+advancedchat_version=v1.5.10
 
 # Uploading data
 curseforge_slug=advancedchathud

src/main/java/io/github/darkkronicle/advancedchathud/config/gui/SharingScreen.java

@@ -49,13 +49,14 @@ public class SharingScreen extends GuiBase {
         text.setMaxLength(12800);
         if (starting != null) {
             text.setText(starting);
-            text.setTextFieldFocused(true);
+            text.setFocused(true);
         }
 
-        text.changeFocus(true);
+        text.setFocused(true);
         text.setDrawsBackground(true);
         text.setEditable(true);
-        text.changeFocus(true);
+        text.setFocused(true);
+
         this.addTextField(text, null);
 
         this.addButton(

src/main/java/io/github/darkkronicle/advancedchathud/gui/ChatWindow.java

@@ -431,7 +431,7 @@ public class ChatWindow {
                     labelWidth,
                     scaledBar,
                     tab.getBorderColor().color());
-            DrawableHelper.drawCenteredText(
+            DrawableHelper.drawCenteredTextWithShadow(
                     matrixStack,
                     MinecraftClient.getInstance().textRenderer,
                     tab.getAbbreviation(),
@@ -525,7 +525,7 @@ public class ChatWindow {
             double mouseX = client.mouse.getX() / 2;
             double mouseY = client.mouse.getY() / 2;
             if (isMouseOverVisibility(mouseX, mouseY)) {
-                DrawableHelper.drawStringWithShadow(
+                DrawableHelper.drawCenteredTextWithShadow(
                         matrixStack,
                         client.textRenderer,
                         visibility.getDisplayName(),

src/main/resources/assets/advancedchathud/lang/zh_cn.json

@@ -0,0 +1,156 @@
+{
+  "advancedchat.config.yes": "正确!",
+
+  "advancedchathud.gui.button.addtab": "新建聊天选项卡",
+  "advancedchathud.gui.button.reload": "重新加载构造标签栏",
+  "advancedchathud.tab.advancedchathud": "§9HUD§r",
+  "advancedchathud.tab.general": "§7聊天HUD§r",
+  "advancedchathud.tab.tabs": "§b聊天选项卡§r",
+
+  "advancedchathud.config.general.timeformat": "时间格式",
+  "advancedchathud.config.general.info.timeformat": "如果同时为§9聊天 HUD§r和§a聊天日志§r启用了显示时间，则§6显示时间§r。\n有关格式请参阅§6简单日期格式§r类。",
+  "advancedchathud.config.general.chatheads": "显示聊天头像",
+  "advancedchathud.config.general.info.chatheads": "信息发送人的§6头像§r是否显示在其信息旁边",
+  "advancedchathud.gui.button.matches": "§6匹配§r",
+  "advancedchathud.gui.button.back": "返回",
+  "advancedchathud.gui.button.export": "导出",
+  "advancedchathud.gui.button.addmatch": "§a添加匹配项§r",
+  "advancedchathud.config.match.remove": "§c删除§r",
+  "advancedchathud.config.match.screen.name": "匹配",
+
+  "advancedchathud.config.general.vanillahud": "移除原版聊天HUD",
+  "advancedchathud.config.general.info.vanillahud": "启用§6原版聊天HUD§r，其作用主要类似于§9聊天窗口§r.\n§6原版聊天HUD§r可以使用§9聊天选项卡§r 如果您单击它然后更改选项卡",
+  "advancedchathud.config.general.width": "默认聊天宽度",
+  "advancedchathud.config.general.info.width": "§9聊天HUD§r的§6宽度§r\n覆盖原版聊天宽度！",
+  "advancedchathud.config.general.height": "默认聊天高度",
+  "advancedchathud.config.general.info.height": "§9聊天HUD§r的§6高度§r\n覆盖原版聊天高度！",
+  "advancedchathud.config.general.showtabs":  "显示聊天标签页",
+  "advancedchathud.config.general.info.showtabs": "§b聊天选项卡§r是否在§9聊天HUD§r中的§6边框§r上可见",
+  "advancedchathud.config.general.leftpad": "左侧聊天框间距",
+  "advancedchathud.config.general.info.leftpad": "聊天框的§6左侧§r与§6文本开始§r的位置之间的间距",
+  "advancedchathud.config.general.rightpad": "右侧聊天框间距",
+  "advancedchathud.config.general.info.rightpad": "聊天框的§6右侧§r与§6文本结束§r的位置之间的间距",
+  "advancedchathud.config.general.bottompad": "下侧聊天框间距",
+  "advancedchathud.config.general.info.bottompad": "聊天框的§6底侧§r与§6最新消息§r之间的间距",
+  "advancedchathud.config.general.toppad": "上侧聊天框间距",
+  "advancedchathud.config.general.info.toppad": "聊天框的§6顶侧与§6旧消息§r之间的间距量",
+  "advancedchathud.config.general.tabsidechars": "最大缩写长度",
+  "advancedchathud.config.general.info.tabsidechars": "用于§b聊天选项卡§r中的§6缩写§r的最多字符数\n影响聊天选项卡的外观§6边框§r和§9聊天HUD§r",
+  "advancedchathud.config.general.visibility": "聊天可见性",
+  "advancedchathud.config.general.info.visibility": "§9聊天HUD§r的显示模式\n§6原版§r-§9聊天HUD§r渲染就像§6原版\n§a总是§r-渲染§9聊天HUD§6在任何时候\n§c仅对焦§r-渲染§9聊天HUD§r当§6聊天框§r被打开",
+  "advancedchathud.config.visibility.vanilla": "§6原版§r",
+  "advancedchathud.config.visibility.always": "§a总是§r",
+  "advancedchathud.config.visibility.focus_only": "§c仅对焦§r",
+  "advancedchathud.config.general.linespace": "行距",
+  "advancedchathud.config.general.info.linespace": "聊天栏的§6行距§r(以像素为单位)",
+  "advancedchathud.config.general.x": "默认聊天 X",
+  "advancedchathud.config.general.info.x": "聊天框的§6X坐标§r，从屏幕§6左下角开始§r",
+  "advancedchathud.config.general.y": "默认聊天 Y",
+  "advancedchathud.config.general.info.y": "聊天框的§6Y坐标§r，从屏幕§6左下角开始§r",
+  "advancedchathud.config.general.messagespace": "在消息之间的间距",
+  "advancedchathud.config.general.info.messagespace": "§6单个消息§r之间间距",
+  "advancedchathud.config.general.chatscale": "聊天扩展",
+  "advancedchathud.config.general.info.chatscale": "聊天框的文本§6内部§r的§6大小§r。不影响§9聊天 HUD§r的大小!",
+  "advancedchathud.config.general.fadetime": "淡入淡出速度",
+  "advancedchathud.config.general.info.fadetime": "消息§6淡出§r的速度",
+  "advancedchathud.config.general.fadestart": "淡进淡出的时间",
+  "advancedchathud.config.general.info.fadestart": "在新收到的消息开始消失之前的§6刻数§r",
+  "advancedchathud.config.general.fadetype": "淡入淡出样式",
+  "advancedchathud.config.general.info.fadetype": "用于淡入淡出动画的§6缓动函数§r\n原版使用§6线性§r缓动",
+  "advancedchat.config.easing.linear": "§c线性缓动§r",
+  "advancedchat.config.easing.sine": "§6正弦缓动§r",
+  "advancedchat.config.easing.quad": "§e二次缓动§r",
+  "advancedchat.config.easing.quart": "§a四次缓动§r",
+  "advancedchat.config.easing.circ": "§b曲线缓动§r",
+  "advancedchathud.config.general.hudbackgroundcolor": "HUD背景颜色",
+  "advancedchathud.config.general.info.hudbackgroundcolor": "§9聊天HUD§r的§6背景颜色§r",
+  "advancedchathud.config.general.emptytextcolor": "空文本颜色",
+  "advancedchathud.config.general.info.emptytextcolor": "没有格式的文本的颜色(例如使用 §6§r格式化的文本)",
+  "advancedchathud.config.general.hudlinetype": "背景行样式",
+  "advancedchathud.config.general.info.hudlinetype": "§6未聚焦§r的§9聊天HUD§r的§6背景§r如何适应消息\n§6完整§r-使背景适合§9聊天HUD§r的§6宽度§r\n§b紧凑§r-使背景适合每§6行§r的长度",
+  "advancedchathud.config.hudlinetype.full": "§6完整§r",
+  "advancedchathud.config.hudlinetype.compact": "§b紧凑§r",
+  "advancedchathud.config.general.alternatelines": "条纹化消息",
+  "advancedchathud.config.general.info.alternatelines": "是否对其他§6每条消息§r的背景进行不同的颜色以创建§6条纹§r效果\n§7有助于区分消息§r",
+  "advancedchathud.config.general.showtime": "显示时间",
+  "advancedchathud.config.general.info.showtime": "§6时间§r是否显示在§9聊天HUD§r中\n格式可以在§7常规§r中配置",
+  "advancedchathud.config.general.storedlines": "存储行",
+  "advancedchathud.config.general.info.storedlines": "§9聊天HUD§r中存储的§6最大§r行数\n§7值过大可能会导致内存不足错误!§r",
+  "advancedchathud.config.general.righttabbuttons": "右标签按钮",
+  "advancedchathud.config.general.info.righttabbuttons": "§6选项卡按钮§r是否显示在右侧",
+  "advancedchathud.config.general.renderinother": "在其他GUI中呈现聊天",
+  "advancedchathud.config.general.info.renderinother": "§6选项卡按钮§r是否显示在右侧",
+  "advancedchathud.config.general.scrolltime": "滚动时间",
+  "advancedchathud.config.general.info.scrolltime": "完成滚动动画所需的时间(以毫秒为单位)",
+  "advancedchathud.config.general.scrolltype": "滚动类型",
+  "advancedchathud.config.general.info.scrolltype": "滚动动画的类型",
+  "advancedchathud.config.general.persistenttext": "保留文本",
+  "advancedchathud.config.general.info.persistenttext": "关闭§9聊天框§r后是否保留§6已输入但未发送§r的消息",
+  "advancedchathud.config.general.moretext": "扩展文本限制",
+  "advancedchathud.config.general.info.moretext": "超过§6256个字符§r限制的消息分为多个聊天消息",
+  "advancedchathud.config.general.sendtocurrenttab": "始终将消息发送到焦点选项卡",
+  "advancedchathud.config.general.info.sendtocurrenttab": "§6您发送的消息§r是否显示在当前焦点选项卡中，§6无论聊天过滤器是什么§r",
+  "advancedchathud.config.general.changeStartMessage": "更改开始消息",
+  "advancedchathud.config.general.info.changeStartMessage": "切换聊天窗口时是否更改开始消息",
+
+  "advancedchathud.config.tabmenu.configure": "§b配置§r",
+  "advancedchathud.config.tabmenu.remove": "§c删除§r",
+  "advancedchathud.config.tabdescription": "§7名称§r: <name> \n§a查找字符串§r: <find>\n§e查找类型§r: <findtype>",
+
+  "advancedchathud.gui.button.import": "导入选项卡",
+  "advancedchathud.config.tab.name": "选项卡名称",
+  "advancedchathud.config.tab.info.name": "选项卡在§6配置§r中的显示方式\n§7§o有意义地命名选项卡是一种很好的做法!§r",
+  "advancedchathud.config.tab.order": "顺序",
+  "advancedchathud.config.tab.info.order": "对选项卡进行排序的数字，如果此数字较低，则列表中将较高。",
+  "advancedchathud.config.tab.startingmessage": "起始消息",
+  "advancedchathud.config.tab.info.startingmessage": "§6选项卡聚焦时§r显示哪些文本",
+  "advancedchathud.config.tab.abbreviation": "选项卡 HUD 缩写",
+  "advancedchathud.config.tab.info.abbreviation": "如果在§9聊天HUD§r设置下启用了§6显示聊天选项卡§r，选项卡在§9聊天HUD§6一侧§r显示的内容",
+  "advancedchathud.config.tab.forward": "将消息转发到主消息",
+  "advancedchathud.config.tab.info.forward": "发送到此聊天选项卡的消息是否也显示在§6主聊天选项卡§r中",
+  "advancedchathud.config.tab.forwardtoggle": "%s",
+  "advancedchathud.config.tab.findstring": "查找字符串",
+  "advancedchathud.config.tab.info.findstring": "将被§6剪切§r并§6转移到此选项卡§r的字符串",
+  "advancedchathud.config.tab.findtype": "查找类型",
+  "advancedchathud.config.tab.info.findtype": "如何找到匹配项\n§6文字§r-§6完全匹配§r字符串\n§e比较§r-像§6字符, §r但不§6区分大小写\n§b正则§r-将字符串解析为§6正则表达式\n§d所有§r-将§6所有§r文本传递到选项卡,无论要查找的字符串是什么",
+  "advancedchathud.config.tab.maincolor": "主题色",
+  "advancedchathud.config.tab.info.maincolor": "§b聊天选项卡§r的§6主题色§r",
+  "advancedchathud.config.tab.bordercolor": "边框颜色",
+  "advancedchathud.config.tab.info.bordercolor": "§b聊天选项卡§6边框§r的颜色",
+  "advancedchathud.config.tab.innercolor": "背景颜色",
+  "advancedchathud.config.tab.info.innercolor": "§b聊天选项卡§6背景§r的颜色",
+  "advancedchathud.config.tab.showunread": "显示未读信息",
+  "advancedchathud.config.tab.info.showunread": "是否为§b聊天选项卡§r显示§6未读消息数§r",
+
+  "advancedchathud.windowconfig.x": "窗口 X",
+  "advancedchathud.windowconfig.info.x": "窗口的 X 值",
+  "advancedchathud.windowconfig.y": "窗口 Y",
+  "advancedchathud.windowconfig.info.y": "窗口的 Y 值",
+  "advancedchathud.windowconfig.width": "窗口宽度",
+  "advancedchathud.windowconfig.info.width": "窗口的宽度值",
+  "advancedchathud.windowconfig.height": "窗口高度",
+  "advancedchathud.windowconfig.info.height": "窗口的高度值",
+  "advancedchathud.windowconfig.renderright": "右对齐",
+  "advancedchathud.windowconfig.info.renderright": "文本应呈现与右侧对齐",
+  "advancedchathud.windowconfig.rendertopfirst": "渲染顶部首先",
+  "advancedchathud.windowconfig.info.rendertopfirst": "自上而下呈现消息",
+  "advancedchathud.windowconfig.minimalist": "极简模式",
+  "advancedchathud.windowconfig.info.minimalist": "启用不那么杂乱的窗口设计。当主动移动是不可能的。\n右键单击context menu可以切换此选项。",
+
+
+  "advancedchat.config.findtype.literal": "§6文字§r",
+  "advancedchat.config.findtype.upperlower": "§e比较§r",
+  "advancedchat.config.findtype.regex": "§b正则§r",
+  "advancedchat.config.findtype.all": "§d所有§r",
+
+  "advancedchathud.context.copied": "§a复制§r",
+
+  "advancedchathud.context.copy": "复制",
+  "advancedchathud.context.delete": "删除",
+  "advancedchathud.context.minimalist": "切换极简模式",
+  "advancedchathud.context.removeallwindows": "删除所有窗口",
+  "advancedchathud.context.clearallmessages": "清除所有信息",
+  "advancedchathud.context.duplicatewindow": "复制窗口",
+  "advancedchathud.context.configurewindow": "配置窗口",
+  "advancedchathud.context.messageowner": "回复"
+}

src/main/resources/fabric.mod.json

@@ -24,11 +24,11 @@
     "advancedchathud.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.8.9+build.204",
+    "fabricloader": ">=0.14.18",
     "fabric": "*",
-    "minecraft": ">=1.19.3",
-    "malilib": ">=0.13.0",
-    "advancedchatcore": ">=1.5.2-1.19"
+    "minecraft": ">=1.19.4",
+    "malilib": ">=0.15.2",
+    "advancedchatcore": ">=1.5.10-1.19"
   },
   "custom": {
     "acmodule": true,