diff --git a/core/AllMusic.java b/core/AllMusic.java index cb61208c..4192da3b 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -123,14 +123,14 @@ public class AllMusic { } /** - * 检查是否需要 + * 检查是否需要放歌 * * @param name 用户名 * @param server 服务器名 - * @param checkList 是否检查正在播放的列表 - * @return 结果 + * @param checkPlay 是否检查正在播放的列表 + * @return 是否跳过放歌 */ - public static boolean isSkip(String name, String server, boolean checkList) { + public static boolean isSkip(String name, String server, boolean checkPlay) { try { name = name.toLowerCase(); if (server != null && AllMusic.getConfig().muteServer.contains(server)) @@ -139,7 +139,33 @@ public class AllMusic { return true; if (PlayMusic.nowPlayMusic != null && PlayMusic.nowPlayMusic.isList() && DataSql.checkMuteListPlayer(name)) return true; - if (!checkList) + if (!checkPlay) + return false; + return AllMusic.containNowPlay(name); + } catch (NoSuchElementException e) { + return true; + } + } + + /** + * 检查是否需要放歌 + * + * @param name 用户名 + * @param server 服务器名 + * @param checkPlay 是否检查正在播放的列表 + * @param islist 是否为空闲歌单的歌 + * @return 是否跳过放歌 + */ + public static boolean isSkip(String name, String server, boolean checkPlay, boolean islist) { + try { + name = name.toLowerCase(); + if (server != null && AllMusic.getConfig().muteServer.contains(server)) + return true; + if (DataSql.checkMutePlayer(name)) + return true; + if (islist && DataSql.checkMuteListPlayer(name)) + return true; + if (!checkPlay) return false; return AllMusic.containNowPlay(name); } catch (NoSuchElementException e) { diff --git a/core/command/CommandBanPlayer.java b/core/command/CommandBanPlayer.java index 78c84bab..f70170e1 100644 --- a/core/command/CommandBanPlayer.java +++ b/core/command/CommandBanPlayer.java @@ -3,9 +3,9 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.sql.DataSql; +import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Locale; public class CommandBanPlayer implements ICommand { @Override @@ -21,7 +21,15 @@ public class CommandBanPlayer implements ICommand { @Override public List tab(Object player, String name, String[] args, int index) { if (args.length == index || (args.length == index + 1 && args[index].isEmpty())) { - return AllMusic.side.getPlayerList(); + List list = new ArrayList<>(); + for (Object item : AllMusic.side.getPlayers()) { + String name1 = AllMusic.side.getPlayerName(item); + if (name1 != null) { + list.add(name1); + } + } + + return list; } return Collections.emptyList(); diff --git a/core/command/CommandClearBanList.java b/core/command/CommandClearBanList.java index 0b5c9f34..08668765 100644 --- a/core/command/CommandClearBanList.java +++ b/core/command/CommandClearBanList.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.music.play.PlayMusic; import com.coloryr.allmusic.server.core.sql.DataSql; public class CommandClearBanList extends ACommand { diff --git a/core/command/CommandClearBanPlayerList.java b/core/command/CommandClearBanPlayerList.java index bfc8fd3f..09338538 100644 --- a/core/command/CommandClearBanPlayerList.java +++ b/core/command/CommandClearBanPlayerList.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.music.play.PlayMusic; import com.coloryr.allmusic.server.core.sql.DataSql; public class CommandClearBanPlayerList extends ACommand { diff --git a/core/command/CommandCookie.java b/core/command/CommandCookie.java index daecacca..66c28ef6 100644 --- a/core/command/CommandCookie.java +++ b/core/command/CommandCookie.java @@ -1,13 +1,10 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.UserCookie; -import com.google.gson.reflect.TypeToken; import okhttp3.Cookie; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; diff --git a/core/command/CommandEX.java b/core/command/CommandEX.java index 5d181236..c2b4ccbb 100644 --- a/core/command/CommandEX.java +++ b/core/command/CommandEX.java @@ -190,7 +190,7 @@ public class CommandEX { return; } DataSql.removeMutePlayer(name); - if (AllMusic.side.needPlay()) { + if (AllMusic.side.needPlay(false)) { MusicObj obj = new MusicObj(); obj.sender = sender; obj.id = musicID; @@ -255,7 +255,7 @@ public class CommandEX { break; case 0: default: - DataSql.task(()-> addMusic(sender, name, args)); + DataSql.task(() -> addMusic(sender, name, args)); } } } diff --git a/core/command/CommandHud.java b/core/command/CommandHud.java index b45e8719..a291e197 100644 --- a/core/command/CommandHud.java +++ b/core/command/CommandHud.java @@ -3,7 +3,6 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.message.PAL; -import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.utils.HudUtils; import java.util.*; diff --git a/core/command/CommandHudSet.java b/core/command/CommandHudSet.java index 13eb7d2e..1de32a70 100644 --- a/core/command/CommandHudSet.java +++ b/core/command/CommandHudSet.java @@ -5,7 +5,6 @@ import com.coloryr.allmusic.server.core.objs.enums.HudDirType; import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.hud.PosObj; import com.coloryr.allmusic.server.core.objs.message.PAL; -import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.utils.HudUtils; import java.util.*; diff --git a/core/command/CommandUnban.java b/core/command/CommandUnban.java index c221b672..3ce5953d 100644 --- a/core/command/CommandUnban.java +++ b/core/command/CommandUnban.java @@ -1,12 +1,9 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.music.play.PlayMusic; -import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.utils.Function; -import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/core/music/api/APIMain.java b/core/music/api/APIMain.java index f0d8780c..4f5f7d44 100644 --- a/core/music/api/APIMain.java +++ b/core/music/api/APIMain.java @@ -3,7 +3,6 @@ package com.coloryr.allmusic.server.core.music.api; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.play.LyricDo; import com.coloryr.allmusic.server.core.music.play.LyricSave; -import com.coloryr.allmusic.server.core.music.play.PlayMusic; import com.coloryr.allmusic.server.core.objs.HttpResObj; import com.coloryr.allmusic.server.core.objs.SearchMusicObj; import com.coloryr.allmusic.server.core.objs.api.music.info.InfoObj; @@ -20,11 +19,9 @@ 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; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; public class APIMain { @@ -146,7 +143,6 @@ public class APIMain { 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) { AllMusic.log.warning("§d[AllMusic3]§c歌曲列表获取错误"); diff --git a/core/music/api/HttpClientUtil.java b/core/music/api/HttpClientUtil.java index f388d004..4d4f9e52 100644 --- a/core/music/api/HttpClientUtil.java +++ b/core/music/api/HttpClientUtil.java @@ -22,9 +22,8 @@ public class HttpClientUtil { private static final int CONNECT_TIMEOUT = 5; private static final int READ_TIMEOUT = 7; - private static OkHttpClient client; - private static final String UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0"; + private static OkHttpClient client; public static void init() { try { diff --git a/core/music/play/PlayMusic.java b/core/music/play/PlayMusic.java index 5f96518e..472df06a 100644 --- a/core/music/play/PlayMusic.java +++ b/core/music/play/PlayMusic.java @@ -24,36 +24,15 @@ 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<>(); - /** - * 切歌投票时间 - */ - private static int voteTime = 0; - /** - * 切歌发起人 - */ - private static String voteSender; /** * 切歌投票的玩家 */ private static final Set votePlayer = new HashSet<>(); - /** - * 插歌投票时间 - */ - private static int pushTime = 0; - /** - * 插歌发起人 - */ - private static String pushSender; /** * 插歌投票的玩家 */ private static final Set pushPlayer = new HashSet<>(); - /** - * 插歌目标 - */ - private static SongInfoObj push; /** * 总歌曲长度 */ @@ -82,6 +61,26 @@ public class PlayMusic { * 错误次数 */ public static int error; + /** + * 切歌投票时间 + */ + private static int voteTime = 0; + /** + * 切歌发起人 + */ + private static String voteSender; + /** + * 插歌投票时间 + */ + private static int pushTime = 0; + /** + * 插歌发起人 + */ + private static String pushSender; + /** + * 插歌目标 + */ + private static SongInfoObj push; private static boolean isRun; private static int idleNow; @@ -211,7 +210,9 @@ public class PlayMusic { public static boolean containPush(String player) { player = player.toLowerCase(); return pushPlayer.contains(player); - }; + } + + ; /** * 添加点歌任务 @@ -466,18 +467,13 @@ public class PlayMusic { return list <= count; } - public static void addIdleList(List list) { - playIdleList.addAll(list); - } - public static void clearIdleList() { deep.clear(); - playIdleList.clear(); DataSql.clearIdleList(); } public static int getIdleListSize() { - return playIdleList.size(); + return DataSql.getListSize(); } /** @@ -490,31 +486,32 @@ public class PlayMusic { return null; } String id; - if (playIdleList.isEmpty()) + int len = DataSql.getListSize(); + if (len == 0) return null; if (AllMusic.getConfig().playListRandom) { - if (playIdleList.size() == 1) - return playIdleList.get(0); - if (playIdleList.size() > 10) { + if (len == 1) + return DataSql.readListItem(); + if (len > 10) { int size = AllMusic.getConfig().playListEscapeDeep; - if (size > playIdleList.size() / 2) { - size = playIdleList.size() / 2; + if (size > len / 2) { + size = len / 2; } while (deep.size() >= size) { deep.poll(); } do { - id = playIdleList.get(AllMusic.random.nextInt(playIdleList.size())); + id = DataSql.readListItem(); } while (deep.contains(id)); deep.add(id); } else { - id = playIdleList.get(AllMusic.random.nextInt(playIdleList.size())); + id = DataSql.readListItem(); } } else { - id = playIdleList.get(idleNow); + id = DataSql.readListItem(idleNow); idleNow++; - if (idleNow >= playIdleList.size()) { + if (idleNow >= len) { idleNow = 0; } } diff --git a/core/music/play/PlayRuntime.java b/core/music/play/PlayRuntime.java index b13decbd..879c1063 100644 --- a/core/music/play/PlayRuntime.java +++ b/core/music/play/PlayRuntime.java @@ -177,7 +177,7 @@ public class PlayRuntime { PlayMusic.clearPush(); AllMusic.side.broadcastInTask(AllMusic.getMessage().push.timeOut); } else { - int players = AllMusic.side.getPlayerSize(); + int players = AllMusic.side.getPlayers().size(); if (PlayMusic.getPushCount() >= AllMusic.getConfig().minVote || (players <= AllMusic.getConfig().minVote && players <= PlayMusic.getPushCount())) { @@ -195,7 +195,7 @@ public class PlayRuntime { PlayMusic.clearVote(); AllMusic.side.broadcastInTask(AllMusic.getMessage().vote.timeOut); } else { - int players = AllMusic.side.getPlayerSize(); + int players = AllMusic.side.getPlayers().size(); if (PlayMusic.getVoteCount() >= AllMusic.getConfig().minVote || (players <= AllMusic.getConfig().minVote && players <= PlayMusic.getVoteCount())) { @@ -217,7 +217,7 @@ public class PlayRuntime { if (PlayMusic.error >= 10) { Thread.sleep(1000); } else if (PlayMusic.getIdleListSize() > 0) { - if (AllMusic.side.needPlay()) { + if (AllMusic.side.needPlay(true)) { String id = PlayMusic.getIdleMusic(); if (id != null) { PlayMusic.addMusic(null, id, AllMusic.getMessage().custom.idle, true); @@ -289,7 +289,7 @@ public class PlayRuntime { while (PlayMusic.musicLessTime > 0) { HudUtils.sendHudNowData(); HudUtils.sendHudListData(); - if (!AllMusic.side.needPlay()) { + if (PlayMusic.nowPlayMusic == null || !AllMusic.side.needPlay(PlayMusic.nowPlayMusic.isList())) { PlayMusic.musicLessTime = 1; } Thread.sleep(AllMusic.getConfig().sendDelay); diff --git a/core/objs/CookieObj.java b/core/objs/CookieObj.java index d931d992..46dae76c 100644 --- a/core/objs/CookieObj.java +++ b/core/objs/CookieObj.java @@ -4,7 +4,6 @@ import okhttp3.Cookie; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; public class CookieObj { public HashMap> cookieStore = new HashMap<>(); diff --git a/core/objs/config/ConfigObj.java b/core/objs/config/ConfigObj.java index b6cb6cc8..ea164d20 100644 --- a/core/objs/config/ConfigObj.java +++ b/core/objs/config/ConfigObj.java @@ -3,7 +3,6 @@ package com.coloryr.allmusic.server.core.objs.config; import com.coloryr.allmusic.server.core.AllMusic; import java.util.HashSet; -import java.util.Locale; import java.util.Set; /** diff --git a/core/side/BaseSide.java b/core/side/BaseSide.java index c0993edf..2e9797de 100644 --- a/core/side/BaseSide.java +++ b/core/side/BaseSide.java @@ -1,25 +1,18 @@ package com.coloryr.allmusic.server.core.side; import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.enums.ComType; import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.utils.HudUtils; -import java.util.List; +import java.io.File; +import java.util.Collection; +import java.util.Locale; public abstract class BaseSide { - /** - * 重载 - */ - public abstract void reload(); - - /** - * 获取当前玩家数量 - * - * @return 数量 - */ - public abstract int getPlayerSize(); - /** * 主线程运行任务 * @@ -45,6 +38,7 @@ public abstract class BaseSide { /** * 是否为玩家执行指令 + * * @param source 命令源 * @return 是否为玩家 */ @@ -64,168 +58,63 @@ public abstract class BaseSide { * * @return 结果 */ - public abstract boolean needPlay(); + public abstract boolean needPlay(boolean islist); /** - * 发送停止指令 - */ - public final void sendStop() { - AllMusic.clearNowPlayer(); - sideSendStop(); - } - - protected abstract void sideSendStop(); - - /** - * 发送停止指令 + * 获取所有玩家 * - * @param name 用户名 + * @return 玩家列表 */ - public final void sendStop(String name) { - AllMusic.removeNowPlayPlayer(name); - sideSendStop(name); - } - - protected abstract void sideSendStop(String name); + public abstract Collection getPlayers(); /** - * 发送播放歌曲指令 - * - * @param url 歌曲Url - */ - public abstract void sendMusic(String url); - - /** - * 向指定玩家发送播放歌曲指令 + * 获取玩家名字 * * @param player 玩家 - * @param url 地址 + * @return 名字 */ - public final void sendMusic(String player, String url) { - AllMusic.addNowPlayPlayer(player); - sideSendMusic(player, url); - } - - protected abstract void sideSendMusic(String player, String url); + public abstract String getPlayerName(Object player); /** - * 发送图片数据指令 + * 获取玩家所在的服务器 * - * @param url 图片地址 + * @param player 玩家 + * @return 名字 */ - public abstract void sendPic(String url); + public abstract String getPlayerServer(Object player); /** - * 发送图片数据指令 + * 向玩家发送数据包 * - * @param player 用户名 - * @param url 图片地址 + * @param player 玩家 + * @param type 数据 + * @param data 数据 + * @param data1 数据 */ - public abstract void sendPic(String player, String url); + public abstract void send(Object player, ComType type, String data, int data1); /** - * 发送歌曲位置信息 + * 根据名字获取玩家 * - * @param player 用户名 - * @param pos 歌曲位置(毫秒) + * @param player 名字 + * @return 玩家 */ - public abstract void sendPos(String player, int pos); + public abstract Object getPlayer(String player); /** - * 发送Hud的歌词数据 + * 发送bar消息 * - * @param data 数据 + * @param player 玩家 + * @param data 消息 */ - public abstract void sendHudLyric(String data); + public abstract void sendBar(Object player, String data); /** - * 发送Hud的信息数据 + * 获取插件配置文件夹 * - * @param data 数据 + * @return 文件夹 */ - public abstract void sendHudInfo(String data); - - /** - * 发送Hud的位置信息 - * - * @param name 用户名 - */ - public abstract void sendHudPos(String name); - - /** - * 发送Hud数据 - * - * @param name 用户名 - * @param pos 位置 - * @param data 信息 - */ - public abstract void sendHud(String name, HudType pos, String data); - - /** - * 发送Hud的歌曲列表数据 - * - * @param data 数据 - */ - public abstract void sendHudList(String data); - - /** - * 发送Hud位置数据 - */ - public abstract void sendHudUtilsAll(); - - /** - * 发送Bar数据 - * - * @param data 数据 - */ - public abstract void sendBar(String data); - - /** - * 清理Hud数据 - * - * @param player 用户名 - */ - public abstract void clearHud(String player); - - /** - * 清理Hud数据 - */ - public abstract void clearHud(); - - /** - * 广播消息 - * - * @param data 消息 - */ - public abstract void broadcast(String data); - - /** - * 广播点击消息 - * - * @param message 消息 - * @param end 结尾 - * @param command 指令 - */ - public abstract void broadcastWithRun(String message, String end, String command); - - /** - * 在主线程中广播消息 - * - * @param data 消息 - */ - public final void broadcastInTask(String data) { - runTask(() -> broadcast(data)); - } - - /** - * 在主线程发送消息 - * - * @param obj 接受对象 - * @param message 消息 - */ - public final void sendMessageTask(Object obj, String message) { - runTask(() -> sendMessage(obj, message)); - } + public abstract File getFolder(); /** * 发送消息 @@ -273,11 +162,391 @@ public abstract class BaseSide { public abstract boolean onMusicAdd(Object obj, MusicObj music); /** - * 获取玩家列表 + * 广播消息 * - * @return 玩家列表 + * @param data 消息 */ - public abstract List getPlayerList(); + public abstract void broadcast(String data); + + /** + * 广播点击消息 + * + * @param message 消息 + * @param end 结尾 + * @param command 指令 + */ + public abstract void broadcastWithRun(String message, String end, String command); + + /** + * 重载 + */ + public final void reload() { + new AllMusic().init(getFolder()); + } + + /** + * 发送歌曲位置信息 + * + * @param player 用户名 + * @param pos 歌曲位置(毫秒) + */ + public final void sendPos(String player, int pos) { + Object player1 = getPlayer(player); + if (player1 == null) + return; + if (AllMusic.isSkip(player, getPlayerServer(player), true)) + return; + try { + send(player1, ComType.POS, null, pos); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); + e.printStackTrace(); + } + } + + /** + * 发送停止指令 + * + * @param name 用户名 + */ + public final void sendStop(String name) { + AllMusic.removeNowPlayPlayer(name); + Object player = getPlayer(name); + if (player == null) + return; + try { + send(player, ComType.STOP, null, 0); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + + /** + * 发送停止指令 + */ + public final void sendStop() { + AllMusic.clearNowPlayer(); + try { + for (Object player : getPlayers()) { + send(player, ComType.STOP, null, 0); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + + /** + * 向指定玩家发送播放歌曲指令 + * + * @param player 玩家 + * @param url 地址 + */ + public final void sendMusic(String player, String url) { + AllMusic.addNowPlayPlayer(player); + Object player1 = getPlayer(player); + if (player1 == null) + return; + try { + if (AllMusic.isSkip(player, getPlayerServer(player), false)) + return; + send(player1, ComType.PLAY, url, 0); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); + e.printStackTrace(); + } + } + + /** + * 发送Hud的歌词数据 + * + * @param data 数据 + */ + public final void sendHudLyric(String data) { + for (Object player : getPlayers()) { + String name = getPlayerName(player); + if (name == null) + continue; + name = name.toLowerCase(Locale.ROOT); + if (AllMusic.isSkip(name, getPlayerServer(player), true)) + continue; + try { + SaveObj obj = HudUtils.get(name); + if (!obj.lyric.enable) + continue; + send(player, ComType.LYRIC, data, 0); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); + e.printStackTrace(); + } + } + } + + /** + * 发送Hud的信息数据 + * + * @param data 数据 + */ + public final void sendHudInfo(String data) { + for (Object player : getPlayers()) { + String name = getPlayerName(player); + if (name == null) + continue; + name = name.toLowerCase(Locale.ROOT); + if (AllMusic.isSkip(name, getPlayerServer(player), true)) + continue; + try { + SaveObj obj = HudUtils.get(name); + if (!obj.lyric.enable) + continue; + send(player, ComType.INFO, data, 0); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); + e.printStackTrace(); + } + } + } + + /** + * 发送Hud的位置信息 + * + * @param name 用户名 + */ + public final void sendHudPos(String name) { + Object player = getPlayer(name); + if (player == null) + return; + if (AllMusic.isSkip(name, null, false)) + return; + try { + SaveObj obj = HudUtils.get(name); + String data = AllMusic.gson.toJson(obj); + send(player, ComType.HUD, data, 0); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); + e.printStackTrace(); + } + } + + /** + * 发送Hud数据 + * + * @param name 用户名 + * @param pos 位置 + * @param data 信息 + */ + public final void sendHud(String name, HudType pos, String data) { + try { + if (pos == HudType.PIC) { + return; + } + Object player = getPlayer(name); + if (player == null) + return; + if (AllMusic.isSkip(name, getPlayerServer(player), true)) + return; + switch (pos) { + case INFO: + send(player, ComType.INFO, data, 0); + break; + case LIST: + send(player, ComType.LIST, data, 0); + break; + case LYRIC: + send(player, ComType.LYRIC, data, 0); + break; + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + + /** + * 发送Hud的歌曲列表数据 + * + * @param data 数据 + */ + public final void sendHudList(String data) { + for (Object player : getPlayers()) { + String name = getPlayerName(player); + if (name == null) + continue; + name = name.toLowerCase(Locale.ROOT); + if (AllMusic.isSkip(name, getPlayerServer(player), true)) + continue; + try { + SaveObj obj = HudUtils.get(name); + if (!obj.list.enable) + continue; + send(player, ComType.LIST, data, 0); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); + e.printStackTrace(); + } + } + } + + /** + * 发送Hud位置数据 + */ + public final void sendHudUtilsAll() { + for (Object player : getPlayers()) { + String name = getPlayerName(player); + if (name == null) + continue; + name = name.toLowerCase(Locale.ROOT); + try { + SaveObj obj = HudUtils.get(name); + String data = AllMusic.gson.toJson(obj); + send(player, ComType.HUD, data, 0); + } catch (Exception e1) { + AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); + e1.printStackTrace(); + } + } + } + + /** + * 发送Bar数据 + * + * @param data 数据 + */ + public final void sendBar(String data) { + for (Object player : getPlayers()) { + String name = getPlayerName(player); + if (name == null) + continue; + name = name.toLowerCase(Locale.ROOT); + try { + if (AllMusic.isSkip(name, getPlayerServer(player), true)) + continue; + sendBar(player, data); + } catch (Exception e1) { + AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); + e1.printStackTrace(); + } + } + } + + /** + * 发送播放歌曲指令 + * + * @param url 歌曲Url + */ + public final void sendMusic(String url) { + for (Object player : getPlayers()) { + String name = getPlayerName(player); + if (name == null) + continue; + name = name.toLowerCase(Locale.ROOT); + if (AllMusic.isSkip(name, getPlayerServer(player), false)) + continue; + try { + send(player, ComType.PLAY, url, 0); + AllMusic.addNowPlayPlayer(name); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); + e.printStackTrace(); + } + } + } + + /** + * 发送图片数据指令 + * + * @param url 图片地址 + */ + public final void sendPic(String url) { + for (Object player : getPlayers()) { + String name = getPlayerName(player); + if (name == null) + continue; + name = name.toLowerCase(Locale.ROOT); + if (AllMusic.isSkip(name, getPlayerServer(player), true)) + continue; + SaveObj obj = HudUtils.get(name); + if (!obj.pic.enable) + continue; + try { + send(player, ComType.IMG, url, 0); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); + e.printStackTrace(); + } + } + } + + /** + * 发送图片数据指令 + * + * @param player 用户名 + * @param url 图片地址 + */ + public final void sendPic(String player, String url) { + Object player1 = getPlayer(player); + if (player1 == null) + return; + if (AllMusic.isSkip(player, getPlayerServer(player), true)) + return; + try { + send(player1, ComType.IMG, url, 0); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); + e.printStackTrace(); + } + } + + /** + * 清理Hud数据 + * + * @param name 用户名 + */ + public final void clearHud(String name) { + Object player = getPlayer(name); + if (player == null) + return; + try { + send(player, ComType.CLEAR, null, 0); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); + e.printStackTrace(); + } + } + + /** + * 清理Hud数据 + */ + public final void clearHud() { + for (Object player : getPlayers()) { + try { + send(player, ComType.CLEAR, null, 0); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); + e.printStackTrace(); + } + } + } + + /** + * 在主线程中广播消息 + * + * @param data 消息 + */ + public final void broadcastInTask(String data) { + runTask(() -> broadcast(data)); + } + + /** + * 在主线程发送消息 + * + * @param obj 接受对象 + * @param message 消息 + */ + public final void sendMessageTask(Object obj, String message) { + runTask(() -> sendMessage(obj, message)); + } /** * 更新信息 diff --git a/core/sql/DataSql.java b/core/sql/DataSql.java index c7d9ad4f..d6c5f8a6 100644 --- a/core/sql/DataSql.java +++ b/core/sql/DataSql.java @@ -1,15 +1,12 @@ package com.coloryr.allmusic.server.core.sql; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.music.play.PlayMusic; import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.HudDirType; import com.coloryr.allmusic.server.core.objs.hud.PosObj; -import com.coloryr.allmusic.server.core.utils.HudUtils; import java.io.File; import java.sql.*; -import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Queue; @@ -307,11 +304,10 @@ public class DataSql { } /** - * 读取空闲歌单列表 + * 随机获取空闲歌单歌曲 */ - private static String readListItem() { + public static String readListItem() { try { - AllMusic.log.info("正在读取空闲歌单"); if (connection.isReadOnly() || connection.isClosed()) { init(); } @@ -330,9 +326,59 @@ public class DataSql { return null; } + /** + * 读取空闲歌单列表 + */ + public static String readListItem(int index) { + try { + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + Statement stat = connection.createStatement(); + ResultSet set = stat.executeQuery("SELECT sid FROM allmusic_list limit 1 offset " + index); + String name = null; + if (set.next()) { + name = set.getString(1); + } + stat.close(); + return name; + } catch (Exception e) { + AllMusic.log.warning("数据库读取错误,请删除关闭服务器删除数据库,在启动服务器"); + e.printStackTrace(); + } + return null; + } + + /** + * 获取空闲歌单歌曲数量 + * + * @return 歌曲数量 + */ + public static int getListSize() { + try { + AllMusic.log.info("正在读取空闲歌单"); + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + Statement stat = connection.createStatement(); + ResultSet set = stat.executeQuery("SELECT count(sid) FROM allmusic_list"); + int count = 0; + if (set.next()) { + count = set.getInt(1); + } + stat.close(); + return count; + } catch (Exception e) { + AllMusic.log.warning("数据库读取错误,请删除关闭服务器删除数据库,在启动服务器"); + e.printStackTrace(); + } + return 0; + } + public static void addIdleList(List list) { task(() -> { try { + AllMusic.log.info("添加" + list.size() + "首歌到空闲歌单"); if (connection.isReadOnly() || connection.isClosed()) { init(); } diff --git a/core/utils/HudUtils.java b/core/utils/HudUtils.java index 1ec23d96..cec17c29 100644 --- a/core/utils/HudUtils.java +++ b/core/utils/HudUtils.java @@ -21,6 +21,7 @@ public class HudUtils { /** * 获取玩家的Hud储存 + * * @param name 玩家名 * @return Hud储存 */ diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index c1074a22..0e04739b 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,18 +1,13 @@ package com.coloryr.allmusic.server.side.fabric; import com.coloryr.allmusic.server.AllMusicFabric; -import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.mixin.IGetCommandOutput; import net.minecraft.network.packet.s2c.play.TitleS2CPacket; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; import net.minecraft.text.LiteralText; -import net.minecraft.text.Text; import net.minecraft.util.Util; -import java.util.UUID; - public class FabricApi { public static void sendMessageRun(Object obj, String message, String end, String command) { @@ -50,9 +45,7 @@ public class FabricApi { endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endText); for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendMessage(send, false); - } + player.sendMessage(send, false); } } } 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 28c2948f..cdee1742 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 @@ -5,13 +5,10 @@ import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.mixin.IGetCommandOutput; import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; @@ -25,22 +22,11 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Util; import java.io.File; -import java.util.Arrays; -import java.util.List; +import java.util.Collection; +import java.util.Collections; public class SideFabric extends BaseSide { - @Override - public void reload() { - String path = "allmusic/"; - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicFabric.server.getCurrentPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicFabric.server.execute(run); @@ -72,280 +58,68 @@ public class SideFabric extends BaseSide { } @Override - public boolean needPlay() { + public Collection getPlayers() { + return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayerEntity) { + ServerPlayerEntity player1 = (ServerPlayerEntity) player; + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayerEntity) { + ServerPlayerEntity player1 = (ServerPlayerEntity) player; + send(player1, PacketCodec.pack(type, data, data1)); + } + } + + @Override + public Object getPlayer(String player) { + return null; + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayerEntity) { + ServerPlayerEntity player1 = (ServerPlayerEntity) player; + FabricApi.sendBar(player1, data); + } + } + + @Override + public File getFolder() { + return new File("allmusic/"); + } + + @Override + public boolean needPlay(boolean islist) { for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } return false; } - @Override - protected void sideSendStop() { - try { - for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendStop(String name) { - try { - ServerPlayerEntity player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendMusic(String data) { - try { - for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - ServerPlayerEntity player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - ServerPlayerEntity player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - ServerPlayerEntity player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - ServerPlayerEntity player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - ServerPlayerEntity player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - - if (AllMusic.isSkip(name, null, true)) - return; - - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - FabricApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String name) { - try { - ServerPlayerEntity player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - @Override public void broadcast(String message) { if (message == null || message.isEmpty()) { return; } for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(message), false); - } + player.sendMessage(Text.of(message), false); } } @@ -399,11 +173,6 @@ public class SideFabric extends BaseSide { return MusicAddEvent.EVENT.invoker().interact(entity, music) != ActionResult.PASS; } - @Override - public List getPlayerList() { - return Arrays.asList(AllMusicFabric.server.getPlayerNames()); - } - private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 01f587a8..5291011e 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -16,10 +16,9 @@ import org.slf4j.LoggerFactory; import java.io.File; public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); - public static final Identifier ID = new Identifier("allmusic", "channel"); + public static MinecraftServer server; @Override public void onInitialize() { diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index aad16513..3203c447 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -9,6 +9,7 @@ import org.spongepowered.asm.mixin.gen.Accessor; public interface IGetCommandOutput { @Accessor(value = "output") CommandOutput getOutput(); + @Accessor(value = "silent") boolean getSilent(); } diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index b247d504..6da7e690 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,18 +1,14 @@ package com.coloryr.allmusic.server.side.fabric; import com.coloryr.allmusic.server.AllMusicFabric; -import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.mixin.IGetCommandOutput; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import net.minecraft.util.Util; -import java.util.UUID; - public class FabricApi { public static void sendMessageRun(Object obj, String message, String end, String command) { @@ -50,9 +46,7 @@ public class FabricApi { endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endText); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendMessage(send, false); - } + player.sendMessage(send, 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 9f4afc68..230ec1e5 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 @@ -5,13 +5,10 @@ import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.mixin.IGetCommandOutput; import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; @@ -26,22 +23,11 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Util; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; public class SideFabric extends BaseSide { - @Override - public void reload() { - String path = "allmusic/"; - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicFabric.server.getCurrentPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicFabric.server.execute(run); @@ -73,9 +59,9 @@ public class SideFabric extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -83,259 +69,46 @@ public class SideFabric extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayerEntity player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayerEntity player1) { + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicFabric.server.getPlayerManager().getPlayer(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayerEntity player1) { + FabricApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - - if (AllMusic.isSkip(name, null, true)) - return; - - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - FabricApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File("allmusic/"); } @Override @@ -400,15 +173,6 @@ public class SideFabric extends BaseSide { return MusicAddEvent.EVENT.invoker().interact(player, music) != ActionResult.PASS; } - @Override - public List getPlayerList() { - var list = new ArrayList(); - for (var item : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - list.add(item.getGameProfile().getName()); - } - return list; - } - private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index e917965a..5d5eadf1 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -16,10 +16,9 @@ import org.slf4j.LoggerFactory; import java.io.File; public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); - public static final Identifier ID = new Identifier("allmusic", "channel"); + public static MinecraftServer server; @Override public void onInitialize() { diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index 968a399c..d2fe06f4 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -3,7 +3,6 @@ package com.coloryr.allmusic.server.side.fabric; import com.coloryr.allmusic.server.AllMusicFabric; import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; 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 e355b9de..051ef529 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 @@ -5,46 +5,25 @@ import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import java.io.File; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; public class SideFabric extends BaseSide { - - @Override - public void reload() { - String path = "allmusic/"; - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicFabric.server.getCurrentPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicFabric.server.execute(run); @@ -76,10 +55,10 @@ public class SideFabric extends BaseSide { } @Override - public boolean needPlay() { - int online = getPlayerSize(); + public boolean needPlay(boolean islist) { + int online = getPlayers().size(); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) { + if (AllMusic.isSkip(player.getName().getString(), null, false, islist)) { online--; } } @@ -87,259 +66,46 @@ public class SideFabric extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayerEntity player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayerEntity player1) { + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicFabric.server.getPlayerManager().getPlayer(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayerEntity player1) { + FabricApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - - if (AllMusic.isSkip(name, null, true)) - return; - - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - FabricApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File("allmusic/"); } @Override @@ -398,15 +164,6 @@ public class SideFabric extends BaseSide { return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS; } - @Override - public List getPlayerList() { - var list = new ArrayList(); - for (var item : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - list.add(item.getGameProfile().getName()); - } - return list; - } - private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index 968a399c..8455cbda 100644 --- a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,9 +1,7 @@ package com.coloryr.allmusic.server.side.fabric; import com.coloryr.allmusic.server.AllMusicFabric; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; @@ -41,9 +39,7 @@ public class FabricApi { endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endText); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendMessage(send, false); - } + player.sendMessage(send, 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 9f57daaf..f43c899d 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 @@ -5,44 +5,25 @@ import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import io.netty.buffer.ByteBuf; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; public class SideFabric extends BaseSide { - - @Override - public void reload() { - String path = "allmusic/"; - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicFabric.server.getCurrentPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicFabric.server.execute(run); @@ -74,269 +55,57 @@ public class SideFabric extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } return false; } + @Override - protected void sideSendStop() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayerEntity player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayerEntity player1) { + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicFabric.server.getPlayerManager().getPlayer(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayerEntity player1) { + FabricApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - - if (AllMusic.isSkip(name, null, true)) - return; - - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - FabricApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File("allmusic/"); } @Override @@ -395,15 +164,6 @@ public class SideFabric extends BaseSide { return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS; } - @Override - public List getPlayerList() { - var list = new ArrayList(); - for (var item : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - list.add(item.getGameProfile().getName()); - } - return list; - } - private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index 968a399c..8455cbda 100644 --- a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,9 +1,7 @@ package com.coloryr.allmusic.server.side.fabric; import com.coloryr.allmusic.server.AllMusicFabric; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; @@ -41,9 +39,7 @@ public class FabricApi { endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endText); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendMessage(send, false); - } + player.sendMessage(send, 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 9f57daaf..91cb8eb4 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 @@ -5,44 +5,25 @@ import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import io.netty.buffer.ByteBuf; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; public class SideFabric extends BaseSide { - - @Override - public void reload() { - String path = "allmusic/"; - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicFabric.server.getCurrentPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicFabric.server.execute(run); @@ -74,9 +55,9 @@ public class SideFabric extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -84,259 +65,46 @@ public class SideFabric extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayerEntity player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayerEntity player1) { + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicFabric.server.getPlayerManager().getPlayer(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayerEntity player1) { + FabricApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - - if (AllMusic.isSkip(name, null, true)) - return; - - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - FabricApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File("allmusic/"); } @Override @@ -395,15 +163,6 @@ public class SideFabric extends BaseSide { return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS; } - @Override - public List getPlayerList() { - var list = new ArrayList(); - for (var item : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - list.add(item.getGameProfile().getName()); - } - return list; - } - private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index 968a399c..8455cbda 100644 --- a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,9 +1,7 @@ package com.coloryr.allmusic.server.side.fabric; import com.coloryr.allmusic.server.AllMusicFabric; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; @@ -41,9 +39,7 @@ public class FabricApi { endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endText); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendMessage(send, false); - } + player.sendMessage(send, 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 3efe2fe7..91cb8eb4 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 @@ -5,45 +5,25 @@ import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import java.io.File; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; public class SideFabric extends BaseSide { - - @Override - public void reload() { - String path = "allmusic/"; - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicFabric.server.getCurrentPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicFabric.server.execute(run); @@ -75,9 +55,9 @@ public class SideFabric extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -85,259 +65,46 @@ public class SideFabric extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayerEntity player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayerEntity player1) { + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicFabric.server.getPlayerManager().getPlayer(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayerEntity player1) { + FabricApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - - if (AllMusic.isSkip(name, null, true)) - return; - - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - FabricApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File("allmusic/"); } @Override @@ -396,15 +163,6 @@ public class SideFabric extends BaseSide { return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS; } - @Override - public List getPlayerList() { - var list = new ArrayList(); - for (var item : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - list.add(item.getGameProfile().getName()); - } - return list; - } - private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; diff --git a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 340f2cef..570d83ac 100644 --- a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -1,31 +1,24 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.enums.ComType; import com.coloryr.allmusic.server.side.fabric.CommandFabric; import com.coloryr.allmusic.server.side.fabric.LogFabric; import com.coloryr.allmusic.server.side.fabric.SideFabric; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.network.codec.PacketCodec; -import net.minecraft.network.packet.CustomPayload; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Identifier; -import okio.Buffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); - public static final Identifier ID = new Identifier("allmusic", "channel"); + public static MinecraftServer server; @Override public void onInitialize() { diff --git a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index 968a399c..8455cbda 100644 --- a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java +++ b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,9 +1,7 @@ package com.coloryr.allmusic.server.side.fabric; import com.coloryr.allmusic.server.AllMusicFabric; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; @@ -41,9 +39,7 @@ public class FabricApi { endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endText); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendMessage(send, false); - } + player.sendMessage(send, 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 da9be120..3a8b1abc 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 @@ -5,39 +5,23 @@ import com.coloryr.allmusic.server.PackPayload; import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; public class SideFabric extends BaseSide { - - @Override - public void reload() { - String path = "allmusic/"; - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicFabric.server.getCurrentPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicFabric.server.execute(run); @@ -69,9 +53,9 @@ public class SideFabric extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -79,259 +63,46 @@ public class SideFabric extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, new PackPayload(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayerEntity player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayerEntity player1) { + send(player1, new PackPayload(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, new PackPayload(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicFabric.server.getPlayerManager().getPlayer(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayerEntity player1) { + FabricApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, new PackPayload(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, new PackPayload(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, new PackPayload(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackPayload(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackPayload(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, new PackPayload(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, new PackPayload(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, new PackPayload(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - - if (AllMusic.isSkip(name, null, true)) - return; - - switch (pos) { - case INFO: - send(player, new PackPayload(ComType.INFO, data, 0)); - break; - case LIST: - send(player, new PackPayload(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, new PackPayload(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, new PackPayload(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = AllMusic.gson.toJson(obj); - send(player, new PackPayload(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - FabricApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, new PackPayload(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, new PackPayload(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File("allmusic/"); } @Override @@ -390,15 +161,6 @@ public class SideFabric extends BaseSide { return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS; } - @Override - public List getPlayerList() { - var list = new ArrayList(); - for (var item : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - list.add(item.getGameProfile().getName()); - } - return list; - } - private void send(ServerPlayerEntity players, PackPayload data) { if (players == null) return; diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 7a8eb4d3..d9c79be9 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -16,10 +16,9 @@ import org.slf4j.LoggerFactory; import java.io.File; public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); - public static final Identifier ID = Identifier.of("allmusic", "channel"); + public static MinecraftServer server; @Override public void onInitialize() { diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index 968a399c..8455cbda 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,9 +1,7 @@ package com.coloryr.allmusic.server.side.fabric; import com.coloryr.allmusic.server.AllMusicFabric; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; @@ -41,9 +39,7 @@ public class FabricApi { endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endText); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendMessage(send, false); - } + player.sendMessage(send, 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 7e011325..545f1aa2 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 @@ -5,42 +5,24 @@ import com.coloryr.allmusic.server.PackPayload; import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.client.MinecraftClient; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; public class SideFabric extends BaseSide { - @Override - public void reload() { - String path = "allmusic/"; - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicFabric.server.getCurrentPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicFabric.server.execute(run); @@ -72,9 +54,9 @@ public class SideFabric extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -82,259 +64,46 @@ public class SideFabric extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, new PackPayload(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayerEntity player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayerEntity player1) { + send(player1, new PackPayload(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, new PackPayload(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicFabric.server.getPlayerManager().getPlayer(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayerEntity player1) { + FabricApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, new PackPayload(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, new PackPayload(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, new PackPayload(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackPayload(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackPayload(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, new PackPayload(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, new PackPayload(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, new PackPayload(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - - if (AllMusic.isSkip(name, null, true)) - return; - - switch (pos) { - case INFO: - send(player, new PackPayload(ComType.INFO, data, 0)); - break; - case LIST: - send(player, new PackPayload(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, new PackPayload(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, new PackPayload(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = AllMusic.gson.toJson(obj); - send(player, new PackPayload(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - FabricApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, new PackPayload(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, new PackPayload(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File("allmusic/"); } @Override @@ -393,15 +162,6 @@ public class SideFabric extends BaseSide { return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS; } - @Override - public List getPlayerList() { - var list = new ArrayList(); - for (var item : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - list.add(item.getGameProfile().getName()); - } - return list; - } - private void send(ServerPlayerEntity players, PackPayload data) { if (players == null) return; diff --git a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index 28e47f6d..606143b6 100644 --- a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java +++ b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,9 +1,7 @@ package com.coloryr.allmusic.server.side.fabric; import com.coloryr.allmusic.server.AllMusicFabric; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; @@ -41,9 +39,7 @@ public class FabricApi { endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endText); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendMessage(send, false); - } + player.sendMessage(send, false); } } } diff --git a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 4ea4dc0f..3a8b1abc 100644 --- a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -5,43 +5,23 @@ import com.coloryr.allmusic.server.PackPayload; import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.client.MinecraftClient; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; public class SideFabric extends BaseSide { - - @Override - public void reload() { - String path = "allmusic/"; - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicFabric.server.getCurrentPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicFabric.server.execute(run); @@ -73,9 +53,9 @@ public class SideFabric extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -83,259 +63,46 @@ public class SideFabric extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, new PackPayload(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayerEntity player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayerEntity player1) { + send(player1, new PackPayload(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, new PackPayload(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicFabric.server.getPlayerManager().getPlayer(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayerEntity player1) { + FabricApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, new PackPayload(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, new PackPayload(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, new PackPayload(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackPayload(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackPayload(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, new PackPayload(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, new PackPayload(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, new PackPayload(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - - if (AllMusic.isSkip(name, null, true)) - return; - - switch (pos) { - case INFO: - send(player, new PackPayload(ComType.INFO, data, 0)); - break; - case LIST: - send(player, new PackPayload(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, new PackPayload(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, new PackPayload(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = AllMusic.gson.toJson(obj); - send(player, new PackPayload(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - FabricApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, new PackPayload(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, new PackPayload(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File("allmusic/"); } @Override @@ -394,15 +161,6 @@ public class SideFabric extends BaseSide { return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS; } - @Override - public List getPlayerList() { - var list = new ArrayList(); - for (var item : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - list.add(item.getGameProfile().getName()); - } - return list; - } - private void send(ServerPlayerEntity players, PackPayload data) { if (players == null) return; diff --git a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java index eb8f51c0..750604d8 100644 --- a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java +++ b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java @@ -4,7 +4,6 @@ import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.ActionResult; public interface MusicAddEvent { diff --git a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/MetricsFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/MetricsFolia.java index 4a6174dd..bd04d68a 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/MetricsFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/MetricsFolia.java @@ -24,7 +24,7 @@ public class MetricsFolia { /** * Creates a new Metrics instance. * - * @param plugin Your plugin instance. + * @param plugin Your plugin instance. * @param serviceId The id of the service. * It can be found at What is my plugin id? */ @@ -53,7 +53,8 @@ public class MetricsFolia { ).copyDefaults(true); try { config.save(configFile); - } catch (IOException ignored) { } + } catch (IOException ignored) { + } } // Load the data 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 a27ff1e0..39b556a9 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 @@ -3,18 +3,14 @@ package com.coloryr.allmusic.server.side.folia; import com.coloryr.allmusic.server.AllMusicFolia; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.folia.event.MusicAddEvent; import com.coloryr.allmusic.server.side.folia.event.MusicPlayEvent; import com.coloryr.allmusic.server.side.folia.hooks.CitizensNPC; import com.coloryr.allmusic.server.side.folia.hooks.SpigotApi; -import io.netty.buffer.ByteBuf; import io.papermc.paper.threadedregions.scheduler.ScheduledTask; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -23,274 +19,43 @@ import org.bukkit.entity.Player; import org.bukkit.permissions.Permissible; import org.bukkit.permissions.ServerOperator; -import java.util.List; +import java.io.File; +import java.util.Collection; +import java.util.Collections; public class SideFolia extends BaseSide { @Override - public int getPlayerSize() { - return Bukkit.getOnlinePlayers().size(); + public Collection getPlayers() { + return Collections.singleton(Bukkit.getOnlinePlayers()); } @Override - public void sendHudLyric(String data) { - try { - for (Player player : Bukkit.getOnlinePlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); + public String getPlayerName(Object player) { + if (player instanceof Player player1) { + return player1.getName(); } + return null; } @Override - public void sendHudInfo(String data) { - try { - for (Player player : Bukkit.getOnlinePlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } + public String getPlayerServer(Object player) { + return null; } @Override - public void sendHudPos(String name) { - try { - Player player = Bukkit.getPlayer(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, false)) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - Player player = Bukkit.getPlayer(name); - if (player == null) - return; - - if (AllMusic.isSkip(name, null, true)) - return; - - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (Player player : Bukkit.getOnlinePlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (Player player : Bukkit.getOnlinePlayers()) { - String Name = player.getName(); - try { - SaveObj obj = HudUtils.get(Name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); + public void sendBar(Object player, String data) { + if (player instanceof Player player1) { + if (AllMusicFolia.spigotSet) { + SpigotApi.sendBar(player1, data); + } else { + sendMessage(player1, data); } } } @Override - public void sendBar(String data) { - if (AllMusicFolia.spigotSet) { - for (Player player : Bukkit.getOnlinePlayers()) { - try { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - SpigotApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } else { - broadcast(data); - } - } - - @Override - public void sendMusic(String data) { - try { - for (Player player : Bukkit.getOnlinePlayers()) { - if (AllMusic.isSkip(player.getName(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - Player player1 = Bukkit.getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (Player player : Bukkit.getOnlinePlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - Player player1 = Bukkit.getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - Player player1 = Bukkit.getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendStop() { - try { - for (Player player : Bukkit.getOnlinePlayers()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendStop(String name) { - try { - Player player = Bukkit.getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud(String name) { - try { - Player player = Bukkit.getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (Player player : Bukkit.getOnlinePlayers()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return AllMusicFolia.plugin.getDataFolder(); } @Override @@ -310,16 +75,18 @@ public class SideFolia extends BaseSide { if (message == null || message.isEmpty()) { return; } - SpigotApi.sendMessageBqRun(message, end, command); + for (Player player : Bukkit.getOnlinePlayers()) { + SpigotApi.sendMessageBqRun(player, message, end, command); + } } @Override - public boolean needPlay() { - int online = getPlayerSize(); + public boolean needPlay(boolean islist) { + int online = AllMusic.side.getPlayers().size(); for (Player player : Bukkit.getOnlinePlayers()) { if (CitizensNPC.isNPC(player)) online--; - else if (AllMusic.isSkip(player.getName(), null, false)) { + else if (AllMusic.isSkip(player.getName(), null, false, islist)) { online--; } } @@ -366,11 +133,6 @@ public class SideFolia extends BaseSide { Bukkit.getGlobalRegionScheduler().execute(AllMusicFolia.plugin, run); } - @Override - public void reload() { - new AllMusic().init(AllMusicFolia.plugin.getDataFolder()); - } - @Override public boolean checkPermission(Object player, String permission) { if (checkPermission(player)) { @@ -404,11 +166,6 @@ public class SideFolia extends BaseSide { scheduledTask -> run.run(), delay); } - @Override - public List getPlayerList() { - return List.of(); - } - @Override public boolean onMusicPlay(SongInfoObj obj) { MusicPlayEvent event = new MusicPlayEvent(obj); @@ -440,17 +197,22 @@ public class SideFolia extends BaseSide { return isCancelled; } - private void send(Player players, ByteBuf data) { - if (players == null) - return; - try { - if (AllMusic.isRun) { + @Override + public void send(Object player, ComType type, String data, int data1) { + if (AllMusic.isRun && player instanceof Player player1) { + try { runTask(() -> - players.sendPluginMessage(AllMusicFolia.plugin, AllMusic.channel, data.array())); + player1.sendPluginMessage(AllMusicFolia.plugin, AllMusic.channel, PacketCodec.pack(type, data, data1).array())); + + } catch (Exception e) { + AllMusic.log.warning("§c数据发送发生错误"); + e.printStackTrace(); } - } catch (Exception e) { - AllMusic.log.warning("§c数据发送发生错误"); - e.printStackTrace(); } } + + @Override + public Object getPlayer(String player) { + return Bukkit.getPlayer(player); + } } diff --git a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/event/MusicAddEvent.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/event/MusicAddEvent.java index 636135cf..66c4b276 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/event/MusicAddEvent.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/event/MusicAddEvent.java @@ -32,6 +32,7 @@ public class MusicAddEvent extends Event implements Cancellable { /** * 事件是否被取消 + * * @return 是否被取消 * @deprecated 请使用 {@link #isCancelled()} */ @@ -42,6 +43,7 @@ public class MusicAddEvent extends Event implements Cancellable { /** * 设置事件是否被取消 + * * @param cancel 是否取消事件 * @deprecated 请使用 {@link #setCancelled(boolean)} */ diff --git a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/SpigotApi.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/SpigotApi.java index 0d74c897..ec39d88c 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/SpigotApi.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/SpigotApi.java @@ -1,6 +1,6 @@ package com.coloryr.allmusic.server.side.folia.hooks; -import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.sql.DataSql; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; @@ -31,15 +31,11 @@ public class SpigotApi { player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(message)); } - public static void sendMessageBqRun(String message, String end, String command) { + public static void sendMessageBqRun(Player player, String message, String end, String command) { TextComponent send = new TextComponent(message); TextComponent endtext = new TextComponent(end); endtext.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command)); send.addExtra(endtext); - for (Player player : Bukkit.getOnlinePlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName())) { - player.spigot().sendMessage(send); - } - } + player.spigot().sendMessage(send); } } diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index d71430d7..67ce17cb 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.play.server.SPacketTitle; @@ -38,9 +37,7 @@ public class ForgeApi { endtext.setStyle(endtext.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.appendSibling(endtext); for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName())) { - player.sendMessage(send); - } + player.sendMessage(send); } } } 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 77c5273a..46b5590f 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 @@ -5,16 +5,12 @@ import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; -import com.google.gson.Gson; import io.netty.buffer.ByteBuf; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; @@ -26,23 +22,11 @@ import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; import net.minecraftforge.fml.relauncher.Side; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; import java.util.Locale; public class SideForge extends BaseSide { - - @Override - public void reload() { - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicForge.server.getCurrentPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicForge.server.addScheduledTask(run); @@ -79,9 +63,9 @@ public class SideForge extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.isSkip(player.getName(), null,false)) { + if (!AllMusic.isSkip(player.getName(), null, false, islist)) { return true; } } @@ -89,257 +73,49 @@ public class SideForge extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof EntityPlayerMP) { + EntityPlayerMP player1 = (EntityPlayerMP) player; + return player1.getName(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof EntityPlayerMP) { + EntityPlayerMP player1 = (EntityPlayerMP) player; + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - EntityPlayerMP player = AllMusicForge.server.getPlayerList().getPlayerByUsername(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicForge.server.getPlayerList().getPlayerByUsername(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof EntityPlayerMP) { + EntityPlayerMP player1 = (EntityPlayerMP) player; + ForgeApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - EntityPlayerMP player1 = AllMusicForge.server.getPlayerList().getPlayerByUsername(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - EntityPlayerMP player1 = AllMusicForge.server.getPlayerList().getPlayerByUsername(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - EntityPlayerMP player1 = AllMusicForge.server.getPlayerList().getPlayerByUsername(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - EntityPlayerMP player = AllMusicForge.server.getPlayerList().getPlayerByUsername(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - EntityPlayerMP player = AllMusicForge.server.getPlayerList().getPlayerByUsername(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, true)) - return; - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - String Name = player.getName(); - try { - SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - try { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - ForgeApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String name) { - try { - EntityPlayerMP player = AllMusicForge.server.getPlayerList().getPlayerByUsername(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File(String.format(Locale.ROOT, "config/%s/", "allmusic")); } @Override @@ -399,15 +175,6 @@ public class SideForge extends BaseSide { return MinecraftForge.EVENT_BUS.post(event); } - @Override - public List getPlayerList() { - List list = new ArrayList<>(); - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { - list.add(player.getName()); - } - return list; - } - private void send(EntityPlayerMP players, ByteBuf data) { if (players == null) return; diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index 17816f39..ac56b7bc 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -40,9 +40,7 @@ public class ForgeApi { endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endtext); for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendMessage(send, UUID.randomUUID()); - } + player.sendMessage(send, UUID.randomUUID()); } } } 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 ab11e688..3fbbdaba 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 @@ -27,24 +27,10 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.network.PacketDistributor; import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.UUID; +import java.util.*; public class SideForge extends BaseSide { - @Override - public void reload() { - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicForge.server.getPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicForge.server.execute(run); @@ -76,9 +62,9 @@ public class SideForge extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null,false, islist)) { return true; } } @@ -86,257 +72,49 @@ public class SideForge extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayerEntity) { + ServerPlayerEntity player1 = (ServerPlayerEntity) player; + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayerEntity) { + ServerPlayerEntity player1 = (ServerPlayerEntity) player; + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - ServerPlayerEntity player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicForge.server.getPlayerList().getPlayerByName(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayerEntity) { + ServerPlayerEntity player1 = (ServerPlayerEntity) player; + ForgeApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - ServerPlayerEntity player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - ServerPlayerEntity player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - ServerPlayerEntity player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - ServerPlayerEntity player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - ServerPlayerEntity player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, true)) - return; - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - ForgeApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String player) { - try { - ServerPlayerEntity player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - send(player1, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File(String.format(Locale.ROOT, "config/%s/", "allmusic")); } @Override @@ -396,15 +174,6 @@ public class SideForge extends BaseSide { return MinecraftForge.EVENT_BUS.post(event); } - @Override - public List getPlayerList() { - List list = new ArrayList<>(); - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - list.add(player.getName().getString()); - } - return list; - } - private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index 144733b1..808c394f 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,8 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; -import com.coloryr.allmusic.server.core.AllMusic; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.MutableComponent; @@ -42,9 +40,7 @@ public class ForgeApi { endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endtext); for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendMessage(send, UUID.randomUUID()); - } + player.sendMessage(send, 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 48b021a1..52267f92 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 @@ -5,47 +5,29 @@ import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; -import com.google.gson.Gson; import io.netty.buffer.ByteBuf; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.TextComponent; import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.network.PacketDistributor; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; import java.util.Locale; import java.util.UUID; public class SideForge extends BaseSide { - @Override - public void reload() { - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicForge.server.getPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicForge.server.execute(run); @@ -77,9 +59,9 @@ public class SideForge extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -87,257 +69,46 @@ public class SideForge extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayer player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayer player1) { + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicForge.server.getPlayerList().getPlayerByName(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayer player1) { + ForgeApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, true)) - return; - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - ForgeApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String player) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - send(player1, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File(String.format(Locale.ROOT, "config/%s/", "allmusic")); } @Override @@ -402,15 +173,6 @@ public class SideForge extends BaseSide { return MinecraftForge.EVENT_BUS.post(event); } - @Override - public List getPlayerList() { - List list = new ArrayList<>(); - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - list.add(player.getName().getString()); - } - return list; - } - private void send(ServerPlayer players, ByteBuf data) { if (players == null) return; diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index b3bac449..43a8aa31 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -39,9 +39,7 @@ public class ForgeApi { endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endtext); for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendSystemMessage(send); - } + player.sendSystemMessage(send); } } } 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 ff879560..bda779c1 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 @@ -5,46 +5,28 @@ import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; -import com.google.gson.Gson; import io.netty.buffer.ByteBuf; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.network.PacketDistributor; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; import java.util.Locale; public class SideForge extends BaseSide { - @Override - public void reload() { - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicForge.server.getPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicForge.server.execute(run); @@ -65,20 +47,20 @@ public class SideForge extends BaseSide { @Override public boolean checkPermission(Object player) { - CommandSourceStack source = (CommandSourceStack) player; - return source.hasPermission(2); + CommandSourceStack sender = (CommandSourceStack) player; + return sender.hasPermission(2); } @Override public boolean isPlayer(Object player) { - CommandSourceStack source = (CommandSourceStack) player; - return source.isPlayer(); + CommandSourceStack sender = (CommandSourceStack) player; + return sender.getEntity() instanceof ServerPlayer; } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -86,257 +68,46 @@ public class SideForge extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayer player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayer player1) { + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicForge.server.getPlayerList().getPlayerByName(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayer player1) { + ForgeApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, true)) - return; - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - ForgeApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String player) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - send(player1, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File(String.format(Locale.ROOT, "config/%s/", "allmusic")); } @Override @@ -392,18 +163,13 @@ public class SideForge extends BaseSide { @Override public boolean onMusicAdd(Object obj, MusicObj music) { - CommandSourceStack source = (CommandSourceStack) obj; - MusicAddEvent event = new MusicAddEvent(music, source.getPlayer()); - return MinecraftForge.EVENT_BUS.post(event); - } - - @Override - public List getPlayerList() { - List list = new ArrayList<>(); - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - list.add(player.getName().getString()); + CommandSourceStack sender = (CommandSourceStack) obj; + ServerPlayer serverPlayer = null; + if (sender.getEntity() instanceof ServerPlayer player) { + serverPlayer = player; } - return list; + MusicAddEvent event = new MusicAddEvent(music, serverPlayer); + return MinecraftForge.EVENT_BUS.post(event); } private void send(ServerPlayer players, ByteBuf data) { diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index b3bac449..3364eb1e 100644 --- a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; @@ -39,9 +38,7 @@ public class ForgeApi { endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endtext); for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendSystemMessage(send); - } + player.sendSystemMessage(send); } } } 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 958a50be..bda779c1 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 @@ -5,46 +5,28 @@ import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; -import com.google.gson.Gson; import io.netty.buffer.ByteBuf; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.network.PacketDistributor; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; import java.util.Locale; public class SideForge extends BaseSide { - @Override - public void reload() { - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicForge.server.getPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicForge.server.execute(run); @@ -65,20 +47,20 @@ public class SideForge extends BaseSide { @Override public boolean checkPermission(Object player) { - CommandSourceStack source = (CommandSourceStack) player; - return source.hasPermission(2); + CommandSourceStack sender = (CommandSourceStack) player; + return sender.hasPermission(2); } @Override public boolean isPlayer(Object player) { - CommandSourceStack source = (CommandSourceStack) player; - return source.isPlayer(); + CommandSourceStack sender = (CommandSourceStack) player; + return sender.getEntity() instanceof ServerPlayer; } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -86,257 +68,46 @@ public class SideForge extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayer player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayer player1) { + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicForge.server.getPlayerList().getPlayerByName(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayer player1) { + ForgeApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, true)) - return; - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - ForgeApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String player) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - send(player1, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File(String.format(Locale.ROOT, "config/%s/", "allmusic")); } @Override @@ -364,8 +135,8 @@ public class SideForge extends BaseSide { if (message == null || message.isEmpty()) { return; } - CommandSourceStack source = (CommandSourceStack) obj; - source.sendSystemMessage(Component.literal(message)); + CommandSourceStack sender = (CommandSourceStack) obj; + sender.sendSystemMessage(Component.literal(message)); } @Override @@ -392,18 +163,13 @@ public class SideForge extends BaseSide { @Override public boolean onMusicAdd(Object obj, MusicObj music) { - CommandSourceStack source = (CommandSourceStack) obj; - MusicAddEvent event = new MusicAddEvent(music, source.getPlayer()); - return MinecraftForge.EVENT_BUS.post(event); - } - - @Override - public List getPlayerList() { - List list = new ArrayList<>(); - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - list.add(player.getName().getString()); + CommandSourceStack sender = (CommandSourceStack) obj; + ServerPlayer serverPlayer = null; + if (sender.getEntity() instanceof ServerPlayer player) { + serverPlayer = player; } - return list; + MusicAddEvent event = new MusicAddEvent(music, serverPlayer); + return MinecraftForge.EVENT_BUS.post(event); } private void send(ServerPlayer players, ByteBuf data) { diff --git a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index 6ea7040c..54aa6f2e 100644 --- a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.event.ClickEvent; @@ -40,9 +39,7 @@ public class ForgeApi { send.appendSibling(endtext); for (Object player : AllMusicForge.server.getConfigurationManager().playerEntityList) { EntityPlayerMP player1 = (EntityPlayerMP) player; - if (!AllMusic.getConfig().mutePlayer.contains(player1.getCommandSenderName())) { - player1.addChatMessage(send); - } + player1.addChatMessage(send); } } } 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 ad863fc4..1bcd2008 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 @@ -5,16 +5,12 @@ import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; -import com.google.gson.Gson; import cpw.mods.fml.common.network.internal.FMLProxyPacket; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; @@ -26,23 +22,10 @@ import net.minecraft.util.ChatComponentText; import net.minecraftforge.common.MinecraftForge; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; import java.util.Locale; public class SideForge extends BaseSide { - - @Override - public void reload() { - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicForge.server.getCurrentPlayerCount(); - } - @Override public void runTask(Runnable run) { runTask(run, 0); @@ -79,10 +62,10 @@ public class SideForge extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { EntityPlayerMP player = (EntityPlayerMP) player1; - if (!AllMusic.isSkip(player.getCommandSenderName(), null, false)) { + if (!AllMusic.isSkip(player.getCommandSenderName(), null, false, islist)) { return true; } } @@ -90,266 +73,49 @@ public class SideForge extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { - EntityPlayerMP player = (EntityPlayerMP) player1; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return AllMusicForge.server.getConfigurationManager().playerEntityList; + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof EntityPlayerMP) { + EntityPlayerMP player1 = (EntityPlayerMP) player; + return player1.getCommandSenderName(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof EntityPlayerMP) { + EntityPlayerMP player1 = (EntityPlayerMP) player; + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - EntityPlayerMP player = AllMusicForge.server.getConfigurationManager().func_152612_a(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicForge.server.getConfigurationManager().func_152612_a(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof EntityPlayerMP) { + EntityPlayerMP player1 = (EntityPlayerMP) player; + ForgeApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { - EntityPlayerMP player = (EntityPlayerMP) player1; - if (AllMusic.isSkip(player.getCommandSenderName(), null, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getCommandSenderName()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - EntityPlayerMP player1 = AllMusicForge.server.getConfigurationManager().func_152612_a(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { - EntityPlayerMP player = (EntityPlayerMP) player1; - if (AllMusic.isSkip(player.getCommandSenderName(), null, true)) - continue; - String name = player.getCommandSenderName(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - EntityPlayerMP player1 = AllMusicForge.server.getConfigurationManager().func_152612_a(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getCommandSenderName(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - EntityPlayerMP player1 = AllMusicForge.server.getConfigurationManager().func_152612_a(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getCommandSenderName(), null, true)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { - EntityPlayerMP player = (EntityPlayerMP) player1; - if (AllMusic.isSkip(player.getCommandSenderName(), null, true)) - continue; - String name = player.getCommandSenderName(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { - EntityPlayerMP player = (EntityPlayerMP) player1; - if (AllMusic.isSkip(player.getCommandSenderName(), null, true)) - continue; - String name = player.getCommandSenderName(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - EntityPlayerMP player = AllMusicForge.server.getConfigurationManager().func_152612_a(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - EntityPlayerMP player = AllMusicForge.server.getConfigurationManager().func_152612_a(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, true)) - return; - switch (pos) { - case INFO: - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { - EntityPlayerMP player = (EntityPlayerMP) player1; - if (AllMusic.isSkip(player.getCommandSenderName(), null, true)) - continue; - String name = player.getCommandSenderName(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { - EntityPlayerMP player = (EntityPlayerMP) player1; - String Name = player.getCommandSenderName(); - try { - SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { - EntityPlayerMP player = (EntityPlayerMP) player1; - try { - if (AllMusic.isSkip(player.getCommandSenderName(), null, true)) - continue; - ForgeApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String name) { - try { - EntityPlayerMP player = AllMusicForge.server.getConfigurationManager().func_152612_a(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { - EntityPlayerMP player = (EntityPlayerMP) player1; - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File(String.format(Locale.ROOT, "config/%s/", "allmusic")); } @Override @@ -410,16 +176,6 @@ public class SideForge extends BaseSide { return MinecraftForge.EVENT_BUS.post(event); } - @Override - public List getPlayerList() { - List list = new ArrayList<>(); - for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { - EntityPlayerMP player = (EntityPlayerMP) player1; - list.add(player.getCommandSenderName()); - } - return list; - } - private void send(EntityPlayerMP players, ByteBuf data) { if (players == null) return; diff --git a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index b3bac449..3364eb1e 100644 --- a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; @@ -39,9 +38,7 @@ public class ForgeApi { endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endtext); for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendSystemMessage(send); - } + player.sendSystemMessage(send); } } } 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 e383797b..fede40ff 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 @@ -4,43 +4,24 @@ import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; -import com.google.gson.Gson; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.Component; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.network.PacketDistributor; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; import java.util.Locale; public class SideForge extends BaseSide { - - @Override - public void reload() { - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicForge.server.getPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicForge.server.execute(run); @@ -72,9 +53,9 @@ public class SideForge extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -82,257 +63,46 @@ public class SideForge extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, new PackData(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayer player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayer player1) { + send(player1, new PackData(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - send(player, new PackData(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicForge.server.getPlayerList().getPlayerByName(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayer player1) { + ForgeApi.sendBar(player1, data); } } @Override - public void sendMusic(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, new PackData(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, new PackData(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, new PackData(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackData(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackData(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, new PackData(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, new PackData(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, new PackData(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, true)) - return; - switch (pos) { - case INFO: - send(player, new PackData(ComType.INFO, data, 0)); - break; - case LIST: - send(player, new PackData(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, new PackData(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, new PackData(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, new PackData(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - ForgeApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String player) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - send(player1, new PackData(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, new PackData(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File(String.format(Locale.ROOT, "config/%s/", "allmusic")); } @Override @@ -395,15 +165,6 @@ public class SideForge extends BaseSide { return event.isCancel(); } - @Override - public List getPlayerList() { - List list = new ArrayList<>(); - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - list.add(player.getName().getString()); - } - return list; - } - private void send(ServerPlayer players, PackData data) { if (players == null) return; diff --git a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index b3bac449..43a8aa31 100644 --- a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -39,9 +39,7 @@ public class ForgeApi { endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endtext); for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendSystemMessage(send); - } + player.sendSystemMessage(send); } } } 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 77bc3814..3c516b86 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 @@ -4,43 +4,24 @@ import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; -import com.google.gson.Gson; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.Component; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.network.PacketDistributor; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; import java.util.Locale; public class SideForge extends BaseSide { - - @Override - public void reload() { - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicForge.server.getPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicForge.server.execute(run); @@ -72,9 +53,9 @@ public class SideForge extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -82,257 +63,46 @@ public class SideForge extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, new PackData(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayer player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayer player1) { + send(player1, new PackData(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - send(player, new PackData(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicForge.server.getPlayerList().getPlayerByName(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayer player1) { + ForgeApi.sendBar(player1, data); } } @Override - public void sendMusic(String url) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, new PackData(ComType.PLAY, url, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String url) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, new PackData(ComType.PLAY, url, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String url) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, new PackData(ComType.IMG, url, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String url) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackData(ComType.IMG, url, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackData(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, new PackData(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, new PackData(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, new PackData(ComType.INFO, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, true)) - return; - switch (pos) { - case INFO: - send(player, new PackData(ComType.INFO, data, 0)); - break; - case LIST: - send(player, new PackData(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, new PackData(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, new PackData(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, new PackData(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - ForgeApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String player) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - send(player1, new PackData(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, new PackData(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File(String.format(Locale.ROOT, "config/%s/", "allmusic")); } @Override @@ -395,15 +165,6 @@ public class SideForge extends BaseSide { return event.isCancel(); } - @Override - public List getPlayerList() { - List list = new ArrayList<>(); - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - list.add(player.getName().getString()); - } - return list; - } - private void send(ServerPlayer players, PackData data) { if (players == null) return; diff --git a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index b3bac449..3364eb1e 100644 --- a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; @@ -39,9 +38,7 @@ public class ForgeApi { endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endtext); for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendSystemMessage(send); - } + player.sendSystemMessage(send); } } } diff --git a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java index 0ba6adf0..1ccbf045 100644 --- a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java +++ b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java @@ -3,14 +3,11 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import io.netty.buffer.ByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import org.jetbrains.annotations.NotNull; -import java.nio.charset.StandardCharsets; - public record PackData(ComType cmd, String data, int data1) implements CustomPacketPayload { public static final Type TYPE = new Type<>(AllMusicForge.channel); public static final StreamCodec CODEC = new PackCodec(); 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 77bc3814..3c516b86 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 @@ -4,43 +4,24 @@ import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; -import com.google.gson.Gson; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.Component; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.network.PacketDistributor; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; import java.util.Locale; public class SideForge extends BaseSide { - - @Override - public void reload() { - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicForge.server.getPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicForge.server.execute(run); @@ -72,9 +53,9 @@ public class SideForge extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -82,257 +63,46 @@ public class SideForge extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, new PackData(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayer player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayer player1) { + send(player1, new PackData(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - send(player, new PackData(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicForge.server.getPlayerList().getPlayerByName(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayer player1) { + ForgeApi.sendBar(player1, data); } } @Override - public void sendMusic(String url) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, new PackData(ComType.PLAY, url, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String url) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, new PackData(ComType.PLAY, url, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String url) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, new PackData(ComType.IMG, url, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String url) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackData(ComType.IMG, url, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackData(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, new PackData(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, new PackData(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, new PackData(ComType.INFO, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, true)) - return; - switch (pos) { - case INFO: - send(player, new PackData(ComType.INFO, data, 0)); - break; - case LIST: - send(player, new PackData(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, new PackData(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, new PackData(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, new PackData(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - ForgeApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String player) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - send(player1, new PackData(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, new PackData(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File(String.format(Locale.ROOT, "config/%s/", "allmusic")); } @Override @@ -395,15 +165,6 @@ public class SideForge extends BaseSide { return event.isCancel(); } - @Override - public List getPlayerList() { - List list = new ArrayList<>(); - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - list.add(player.getName().getString()); - } - return list; - } - private void send(ServerPlayer players, PackData data) { if (players == null) return; diff --git a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index b3bac449..3364eb1e 100644 --- a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; -import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; @@ -39,9 +38,7 @@ public class ForgeApi { endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endtext); for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { - player.sendSystemMessage(send); - } + player.sendSystemMessage(send); } } } diff --git a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java index 0ba6adf0..1ccbf045 100644 --- a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java +++ b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java @@ -3,14 +3,11 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import io.netty.buffer.ByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import org.jetbrains.annotations.NotNull; -import java.nio.charset.StandardCharsets; - public record PackData(ComType cmd, String data, int data1) implements CustomPacketPayload { public static final Type TYPE = new Type<>(AllMusicForge.channel); public static final StreamCodec CODEC = new PackCodec(); diff --git a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 9e3f31f7..3c516b86 100644 --- a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -4,16 +4,12 @@ import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.TaskItem; import com.coloryr.allmusic.server.Tasks; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; -import com.google.gson.Gson; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; @@ -21,23 +17,11 @@ import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.network.PacketDistributor; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.Collections; import java.util.Locale; public class SideForge extends BaseSide { - - @Override - public void reload() { - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); - new AllMusic().init(new File(path)); - } - - @Override - public int getPlayerSize() { - return AllMusicForge.server.getPlayerCount(); - } - @Override public void runTask(Runnable run) { AllMusicForge.server.execute(run); @@ -69,9 +53,9 @@ public class SideForge extends BaseSide { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -79,257 +63,46 @@ public class SideForge extends BaseSide { } @Override - protected void sideSendStop() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, new PackData(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Collection getPlayers() { + return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ServerPlayer player1) { + return player1.getName().getString(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ServerPlayer player1) { + send(player1, new PackData(type, data, data1)); } } @Override - protected void sideSendStop(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - send(player, new PackData(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicForge.server.getPlayerList().getPlayerByName(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ServerPlayer player1) { + ForgeApi.sendBar(player1, data); } } @Override - public void sendMusic(String url) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, false)) - continue; - send(player, new PackData(ComType.PLAY, url, 0)); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String url) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) - return; - send(player1, new PackData(ComType.PLAY, url, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String url) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, new PackData(ComType.IMG, url, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String url) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackData(ComType.IMG, url, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName().getString(), null, true)) - return; - send(player1, new PackData(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, new PackData(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, new PackData(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player, new PackData(ComType.INFO, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, true)) - return; - switch (pos) { - case INFO: - send(player, new PackData(ComType.INFO, data, 0)); - break; - case LIST: - send(player, new PackData(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player, new PackData(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, new PackData(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, new PackData(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - try { - if (AllMusic.isSkip(player.getName().getString(), null, true)) - continue; - ForgeApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String player) { - try { - ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); - if (player1 == null) - return; - send(player1, new PackData(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, new PackData(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return new File(String.format(Locale.ROOT, "config/%s/", "allmusic")); } @Override @@ -392,30 +165,6 @@ public class SideForge extends BaseSide { return event.isCancel(); } - @Override - public void updateInfo() { - - } - - @Override - public void updateLyric() { - - } - - @Override - public void ping() { - - } - - @Override - public List getPlayerList() { - List list = new ArrayList<>(); - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { - list.add(player.getName().getString()); - } - return list; - } - private void send(ServerPlayer players, PackData data) { if (players == null) return; 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 33a2e66b..f791c1a9 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 @@ -20,11 +20,12 @@ import org.bukkit.entity.Player; import org.bukkit.permissions.Permissible; import org.bukkit.permissions.ServerOperator; +import java.io.File; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; +import java.util.Collection; import java.util.Collections; -import java.util.List; public class SideBukkit extends BaseSide { private static Class ByteBufC; @@ -73,309 +74,6 @@ public class SideBukkit extends BaseSide { } } - @Override - public int getPlayerSize() { - return Bukkit.getOnlinePlayers().size(); - } - - @Override - public void sendHudLyric(String data) { - try { - Object obj1 = pack(ComType.LYRIC, data, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - for (Player player : Bukkit.getOnlinePlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.lyric.enable) - continue; - send(player, temp); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - Object obj1 = pack(ComType.INFO, data, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - for (Player player : Bukkit.getOnlinePlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.info.enable) - continue; - send(player, temp); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - Player player = Bukkit.getPlayer(name); - if (player == null) - return; - if (AllMusic.isSkip(name, null, false)) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - Object obj1 = pack(ComType.HUD, data, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - send(player, temp); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - Player player = Bukkit.getPlayer(name); - if (player == null) - return; - - if (AllMusic.isSkip(name, null, true)) - return; - Object obj1 = null; - switch (pos) { - case INFO: - obj1 = pack(ComType.INFO, data, 0); - break; - case LIST: - obj1 = pack(ComType.LIST, data, 0); - break; - case LYRIC: - obj1 = pack(ComType.LYRIC, data, 0); - break; - } - if (obj1 == null) { - return; - } - - byte[] temp = (byte[]) arrayM.invoke(obj1); - send(player, temp); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - Object obj1 = pack(ComType.LIST, data, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - for (Player player : Bukkit.getOnlinePlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, temp); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (Player player : Bukkit.getOnlinePlayers()) { - String Name = player.getName(); - try { - SaveObj obj = HudUtils.get(Name); - String data = AllMusic.gson.toJson(obj); - Object obj1 = pack(ComType.HUD, data, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - send(player, temp); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - if (AllMusicBukkit.spigotSet) { - for (Player player : Bukkit.getOnlinePlayers()) { - try { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - SpigotApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } else { - broadcast(data); - } - } - - @Override - public void sendMusic(String data) { - try { - Object obj1 = pack(ComType.PLAY, data, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - for (Player player : Bukkit.getOnlinePlayers()) { - if (AllMusic.isSkip(player.getName(), null, false)) { - continue; - } - send(player, temp); - AllMusic.addNowPlayPlayer(player.getName()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - Player player1 = Bukkit.getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player, null, false)) { - return; - } - Object obj1 = pack(ComType.PLAY, data, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - send(player1, temp); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - Object obj1 = pack(ComType.IMG, data, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - for (Player player : Bukkit.getOnlinePlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, temp); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - Player player1 = Bukkit.getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName(), null, true)) - return; - Object obj1 = pack(ComType.IMG, data, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - send(player1, temp); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - Player player1 = Bukkit.getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isSkip(player1.getName(), null, true)) - return; - Object obj1 = pack(ComType.POS, null, pos); - byte[] temp = (byte[]) arrayM.invoke(obj1); - send(player1, temp); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendStop() { - try { - Object obj1 = pack(ComType.STOP, null, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - for (Player player : Bukkit.getOnlinePlayers()) { - send(player, temp); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendStop(String name) { - try { - Player player = Bukkit.getPlayer(name); - if (player == null) - return; - Object obj1 = pack(ComType.STOP, null, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - send(player, temp); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud(String name) { - try { - Player player = Bukkit.getPlayer(name); - if (player == null) - return; - Object obj1 = pack(ComType.CLEAR, null, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - send(player, temp); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - Object obj1 = pack(ComType.CLEAR, null, 0); - byte[] temp = (byte[]) arrayM.invoke(obj1); - for (Player player : Bukkit.getOnlinePlayers()) { - send(player, temp); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - @Override public void broadcast(String data) { if (data == null || data.isEmpty()) @@ -391,22 +89,85 @@ public class SideBukkit extends BaseSide { public void broadcastWithRun(String message, String end, String command) { if (message == null || message.isEmpty()) return; - SpigotApi.sendMessageBqRun(message, end, command); + for (Player player : Bukkit.getOnlinePlayers()) { + if (AllMusic.isSkip(player.getName(), null, true)) + continue; + SpigotApi.sendMessageBqRun(player, message, end, command); + } } @Override - public boolean needPlay() { - int online = getPlayerSize(); + public boolean needPlay(boolean islist) { + int online = Bukkit.getOnlinePlayers().size(); for (Player player : Bukkit.getOnlinePlayers()) { if (CitizensNPC.isNPC(player)) online--; - else if (AllMusic.isSkip(player.getName(), null, false)) { + else if (AllMusic.isSkip(player.getName(), null, false, islist)) { online--; } } return online > 0; } + @Override + public Collection getPlayers() { + return Collections.singleton(Bukkit.getOnlinePlayers()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof Player) { + Player player1 = (Player) player; + return player1.getName(); + } + + return null; + } + + @Override + public String getPlayerServer(Object player) { + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof Player) { + Player player1 = (Player) player; + try { + Object obj1 = pack(ComType.CLEAR, null, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); + send(player1, temp); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + @Override + public Object getPlayer(String player) { + return null; + } + + @Override + public void sendBar(Object player, String message) { + if (message == null || message.isEmpty()) { + return; + } + if (player instanceof Player) { + Player player1 = (Player) player; + if (AllMusicBukkit.spigotSet) { + SpigotApi.sendBar(player1, message); + } else { + player1.sendMessage(message); + } + } + } + + @Override + public File getFolder() { + return AllMusicBukkit.plugin.getDataFolder(); + } + @Override public void sendMessage(Object obj, String message) { if (message == null || message.isEmpty()) @@ -442,11 +203,6 @@ public class SideBukkit extends BaseSide { Bukkit.getScheduler().runTask(AllMusicBukkit.plugin, run); } - @Override - public void reload() { - new AllMusic().init(AllMusicBukkit.plugin.getDataFolder()); - } - @Override public boolean checkPermission(Object player, String permission) { if (checkPermission(player)) { @@ -483,11 +239,6 @@ public class SideBukkit extends BaseSide { Bukkit.getScheduler().runTaskLater(AllMusicBukkit.plugin, run, delay); } - @Override - public List getPlayerList() { - return Collections.emptyList(); - } - @Override public boolean onMusicPlay(SongInfoObj obj) { MusicPlayEvent event = new MusicPlayEvent(obj); diff --git a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/SpigotApi.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/SpigotApi.java index 54d475a0..cf73ddd1 100644 --- a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/SpigotApi.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/SpigotApi.java @@ -1,10 +1,8 @@ package com.coloryr.allmusic.server.side.bukkit.hooks; -import com.coloryr.allmusic.server.core.AllMusic; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; -import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -31,15 +29,11 @@ public class SpigotApi { player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(message)); } - public static void sendMessageBqRun(String message, String end, String command) { + public static void sendMessageBqRun(Player player, String message, String end, String command) { TextComponent send = new TextComponent(message); TextComponent endtext = new TextComponent(end); endtext.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command)); send.addExtra(endtext); - for (Player player : Bukkit.getOnlinePlayers()) { - if (!AllMusic.isSkip(player.getName(), null, false)) { - player.spigot().sendMessage(send); - } - } + player.spigot().sendMessage(send); } } diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/ListenerBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/ListenerBC.java index 046e00a1..32479152 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/ListenerBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/ListenerBC.java @@ -4,7 +4,9 @@ import com.coloryr.allmusic.server.core.AllMusic; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; import net.md_5.bungee.api.connection.Server; -import net.md_5.bungee.api.event.*; +import net.md_5.bungee.api.event.PlayerDisconnectEvent; +import net.md_5.bungee.api.event.PluginMessageEvent; +import net.md_5.bungee.api.event.ServerConnectedEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/MetricsBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/MetricsBC.java index 370d3f91..5dec89d3 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/MetricsBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/MetricsBC.java @@ -29,7 +29,7 @@ public class MetricsBC { /** * Creates a new Metrics instance. * - * @param plugin Your plugin instance. + * @param plugin Your plugin instance. * @param serviceId The id of the service. * It can be found at What is my plugin id? */ @@ -119,7 +119,7 @@ public class MetricsBC { } private void appendPlatformData(JsonObjectBuilder builder) { - builder.appendField("playerAmount", plugin.getProxy().getOnlineCount()); + builder.appendField("playerAmount", plugin.getProxy().getOnlineCount()); builder.appendField("managedServers", plugin.getProxy().getServers().size()); builder.appendField("onlineMode", plugin.getProxy().getConfig().isOnlineMode() ? 1 : 0); builder.appendField("bungeecordVersion", plugin.getProxy().getVersion()); 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 84dd93d8..e93a0f97 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 @@ -4,14 +4,11 @@ import com.coloryr.allmusic.server.AllMusicBC; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.play.PlayMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.core.sql.IEconomy; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.bc.event.MusicAddEvent; import com.coloryr.allmusic.server.side.bc.event.MusicPlayEvent; import com.google.common.io.ByteArrayDataOutput; @@ -22,10 +19,10 @@ import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; -import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.Server; +import java.io.File; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArraySet; @@ -126,269 +123,6 @@ public class SideBC extends BaseSide implements IEconomy { server.sendData(AllMusic.channelBC, out.toByteArray()); } - @Override - public int getPlayerSize() { - return ProxyServer.getInstance().getOnlineCount(); - } - - @Override - public void sendHudLyric(String data) { - try { - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (skip(player)) - continue; - SaveObj obj = HudUtils.get(player.getName()); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (skip(player)) - continue; - SaveObj obj = HudUtils.get(player.getName()); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (skip(player)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - try { - SaveObj obj = HudUtils.get(player.getName()); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - TextComponent message = new TextComponent(data); - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - try { - player.sendMessage(ChatMessageType.ACTION_BAR, message); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendMusic(String data) { - try { - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - String server = player.getServer() == null ? null : player.getServer().getInfo().getName(); - if (AllMusic.isSkip(player.getName(), server, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getName()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - ProxiedPlayer player1 = ProxyServer.getInstance().getPlayer(player); - if (player1 == null) - return; - String server = player1.getServer() == null ? null : player1.getServer().getInfo().getName(); - if (AllMusic.isSkip(player1.getName(), server, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String player) { - try { - ProxiedPlayer player1 = ProxyServer.getInstance().getPlayer(player); - if (player1 == null) - return; - String server = player1.getServer() == null ? null : player1.getServer().getInfo().getName(); - if (AllMusic.isSkip(player1.getName(), server, false)) - return; - - SaveObj obj = HudUtils.get(player); - String data = AllMusic.gson.toJson(obj); - send(player1, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - ProxiedPlayer player1 = ProxyServer.getInstance().getPlayer(name); - if (player1 == null) - return; - if (skip(player1)) - return; - - switch (pos) { - case INFO: - send(player1, PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player1, PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player1, PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (skip(player)) - continue; - String name = player.getName(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - ProxiedPlayer player1 = ProxyServer.getInstance().getPlayer(player); - if (player1 == null) - return; - if (skip(player1)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - ProxiedPlayer player1 = ProxyServer.getInstance().getPlayer(player); - if (player1 == null) - return; - if (skip(player1)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲位置指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendStop() { - try { - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendStop(String name) { - try { - ProxiedPlayer player = ProxyServer.getInstance().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud(String name) { - try { - ProxiedPlayer player = ProxyServer.getInstance().getPlayer(name); - if (player == null) - return; - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - Collection values = ProxyServer.getInstance().getPlayers(); - for (ProxiedPlayer player : values) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - @Override public void broadcast(String data) { if (data == null || data.isEmpty()) @@ -417,10 +151,10 @@ public class SideBC extends BaseSide implements IEconomy { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { String server = player.getServer() == null ? null : player.getServer().getInfo().getName(); - if (!AllMusic.isSkip(player.getName(), server, false)) { + if (!AllMusic.isSkip(player.getName(), server, false, islist)) { return true; } } @@ -465,11 +199,6 @@ public class SideBC extends BaseSide implements IEconomy { ProxyServer.getInstance().getScheduler().runAsync(AllMusicBC.plugin, run); } - @Override - public void reload() { - new AllMusic().init(AllMusicBC.plugin.getDataFolder()); - } - @Override public boolean checkPermission(Object player, String permission) { if (checkPermission(player)) { @@ -481,6 +210,58 @@ public class SideBC extends BaseSide implements IEconomy { return false; } + @Override + public Collection getPlayers() { + return Collections.singleton(ProxyServer.getInstance().getPlayers()); + } + + @Override + public String getPlayerName(Object player) { + if (player instanceof ProxiedPlayer) { + ProxiedPlayer player1 = (ProxiedPlayer) player; + return player1.getName(); + } + return null; + } + + @Override + public String getPlayerServer(Object player) { + if (player instanceof ProxiedPlayer) { + ProxiedPlayer player1 = (ProxiedPlayer) player; + Server info = player1.getServer(); + if (info != null) { + return info.getInfo().getName(); + } + } + return null; + } + + @Override + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof ProxiedPlayer) { + ProxiedPlayer player1 = (ProxiedPlayer) player; + send(player1, PacketCodec.pack(type, data, data1)); + } + } + + @Override + public Object getPlayer(String player) { + return ProxyServer.getInstance().getPlayer(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof ProxiedPlayer) { + ProxiedPlayer player1 = (ProxiedPlayer) player; + player1.sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(data)); + } + } + + @Override + public File getFolder() { + return AllMusicBC.plugin.getDataFolder(); + } + @Override public boolean checkPermission(Object player) { return player.equals(ProxyServer.getInstance().getConsole()); @@ -532,16 +313,6 @@ public class SideBC extends BaseSide implements IEconomy { } } - @Override - public List getPlayerList() { - List list = new ArrayList<>(); - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - list.add(player.getName().toLowerCase(Locale.ROOT)); - } - - return list; - } - @Override public boolean onMusicPlay(SongInfoObj obj) { MusicPlayEvent event = new MusicPlayEvent(obj); diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java index 8760efe3..88e44097 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java @@ -5,10 +5,7 @@ import com.google.common.io.ByteArrayDataInput; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.DisconnectEvent; import com.velocitypowered.api.event.connection.PluginMessageEvent; -import com.velocitypowered.api.event.connection.PostLoginEvent; -import com.velocitypowered.api.event.player.KickedFromServerEvent; import com.velocitypowered.api.event.player.ServerPostConnectEvent; -import com.velocitypowered.api.event.player.ServerPreConnectEvent; import com.velocitypowered.api.proxy.ServerConnection; public class ListenerVelocity { diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/MetricsVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/MetricsVelocity.java index 254df6e0..4d3f3d82 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/MetricsVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/MetricsVelocity.java @@ -17,43 +17,9 @@ import java.nio.file.Path; public class MetricsVelocity { - /** - * A factory to create new Metrics classes. - */ - public static class Factory { - - private final ProxyServer server; - private final Logger logger; - private final Path dataDirectory; - - // The constructor is not meant to be called by the user. - // The instance is created using Dependency Injection - @Inject - private Factory(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) { - this.server = server; - this.logger = logger; - this.dataDirectory = dataDirectory; - } - - /** - * Creates a new Metrics class. - * - * @param plugin The plugin instance. - * @param serviceId The id of the service. - * It can be found at What is my plugin id? - *

Not to be confused with Velocity's {@link PluginDescription#getId()} method! - * @return A Metrics instance that can be used to register custom charts. - *

The return value can be ignored, when you do not want to register custom charts. - */ - public MetricsVelocity make(Object plugin, int serviceId) { - return new MetricsVelocity(plugin, server, logger, dataDirectory, serviceId); - } - } - private final PluginContainer pluginContainer; private final ProxyServer server; private MetricsBase metricsBase; - private MetricsVelocity(Object plugin, ProxyServer server, Logger logger, Path dataDirectory, int serviceId) { pluginContainer = server.getPluginManager().fromInstance(plugin) .orElseThrow(() -> new IllegalArgumentException("The provided instance is not a plugin")); @@ -131,4 +97,37 @@ public class MetricsVelocity { builder.appendField("pluginVersion", pluginContainer.getDescription().getVersion().orElse("unknown")); } + /** + * A factory to create new Metrics classes. + */ + public static class Factory { + + private final ProxyServer server; + private final Logger logger; + private final Path dataDirectory; + + // The constructor is not meant to be called by the user. + // The instance is created using Dependency Injection + @Inject + private Factory(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) { + this.server = server; + this.logger = logger; + this.dataDirectory = dataDirectory; + } + + /** + * Creates a new Metrics class. + * + * @param plugin The plugin instance. + * @param serviceId The id of the service. + * It can be found at What is my plugin id? + *

Not to be confused with Velocity's {@link PluginDescription#getId()} method! + * @return A Metrics instance that can be used to register custom charts. + *

The return value can be ignored, when you do not want to register custom charts. + */ + public MetricsVelocity make(Object plugin, int serviceId) { + return new MetricsVelocity(plugin, server, logger, dataDirectory, serviceId); + } + } + } \ No newline at end of file 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 59b9745e..304197ec 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 @@ -4,14 +4,11 @@ import com.coloryr.allmusic.server.AllMusicVelocity; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.play.PlayMusic; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.core.sql.IEconomy; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.velocity.event.MusicAddEvent; import com.coloryr.allmusic.server.side.velocity.event.MusicPlayEvent; import com.google.common.io.ByteArrayDataOutput; @@ -26,6 +23,7 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.event.ClickEvent; +import java.io.File; import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -132,11 +130,6 @@ public class SideVelocity extends BaseSide implements IEconomy { buf.writeBytes(temp); } - @Override - public int getPlayerSize() { - return AllMusicVelocity.plugin.server.getPlayerCount(); - } - @Override public void broadcast(String data) { if (data == null || data.isEmpty()) @@ -168,14 +161,14 @@ public class SideVelocity extends BaseSide implements IEconomy { } @Override - public boolean needPlay() { + public boolean needPlay(boolean islist) { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { String server = null; if (player.getCurrentServer().isPresent()) { server = player.getCurrentServer().get().getServerInfo().getName(); } - if (!AllMusic.isSkip(player.getUsername(), server, false)) { + if (!AllMusic.isSkip(player.getUsername(), server, false, islist)) { return true; } } @@ -184,264 +177,57 @@ public class SideVelocity extends BaseSide implements IEconomy { } @Override - protected void sideSendStop() { - try { - for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - send(player, PacketCodec.pack(ComType.STOP, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } + public Collection getPlayers() { + return Collections.singleton(AllMusicVelocity.plugin.server.getAllPlayers()); } @Override - protected void sideSendStop(String name) { - try { - Optional player = AllMusicVelocity.plugin.server.getPlayer(name); - if (!player.isPresent()) - return; - send(player.get(), PacketCodec.pack(ComType.STOP, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); + public String getPlayerName(Object player) { + if (player instanceof Player) { + Player player1 = (Player) player; + return player1.getUsername(); } + return null; } @Override - public void sendMusic(String data) { - try { - for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - String server = player.getCurrentServer().isPresent() ? - player.getCurrentServer().get().getServerInfo().getName() : null; - if (AllMusic.isSkip(player.getUsername(), server, false)) - continue; - send(player, PacketCodec.pack(ComType.PLAY, data, 0)); - AllMusic.addNowPlayPlayer(player.getUsername()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void sideSendMusic(String player, String data) { - try { - if (AllMusicVelocity.plugin.server.getPlayer(player).isPresent()) { - Player player1 = AllMusicVelocity.plugin.server.getPlayer(player).get(); - String server = player1.getCurrentServer().isPresent() ? - player1.getCurrentServer().get().getServerInfo().getName() : null; - if (AllMusic.isSkip(player1.getUsername(), server, false)) - return; - send(player1, PacketCodec.pack(ComType.PLAY, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String data) { - try { - for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - if (skip(player)) - continue; - String name = player.getUsername(); - SaveObj obj = HudUtils.get(name); - if (!obj.pic.enable) - continue; - send(player, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String data) { - try { - if (AllMusicVelocity.plugin.server.getPlayer(player).isPresent()) { - Player player1 = AllMusicVelocity.plugin.server.getPlayer(player).get(); - if (skip(player1)) - return; - send(player1, PacketCodec.pack(ComType.IMG, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - if (AllMusicVelocity.plugin.server.getPlayer(player).isPresent()) { - Player player1 = AllMusicVelocity.plugin.server.getPlayer(player).get(); - if (skip(player1)) - return; - send(player1, PacketCodec.pack(ComType.POS, null, pos)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲位置指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - if (skip(player)) - continue; - SaveObj obj = HudUtils.get(player.getUsername()); - if (!obj.lyric.enable) - continue; - send(player, PacketCodec.pack(ComType.LYRIC, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - if (skip(player)) - continue; - SaveObj obj = HudUtils.get(player.getUsername()); - if (!obj.info.enable) - continue; - send(player, PacketCodec.pack(ComType.INFO, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudPos(String name) { - try { - Optional player = AllMusicVelocity.plugin.server.getPlayer(name); - if (!player.isPresent()) - return; - SaveObj obj = HudUtils.get(name); - String data = AllMusic.gson.toJson(obj); - send(player.get(), PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHud(String name, HudType pos, String data) { - try { - if (pos == HudType.PIC) { - return; - } - Optional player = AllMusicVelocity.plugin.server.getPlayer(name); - if (!player.isPresent()) - return; - - if (skip(player.get())) - return; - - switch (pos) { - case INFO: - send(player.get(), PacketCodec.pack(ComType.INFO, data, 0)); - break; - case LIST: - send(player.get(), PacketCodec.pack(ComType.LIST, data, 0)); - break; - case LYRIC: - send(player.get(), PacketCodec.pack(ComType.LYRIC, data, 0)); - break; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - if (skip(player)) - continue; - String name = player.getUsername(); - SaveObj obj = HudUtils.get(name); - if (!obj.list.enable) - continue; - send(player, PacketCodec.pack(ComType.LIST, data, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - try { - SaveObj obj = HudUtils.get(player.getUsername()); - String data = AllMusic.gson.toJson(obj); - send(player, PacketCodec.pack(ComType.HUD, data, 0)); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); + public String getPlayerServer(Object player) { + if (player instanceof Player) { + Player player1 = (Player) player; + Optional serverConnection = player1.getCurrentServer(); + if (serverConnection.isPresent()) { + return serverConnection.get().getServer().getServerInfo().getName(); } } + + return null; } @Override - public void sendBar(String data) { - if (data == null || data.isEmpty()) - return; - Component message = Component.text(data); - for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - try { - if (skip(player)) - continue; - player.sendActionBar(message); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } + public void send(Object player, ComType type, String data, int data1) { + if (player instanceof Player) { + Player player1 = (Player) player; + send(player1, PacketCodec.pack(type, data, data1)); } } @Override - public void clearHud(String name) { - try { - Optional player = AllMusicVelocity.plugin.server.getPlayer(name); - if (!player.isPresent()) - return; - send(player.get(), PacketCodec.pack(ComType.CLEAR, null, 0)); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); + public Object getPlayer(String player) { + return AllMusicVelocity.plugin.server.getPlayer(player); + } + + @Override + public void sendBar(Object player, String data) { + if (player instanceof Player) { + Player player1 = (Player) player; + Component message = Component.text(data); + player1.sendActionBar(message); } } @Override - public void clearHud() { - try { - Collection values = AllMusicVelocity.plugin.server.getAllPlayers(); - for (Player player : values) { - send(player, PacketCodec.pack(ComType.CLEAR, null, 0)); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发生出错"); - e.printStackTrace(); - } + public File getFolder() { + return AllMusicVelocity.plugin.dataDirectory.toFile(); } @Override @@ -479,11 +265,6 @@ public class SideVelocity extends BaseSide implements IEconomy { AllMusicVelocity.plugin.server.getScheduler().buildTask(AllMusicVelocity.plugin, run).schedule(); } - @Override - public void reload() { - new AllMusic().init(AllMusicVelocity.plugin.dataDirectory.toFile()); - } - @Override public boolean checkPermission(Object player, String permission) { if (checkPermission(player)) { @@ -524,11 +305,6 @@ public class SideVelocity extends BaseSide implements IEconomy { } } - @Override - public List getPlayerList() { - return Collections.emptyList(); - } - @Override public boolean onMusicPlay(SongInfoObj obj) { MusicPlayEvent event = new MusicPlayEvent(obj);