From 5830e2c4f96dc544f69a46047ded39174ecbc36a Mon Sep 17 00:00:00 2001 From: Coloryr <402067010@qq.com> Date: Mon, 12 Aug 2024 11:14:54 +0800 Subject: [PATCH] up 3.2.0 Closed #36 #35 --- core/AllMusic.java | 16 ++--- core/music/api/APIMain.java | 2 + core/music/play/PlayMusic.java | 69 ++++++++++-------- .../play/{PlayGo.java => PlayRuntime.java} | 71 +++++++++---------- core/objs/config/ConfigObj.java | 7 +- core/objs/config/LimitObj.java | 10 +-- core/objs/message/ListMusicObj.java | 2 +- core/objs/message/MusicPlayObj.java | 2 +- core/side/BaseSide.java | 21 +----- core/utils/HudUtils.java | 47 ++++++++---- .../server/side/fabric/SideFabric.java | 2 +- .../server/side/fabric/SideFabric.java | 2 +- .../server/side/fabric/SideFabric.java | 2 +- .../server/side/fabric/SideFabric.java | 2 +- .../server/side/fabric/SideFabric.java | 2 +- .../server/side/fabric/SideFabric.java | 2 +- .../server/side/fabric/SideFabric.java | 2 +- .../server/side/fabric/SideFabric.java | 2 +- .../allmusic/server/side/folia/SideFolia.java | 2 +- .../allmusic/server/side/forge/SideForge.java | 2 +- .../allmusic/server/side/forge/SideForge.java | 2 +- .../allmusic/server/side/forge/SideForge.java | 2 +- .../allmusic/server/side/forge/SideForge.java | 2 +- .../allmusic/server/side/forge/SideForge.java | 2 +- .../allmusic/server/side/forge/SideForge.java | 2 +- .../allmusic/server/side/forge/SideForge.java | 2 +- .../allmusic/server/side/forge/SideForge.java | 2 +- .../allmusic/server/side/forge/SideForge.java | 2 +- .../server/side/bukkit/SideBukkit.java | 2 +- server_top/build.gradle | 6 +- .../allmusic/server/side/bc/SideBC.java | 2 +- .../server/side/velocity/SideVelocity.java | 2 +- version | 2 +- 33 files changed, 156 insertions(+), 141 deletions(-) rename core/music/play/{PlayGo.java => PlayRuntime.java} (82%) diff --git a/core/AllMusic.java b/core/AllMusic.java index da7a8418..dd3b3d68 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -2,8 +2,8 @@ package com.coloryr.allmusic.server.core; import com.coloryr.allmusic.server.core.music.api.APIMain; import com.coloryr.allmusic.server.core.music.play.MusicSearch; -import com.coloryr.allmusic.server.core.music.play.PlayGo; import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.music.play.PlayRuntime; import com.coloryr.allmusic.server.core.objs.CookieObj; import com.coloryr.allmusic.server.core.objs.config.ConfigObj; import com.coloryr.allmusic.server.core.objs.message.MessageObj; @@ -36,15 +36,15 @@ public class AllMusic { /** * 插件版本号 */ - public static final String version = "3.1.9"; + public static final String version = "3.2.0"; /** * 配置文件版本号 */ - public static final String configVersion = "202"; + public static final String configVersion = "203"; /** * 语言文件配置版本号 */ - public static final String messageVersion = "204"; + public static final String messageVersion = "205"; /** * 搜歌结果 * 玩家名 结果 @@ -363,7 +363,7 @@ public class AllMusic { public static void start() { AllMusic.apiMusic = new APIMain(); PlayMusic.start(); - PlayGo.start(); + PlayRuntime.start(); MusicSearch.start(); DataSql.start(); @@ -380,7 +380,7 @@ public class AllMusic { side.sendStop(); MusicSearch.stop(); PlayMusic.stop(); - PlayGo.stop(); + PlayRuntime.stop(); DataSql.stop(); } catch (IOException e) { e.printStackTrace(); @@ -460,9 +460,9 @@ public class AllMusic { String finalPlayer = player; AllMusic.side.runTask(() -> { SongInfoObj music = PlayMusic.nowPlayMusic; - if (music != null && PlayGo.url != null) { + if (music != null && PlayMusic.url != null) { AllMusic.side.sendHudPos(finalPlayer); - AllMusic.side.sendMusic(finalPlayer, PlayGo.url); + AllMusic.side.sendMusic(finalPlayer, PlayMusic.url); if (!music.isUrl()) { AllMusic.side.sendPic(finalPlayer, music.getPicUrl()); } diff --git a/core/music/api/APIMain.java b/core/music/api/APIMain.java index f3f1cc1c..5c95608d 100644 --- a/core/music/api/APIMain.java +++ b/core/music/api/APIMain.java @@ -17,6 +17,7 @@ import com.coloryr.allmusic.server.core.objs.enums.EncryptType; import com.coloryr.allmusic.server.core.objs.message.PAL; import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.utils.Logs; import com.google.gson.JsonObject; import okhttp3.Cookie; @@ -224,6 +225,7 @@ public class APIMain { try { isUpdate = true; DataObj obj = AllMusic.gson.fromJson(res.data, DataObj.class); + DataSql.addIdleList(obj.getPlaylist()); PlayMusic.addIdleList(obj.getPlaylist()); AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().musicPlay.listMusic.get.replace(PAL.name, obj.getName())); } catch (Exception e) { diff --git a/core/music/play/PlayMusic.java b/core/music/play/PlayMusic.java index 974a3d05..023ef03f 100644 --- a/core/music/play/PlayMusic.java +++ b/core/music/play/PlayMusic.java @@ -8,16 +8,14 @@ import com.coloryr.allmusic.server.core.objs.message.PAL; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.sql.DataSql; +import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.core.utils.Logs; import org.jetbrains.annotations.NotNull; import java.io.BufferedInputStream; import java.net.URL; import java.net.URLConnection; -import java.util.ArrayList; -import java.util.List; -import java.util.Queue; -import java.util.Random; +import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; public class PlayMusic { @@ -28,6 +26,7 @@ public class PlayMusic { private static final List playList = new ArrayList<>(); private static final Queue tasks = new ConcurrentLinkedQueue<>(); private static final List playIdleList = new ArrayList<>(); + private static final Queue deep = new PriorityQueue<>(); /** * 投票时间 */ @@ -55,6 +54,10 @@ public class PlayMusic { * 当前歌词信息 */ public static LyricSave lyric; + /** + * 播放链接 + */ + public static String url; /** * 错误次数 */ @@ -75,7 +78,7 @@ public class PlayMusic { * 开始歌曲逻辑 */ public static void start() { - Thread addT = new Thread(PlayMusic::task, "AllMusic_list"); + Thread addT = new Thread(PlayMusic::task, "AllMusicList"); isRun = true; addT.start(); } @@ -141,10 +144,21 @@ public class PlayMusic { } playList.add(info); if (!AllMusic.getConfig().muteAddMessage) { - String data = getData(info); if (AllMusic.getConfig().showInBar) { + String data = AllMusic.getMessage().musicPlay.addMusic + .replace(PAL.musicName, HudUtils.messageLimit(info.getName())) + .replace(PAL.musicAuthor, HudUtils.messageLimit(info.getAuthor())) + .replace(PAL.musicAl, HudUtils.messageLimit(info.getAl())) + .replace(PAL.musicAlia, HudUtils.messageLimit(info.getAlia())) + .replace(PAL.player, info.getCall()); AllMusic.side.sendBar(data); } else { + String data = AllMusic.getMessage().musicPlay.addMusic + .replace(PAL.musicName, info.getName()) + .replace(PAL.musicAuthor, info.getAuthor()) + .replace(PAL.musicAl, info.getAl()) + .replace(PAL.musicAlia, info.getAlia()) + .replace(PAL.player, info.getCall()); AllMusic.side.bqTask(data); } } @@ -164,26 +178,6 @@ public class PlayMusic { } } - /** - * 构建字符串 - * - * @param info 歌曲信息 - * @return 信息 - */ - private static @NotNull String getData(SongInfoObj info) { - LimitObj limit = AllMusic.getConfig().limit; - String message = AllMusic.getMessage().musicPlay.addMusic - .replace(PAL.musicName, info.getName()) - .replace(PAL.musicAuthor, info.getAuthor()) - .replace(PAL.musicAl, info.getAl()) - .replace(PAL.musicAlia, info.getAlia()); - if (limit.messageLimit - && message.length() > limit.messageLimitSize) { - message = message.substring(0, limit.messageLimitSize) + limit.limitText; - } - return message; - } - /** * 将歌曲移动到队列头 * @@ -362,21 +356,36 @@ public class PlayMusic { if (AllMusic.getMusicApi().isUpdate()) { return null; } - String ID; + String id; if (playIdleList.isEmpty()) return null; if (AllMusic.getConfig().playListRandom) { if (playIdleList.size() == 1) return playIdleList.get(0); - ID = playIdleList.get(new Random().nextInt(playIdleList.size())); + if (playIdleList.size() > 10) { + int size = AllMusic.getConfig().playListEscapeDeep; + if (size > playIdleList.size() / 2) { + size = playIdleList.size() / 2; + } + if (deep.size() >= size) { + deep.poll(); + } + do { + id = playIdleList.get(new Random().nextInt(playIdleList.size())); + } + while (deep.contains(id)); + deep.add(id); + } else { + id = playIdleList.get(new Random().nextInt(playIdleList.size())); + } } else { - ID = playIdleList.get(idleNow); + id = playIdleList.get(idleNow); idleNow++; if (idleNow >= playIdleList.size()) { idleNow = 0; } } - return ID; + return id; } public static SongInfoObj findPlayerMusic(String name) { diff --git a/core/music/play/PlayGo.java b/core/music/play/PlayRuntime.java similarity index 82% rename from core/music/play/PlayGo.java rename to core/music/play/PlayRuntime.java index deaf6d32..63bb3698 100644 --- a/core/music/play/PlayGo.java +++ b/core/music/play/PlayRuntime.java @@ -12,11 +12,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -public class PlayGo { - /** - * 播放链接 - */ - public static String url; +public class PlayRuntime { /** * 倒数计数器 */ @@ -44,12 +40,12 @@ public class PlayGo { * 启动歌曲工作 */ public static void start() { - Thread taskT = new Thread(PlayGo::task, "AllMusic_Play"); + Thread taskT = new Thread(PlayRuntime::task, "AllMusicPlay"); isRun = true; taskT.start(); service2 = Executors.newSingleThreadScheduledExecutor(); - service2.scheduleAtFixedRate(PlayGo::time3, 0, 1, TimeUnit.SECONDS); + service2.scheduleAtFixedRate(PlayRuntime::time3, 0, 1, TimeUnit.SECONDS); } /** @@ -78,10 +74,10 @@ public class PlayGo { private static void startTimer() { service = Executors.newSingleThreadScheduledExecutor(); - service.scheduleAtFixedRate(PlayGo::time1, 0, 10, TimeUnit.MILLISECONDS); + service.scheduleAtFixedRate(PlayRuntime::time1, 0, 10, TimeUnit.MILLISECONDS); if (PlayMusic.lyric != null && PlayMusic.lyric.isHaveLyric()) { service1 = Executors.newSingleThreadScheduledExecutor(); - service1.scheduleAtFixedRate(PlayGo::time2, 0, 2, TimeUnit.MILLISECONDS); + service1.scheduleAtFixedRate(PlayRuntime::time2, 0, 2, TimeUnit.MILLISECONDS); } } @@ -97,6 +93,9 @@ public class PlayGo { PlayMusic.nowPlayMusic = null; AllMusic.side.updateInfo(); HudUtils.clearHud(); + HudUtils.sendHudNowData(); + HudUtils.sendHudLyricData(); + HudUtils.sendHudListData(); } /** @@ -222,23 +221,19 @@ public class PlayGo { if (PlayMusic.getListSize() == 0) { if (PlayMusic.error >= 10) { Thread.sleep(1000); - } else { - HudUtils.sendHudNowData(); - HudUtils.sendHudLyricData(); - HudUtils.sendHudListData(); + } else if (PlayMusic.getIdleListSize() > 0) { if (AllMusic.side.needPlay()) { - String ID = PlayMusic.getIdleMusic(); - if (ID != null) { - PlayMusic.addMusic(null, ID, AllMusic.getMessage().custom.idle, true); + String id = PlayMusic.getIdleMusic(); + if (id != null) { + PlayMusic.addMusic(null, id, AllMusic.getMessage().custom.idle, true); } } } - Thread.sleep(50); + Thread.sleep(1000); } else { HudUtils.sendHudNowData(); HudUtils.sendHudLyricData(); HudUtils.sendHudListData(); - AllMusic.side.sendHudUtilsAll(); PlayMusic.nowPlayMusic = PlayMusic.remove(0); if (AllMusic.side.onMusicPlay(PlayMusic.nowPlayMusic)) { @@ -246,10 +241,10 @@ public class PlayGo { continue; } - url = PlayMusic.nowPlayMusic.getPlayerUrl() == null ? + PlayMusic.url = PlayMusic.nowPlayMusic.getPlayerUrl() == null ? AllMusic.getMusicApi().getPlayUrl(PlayMusic.nowPlayMusic.getID()) : PlayMusic.nowPlayMusic.getPlayerUrl(); - if (url == null) { + if (PlayMusic.url == null) { String data = AllMusic.getMessage().musicPlay.emptyCanPlay; AllMusic.side.bqTask(data.replace(PAL.musicId, PlayMusic.nowPlayMusic.getID())); PlayMusic.nowPlayMusic = null; @@ -264,13 +259,26 @@ public class PlayGo { if (PlayMusic.nowPlayMusic.getLength() != 0) { PlayMusic.musicAllTime = PlayMusic.musicLessTime = (PlayMusic.nowPlayMusic.getLength() / 1000) + 3; startTimer(); - AllMusic.side.sendMusic(url); + AllMusic.side.sendMusic(PlayMusic.url); if (!AllMusic.getConfig().mutePlayMessage) { - String info = getInfo(); - if (AllMusic.getConfig().showInBar) + SongInfoObj music = PlayMusic.nowPlayMusic; + if (AllMusic.getConfig().showInBar) { + String info = AllMusic.getMessage().musicPlay.nowPlay + .replace(PAL.musicName, HudUtils.messageLimit(music.getName())) + .replace(PAL.musicAuthor, HudUtils.messageLimit(music.getAuthor())) + .replace(PAL.musicAl, HudUtils.messageLimit(music.getAl())) + .replace(PAL.musicAlia, HudUtils.messageLimit(music.getAlia())) + .replace(PAL.player, music.getCall()); AllMusic.side.sendBar(info); - else + } else { + String info = AllMusic.getMessage().musicPlay.nowPlay + .replace(PAL.musicName, music.getName()) + .replace(PAL.musicAuthor, music.getAuthor()) + .replace(PAL.musicAl, music.getAl()) + .replace(PAL.musicAlia, music.getAlia()) + .replace(PAL.player, music.getCall()); AllMusic.side.bqTask(info); + } } if (!PlayMusic.nowPlayMusic.isUrl() && PlayMusic.nowPlayMusic.getPicUrl() != null) { AllMusic.side.sendPic(PlayMusic.nowPlayMusic.getPicUrl()); @@ -304,19 +312,4 @@ public class PlayGo { } } } - - private static @NotNull String getInfo() { - String info = AllMusic.getMessage().musicPlay.nowPlay - .replace(PAL.musicName, PlayMusic.nowPlayMusic.getName()) - .replace(PAL.musicAuthor, PlayMusic.nowPlayMusic.getAuthor()) - .replace(PAL.musicAl, PlayMusic.nowPlayMusic.getAl()) - .replace(PAL.musicAlia, PlayMusic.nowPlayMusic.getAlia()) - .replace(PAL.player, PlayMusic.nowPlayMusic.getCall()); - LimitObj limit = AllMusic.getConfig().limit; - if (limit.messageLimit - && info.length() > limit.messageLimitSize) { - info = info.substring(0, limit.messageLimitSize) + limit.limitText; - } - return info; - } } diff --git a/core/objs/config/ConfigObj.java b/core/objs/config/ConfigObj.java index b7dae5a9..1ab28404 100644 --- a/core/objs/config/ConfigObj.java +++ b/core/objs/config/ConfigObj.java @@ -66,6 +66,10 @@ public class ConfigObj { * 空闲歌单随机播放 */ public boolean playListRandom; + /** + * 多少首歌不重复 + */ + public int playListEscapeDeep; /** * 显示歌词 */ @@ -87,7 +91,7 @@ public class ConfigObj { */ public boolean muteAddMessage; /** - * 将信息限制在bar处 + * 将信息显示在bar处 */ public boolean showInBar; /** @@ -217,6 +221,7 @@ public class ConfigObj { banPlayer = new HashSet<>(); playListSwitch = true; playListRandom = true; + playListEscapeDeep = 40; sendLyric = true; needPermission = false; defaultHud = SaveObj.make(); diff --git a/core/objs/config/LimitObj.java b/core/objs/config/LimitObj.java index d4cf9544..b9aee44c 100644 --- a/core/objs/config/LimitObj.java +++ b/core/objs/config/LimitObj.java @@ -41,13 +41,13 @@ public class LimitObj { public static LimitObj make() { LimitObj obj = new LimitObj(); obj.musicTimeLimit = true; - obj.infoLimit = true; - obj.infoLimitSize = 80; - obj.listLimit = false; - obj.listLimitSize = 60; obj.maxMusicTime = 600; + obj.infoLimit = true; + obj.infoLimitSize = 10; + obj.listLimit = false; + obj.listLimitSize = 10; obj.messageLimit = false; - obj.messageLimitSize = 40; + obj.messageLimitSize = 20; obj.limitText = "..."; return obj; } diff --git a/core/objs/message/ListMusicObj.java b/core/objs/message/ListMusicObj.java index be5c62fe..2126d250 100644 --- a/core/objs/message/ListMusicObj.java +++ b/core/objs/message/ListMusicObj.java @@ -25,7 +25,7 @@ public class ListMusicObj { public void init() { head = "§d[AllMusic3]§e队列中有歌曲数:" + PAL.count; item = "§e" + PAL.index + "->" + PAL.musicName + " | " + PAL.musicAuthor - + " | " + PAL.musicAl + " | " + PAL.musicAlia; + + " | " + PAL.musicAl + " | " + PAL.musicAlia + " | by: " + PAL.player; get = "§d[AllMusic3]§e歌曲列表" + PAL.name + "获取成功"; } } diff --git a/core/objs/message/MusicPlayObj.java b/core/objs/message/MusicPlayObj.java index 82d12777..f75af928 100644 --- a/core/objs/message/MusicPlayObj.java +++ b/core/objs/message/MusicPlayObj.java @@ -66,7 +66,7 @@ public class MusicPlayObj { mute = "§d[AllMusic3]§e你不会再收到点歌了!想要再次参与点歌就点一首歌吧!"; switchMusic = "§d[AllMusic3]§e切换到玩家歌曲"; addMusic = "§d[AllMusic3]§e音乐列表添加" + PAL.musicName + " | " + PAL.musicAuthor - + " | " + PAL.musicAl + " | " + PAL.musicAlia; + + " | " + PAL.musicAl + " | " + PAL.musicAlia + " | by: " + PAL.player; checkMusic = "§d[AllMusic3]§e正在解析歌曲" + PAL.musicId; musicInfo = PAL.musicName + " | " + PAL.musicAuthor + " | " + PAL.musicAl + " | " + PAL.musicAlia + " | by: " + PAL.player; diff --git a/core/side/BaseSide.java b/core/side/BaseSide.java index 8a59c9ae..24fac6f0 100644 --- a/core/side/BaseSide.java +++ b/core/side/BaseSide.java @@ -191,17 +191,7 @@ public abstract class BaseSide { * * @param data 消息 */ - public final void bq(String data) { - LimitObj limit = AllMusic.getConfig().limit; - if (limit.messageLimit - && data.length() > limit.messageLimitSize) { - data = data.substring(0, limit.messageLimitSize - 1) + limit.limitText; - } - - topBq(data); - } - - protected abstract void topBq(String data); + public abstract void bq(String data); /** * 广播点击消息 @@ -218,14 +208,7 @@ public abstract class BaseSide { * @param data 消息 */ public final void bqTask(String data) { - LimitObj limit = AllMusic.getConfig().limit; - if (limit.messageLimit - && data.length() > limit.messageLimitSize) { - data = data.substring(0, limit.messageLimitSize - 1) + limit.limitText; - } - - String finalData = data; - runTask(() -> bq(finalData)); + runTask(() -> bq(data)); } /** diff --git a/core/utils/HudUtils.java b/core/utils/HudUtils.java index 3f4adb9f..00fb409e 100644 --- a/core/utils/HudUtils.java +++ b/core/utils/HudUtils.java @@ -99,13 +99,16 @@ public class HudUtils { } else { String now; StringBuilder list = new StringBuilder(); - LimitObj limit = AllMusic.getConfig().limit; for (SongInfoObj info1 : PlayMusic.getList()) { if (info1 == null) continue; - now = info1.getInfo(); - if (limit.listLimit && now.length() > limit.listLimitSize) - now = now.substring(0, limit.listLimitSize - 1) + limit.limitText; + now = AllMusic.getMessage().musicPlay.musicInfo + .replace(PAL.musicName, listLimit(info1.getName())) + .replace(PAL.musicAuthor, listLimit(info1.getAuthor())) + .replace(PAL.musicAl, listLimit(info1.getAl())) + .replace(PAL.musicAlia, listLimit(info1.getAlia())) + .replace(PAL.player, info1.getCall()); + list.append(now).append("\n"); } info = AllMusic.getMessage().hud.list @@ -137,19 +140,15 @@ public class HudUtils { info = AllMusic.getMessage().hud.emptyMusic; } else { info = AllMusic.getMessage().hud.music - .replace(PAL.name, PlayMusic.nowPlayMusic.getName()) + .replace(PAL.name, infoLimit(PlayMusic.nowPlayMusic.getName())) .replace(PAL.allTime, tranTime(PlayMusic.musicAllTime)) .replace(PAL.nowTime, tranTime(PlayMusic.musicNowTime / 1000)) - .replace(PAL.musicAuthor, PlayMusic.nowPlayMusic.getAuthor()) - .replace(PAL.musicAlia, PlayMusic.nowPlayMusic.getAlia()) - .replace(PAL.musicAl, PlayMusic.nowPlayMusic.getAl()) + .replace(PAL.musicAuthor, infoLimit(PlayMusic.nowPlayMusic.getAuthor())) + .replace(PAL.musicAlia, infoLimit(PlayMusic.nowPlayMusic.getAlia())) + .replace(PAL.musicAl, infoLimit(PlayMusic.nowPlayMusic.getAl())) .replace(PAL.player, PlayMusic.nowPlayMusic.getCall()); } - LimitObj limit = AllMusic.getConfig().limit; - if (limit.messageLimit && info.length() > limit.messageLimitSize) - info = info.substring(0, limit.messageLimitSize - 1) + limit.limitText; - AllMusic.side.sendHudInfo(info); } @@ -509,4 +508,28 @@ public class HudUtils { addAndSave(name, obj); HudUtils.sendHudPos(name); } + + public static String infoLimit(String info) { + LimitObj limit = AllMusic.getConfig().limit; + if (limit.infoLimit && info.length() > limit.infoLimitSize) + info = info.substring(0, limit.infoLimitSize - 1) + limit.limitText; + + return info; + } + + public static String listLimit(String list) { + LimitObj limit = AllMusic.getConfig().limit; + if (limit.listLimit && list.length() > limit.listLimitSize) + list = list.substring(0, limit.listLimitSize - 1) + limit.limitText; + + return list; + } + + public static String messageLimit(String message) { + LimitObj limit = AllMusic.getConfig().limit; + if (limit.messageLimit && message.length() > limit.messageLimitSize) + message = message.substring(0, limit.messageLimitSize - 1) + limit.limitText; + + return message; + } } diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index ca61f197..fa86492f 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -339,7 +339,7 @@ public class SideFabric extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(Text.of(data), false); diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 9fd48977..ae923565 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -339,7 +339,7 @@ public class SideFabric extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(Text.of(data), false); diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index b5d1e55d..8dad7ce8 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -341,7 +341,7 @@ public class SideFabric extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(Text.of(data), false); diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 36d4bd28..ec8f4371 100644 --- a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -338,7 +338,7 @@ public class SideFabric extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(Text.of(data), false); diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 36d4bd28..ec8f4371 100644 --- a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -338,7 +338,7 @@ public class SideFabric extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(Text.of(data), false); diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 5c7757cc..86563bc2 100644 --- a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -340,7 +340,7 @@ public class SideFabric extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(Text.of(data), false); diff --git a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index c3d81fe3..5fc1abc8 100644 --- a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -336,7 +336,7 @@ public class SideFabric extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(Text.of(data), false); diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index c3d81fe3..5fc1abc8 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -336,7 +336,7 @@ public class SideFabric extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(Text.of(data), false); diff --git a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java index c64b91ae..a4dd1c96 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java @@ -292,7 +292,7 @@ public class SideFolia extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (Player player : Bukkit.getOnlinePlayers()) { if (!AllMusic.isSkip(player.getName(), null, false)) { player.sendMessage(data); diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 3acc9a0d..b6e4adbc 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -339,7 +339,7 @@ public class SideForge extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName(), null, false)) { player.sendMessage(new TextComponentString(data)); diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 7b3b8691..290a9782 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -340,7 +340,7 @@ public class SideForge extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(new StringTextComponent(data), UUID.randomUUID()); diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 07894548..c30a523d 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -340,7 +340,7 @@ public class SideForge extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(new TextComponent(data), UUID.randomUUID()); diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 3b04685d..cf5f64fc 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -339,7 +339,7 @@ public class SideForge extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendSystemMessage(Component.literal(data)); diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 285082f5..41b1798d 100644 --- a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -339,7 +339,7 @@ public class SideForge extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendSystemMessage(Component.literal(data)); diff --git a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 20ec3b2e..4a3a90f5 100644 --- a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -349,7 +349,7 @@ public class SideForge extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { EntityPlayerMP player = (EntityPlayerMP) player1; if (!AllMusic.isSkip(player.getCommandSenderName(), null, false)) { diff --git a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 7b7c7563..21027389 100644 --- a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -335,7 +335,7 @@ public class SideForge extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendSystemMessage(Component.literal(data)); diff --git a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index a40f2a52..40b38688 100644 --- a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -335,7 +335,7 @@ public class SideForge extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendSystemMessage(Component.literal(data)); diff --git a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index a40f2a52..40b38688 100644 --- a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -335,7 +335,7 @@ public class SideForge extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendSystemMessage(Component.literal(data)); diff --git a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java index f31f1216..66360e9d 100644 --- a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java @@ -374,7 +374,7 @@ public class SideBukkit extends BaseSide { } @Override - public void topBq(String data) { + public void bq(String data) { for (Player player : Bukkit.getOnlinePlayers()) { if (!AllMusic.isSkip(player.getName(), null, false)) { player.sendMessage(data); diff --git a/server_top/build.gradle b/server_top/build.gradle index 16fd44ca..a96218f0 100644 --- a/server_top/build.gradle +++ b/server_top/build.gradle @@ -54,9 +54,9 @@ dependencies { //compileOnly 'net.citizensnpcs:citizens-main:2.0.30-SNAPSHOT' // compileOnly fileTree(dir:'lib',include:['*.jar']) - implementation 'org.xerial:sqlite-jdbc:+' - compile 'com.squareup.okhttp3:okhttp:+' - compile 'com.google.code.gson:gson:+' + implementation 'org.xerial:sqlite-jdbc:3.46.0.1' + compile 'com.squareup.okhttp3:okhttp:4.12.0' + compile 'com.google.code.gson:gson:2.11.0' annotationProcessor 'com.velocitypowered:velocity-api:3.0.0' } 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 5e7b87b8..32bb9028 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 @@ -390,7 +390,7 @@ public class SideBC extends BaseSide implements IEconomy { } @Override - public void topBq(String data) { + public void bq(String data) { TextComponent message = new TextComponent(data); for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { if (skip(player)) 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 a38acec3..62effa77 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 @@ -136,7 +136,7 @@ public class SideVelocity extends BaseSide implements IEconomy { } @Override - public void topBq(String data) { + public void bq(String data) { Component message = Component.text(data); for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { if (skip(player)) { diff --git a/version b/version index 7d8ebf9e..a4f52a5d 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.1.9 \ No newline at end of file +3.2.0 \ No newline at end of file