From accea52f5df7ad67338f2e82c370dfad1dfc0da3 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Mon, 26 Dec 2022 15:36:01 +0800 Subject: [PATCH] up MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整信息提示 --- build.gradle | 2 +- src/main/java/coloryr/allmusic/AllMusic.java | 17 +++++--- src/main/java/coloryr/allmusic/ConfigOBJ.java | 13 +++++++ .../coloryr/allmusic/command/CommandEX.java | 4 +- .../coloryr/allmusic/message/MessageOBJ.java | 9 +++++ .../allmusic/message/MusicPlayOBJ.java | 10 ++--- .../coloryr/allmusic/music/play/MusicObj.java | 1 + .../coloryr/allmusic/music/play/PlayGo.java | 20 +++++----- .../allmusic/music/play/PlayMusic.java | 39 +++++++++++-------- .../java/coloryr/allmusic/side/bc/SideBC.java | 15 ++++--- .../allmusic/side/bukkit/SideBukkit.java | 14 ++++++- .../allmusic/side/velocity/SideVelocity.java | 15 ++++--- src/main/resources/bungee.yml | 2 +- src/main/resources/config.json | 4 +- src/main/resources/message.json | 5 ++- src/main/resources/plugin.yml | 3 +- 16 files changed, 115 insertions(+), 58 deletions(-) diff --git a/build.gradle b/build.gradle index 0838639a..7953206d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'com.github.johnrengelman.shadow' version '6.1.0' } -version = "2.16.6" +version = "2.17.0" repositories { mavenCentral() diff --git a/src/main/java/coloryr/allmusic/AllMusic.java b/src/main/java/coloryr/allmusic/AllMusic.java index c2656896..742d6e7b 100644 --- a/src/main/java/coloryr/allmusic/AllMusic.java +++ b/src/main/java/coloryr/allmusic/AllMusic.java @@ -27,7 +27,8 @@ import java.util.Map; public class AllMusic { public static final String channel = "allmusic:channel"; public static final String channelBC = "allmusic:channelbc"; - public static final String version = "2.16.2"; + public static final String version = "2.17.0"; + public static final String configVersion = "100"; private static final Map searchSave = new HashMap<>(); private static final List votePlayer = new ArrayList<>(); @@ -196,14 +197,18 @@ public class AllMusic { reader.close(); configCheck(); - reader = new InputStreamReader(Files.newInputStream(AllMusic.messageFile.toPath()), StandardCharsets.UTF_8); + reader = new InputStreamReader(Files.newInputStream(messageFile.toPath()), StandardCharsets.UTF_8); bf = new BufferedReader(reader); message = new Gson().fromJson(bf, MessageOBJ.class); bf.close(); reader.close(); messageCheck(); - reader = new InputStreamReader(Files.newInputStream(AllMusic.cookieFile.toPath()), StandardCharsets.UTF_8); + if (!message.getVersion().equalsIgnoreCase(configVersion)) { + log.warning("§d[AllMusic]§c语言文件版本号错误,运行可能会发生问题,请删除后重载"); + } + + reader = new InputStreamReader(Files.newInputStream(cookieFile.toPath()), StandardCharsets.UTF_8); bf = new BufferedReader(reader); cookie = new Gson().fromJson(bf, CookieObj.class); bf.close(); @@ -213,10 +218,10 @@ public class AllMusic { saveCookie(); } - log.info("§d[AllMusic]§e当前插件版本为:" + AllMusic.version - + ",你的配置文件版本为:" + AllMusic.config.getVersion()); + log.info("§d[AllMusic]§e当前插件配置文件版本为:" + configVersion + + ",你的配置文件版本为:" + config.getVersion()); - if (!AllMusic.version.equalsIgnoreCase(AllMusic.config.getVersion())) { + if (!AllMusic.version.equalsIgnoreCase(config.getVersion())) { log.warning("§d[AllMusic]§c请及时更新配置文件"); } } catch (Exception e) { diff --git a/src/main/java/coloryr/allmusic/ConfigOBJ.java b/src/main/java/coloryr/allmusic/ConfigOBJ.java index 789d6e86..ed398eef 100644 --- a/src/main/java/coloryr/allmusic/ConfigOBJ.java +++ b/src/main/java/coloryr/allmusic/ConfigOBJ.java @@ -39,6 +39,9 @@ public class ConfigOBJ { private boolean MessageLimit; private int MessageLimitSize; + private boolean MutePlayMessage; + private boolean MuteAddMessage; + public ConfigOBJ() { MaxList = 10; MinVote = 3; @@ -58,6 +61,8 @@ public class ConfigOBJ { UseCost = false; SearchCost = 20; + MutePlayMessage = false; + MuteAddMessage = false; AddMusicCost = 10; DefaultAddMusic = 0; @@ -72,6 +77,14 @@ public class ConfigOBJ { Version = AllMusic.version; } + public boolean isMuteAddMessage() { + return MuteAddMessage; + } + + public boolean isMutePlayMessage() { + return MutePlayMessage; + } + public int getMessageLimitSize() { return MessageLimitSize; } diff --git a/src/main/java/coloryr/allmusic/command/CommandEX.java b/src/main/java/coloryr/allmusic/command/CommandEX.java index 060af721..8385b6e6 100644 --- a/src/main/java/coloryr/allmusic/command/CommandEX.java +++ b/src/main/java/coloryr/allmusic/command/CommandEX.java @@ -53,7 +53,8 @@ public class CommandEX { AllMusic.getConfig().RemoveNoMusicPlayer(name); if (AllMusic.side.NeedPlay()) { MusicObj obj = new MusicObj(); - obj.sender = musicID; + obj.sender = sender; + obj.id = musicID; obj.name = name; obj.isDefault = false; PlayMusic.addTask(obj); @@ -339,6 +340,7 @@ public class CommandEX { return; } else if (args[0].equalsIgnoreCase("url") && args.length == 2) { MusicObj obj = new MusicObj(); + obj.sender = sender; obj.isUrl = true; obj.url = args[1]; PlayMusic.addTask(obj); diff --git a/src/main/java/coloryr/allmusic/message/MessageOBJ.java b/src/main/java/coloryr/allmusic/message/MessageOBJ.java index 1ddfa355..e04af2c0 100644 --- a/src/main/java/coloryr/allmusic/message/MessageOBJ.java +++ b/src/main/java/coloryr/allmusic/message/MessageOBJ.java @@ -1,5 +1,7 @@ package coloryr.allmusic.message; +import coloryr.allmusic.AllMusic; + public class MessageOBJ { private MusicPlayOBJ MusicPlay; private AddMusicOBJ AddMusic; @@ -16,6 +18,8 @@ public class MessageOBJ { private ClickObj Click; private HelpObj Help; + private String Version; + public MessageOBJ() { MusicPlay = new MusicPlayOBJ(); AddMusic = new AddMusicOBJ(); @@ -31,6 +35,11 @@ public class MessageOBJ { Cost = new CostObj(); Click = new ClickObj(); Help = new HelpObj(); + Version = AllMusic.configVersion; + } + + public String getVersion() { + return Version; } public ClickObj getClick() { diff --git a/src/main/java/coloryr/allmusic/message/MusicPlayOBJ.java b/src/main/java/coloryr/allmusic/message/MusicPlayOBJ.java index 63c6003a..5fb49577 100644 --- a/src/main/java/coloryr/allmusic/message/MusicPlayOBJ.java +++ b/src/main/java/coloryr/allmusic/message/MusicPlayOBJ.java @@ -10,7 +10,7 @@ public class MusicPlayOBJ { private String NoPlayMusic; private String Switch; private String AddMusic; - private String PlayerAdd; + private String CheckMusic; private String MusicInfo; private String Trail; @@ -24,7 +24,7 @@ public class MusicPlayOBJ { NoPlayMusic = "§d[AllMusic]§2你不会再收到点歌了!想要再次参与点歌就点一首歌吧!"; Switch = "§d[AllMusic]§2切换到玩家歌曲"; AddMusic = "§d[AllMusic]§2音乐列表添加%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia%"; - PlayerAdd = "§d[AllMusic]§2%PlayerName%点歌%MusicID%"; + CheckMusic = "§d[AllMusic]§2正在解析歌曲%MusicID%"; MusicInfo = "%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia% | by: %PlayerName%"; Trail = "§d[AllMusic]§2该音乐为试听音乐"; } @@ -49,7 +49,7 @@ public class MusicPlayOBJ { res = true; if (AddMusic == null) res = true; - if (PlayerAdd == null) + if (CheckMusic == null) res = true; if (MusicInfo == null) res = true; @@ -67,8 +67,8 @@ public class MusicPlayOBJ { return MusicInfo; } - public String getPlayerAdd() { - return PlayerAdd; + public String getCheckMusic() { + return CheckMusic; } public String getAddMusic() { diff --git a/src/main/java/coloryr/allmusic/music/play/MusicObj.java b/src/main/java/coloryr/allmusic/music/play/MusicObj.java index 845c62bb..49753757 100644 --- a/src/main/java/coloryr/allmusic/music/play/MusicObj.java +++ b/src/main/java/coloryr/allmusic/music/play/MusicObj.java @@ -2,6 +2,7 @@ package coloryr.allmusic.music.play; public class MusicObj { public Object sender; + public String id; public String name; public String[] args; public boolean isDefault; diff --git a/src/main/java/coloryr/allmusic/music/play/PlayGo.java b/src/main/java/coloryr/allmusic/music/play/PlayGo.java index 7f42720b..a938d357 100644 --- a/src/main/java/coloryr/allmusic/music/play/PlayGo.java +++ b/src/main/java/coloryr/allmusic/music/play/PlayGo.java @@ -114,7 +114,7 @@ public class PlayGo { obj.sender = ID; obj.name = "空闲列表"; obj.isDefault = true; - PlayMusic.addMusic(ID, "空闲列表", true); + PlayMusic.addMusic(null, ID, "空闲列表", true); } } Thread.sleep(50); @@ -138,16 +138,18 @@ public class PlayGo { if (PlayMusic.nowPlayMusic.getLength() != 0) { PlayMusic.musicAllTime = PlayMusic.musicLessTime = (PlayMusic.nowPlayMusic.getLength() / 1000) + 3; - String info = AllMusic.getMessage().getMusicPlay().getPlay(); - info = info.replace("%MusicName%", PlayMusic.nowPlayMusic.getName()) - .replace("%MusicAuthor%", PlayMusic.nowPlayMusic.getAuthor()) - .replace("%MusicAl%", PlayMusic.nowPlayMusic.getAl()) - .replace("%MusicAlia%", PlayMusic.nowPlayMusic.getAlia()) - .replace("%PlayerName%", PlayMusic.nowPlayMusic.getCall()); - AllMusic.side.bqt(info); + if (!AllMusic.getConfig().isMutePlayMessage()) { + String info = AllMusic.getMessage().getMusicPlay().getPlay(); + info = info.replace("%MusicName%", PlayMusic.nowPlayMusic.getName()) + .replace("%MusicAuthor%", PlayMusic.nowPlayMusic.getAuthor()) + .replace("%MusicAl%", PlayMusic.nowPlayMusic.getAl()) + .replace("%MusicAlia%", PlayMusic.nowPlayMusic.getAlia()) + .replace("%PlayerName%", PlayMusic.nowPlayMusic.getCall()); + AllMusic.side.bqt(info); + } startTimer(); AllMusic.side.send("[Play]" + url, true); - if(!PlayMusic.nowPlayMusic.isUrl() && PlayMusic.nowPlayMusic.getPicUrl() != null){ + if (!PlayMusic.nowPlayMusic.isUrl() && PlayMusic.nowPlayMusic.getPicUrl() != null) { AllMusic.side.task(() -> AllMusic.side.send("[Img]" + PlayMusic.nowPlayMusic.getPicUrl(), true), 10); } diff --git a/src/main/java/coloryr/allmusic/music/play/PlayMusic.java b/src/main/java/coloryr/allmusic/music/play/PlayMusic.java index 137e2741..1ca8eb1c 100644 --- a/src/main/java/coloryr/allmusic/music/play/PlayMusic.java +++ b/src/main/java/coloryr/allmusic/music/play/PlayMusic.java @@ -56,7 +56,7 @@ public class PlayMusic { if (obj.isUrl) { addUrl(obj.url); } else { - addMusic((String) obj.sender, obj.name, obj.isDefault); + addMusic(obj.sender, obj.id, obj.name, obj.isDefault); } } Thread.sleep(10); @@ -67,27 +67,32 @@ public class PlayMusic { } } - public static void addMusic(String ID, String player, boolean isList) { - if (isHave(ID)) + public static void addMusic(Object sender, String id, String player, boolean isList) { + if (isHave(id)) return; - String text = AllMusic.getMessage().getMusicPlay().getPlayerAdd(); - text = text.replace("%PlayerName%", player) - .replace("%MusicID%", ID); - AllMusic.side.bqt(text); - logs.logWrite("玩家:" + player + " 点歌:" + ID); + if(sender != null) { + String text = AllMusic.getMessage().getMusicPlay().getCheckMusic(); + text = text.replace("%MusicID%", id); + AllMusic.side.sendMessaget(sender, text); + } + logs.logWrite("玩家:" + player + " 点歌:" + id); try { - SongInfo info = AllMusic.getMusicApi().getMusic(ID, player, isList); + SongInfo info = AllMusic.getMusicApi().getMusic(id, player, isList); if (info != null) { playList.add(info); - String data = AllMusic.getMessage().getMusicPlay().getAddMusic(); - data = data.replace("%MusicName%", info.getName()) - .replace("%MusicAuthor%", info.getAuthor()) - .replace("%MusicAl%", info.getAl()) - .replace("%MusicAlia%", info.getAlia()); - AllMusic.side.bqt(data); + if(!AllMusic.getConfig().isMuteAddMessage()) { + String data = AllMusic.getMessage().getMusicPlay().getAddMusic(); + data = data.replace("%MusicName%", info.getName()) + .replace("%MusicAuthor%", info.getAuthor()) + .replace("%MusicAl%", info.getAl()) + .replace("%MusicAlia%", info.getAlia()); + AllMusic.side.bqt(data); + } } else { - String data = AllMusic.getMessage().getMusicPlay().getNoCanPlay(); - AllMusic.side.bqt(data.replace("%MusicID%", ID)); + if (sender != null) { + String data = AllMusic.getMessage().getMusicPlay().getNoCanPlay(); + AllMusic.side.sendMessaget(sender, data.replace("%MusicID%", id)); + } } if (AllMusic.getConfig().isPlayListSwitch() && (PlayMusic.nowPlayMusic != null && PlayMusic.nowPlayMusic.isList())) { diff --git a/src/main/java/coloryr/allmusic/side/bc/SideBC.java b/src/main/java/coloryr/allmusic/side/bc/SideBC.java index 5a7bb54d..ac762d1c 100644 --- a/src/main/java/coloryr/allmusic/side/bc/SideBC.java +++ b/src/main/java/coloryr/allmusic/side/bc/SideBC.java @@ -156,16 +156,19 @@ public class SideBC implements ISide { && data.length() > AllMusic.getConfig().getMessageLimitSize()) { data = data.substring(0, 30) + "..."; } - ProxyServer.getInstance().broadcast(new TextComponent(data)); + TextComponent message = new TextComponent(data); + for (ServerInfo server : ProxyServer.getInstance().getServers().values()) { + if (AllMusic.getConfig().getNoMusicServer().contains(server.getName())) + continue; + for (ProxiedPlayer player : server.getPlayers()) + if (!AllMusic.getConfig().getNoMusicPlayer().contains(player.getName())) + player.sendMessage(message); + } } @Override public void bqt(String data) { - if (AllMusic.getConfig().isMessageLimit() - && data.length() > AllMusic.getConfig().getMessageLimitSize()) { - data = data.substring(0, 30) + "..."; - } - ProxyServer.getInstance().broadcast(new TextComponent(data)); + this.bq(data); } @Override diff --git a/src/main/java/coloryr/allmusic/side/bukkit/SideBukkit.java b/src/main/java/coloryr/allmusic/side/bukkit/SideBukkit.java index c5afae62..c6ad943e 100644 --- a/src/main/java/coloryr/allmusic/side/bukkit/SideBukkit.java +++ b/src/main/java/coloryr/allmusic/side/bukkit/SideBukkit.java @@ -107,7 +107,11 @@ public class SideBukkit implements ISide { && data.length() > AllMusic.getConfig().getMessageLimitSize()) { data = data.substring(0, 30) + "..."; } - Bukkit.broadcastMessage(data); + for(Player player : Bukkit.getOnlinePlayers()){ + if(!AllMusic.getConfig().getNoMusicPlayer().contains(player.getName())){ + player.sendMessage(data); + } + } } @Override @@ -117,7 +121,13 @@ public class SideBukkit implements ISide { data = data.substring(0, 30) + "..."; } String finalData = data; - Bukkit.getScheduler().runTask(AllMusicBukkit.plugin, () -> Bukkit.broadcastMessage(finalData)); + Bukkit.getScheduler().runTask(AllMusicBukkit.plugin, () -> { + for (Player player : Bukkit.getOnlinePlayers()) { + if (!AllMusic.getConfig().getNoMusicPlayer().contains(player.getName())) { + player.sendMessage(finalData); + } + } + }); } @Override diff --git a/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java b/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java index cb615255..2f4f724b 100644 --- a/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java +++ b/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java @@ -80,16 +80,19 @@ public class SideVelocity implements ISide { && data.length() > AllMusic.getConfig().getMessageLimitSize()) { data = data.substring(0, 30) + "..."; } - AllMusicVelocity.plugin.server.sendMessage(Component.text(data)); + Component message = Component.text(data); + for (RegisteredServer server : AllMusicVelocity.plugin.server.getAllServers()) { + if (AllMusic.getConfig().getNoMusicServer().contains(server.getServerInfo().getName())) + continue; + for (Player player : server.getPlayersConnected()) + if (!AllMusic.getConfig().getNoMusicPlayer().contains(player.getUsername())) + player.sendMessage(message); + } } @Override public void bqt(String data) { - if (AllMusic.getConfig().isMessageLimit() - && data.length() > AllMusic.getConfig().getMessageLimitSize()) { - data = data.substring(0, 30) + "..."; - } - AllMusicVelocity.plugin.server.sendMessage(Component.text(data)); + this.bq(data); } @Override diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml index d38f75d5..9a7a4800 100644 --- a/src/main/resources/bungee.yml +++ b/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ name: AllMusic main: coloryr.allmusic.AllMusicBC author: Color_yr -version: 2.16.5 +version: 2.17.0 diff --git a/src/main/resources/config.json b/src/main/resources/config.json index 762af54b..f16653f7 100644 --- a/src/main/resources/config.json +++ b/src/main/resources/config.json @@ -16,6 +16,8 @@ "TopPAPI": false, "MessageLimit": false, "MessageLimitSize": 40, + "MutePlayMessage": false, + "MuteAddMessage": false, "DefaultHud": { "List": { "x": 2, @@ -42,5 +44,5 @@ "SearchCost": 20, "AddMusicCost": 10, "MusicBR": "320000", - "Version": "2.16.5" + "Version": "100" } \ No newline at end of file diff --git a/src/main/resources/message.json b/src/main/resources/message.json index 642e6981..b21ccfd9 100644 --- a/src/main/resources/message.json +++ b/src/main/resources/message.json @@ -13,7 +13,7 @@ "NoPlayMusic": "§d[AllMusic]§e你不会再收到点歌了!想要再次参与点歌就点一首歌或者参与切歌投票吧!", "Switch": "§d[AllMusic]§e切换到玩家歌曲", "AddMusic": "§d[AllMusic]§e音乐列表添加%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia%", - "PlayerAdd": "§d[AllMusic]§e%PlayerName%点歌%MusicID%", + "CheckMusic": "§d[AllMusic]§2正在解析歌曲%MusicID%", "MusicInfo": "%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia% | by: %PlayerName%", "Trail": "§d[AllMusic]§e该音乐为试听音乐" }, @@ -114,5 +114,6 @@ "ClearList": "§d[AllMusic]§e使用/music clearlist 清空空闲歌单", "Login": "§d[AllMusic]§e使用/music login 重新登录账户" } - } + }, + "Version": "100" } \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index e0844f79..5eab76c9 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,8 @@ name: AllMusic main: coloryr.allmusic.AllMusicBukkit author: Color_yr -version: 2.16.5 +version: 2.17.0 +softdepend: [PlaceholderAPI, Vault] loadbefore: [PlaceholderAPI, Vault, Essentials, CMI] api-version: 1.13