From 252fdd089c6fa9989c374b636f8829d26dcf89f5 Mon Sep 17 00:00:00 2001 From: Coloryr <402067010@qq.com> Date: Tue, 9 Jul 2024 11:06:38 +0800 Subject: [PATCH] up 3.1.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复bug 添加测试解析指令 --- core/AllMusic.java | 4 +-- core/command/CommandEX.java | 2 ++ core/command/CommandHelp.java | 2 ++ core/command/CommandHud.java | 4 +-- core/command/CommandHudSet.java | 2 +- core/command/CommandTest.java | 35 +++++++++++++++++++ core/objs/message/HelpAdminObj.java | 4 +++ .../allmusic/server/side/bc/SideBC.java | 3 +- .../server/side/velocity/SideVelocity.java | 7 +++- version | 2 +- 10 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 core/command/CommandTest.java diff --git a/core/AllMusic.java b/core/AllMusic.java index bdb89600..d69d2909 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -35,7 +35,7 @@ public class AllMusic { /** * 插件版本号 */ - public static final String version = "3.1.5"; + public static final String version = "3.1.6"; /** * 配置文件版本号 */ @@ -43,7 +43,7 @@ public class AllMusic { /** * 语言文件配置版本号 */ - public static final String messageVersion = "203"; + public static final String messageVersion = "204"; /** * 搜歌结果 * 玩家名 结果 diff --git a/core/command/CommandEX.java b/core/command/CommandEX.java index 69f9bc93..9b860504 100644 --- a/core/command/CommandEX.java +++ b/core/command/CommandEX.java @@ -38,6 +38,7 @@ public class CommandEX { this.add("clearlist"); this.add("login"); this.add("code"); + this.add("test"); }}; /** * 搜歌的指令 @@ -72,6 +73,7 @@ public class CommandEX { commandAdminList.put("clearlist", new CommandClearList()); commandAdminList.put("code", new CommandCode()); commandAdminList.put("login", new CommandLogin()); + commandAdminList.put("test", new CommandTest()); } /** diff --git a/core/command/CommandHelp.java b/core/command/CommandHelp.java index 788b73a6..7b128df8 100644 --- a/core/command/CommandHelp.java +++ b/core/command/CommandHelp.java @@ -73,6 +73,8 @@ public class CommandHelp extends ACommand { AllMusic.getMessage().click.clickCheck, "/music login "); AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.code, AllMusic.getMessage().click.clickCheck, "/music code "); + AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.code, + AllMusic.getMessage().click.clickCheck, "/music test "); } } } diff --git a/core/command/CommandHud.java b/core/command/CommandHud.java index 149cb7f7..1bea30b0 100644 --- a/core/command/CommandHud.java +++ b/core/command/CommandHud.java @@ -57,7 +57,7 @@ public class CommandHud extends ACommand { return Collections.emptyList(); } - public static class HudEnable extends ACommand { + private static class HudEnable extends ACommand { private static final List tf = new ArrayList() {{ this.add("true"); this.add("false"); @@ -84,7 +84,7 @@ public class CommandHud extends ACommand { } } - public static class HudReset extends ACommand { + private static class HudReset extends ACommand { @Override public void ex(Object sender, String name, String[] args) { HudUtils.reset(name); diff --git a/core/command/CommandHudSet.java b/core/command/CommandHudSet.java index e0a850a4..f37b3339 100644 --- a/core/command/CommandHudSet.java +++ b/core/command/CommandHudSet.java @@ -52,7 +52,7 @@ public class CommandHudSet extends AHudCommand { @Override public void ex(Object sender, String name, String[] args) { - if (args.length == 1) { + if (args.length == 2) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); } else { ICommand command = commandList.get(args[2]); diff --git a/core/command/CommandTest.java b/core/command/CommandTest.java new file mode 100644 index 00000000..af732d60 --- /dev/null +++ b/core/command/CommandTest.java @@ -0,0 +1,35 @@ +package com.coloryr.allmusic.server.core.command; + +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.utils.Function; + +public class CommandTest extends ACommand { + @Override + public void ex(Object sender, String name, String[] args) { + if (args.length != 2) { + AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); + return; + } + if (Function.isInteger(args[1])) { + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2正在测试解析" + args[1]); + try { + SongInfoObj info = AllMusic.getMusicApi().getMusic(args[1], "test", false); + if (info == null) { + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2测试解析失败"); + return; + } + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2音乐名称 " + info.getName()); + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2音乐作者 " + info.getAuthor()); + String url = AllMusic.getMusicApi().getPlayUrl(args[1]); + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2播放地址 " + url); + } catch (Exception e) { + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2测试解析错误"); + e.printStackTrace(); + } + } else { + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2请输入有效的ID"); + } + } +} + diff --git a/core/objs/message/HelpAdminObj.java b/core/objs/message/HelpAdminObj.java index 48ffbb20..81dd0350 100644 --- a/core/objs/message/HelpAdminObj.java +++ b/core/objs/message/HelpAdminObj.java @@ -11,6 +11,7 @@ public class HelpAdminObj { public String clearList; public String login; public String code; + public String test; public static HelpAdminObj make() { HelpAdminObj obj = new HelpAdminObj(); @@ -38,6 +39,8 @@ public class HelpAdminObj { return true; if (banPlayer == null) return true; + if (test == null) + return true; return login == null; } @@ -52,5 +55,6 @@ public class HelpAdminObj { clearList = "§d[AllMusic3]§e使用/music clearlist 清空空闲歌单"; login = "§d[AllMusic3]§e使用/music login [验证码] 登录账户"; code = "§d[AllMusic3]§e使用/music code [手机号] 获取短信验证码"; + test = "§d[AllMusic3]§e使用/music test [音乐ID] 测试解析音乐"; } } diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java index 72c3b51a..5e7b87b8 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java @@ -415,7 +415,8 @@ public class SideBC extends BaseSide implements IEconomy { @Override public boolean needPlay() { for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (!skip(player)) { + String server = player.getServer() == null ? null : player.getServer().getInfo().getName(); + if (!AllMusic.isSkip(player.getName(), server, false)) { return true; } } diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java index 6b34ced4..a38acec3 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java @@ -164,7 +164,12 @@ public class SideVelocity extends BaseSide implements IEconomy { @Override public boolean needPlay() { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - if (!skip(player)) { + String server = null; + if (player.getCurrentServer().isPresent()) { + server = player.getCurrentServer().get().getServerInfo().getName(); + } + + if (!AllMusic.isSkip(player.getUsername(), server, false)) { return true; } } diff --git a/version b/version index 97ceee1b..8a4b2758 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.1.5 \ No newline at end of file +3.1.6 \ No newline at end of file