From c0fcc2aaa0fb053e463c2089e77200ddf72928be Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Sun, 11 Aug 2024 11:56:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=9E=E7=8E=B0=E4=BA=86?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=BB=84=E7=A7=B0=E5=8F=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- .../main/java/cn/lunadeer/dominion/commands/Group.java | 5 +++-- .../cn/lunadeer/dominion/controllers/GroupController.java | 8 ++++---- .../main/java/cn/lunadeer/dominion/cuis/CreateGroup.java | 3 ++- .../main/java/cn/lunadeer/dominion/cuis/RenameGroup.java | 5 +++-- .../main/java/cn/lunadeer/dominion/tuis/TitleList.java | 4 +++- .../dominion/tuis/dominion/manage/group/GroupSetting.java | 2 +- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6a06217..0a43c0d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "cn.lunadeer" -version = "2.1.5-beta" +version = "2.1.6-beta" java { toolchain.languageVersion.set(JavaLanguageVersion.of(21)) diff --git a/core/src/main/java/cn/lunadeer/dominion/commands/Group.java b/core/src/main/java/cn/lunadeer/dominion/commands/Group.java index d3f558f..a61920c 100644 --- a/core/src/main/java/cn/lunadeer/dominion/commands/Group.java +++ b/core/src/main/java/cn/lunadeer/dominion/commands/Group.java @@ -5,6 +5,7 @@ import cn.lunadeer.dominion.controllers.GroupController; import cn.lunadeer.dominion.tuis.dominion.manage.group.GroupList; import cn.lunadeer.dominion.tuis.dominion.manage.group.GroupSetting; import cn.lunadeer.dominion.tuis.dominion.manage.group.SelectMember; +import cn.lunadeer.minecraftpluginutils.ColorParser; import cn.lunadeer.minecraftpluginutils.Notification; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -39,7 +40,7 @@ public class Group { BukkitPlayerOperator operator = BukkitPlayerOperator.create(sender); String dominionName = args[2]; String groupName = args[3]; - GroupController.createGroup(operator, dominionName, groupName); + GroupController.createGroup(operator, dominionName, ColorParser.getPlainText(groupName), groupName); GroupList.show(sender, dominionName); } catch (Exception e) { Notification.error(sender, e.getMessage()); @@ -90,7 +91,7 @@ public class Group { String dominionName = args[2]; String oldGroupName = args[3]; String newGroupName = args[4]; - GroupController.renameGroup(operator, dominionName, oldGroupName, newGroupName); + GroupController.renameGroup(operator, dominionName, oldGroupName, ColorParser.getPlainText(newGroupName), newGroupName); GroupSetting.show(sender, dominionName, newGroupName); } catch (Exception e) { Notification.error(sender, e.getMessage()); diff --git a/core/src/main/java/cn/lunadeer/dominion/controllers/GroupController.java b/core/src/main/java/cn/lunadeer/dominion/controllers/GroupController.java index a43a556..d5aef2c 100644 --- a/core/src/main/java/cn/lunadeer/dominion/controllers/GroupController.java +++ b/core/src/main/java/cn/lunadeer/dominion/controllers/GroupController.java @@ -9,7 +9,7 @@ import static cn.lunadeer.dominion.controllers.Apis.notOwner; public class GroupController { - public static void createGroup(AbstractOperator operator, String domName, String groupName) { + public static void createGroup(AbstractOperator operator, String domName, String groupName, String nameColored) { AbstractOperator.Result FAIL = new AbstractOperator.Result(AbstractOperator.Result.FAILURE, "创建权限组 %s 失败", groupName); AbstractOperator.Result SUCCESS = new AbstractOperator.Result(AbstractOperator.Result.SUCCESS, "创建权限组 %s 成功", groupName); if (groupName.contains(" ")) { @@ -30,7 +30,7 @@ public class GroupController { operator.setResponse(FAIL.addMessage("领地 %s 已存在名为 %s 的权限组", domName, groupName)); return; } - group = GroupDTO.create(groupName, dominion); + group = GroupDTO.create(nameColored, dominion); if (group == null) { operator.setResponse(FAIL.addMessage("请联系服务器管理员")); return; @@ -96,7 +96,7 @@ public class GroupController { operator.setResponse(SUCCESS); } - public static void renameGroup(AbstractOperator operator, String domName, String oldName, String newName) { + public static void renameGroup(AbstractOperator operator, String domName, String oldName, String newName, String nameColored) { AbstractOperator.Result FAIL = new AbstractOperator.Result(AbstractOperator.Result.FAILURE, "重命名权限组 %s 为 %s 失败", oldName, newName); AbstractOperator.Result SUCCESS = new AbstractOperator.Result(AbstractOperator.Result.SUCCESS, "重命名权限组 %s 为 %s 成功", oldName, newName); if (newName.contains(" ")) { @@ -117,7 +117,7 @@ public class GroupController { operator.setResponse(FAIL.addMessage("领地 %s 不存在名为 %s 的权限组", domName, oldName)); return; } - group = group.setName(newName); + group = group.setName(nameColored); if (group == null) { operator.setResponse(FAIL.addMessage("请联系服务器管理员")); return; diff --git a/core/src/main/java/cn/lunadeer/dominion/cuis/CreateGroup.java b/core/src/main/java/cn/lunadeer/dominion/cuis/CreateGroup.java index f16fd0c..365f668 100644 --- a/core/src/main/java/cn/lunadeer/dominion/cuis/CreateGroup.java +++ b/core/src/main/java/cn/lunadeer/dominion/cuis/CreateGroup.java @@ -4,6 +4,7 @@ import cn.lunadeer.dominion.controllers.BukkitPlayerOperator; import cn.lunadeer.dominion.controllers.GroupController; import cn.lunadeer.dominion.dtos.DominionDTO; import cn.lunadeer.dominion.tuis.dominion.manage.group.GroupList; +import cn.lunadeer.minecraftpluginutils.ColorParser; import cn.lunadeer.minecraftpluginutils.Notification; import cn.lunadeer.minecraftpluginutils.XLogger; import cn.lunadeer.minecraftpluginutils.scui.CuiTextInput; @@ -28,7 +29,7 @@ public class CreateGroup { public void handleData(String input) { XLogger.debug("createGroupCB.run: %s", input); BukkitPlayerOperator operator = BukkitPlayerOperator.create(sender); - GroupController.createGroup(operator, dominionName, input); + GroupController.createGroup(operator, dominionName, ColorParser.getPlainText(input), input); GroupList.show(sender, dominionName); } } diff --git a/core/src/main/java/cn/lunadeer/dominion/cuis/RenameGroup.java b/core/src/main/java/cn/lunadeer/dominion/cuis/RenameGroup.java index f2a396c..b4eb6cd 100644 --- a/core/src/main/java/cn/lunadeer/dominion/cuis/RenameGroup.java +++ b/core/src/main/java/cn/lunadeer/dominion/cuis/RenameGroup.java @@ -4,6 +4,7 @@ import cn.lunadeer.dominion.controllers.BukkitPlayerOperator; import cn.lunadeer.dominion.controllers.GroupController; import cn.lunadeer.dominion.dtos.DominionDTO; import cn.lunadeer.dominion.tuis.dominion.manage.group.GroupSetting; +import cn.lunadeer.minecraftpluginutils.ColorParser; import cn.lunadeer.minecraftpluginutils.Notification; import cn.lunadeer.minecraftpluginutils.XLogger; import cn.lunadeer.minecraftpluginutils.scui.CuiTextInput; @@ -30,8 +31,8 @@ public class RenameGroup { public void handleData(String input) { XLogger.debug("renameGroupCB.run: %s", input); BukkitPlayerOperator operator = BukkitPlayerOperator.create(sender); - GroupController.renameGroup(operator, dominionName, oldName, input); - GroupSetting.show(sender, dominionName, input); + GroupController.renameGroup(operator, dominionName, oldName, ColorParser.getPlainText(input), input); + GroupSetting.show(sender, dominionName, ColorParser.getPlainText(input)); } } diff --git a/core/src/main/java/cn/lunadeer/dominion/tuis/TitleList.java b/core/src/main/java/cn/lunadeer/dominion/tuis/TitleList.java index 102b93e..8eada7c 100644 --- a/core/src/main/java/cn/lunadeer/dominion/tuis/TitleList.java +++ b/core/src/main/java/cn/lunadeer/dominion/tuis/TitleList.java @@ -1,6 +1,7 @@ package cn.lunadeer.dominion.tuis; import cn.lunadeer.dominion.Cache; +import cn.lunadeer.dominion.dtos.DominionDTO; import cn.lunadeer.dominion.dtos.GroupDTO; import cn.lunadeer.minecraftpluginutils.stui.ListView; import cn.lunadeer.minecraftpluginutils.stui.components.Button; @@ -32,13 +33,14 @@ public class TitleList { GroupDTO using = Cache.instance.getPlayerUsingGroupTitle(player.getUniqueId()); for (GroupDTO group : groups) { + DominionDTO dominion = Cache.instance.getDominion(group.getDomID()); Line line = Line.create(); if (using != null && using.getId().equals(group.getId())) { line.append(Button.createRed("卸下").setExecuteCommand("/dominion use_title -1").build()); } else { line.append(Button.createGreen("使用").setExecuteCommand("/dominion use_title " + group.getId()).build()); } - line.append(group.getNameColoredComponent()); + line.append(group.getNameColoredComponent()).append("来自领地：" + dominion.getName()); view.add(line); } diff --git a/core/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/GroupSetting.java b/core/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/GroupSetting.java index 25a0427..485ac20 100644 --- a/core/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/GroupSetting.java +++ b/core/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/GroupSetting.java @@ -45,7 +45,7 @@ public class GroupSetting { } ListView view = ListView.create(10, "/dominion group setting " + dominion.getName() + " " + group.getName()); - view.title("权限组 " + group.getNameColoredBukkit() + " 管理"); + view.title(Component.text("权限组 ").append(group.getNameColoredComponent()).append(Component.text(" 管理"))); view.navigator( Line.create() .append(Button.create("主菜单").setExecuteCommand("/dominion menu").build())