Skip to content

Commit d2d6634

Browse files
RothesRothes
committed
Add locale for capture commands
1 parent 1dbaf8b commit d2d6634

File tree

6 files changed

+44
-25
lines changed

6 files changed

+44
-25
lines changed

‎src/main/java/me/rothes/protocolstringreplacer/commands/subcommands/Capture.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package me.rothes.protocolstringreplacer.commands.subcommands;
22

3-
import com.comphenix.protocol.ProtocolLibrary;
43
import me.rothes.protocolstringreplacer.PsrLocalization;
54
import me.rothes.protocolstringreplacer.ProtocolStringReplacer;
65
import me.rothes.protocolstringreplacer.api.capture.CaptureInfo;
@@ -170,7 +169,7 @@ private void clipboardCommand(@Nonnull PsrUser user, @Nonnull String[] args) {
170169
return;
171170
}
172171
MessageUtils.sendCaptureInfoClipboard(user, captureInfos.get(index));
173-
user.sendFilteredText("§aClick any entry to copy");
172+
user.sendFilteredText(PsrLocalization.getLocaledMessage("Sender.Commands.Capture.Capture-Info.Click-Any-Entry-To-Copy"));
174173
});
175174
}
176175
}

‎src/main/java/me/rothes/protocolstringreplacer/packetlisteners/server/AbstractServerPacketListener.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.comphenix.protocol.events.PacketEvent;
77
import com.comphenix.protocol.wrappers.WrappedChatComponent;
88
import me.rothes.protocolstringreplacer.ProtocolStringReplacer;
9+
import me.rothes.protocolstringreplacer.PsrLocalization;
910
import me.rothes.protocolstringreplacer.api.capture.CaptureInfo;
1011
import me.rothes.protocolstringreplacer.api.capture.CaptureInfoImpl;
1112
import me.rothes.protocolstringreplacer.api.replacer.ReplacerConfig;
@@ -342,12 +343,13 @@ private static void captureItemStackInfo(@Nonnull PsrUser user, @Nonnull ItemSta
342343
info.setUser(user);
343344
info.setListenType(listenType);
344345

345-
ComponentBuilder extraBuilder = new ComponentBuilder("Extra: ").color(ChatColor.BLUE).bold(true).append("").reset();
346+
ComponentBuilder extraBuilder = new ComponentBuilder(PsrLocalization.getLocaledMessage("Sender.Commands.Capture.Capture-Info.Extra-Prefix")).color(ChatColor.BLUE).bold(true).append("").reset();
346347
container.createDefaultChildren();
347348
container.createJsons(container);
348349
List<Replaceable> jsons = container.getJsons();
349350
extraBuilder.append("[Nbt Json] ").color(ChatColor.GOLD)
350-
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(jsons.get(0).getText() + "\n§aClick to copy")))
351+
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(jsons.get(0).getText() + "\n"
352+
+ PsrLocalization.getLocaledMessage("Sender.Commands.Capture.Capture-Info.Click-To-Copy"))))
351353
.event(new ClickEvent(ProtocolStringReplacer.getInstance().getServerMajorVersion() >= 15 ?
352354
ClickEvent.Action.COPY_TO_CLIPBOARD : ClickEvent.Action.SUGGEST_COMMAND, jsons.get(0).getText()));
353355
ProtocolStringReplacer.getInstance().getReplacerManager().replaceJsonReplaceable(jsons.get(0), nbt);
@@ -357,7 +359,8 @@ private static void captureItemStackInfo(@Nonnull PsrUser user, @Nonnull ItemSta
357359
container.createJsons(container);
358360
jsons = container.getJsons();
359361
extraBuilder.append(" ").reset().append("[Display Json] ").color(ChatColor.GOLD)
360-
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(jsons.get(0).getText() + "\n§aClick to copy")))
362+
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(jsons.get(0).getText() + "\n"
363+
+ PsrLocalization.getLocaledMessage("Sender.Commands.Capture.Capture-Info.Click-To-Copy"))))
361364
.event(new ClickEvent(ProtocolStringReplacer.getInstance().getServerMajorVersion() >= 15 ?
362365
ClickEvent.Action.COPY_TO_CLIPBOARD : ClickEvent.Action.SUGGEST_COMMAND, jsons.get(0).getText()));
363366
info.setExtra(extraBuilder.create());
@@ -395,7 +398,6 @@ private static void captureItemStackInfo(@Nonnull PsrUser user, @Nonnull ItemSta
395398
}
396399

397400
info.setJsons(jsons);
398-
List<String> infoJsons = info.getJsons();
399401
ProtocolStringReplacer.getInstance().getReplacerManager().replaceContainerJsons(container, entries);
400402
try {
401403
container.createDefaultChildrenDeep();

‎src/main/java/me/rothes/protocolstringreplacer/packetlisteners/server/sign/AbstractServerSignPacketListener.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import de.tr7zw.changeme.nbtapi.NBTContainer;
66
import de.tr7zw.changeme.nbtapi.NbtApiException;
77
import me.rothes.protocolstringreplacer.ProtocolStringReplacer;
8+
import me.rothes.protocolstringreplacer.PsrLocalization;
89
import me.rothes.protocolstringreplacer.api.capture.CaptureInfoImpl;
910
import me.rothes.protocolstringreplacer.api.replacer.ReplacerConfig;
1011
import me.rothes.protocolstringreplacer.api.user.PsrUser;
@@ -49,9 +50,11 @@ protected void replaceSign(@NotNull PacketEvent packetEvent, @NotNull NBTContain
4950
info.setTime(System.currentTimeMillis());
5051
info.setUser(user);
5152
info.setListenType(listenType);
52-
ComponentBuilder extraBuilder = new ComponentBuilder("Extra: ").color(ChatColor.BLUE).bold(true).append("").reset();
53+
ComponentBuilder extraBuilder = new ComponentBuilder(PsrLocalization.getLocaledMessage("Sender.Commands.Capture.Capture-Info.Extra-Prefix"))
54+
.color(ChatColor.BLUE).bold(true).append("").reset();
5355
extraBuilder.append("[Nbt Json] ").color(ChatColor.GOLD)
54-
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(originalNbt + "\n§aClick to copy")))
56+
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(originalNbt + "\n"
57+
+ PsrLocalization.getLocaledMessage("Sender.Commands.Capture.Capture-Info.Click-To-Copy"))))
5558
.event(new ClickEvent(ProtocolStringReplacer.getInstance().getServerMajorVersion() >= 15 ?
5659
ClickEvent.Action.COPY_TO_CLIPBOARD : ClickEvent.Action.SUGGEST_COMMAND, originalNbt));
5760
info.setExtra(extraBuilder.create());

‎src/main/java/me/rothes/protocolstringreplacer/utils/MessageUtils.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static void sendCaptureInfo(@Nonnull PsrUser user, @Nonnull CaptureInfo i
2424
Validate.notNull(info, "CaptureInfo cannot be null");
2525

2626
String time = dateFormat.format(new Date(info.getTime()));
27-
ComponentBuilder hoverTextBuilder = new ComponentBuilder("").append("§3§l§m----------------------§3§l Captured Contents §m----------------------\n")
27+
ComponentBuilder hoverTextBuilder = new ComponentBuilder(PsrLocalization.getLocaledMessage("Sender.Commands.Capture.Capture-Info.Captured-Contents")).append("\n")
2828
.append("§b§lCommons: " + (info.getTexts().isEmpty() ? "§fN/A\n" : "\n"));
2929
for (String text : info.getTexts()) {
3030
hoverTextBuilder.append("§6§l- ");
@@ -48,7 +48,7 @@ public static void sendCaptureInfo(@Nonnull PsrUser user, @Nonnull CaptureInfo i
4848
}
4949
hoverTextBuilder.append(sb.append("\n").toString());
5050
}
51-
hoverTextBuilder.append("§aClick for clipboard");
51+
hoverTextBuilder.append(PsrLocalization.getLocaledMessage("Sender.Commands.Capture.Capture-Info.Click-For-Clipboard"));
5252

5353
ComponentBuilder captureMessageBuilder = new ComponentBuilder("")
5454
.append("§3 §l" + info.getListenType().getName() + "§3: §b" + time
@@ -66,7 +66,8 @@ public static void sendCaptureInfoClipboard(@Nonnull PsrUser user, @Nonnull Capt
6666
ClickEvent clickEvent = ProtocolStringReplacer.getInstance().getServerMajorVersion() >= 15 ?
6767
new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, text) : new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, text);
6868
user.sendFilteredMessage(new ComponentBuilder(" - ").color(ChatColor.GOLD).bold(true).event(clickEvent)
69-
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText("§aClick to copy")))
69+
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
70+
TextComponent.fromLegacyText(PsrLocalization.getLocaledMessage("Sender.Commands.Capture.Capture-Info.Click-To-Copy"))))
7071
.append("").color(ChatColor.RESET).bold(false)
7172
.append(ColorUtils.showColorCodes(text)).create());
7273
}
@@ -75,7 +76,8 @@ public static void sendCaptureInfoClipboard(@Nonnull PsrUser user, @Nonnull Capt
7576
ClickEvent clickEvent = ProtocolStringReplacer.getInstance().getServerMajorVersion() >= 15 ?
7677
new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, json) : new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, json);
7778
user.sendFilteredMessage(new ComponentBuilder(" - ").color(ChatColor.GOLD).bold(true).event(clickEvent)
78-
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText("§aClick to copy")))
79+
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
80+
TextComponent.fromLegacyText(PsrLocalization.getLocaledMessage("Sender.Commands.Capture.Capture-Info.Click-To-Copy"))))
7981
.append("").color(ChatColor.RESET).bold(false)
8082
.append(json).create());
8183
}
@@ -84,7 +86,8 @@ public static void sendCaptureInfoClipboard(@Nonnull PsrUser user, @Nonnull Capt
8486
ClickEvent clickEvent = ProtocolStringReplacer.getInstance().getServerMajorVersion() >= 15 ?
8587
new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, direct) : new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, direct);
8688
user.sendFilteredMessage(new ComponentBuilder(" - ").color(ChatColor.GOLD).bold(true).event(clickEvent)
87-
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText("§aClick to copy")))
89+
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
90+
TextComponent.fromLegacyText(PsrLocalization.getLocaledMessage("Sender.Commands.Capture.Capture-Info.Click-To-Copy"))))
8891
.append("").color(ChatColor.RESET).bold(false)
8992
.append(TextComponent.fromLegacyText(ColorUtils.showColorCodes(direct, true))).create());
9093
}

‎src/main/resources/Languages/en-US/Locales/Locale.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ Console-Sender:
2626
Invalid-Listener-Priority: '&cInvalid Listener-Priority value! Using defaults ''HIGHEST'''
2727
Invalid-Config-Load-LifeCycle: '&cInvalid Config-Load-LifeCycle value! Using defaults ''ENABLE'''
2828
Updater:
29-
Invalid-Channel: '§cPSR is in a invalid channel ("%0%"). Please update your plugin to the latest version.'
30-
Error-Checking-Version: '§cFailed to check version information via server, Please try updating your plugin: %0%'
31-
Error-Parsing-Json: '§cFailed to parse version information Json, Please try updating your plugin: %0%'
29+
Invalid-Channel: '&cPSR is in a invalid channel ("%0%"). Please update your plugin to the latest version.'
30+
Error-Checking-Version: '&cFailed to check version information via server, Please try updating your plugin: %0%'
31+
Error-Parsing-Json: '&cFailed to parse version information Json, Please try updating your plugin: %0%'
3232

3333
Command-Block-Sender:
3434
Messages:
@@ -77,6 +77,12 @@ Sender:
7777
Results-Header: '&7&m---------&7&l &7[ &c&lP&6&lS&3&lR &7- &eCaptured list&7 ]&l &7&m---------'
7878
Results-Footer: '&7&m------------------------------------------'
7979
Not-Capturing-Listen-Type: '&cYou are not capturing &f%0% &c.'
80+
Capture-Info:
81+
Captured-Contents: '&3&l&m----------------------&3&l Captured Contents &m----------------------'
82+
Click-For-Clipboard: '&aClick for clipboard'
83+
Click-To-Copy: '&aClick to copy'
84+
Click-Any-Entry-To-Copy: '&aClick any entry to copy'
85+
Extra-Prefix: 'Extra: '
8086
Edit:
8187
Description: 'Replacers editor'
8288
Help:
@@ -220,7 +226,7 @@ Sender:
220226
Description: 'Reload configs'
221227
Already-Reloading: '&cPlugin is already reloading. Please reload later.'
222228
Async-Reloading: '&bReloading plugin in async...'
223-
Error-Occurred: '§cAn error occurred while reloading the plugin. Please check the console.'
229+
Error-Occurred: '&cAn error occurred while reloading the plugin. Please check the console.'
224230
Complete: '&aConfigs has been reloaded.'
225231
Help:
226232
Header: '&7&m------------&7&l &7[ &c&lP&6&lS&3&lR &7- &eReload&7 ]&l &7&m------------'

‎src/main/resources/Languages/zh-CN/Locales/Locale.yml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ Console-Sender:
2626
Invalid-Listener-Priority: '&c数据包监听优先度值无效! 使用默认值 ''HIGHEST'''
2727
Invalid-Config-Load-LifeCycle: '&c配置加载时期值无效! 使用默认值 ''ENABLE'''
2828
Updater:
29-
Invalid-Channel: '§c您使用的插件处于一个未知的版本通道("%0%"). 请尝试更新您的插件到最新版本.'
30-
Error-Checking-Version: '§c无法通过远程服务器检查版本信息, 请尝试更新您的插件: %0%'
31-
Error-Parsing-Json: '§c无法正常解析版本信息 Json, 请尝试更新您的插件: %0%'
29+
Invalid-Channel: '&c您使用的插件处于一个未知的版本通道("%0%"). 请尝试更新您的插件到最新版本.'
30+
Error-Checking-Version: '&c无法通过远程服务器检查版本信息, 请尝试更新您的插件: %0%'
31+
Error-Parsing-Json: '&c无法正常解析版本信息 Json, 请尝试更新您的插件: %0%'
3232

3333
Command-Block-Sender:
3434
Messages:
@@ -60,15 +60,15 @@ Sender:
6060
Remove-Capture-Tip: '&c使用指令 &e/psr capture remove %0% &c即可取消捕获.'
6161
Children:
6262
Add:
63-
Simple-Help: '&7 * &e/psr capture add &7- &b启用监听类型的文本捕获'
64-
Detailed-Help: '&7 * &e/psr capture add <监听类型> &7- &b启用监听类型的文本捕获'
63+
Simple-Help: '&7 * &e/psr capture add &7- &b启用监听类型的内容捕获'
64+
Detailed-Help: '&7 * &e/psr capture add <监听类型> &7- &b启用监听类型的内容捕获'
6565
Listen-Type-Cannot-Be-Captured: '&c您不可捕获此监听类型.'
6666
Listen-Type-Not-Enabled: '&c此监听类型未配置为启用.'
6767
Capture-Added: '&a已启用 &f%0% &a的捕获.'
6868
Already-Capturing-Listen-Type: '&c您已经启用了 &f%0% &c的捕获了.'
6969
Remove:
70-
Simple-Help: '&7 * &e/psr capture remove &7- &b移除监听类型的文本捕获'
71-
Detailed-Help: '&7 * &e/psr capture remove <监听类型> &7- &b移除监听类型的文本捕获'
70+
Simple-Help: '&7 * &e/psr capture remove &7- &b移除监听类型的内容捕获'
71+
Detailed-Help: '&7 * &e/psr capture remove <监听类型> &7- &b移除监听类型的内容捕获'
7272
Capture-Removed: '&a已移除 &f%0% &a的捕获.'
7373
Already-Not-Capturing-Listen-Type: '&c您已经关闭了 &f%0% &c的捕获了.'
7474
List:
@@ -77,6 +77,12 @@ Sender:
7777
Results-Header: '&7&m---------&7&l &7[ &c&lP&6&lS&3&lR &7- &e捕获列表&7 ]&l &7&m---------'
7878
Results-Footer: '&7&m---------------------------------------'
7979
Not-Capturing-Listen-Type: '&c您未在捕获 &f%0% &c.'
80+
Capture-Info:
81+
Captured-Contents: '&3&l&m----------------------&3&l 捕获内容 &m----------------------'
82+
Click-For-Clipboard: '&a点击打开剪贴板'
83+
Click-To-Copy: '&a点击复制'
84+
Click-Any-Entry-To-Copy: '&a点击任何条目复制'
85+
Extra-Prefix: '额外内容: '
8086
Edit:
8187
Description: '替换配置编辑器'
8288
Help:
@@ -220,7 +226,7 @@ Sender:
220226
Description: '重载插件配置文件'
221227
Already-Reloading: '&c插件已经在重载过程中. 请稍后再重载.'
222228
Async-Reloading: '&b正在异步重载插件...'
223-
Error-Occurred: '§c重载插件时发生错误. 请检查控制台.'
229+
Error-Occurred: '&c重载插件时发生错误. 请检查控制台.'
224230
Complete: '&a插件已重载完毕.'
225231
Help:
226232
Header: '&7&m------------&7&l &7[ &c&lP&6&lS&3&lR &7- &e重载&7 ]&l &7&m------------'

0 commit comments

Comments
 (0)