diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f3d64e4b..97a60857 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -347,7 +347,7 @@ jobs: with: name: "allmusic_server_forge_1_20" path: build/libs/ - build_forge_1_20_2: + build_forge_1_20_4: runs-on: windows-latest permissions: contents: read @@ -363,9 +363,9 @@ jobs: - name: build shell: cmd run: | - link.cmd && cd forge_1_20_2 && gradlew build + link.cmd && cd forge_1_20_4 && gradlew build - name: update uses: actions/upload-artifact@v4 with: - name: "allmusic_server_forge_1_20_2" + name: "allmusic_server_forge_1_20_4" path: build/libs/ \ No newline at end of file diff --git a/core/AllMusic.java b/core/AllMusic.java index a453a241..d78b7a23 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -1,18 +1,16 @@ package com.coloryr.allmusic.server.core; -import com.coloryr.allmusic.server.core.sql.DataSql; -import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.core.music.api.APIMain; import com.coloryr.allmusic.server.core.music.play.MusicSearch; import com.coloryr.allmusic.server.core.music.play.PlayGo; import com.coloryr.allmusic.server.core.music.play.PlayMusic; import com.coloryr.allmusic.server.core.objs.CookieObj; import com.coloryr.allmusic.server.core.objs.config.ConfigObj; -import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.message.MessageObj; import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; import com.coloryr.allmusic.server.core.side.IMyLogger; import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.sql.IEconomy; import com.coloryr.allmusic.server.core.utils.Logs; import com.google.gson.Gson; @@ -148,7 +146,7 @@ public class AllMusic { return true; if (AllMusic.getConfig().mutePlayer.contains(name)) return true; - if(AllMusic.isPause(name)) + if (AllMusic.isPause(name)) return true; if (!checkList) return false; @@ -237,7 +235,7 @@ public class AllMusic { * * @param player 用户名 */ - public static void addPush(String player){ + public static void addPush(String player) { pushPlayer.add(player); } @@ -469,6 +467,7 @@ public class AllMusic { /** * 将玩家添加到暂停发送列表 + * * @param player 玩家名 */ public static void pauseSend(String player) { @@ -477,10 +476,11 @@ public class AllMusic { /** * 暂停发送列表中是否存在玩家 + * * @param player 玩家名 * @return 是否存在 */ - public static boolean isPause(String player){ + public static boolean isPause(String player) { return pauseSendPlayer.contains(player); } diff --git a/core/AllMusicAPI.java b/core/AllMusicAPI.java index 425d5fe6..76194f93 100644 --- a/core/AllMusicAPI.java +++ b/core/AllMusicAPI.java @@ -1,7 +1,7 @@ package com.coloryr.allmusic.server.core; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.enums.ComType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; public class AllMusicAPI { /** diff --git a/core/command/CommandHud.java b/core/command/CommandHud.java index 868d40ed..a7918bd4 100644 --- a/core/command/CommandHud.java +++ b/core/command/CommandHud.java @@ -21,7 +21,7 @@ public class CommandHud extends ACommand { public static class HudEnable extends ACommand { @Override public void ex(Object sender, String name, String[] args) { - if(args.length == 2 || args.length == 3) { + if (args.length == 2 || args.length == 3) { boolean temp = HudUtils.setHudEnable(name, null, args.length == 3 ? args[2] : null); AllMusic.side.sendMessage(sender, AllMusic.getMessage().hud.state .replace("%State%", temp ? "启用" : "关闭") diff --git a/core/command/CommandHudSet.java b/core/command/CommandHudSet.java index b985bba5..133052f3 100644 --- a/core/command/CommandHudSet.java +++ b/core/command/CommandHudSet.java @@ -1,8 +1,8 @@ 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.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.utils.HudUtils; @@ -34,7 +34,7 @@ public class CommandHudSet extends AHudCommand { @Override public void ex(Object sender, String name, String[] args) { - if(args.length == 3 || args.length == 4) { + if (args.length == 3 || args.length == 4) { boolean temp = HudUtils.setHudEnable(name, type, args.length == 4 ? args[3] : null); AllMusic.side.sendMessage(sender, AllMusic.getMessage().hud.state .replace("%State%", temp diff --git a/core/music/api/APIMain.java b/core/music/api/APIMain.java index 3ca6e6a6..97fb2a17 100644 --- a/core/music/api/APIMain.java +++ b/core/music/api/APIMain.java @@ -1,10 +1,9 @@ package com.coloryr.allmusic.server.core.music.api; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.music.play.PlayMusic; -import com.coloryr.allmusic.server.core.objs.enums.EncryptType; 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; @@ -14,6 +13,7 @@ import com.coloryr.allmusic.server.core.objs.api.music.search.SearchDataObj; import com.coloryr.allmusic.server.core.objs.api.music.search.songs; import com.coloryr.allmusic.server.core.objs.api.music.trialinfo.TrialInfoObj; import com.coloryr.allmusic.server.core.objs.api.program.info.PrInfoObj; +import com.coloryr.allmusic.server.core.objs.enums.EncryptType; import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.utils.Logs; @@ -67,7 +67,7 @@ public class APIMain { * @param code 手机验证码 */ public void login(Object sender, String code) { - if(phone == null) { + if (phone == null) { if (sender == null) AllMusic.log.info("§d[AllMusic3]§c没有发送过验证码"); else diff --git a/core/music/api/HttpClientUtil.java b/core/music/api/HttpClientUtil.java index c3e30026..6a0276d7 100644 --- a/core/music/api/HttpClientUtil.java +++ b/core/music/api/HttpClientUtil.java @@ -1,9 +1,9 @@ package com.coloryr.allmusic.server.core.music.api; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.enums.EncryptType; import com.coloryr.allmusic.server.core.objs.HttpResObj; import com.coloryr.allmusic.server.core.objs.api.EncResObj; +import com.coloryr.allmusic.server.core.objs.enums.EncryptType; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import okhttp3.*; diff --git a/core/music/play/LyricSave.java b/core/music/play/LyricSave.java index 8e8daa18..939ec6b9 100644 --- a/core/music/play/LyricSave.java +++ b/core/music/play/LyricSave.java @@ -2,7 +2,9 @@ package com.coloryr.allmusic.server.core.music.play; import com.coloryr.allmusic.server.core.objs.music.LyricItemObj; -import java.util.*; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; public class LyricSave { public int lastIndex = 0; diff --git a/core/music/play/PlayGo.java b/core/music/play/PlayGo.java index acfcf2f5..e07b081b 100644 --- a/core/music/play/PlayGo.java +++ b/core/music/play/PlayGo.java @@ -1,9 +1,9 @@ package com.coloryr.allmusic.server.core.music.play; import com.coloryr.allmusic.server.core.AllMusic; +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 com.coloryr.allmusic.server.core.objs.music.MusicObj; import java.util.List; import java.util.concurrent.Executors; @@ -273,7 +273,7 @@ public class PlayGo { .replace("%MusicAl%", PlayMusic.nowPlayMusic.getAl()) .replace("%MusicAlia%", PlayMusic.nowPlayMusic.getAlia()) .replace("%PlayerName%", PlayMusic.nowPlayMusic.getCall()); - if(AllMusic.getConfig().messageLimit + if (AllMusic.getConfig().messageLimit && info.length() > AllMusic.getConfig().messageLimitSize) { info = info.substring(0, AllMusic.getConfig().messageLimitSize) + "..."; } diff --git a/core/music/play/PlayMusic.java b/core/music/play/PlayMusic.java index 31eeb1e0..f1ff9f31 100644 --- a/core/music/play/PlayMusic.java +++ b/core/music/play/PlayMusic.java @@ -171,6 +171,7 @@ public class PlayMusic { /** * 将歌曲移动到队列头 + * * @param obj */ public static void pushMusic(SongInfoObj obj) { @@ -225,6 +226,7 @@ public class PlayMusic { /** * 从播放列表删除 + * * @param index */ public static void remove(SongInfoObj index) { @@ -349,8 +351,7 @@ public class PlayMusic { } else { ID = playIdleList.get(idleNow); idleNow++; - if (idleNow >= playIdleList.size()) - { + if (idleNow >= playIdleList.size()) { idleNow = 0; } } diff --git a/core/objs/message/HudNameObj.java b/core/objs/message/HudNameObj.java index 449619fb..75899c0b 100644 --- a/core/objs/message/HudNameObj.java +++ b/core/objs/message/HudNameObj.java @@ -1,7 +1,7 @@ package com.coloryr.allmusic.server.core.objs.message; -import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.enums.HudDirType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; public class HudNameObj { public String list; diff --git a/core/objs/message/PushObj.java b/core/objs/message/PushObj.java index 5b5ed084..56b4c4bc 100644 --- a/core/objs/message/PushObj.java +++ b/core/objs/message/PushObj.java @@ -47,7 +47,7 @@ public class PushObj { return true; if (pushErr == null) return true; - if(cancel == null) + if (cancel == null) return true; if (err1 == null) return true; diff --git a/core/side/ISide.java b/core/side/ISide.java index 25f51313..1f51b4ed 100644 --- a/core/side/ISide.java +++ b/core/side/ISide.java @@ -133,8 +133,9 @@ public abstract class ISide { /** * 发送Hud数据 + * * @param name 用户名 - * @param pos 位置 + * @param pos 位置 * @param data 信息 */ public abstract void sendHud(String name, HudType pos, String data); @@ -179,6 +180,7 @@ public abstract class ISide { /** * 广播点击消息 + * * @param message 消息 * @param end 结尾 * @param command 指令 @@ -263,6 +265,7 @@ public abstract class ISide { /** * 获取玩家列表 + * * @return 玩家列表 */ public abstract List getPlayerList(); diff --git a/core/sql/DataSql.java b/core/sql/DataSql.java index 7b4436f6..fbcd14b6 100644 --- a/core/sql/DataSql.java +++ b/core/sql/DataSql.java @@ -2,14 +2,13 @@ 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.enums.HudDirType; -import com.coloryr.allmusic.server.core.utils.HudUtils; 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.text.MessageFormat; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/core/utils/HudUtils.java b/core/utils/HudUtils.java index b5819b42..312e2939 100644 --- a/core/utils/HudUtils.java +++ b/core/utils/HudUtils.java @@ -1,15 +1,14 @@ package com.coloryr.allmusic.server.core.utils; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.enums.HudType; 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.config.SaveObj; 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.music.SongInfoObj; import com.coloryr.allmusic.server.core.sql.DataSql; -import com.google.gson.Gson; import java.util.Locale; import java.util.Map; 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 6f226013..8a2c920a 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 @@ -23,6 +23,7 @@ import net.minecraftforge.common.MinecraftForge; import java.io.File; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Locale; @@ -452,7 +453,11 @@ public class SideForge extends ISide { @Override public List getPlayerList() { - return Collections.emptyList(); + List list = new ArrayList<>(); + for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { + list.add(player.getName()); + } + return list; } private void send(EntityPlayerMP players, ByteBuf data) { diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 2d4f4b78..b2b6db79 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -5,6 +5,7 @@ import com.coloryr.allmusic.server.side.forge.CommandForge; import com.coloryr.allmusic.server.side.forge.LogForge; import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; +import io.netty.buffer.ByteBuf; import net.minecraft.command.CommandSource; import net.minecraft.network.PacketBuffer; import net.minecraft.server.MinecraftServer; @@ -54,7 +55,7 @@ public class AllMusicForge { } private void commonSetup(final FMLCommonSetupEvent event) { - channel.registerMessage(666, String.class, this::enc, this::dec, this::proc); + channel.registerMessage(0, ByteBuf.class, this::enc, this::dec, this::proc); String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); @@ -64,15 +65,15 @@ public class AllMusicForge { new AllMusic().init(new File(path)); } - private void enc(String str, PacketBuffer buffer) { - buffer.writeBytes(str.getBytes(StandardCharsets.UTF_8)); + private void enc(ByteBuf str, PacketBuffer buffer) { + buffer.writeBytes(str); } - private String dec(PacketBuffer buffer) { - return buffer.toString(StandardCharsets.UTF_8); + private ByteBuf dec(PacketBuffer buffer) { + return buffer; } - private void proc(String str, Supplier supplier) { + private void proc(ByteBuf str, Supplier supplier) { NetworkEvent.Context context = supplier.get(); context.setPacketHandled(true); } @@ -90,8 +91,6 @@ public class AllMusicForge { AllMusic.start(); Tasks.init(); - - } @SubscribeEvent diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java index 78e2b5ec..852a61c2 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -13,20 +13,16 @@ public class Tasks { } public static void tick() { - synchronized (taskItems) { - for(TaskItem item : taskItems){ - item.tick--; - if (item.tick == 0) { - taskItems.remove(item); - item.run.run(); - } + for (TaskItem item : new ArrayList<>(taskItems)) { + item.tick--; + if (item.tick <= 0) { + taskItems.remove(item); + item.run.run(); } } } public static void add(TaskItem item) { - synchronized (taskItems) { - taskItems.add(item); - } + taskItems.add(item); } } diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 47d5a9a9..9dc2188d 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.core.command.CommandEX; -import com.coloryr.allmusic.server.core.command.TabCommand; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; @@ -54,7 +53,7 @@ public class CommandForge implements Command, Predicate results = TabCommand.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(context.getSource().getTextName(), arg); for (String s : results) { builder.suggest(s); 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 b59c3584..17816f39 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 @@ -1,11 +1,15 @@ package com.coloryr.allmusic.server.side.forge; +import com.coloryr.allmusic.server.AllMusicForge; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.command.CommandSource; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.play.server.STitlePacket; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.event.ClickEvent; +import java.util.UUID; + public class ForgeApi { public static void sendMessageRun(Object obj, String message, String end, String command) { CommandSource sender = (CommandSource) obj; @@ -29,4 +33,16 @@ public class ForgeApi { STitlePacket pack = new STitlePacket(STitlePacket.Type.ACTIONBAR, new StringTextComponent(message)); player.connection.send(pack); } + + public static void sendMessageBqRun(String message, String end, String command) { + StringTextComponent send = new StringTextComponent(message); + StringTextComponent endtext = new StringTextComponent(end); + 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()); + } + } + } } diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java index ca84f904..9d9be9a7 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -1,6 +1,6 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; +import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { 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 3e648e70..49bb8ef8 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 @@ -1,18 +1,21 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.TaskItem; -import coloryr.allmusic.Tasks; +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.hud.HudUtils; 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.ComType; import com.coloryr.allmusic.server.core.side.ISide; +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 io.netty.buffer.Unpooled; import net.minecraft.command.CommandSource; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.util.text.StringTextComponent; @@ -20,8 +23,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.network.PacketDistributor; import java.io.File; -import java.util.Locale; -import java.util.UUID; +import java.nio.charset.StandardCharsets; +import java.util.*; public class SideForge extends ISide { @@ -62,23 +65,20 @@ public class SideForge extends ISide { public boolean needPlay() { int online = getAllPlayer(); for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + if (AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { online--; } } return online > 0; } - @Override - public void send(String data, String player) { - send(AllMusicForge.server.getPlayerList().getPlayerByName(player), data); - } - @Override protected void topSendStop() { try { for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -92,7 +92,9 @@ public class SideForge extends ISide { ServerPlayerEntity player = AllMusicForge.server.getPlayerList().getPlayerByName(name); if (player == null) return; - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -105,7 +107,10 @@ public class SideForge extends ISide { for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, false)) continue; - send(player, ComType.play + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player, buf); AllMusic.addNowPlayPlayer(player.getName().getString()); } } catch (Exception e) { @@ -122,7 +127,10 @@ public class SideForge extends ISide { return; if (AllMusic.isOK(player, null, false)) return; - send(ComType.play + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -137,9 +145,12 @@ public class SideForge extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnablePic) + if (!obj.pic.enable) continue; - send(player, ComType.img + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); @@ -155,7 +166,10 @@ public class SideForge extends ISide { return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.img + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); e.printStackTrace(); @@ -170,7 +184,10 @@ public class SideForge extends ISide { return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.pos + pos, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -185,9 +202,12 @@ public class SideForge extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableLyric) + if (!obj.lyric.enable) continue; - send(player, ComType.lyric + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); @@ -203,9 +223,12 @@ public class SideForge extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableInfo) + if (!obj.info.enable) continue; - send(player, ComType.info + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); @@ -213,6 +236,55 @@ public class SideForge extends ISide { } } + @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); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); + } 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.isOK(name, null, true)) + return; + ByteBuf buf = Unpooled.buffer(); + switch (pos) { + case INFO: + buf.writeByte(ComType.INFO.ordinal()); + break; + case LIST: + buf.writeByte(ComType.LIST.ordinal()); + break; + case LYRIC: + buf.writeByte(ComType.LYRIC.ordinal()); + break; + } + writeString(buf, data); + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + @Override public void sendHudList(String data) { try { @@ -221,9 +293,12 @@ public class SideForge extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableList) + if (!obj.list.enable) continue; - send(player, ComType.list + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); @@ -238,7 +313,10 @@ public class SideForge extends ISide { try { SaveObj obj = HudUtils.get(Name); String data = new Gson().toJson(obj); - send(player, data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -263,7 +341,12 @@ public class SideForge extends ISide { @Override public void clearHud(String player) { try { - send(ComType.clear, player); + ServerPlayerEntity player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + if (player1 == null) + return; + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -274,7 +357,9 @@ public class SideForge extends ISide { public void clearHud() { try { for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.clear); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); @@ -284,27 +369,32 @@ public class SideForge extends ISide { @Override public void bq(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendMessage(new StringTextComponent(data), UUID.randomUUID()); } } } + @Override + public void bqRun(String message, String end, String command) { + ForgeApi.sendMessageBqRun(message, end, command); + } + @Override public void bqt(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } StringTextComponent finalData = new StringTextComponent(data); runTask(() -> { for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendMessage(finalData, UUID.randomUUID()); } } @@ -359,15 +449,19 @@ public class SideForge extends ISide { } - private void send(ServerPlayerEntity players, String data) { + @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; try { -// byte[] bytes = data.getBytes(StandardCharsets.UTF_8); -// ByteBuf buf = Unpooled.buffer(bytes.length + 1); -// buf.writeByte(666); -// buf.writeBytes(bytes); - runTask(() -> AllMusicForge.channel.send(PacketDistributor.PLAYER.with( () -> players ), data)); @@ -376,4 +470,10 @@ public class SideForge extends ISide { e.printStackTrace(); } } + + private void writeString(ByteBuf buf, String data) { + byte[] temp = data.getBytes(StandardCharsets.UTF_8); + buf.writeInt(temp.length) + .writeBytes(temp); + } } diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 19d13210..24e8bc23 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -70,7 +70,7 @@ public class AllMusicForge { } private void commonSetup(final FMLCommonSetupEvent event) { - channel.registerMessage(666, String.class, this::enc, this::dec, this::proc); + channel.registerMessage(0, String.class, this::enc, this::dec, this::proc); String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/Tasks.java index 67fed8ab..3ceeee68 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -12,20 +12,16 @@ public class Tasks { } public static void tick() { - synchronized (taskItems) { - for(TaskItem item : taskItems){ - item.tick--; - if (item.tick == 0) { - taskItems.remove(item); - item.run.run(); - } + for (TaskItem item : new ArrayList<>(taskItems)) { + item.tick--; + if (item.tick <= 0) { + taskItems.remove(item); + item.run.run(); } } } public static void add(TaskItem item) { - synchronized (taskItems) { - taskItems.add(item); - } + taskItems.add(item); } } \ No newline at end of file diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 897aa4d0..7a4e51ed 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.core.command.CommandEX; -import com.coloryr.allmusic.server.core.command.TabCommand; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; @@ -12,7 +11,6 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; -import java.util.Iterator; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; @@ -59,7 +57,7 @@ public class CommandForge implements Command, Predicate results = TabCommand.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(context.getSource().getTextName(), arg); for (String s : results) { builder.suggest(s); 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 c8de9098..700ed723 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,5 +1,7 @@ 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.arguments.ComponentArgument; import net.minecraft.commands.arguments.EntityArgument; @@ -32,4 +34,16 @@ public class ForgeApi { var pack = new ClientboundSetActionBarTextPacket(new TextComponent(message)); player.connection.send(pack); } + + public static void sendMessageBqRun(String message, String end, String command) { + MutableComponent send = new TextComponent(message); + MutableComponent endtext = new TextComponent(end); + 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()); + } + } + } } diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java index ca84f904..9d9be9a7 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -1,6 +1,6 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; +import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { 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 29957839..dac1aa0d 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 @@ -1,33 +1,30 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.TaskItem; -import coloryr.allmusic.Tasks; +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.hud.HudUtils; 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.ComType; import com.coloryr.allmusic.server.core.side.ISide; +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 io.netty.buffer.Unpooled; import net.minecraft.commands.CommandSource; -import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TextComponent; -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.nio.charset.StandardCharsets; -import java.util.Locale; -import java.util.UUID; +import java.util.*; public class SideForge extends ISide { @@ -57,7 +54,7 @@ public class SideForge extends ISide { @Override public boolean checkPermission(String player, String permission) { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; @@ -67,24 +64,21 @@ public class SideForge extends ISide { @Override public boolean needPlay() { int online = getAllPlayer(); - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { online--; } } return online > 0; } - @Override - public void send(String data, String player) { - send(AllMusicForge.server.getPlayerList().getPlayerByName(player), data); - } - @Override protected void topSendStop() { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.stop); + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -95,10 +89,12 @@ public class SideForge extends ISide { @Override protected void topSendStop(String name) { try { - var player = AllMusicForge.server.getPlayerList().getPlayerByName(name); + ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); if (player == null) return; - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -108,10 +104,13 @@ public class SideForge extends ISide { @Override public void sendMusic(String url) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, false)) continue; - send(player, ComType.play + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player, buf); AllMusic.addNowPlayPlayer(player.getName().getString()); } } catch (Exception e) { @@ -123,12 +122,15 @@ public class SideForge extends ISide { @Override protected void topSendMusic(String player, String url) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player, null, false)) return; - send(ComType.play + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -138,14 +140,17 @@ public class SideForge extends ISide { @Override public void sendPic(String url) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnablePic) + if (!obj.pic.enable) continue; - send(player, ComType.img + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); @@ -156,12 +161,15 @@ public class SideForge extends ISide { @Override public void sendPic(String player, String url) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.img + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); e.printStackTrace(); @@ -171,12 +179,15 @@ public class SideForge extends ISide { @Override public void sendPos(String player, int pos) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.pos + pos, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -186,14 +197,17 @@ public class SideForge extends ISide { @Override public void sendHudLyric(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableLyric) + if (!obj.lyric.enable) continue; - send(player, ComType.lyric + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); @@ -204,14 +218,17 @@ public class SideForge extends ISide { @Override public void sendHudInfo(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableInfo) + if (!obj.info.enable) continue; - send(player, ComType.info + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); @@ -219,17 +236,69 @@ public class SideForge extends ISide { } } + @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); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); + } 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.isOK(name, null, true)) + return; + ByteBuf buf = Unpooled.buffer(); + switch (pos) { + case INFO: + buf.writeByte(ComType.INFO.ordinal()); + break; + case LIST: + buf.writeByte(ComType.LIST.ordinal()); + break; + case LYRIC: + buf.writeByte(ComType.LYRIC.ordinal()); + break; + } + writeString(buf, data); + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + @Override public void sendHudList(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableList) + if (!obj.list.enable) continue; - send(player, ComType.list + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); @@ -239,12 +308,15 @@ public class SideForge extends ISide { @Override public void sendHudUtilsAll() { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + 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, data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -254,7 +326,7 @@ public class SideForge extends ISide { @Override public void sendBar(String data) { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { try { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; @@ -269,7 +341,12 @@ public class SideForge extends ISide { @Override public void clearHud(String player) { try { - send(ComType.clear, player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + if (player1 == null) + return; + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -279,8 +356,10 @@ public class SideForge extends ISide { @Override public void clearHud() { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.clear); + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); @@ -290,27 +369,32 @@ public class SideForge extends ISide { @Override public void bq(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendMessage(new TextComponent(data), UUID.randomUUID()); } } } + @Override + public void bqRun(String message, String end, String command) { + ForgeApi.sendMessageBqRun(message, end, command); + } + @Override public void bqt(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - var finalData = new TextComponent(data); + TextComponent finalData = new TextComponent(data); runTask(() -> { - for (Player player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendMessage(finalData, UUID.randomUUID()); } } @@ -365,15 +449,19 @@ public class SideForge extends ISide { } - private void send(ServerPlayer players, String data) { + @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; try { -// byte[] bytes = data.getBytes(StandardCharsets.UTF_8); -// ByteBuf buf = Unpooled.buffer(bytes.length + 1); -// buf.writeByte(666); -// buf.writeBytes(bytes); - runTask(() -> AllMusicForge.channel.send(PacketDistributor.PLAYER.with( () -> players ), data)); @@ -382,4 +470,10 @@ public class SideForge extends ISide { e.printStackTrace(); } } + + private void writeString(ByteBuf buf, String data) { + byte[] temp = data.getBytes(StandardCharsets.UTF_8); + buf.writeInt(temp.length) + .writeBytes(temp); + } } diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 61e3e226..0d485495 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -79,7 +79,7 @@ public class AllMusicForge { } private void commonSetup(final FMLCommonSetupEvent event) { - channel.registerMessage(666, String.class, this::enc, this::dec, this::proc); + channel.registerMessage(0, String.class, this::enc, this::dec, this::proc); String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/Tasks.java index 816c6205..3ceeee68 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -2,8 +2,6 @@ package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; -import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.CopyOnWriteArrayList; public class Tasks { @@ -14,20 +12,16 @@ public class Tasks { } public static void tick() { - synchronized (taskItems) { - for(TaskItem item : taskItems){ - item.tick--; - if (item.tick == 0) { - taskItems.remove(item); - item.run.run(); - } + for (TaskItem item : new ArrayList<>(taskItems)) { + item.tick--; + if (item.tick <= 0) { + taskItems.remove(item); + item.run.run(); } } } public static void add(TaskItem item) { - synchronized (taskItems) { - taskItems.add(item); - } + taskItems.add(item); } -} +} \ No newline at end of file diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 19c9c946..12bd3ac6 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.core.command.CommandEX; -import com.coloryr.allmusic.server.core.command.TabCommand; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; @@ -56,7 +55,7 @@ public class CommandForge implements Command, Predicate results = TabCommand.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(context.getSource().getTextName(), arg); for (String s : results) { builder.suggest(s); 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 de0525b4..1fa6a2b2 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 @@ -1,5 +1,7 @@ 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.arguments.ComponentArgument; import net.minecraft.commands.arguments.EntityArgument; @@ -10,6 +12,8 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; import net.minecraft.server.level.ServerPlayer; +import java.util.UUID; + public class ForgeApi { public static void sendMessageRun(Object obj, String message, String end, String command) { CommandSource sender = (CommandSource) obj; @@ -33,4 +37,16 @@ public class ForgeApi { var pack = new ClientboundSetActionBarTextPacket(Component.literal(message)); player.connection.send(pack); } + + public static void sendMessageBqRun(String message, String end, String command) { + MutableComponent send = Component.literal(message); + MutableComponent endtext = Component.literal(end); + 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); + } + } + } } diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java index ca84f904..9d9be9a7 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -1,6 +1,6 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; +import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { 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 3a020a09..1701d3de 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 @@ -1,15 +1,16 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.TaskItem; -import coloryr.allmusic.Tasks; +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.hud.HudUtils; 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.ComType; import com.coloryr.allmusic.server.core.side.ISide; +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; @@ -17,15 +18,13 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.commands.CommandSource; 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.minecraftforge.common.MinecraftForge; import net.minecraftforge.network.PacketDistributor; import java.io.File; import java.nio.charset.StandardCharsets; -import java.util.Locale; +import java.util.*; public class SideForge extends ISide { @@ -55,7 +54,7 @@ public class SideForge extends ISide { @Override public boolean checkPermission(String player, String permission) { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; @@ -65,24 +64,21 @@ public class SideForge extends ISide { @Override public boolean needPlay() { int online = getAllPlayer(); - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { online--; } } return online > 0; } - @Override - public void send(String data, String player) { - send(AllMusicForge.server.getPlayerList().getPlayerByName(player), data); - } - @Override protected void topSendStop() { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.stop); + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -93,10 +89,12 @@ public class SideForge extends ISide { @Override protected void topSendStop(String name) { try { - var player = AllMusicForge.server.getPlayerList().getPlayerByName(name); + ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); if (player == null) return; - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -106,10 +104,13 @@ public class SideForge extends ISide { @Override public void sendMusic(String url) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, false)) continue; - send(player, ComType.play + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player, buf); AllMusic.addNowPlayPlayer(player.getName().getString()); } } catch (Exception e) { @@ -121,12 +122,15 @@ public class SideForge extends ISide { @Override protected void topSendMusic(String player, String url) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player, null, false)) return; - send(ComType.play + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -136,14 +140,17 @@ public class SideForge extends ISide { @Override public void sendPic(String url) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnablePic) + if (!obj.pic.enable) continue; - send(player, ComType.img + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); @@ -154,12 +161,15 @@ public class SideForge extends ISide { @Override public void sendPic(String player, String url) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.img + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); e.printStackTrace(); @@ -169,12 +179,15 @@ public class SideForge extends ISide { @Override public void sendPos(String player, int pos) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.pos + pos, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -184,14 +197,17 @@ public class SideForge extends ISide { @Override public void sendHudLyric(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableLyric) + if (!obj.lyric.enable) continue; - send(player, ComType.lyric + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); @@ -202,14 +218,17 @@ public class SideForge extends ISide { @Override public void sendHudInfo(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableInfo) + if (!obj.info.enable) continue; - send(player, ComType.info + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); @@ -217,17 +236,69 @@ public class SideForge extends ISide { } } + @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); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); + } 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.isOK(name, null, true)) + return; + ByteBuf buf = Unpooled.buffer(); + switch (pos) { + case INFO: + buf.writeByte(ComType.INFO.ordinal()); + break; + case LIST: + buf.writeByte(ComType.LIST.ordinal()); + break; + case LYRIC: + buf.writeByte(ComType.LYRIC.ordinal()); + break; + } + writeString(buf, data); + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + @Override public void sendHudList(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableList) + if (!obj.list.enable) continue; - send(player, ComType.list + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); @@ -237,12 +308,15 @@ public class SideForge extends ISide { @Override public void sendHudUtilsAll() { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + 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, data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -252,7 +326,7 @@ public class SideForge extends ISide { @Override public void sendBar(String data) { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { try { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; @@ -267,7 +341,12 @@ public class SideForge extends ISide { @Override public void clearHud(String player) { try { - send(ComType.clear, player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + if (player1 == null) + return; + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -277,8 +356,10 @@ public class SideForge extends ISide { @Override public void clearHud() { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.clear); + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); @@ -288,27 +369,32 @@ public class SideForge extends ISide { @Override public void bq(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendSystemMessage(Component.literal(data)); } } } + @Override + public void bqRun(String message, String end, String command) { + ForgeApi.sendMessageBqRun(message, end, command); + } + @Override public void bqt(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } var finalData = Component.literal(data); runTask(() -> { - for (Player player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendSystemMessage(finalData); } } @@ -317,7 +403,7 @@ public class SideForge extends ISide { @Override public void sendMessaget(Object obj, String message) { - runTask(() -> ((CommandSource) obj).sendSystemMessage(Component.literal(message))); + runTask(() -> ((CommandSource) obj).sendSystemMessage( Component.literal(message))); } @Override @@ -363,15 +449,19 @@ public class SideForge extends ISide { } - private void send(ServerPlayer players, String data) { + @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; try { -// byte[] bytes = data.getBytes(StandardCharsets.UTF_8); -// ByteBuf buf = Unpooled.buffer(bytes.length + 1); -// buf.writeByte(666); -// buf.writeBytes(bytes); - runTask(() -> AllMusicForge.channel.send(PacketDistributor.PLAYER.with( () -> players ), data)); @@ -380,4 +470,10 @@ public class SideForge extends ISide { e.printStackTrace(); } } + + private void writeString(ByteBuf buf, String data) { + byte[] temp = data.getBytes(StandardCharsets.UTF_8); + buf.writeInt(temp.length) + .writeBytes(temp); + } } diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index bfeee8c0..aff2bfad 100644 --- a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -81,7 +81,7 @@ public class AllMusicForge { } private void commonSetup(final FMLCommonSetupEvent event) { - channel.registerMessage(666, String.class, this::enc, this::dec, this::proc); + channel.registerMessage(0, String.class, this::enc, this::dec, this::proc); String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/Tasks.java index 816c6205..3ceeee68 100644 --- a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -2,8 +2,6 @@ package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; -import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.CopyOnWriteArrayList; public class Tasks { @@ -14,20 +12,16 @@ public class Tasks { } public static void tick() { - synchronized (taskItems) { - for(TaskItem item : taskItems){ - item.tick--; - if (item.tick == 0) { - taskItems.remove(item); - item.run.run(); - } + for (TaskItem item : new ArrayList<>(taskItems)) { + item.tick--; + if (item.tick <= 0) { + taskItems.remove(item); + item.run.run(); } } } public static void add(TaskItem item) { - synchronized (taskItems) { - taskItems.add(item); - } + taskItems.add(item); } -} +} \ No newline at end of file diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 19c9c946..12bd3ac6 100644 --- a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.core.command.CommandEX; -import com.coloryr.allmusic.server.core.command.TabCommand; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; @@ -56,7 +55,7 @@ public class CommandForge implements Command, Predicate results = TabCommand.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(context.getSource().getTextName(), arg); for (String s : results) { builder.suggest(s); diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index de0525b4..25f78cf5 100644 --- a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,5 +1,7 @@ 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.arguments.ComponentArgument; import net.minecraft.commands.arguments.EntityArgument; @@ -33,4 +35,16 @@ public class ForgeApi { var pack = new ClientboundSetActionBarTextPacket(Component.literal(message)); player.connection.send(pack); } + + public static void sendMessageBqRun(String message, String end, String command) { + MutableComponent send = Component.literal(message); + MutableComponent endtext = Component.literal(end); + 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); + } + } + } } diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java index ca84f904..9d9be9a7 100644 --- a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -1,6 +1,6 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; +import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 3a020a09..1701d3de 100644 --- a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -1,15 +1,16 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.TaskItem; -import coloryr.allmusic.Tasks; +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.hud.HudUtils; 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.ComType; import com.coloryr.allmusic.server.core.side.ISide; +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; @@ -17,15 +18,13 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.commands.CommandSource; 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.minecraftforge.common.MinecraftForge; import net.minecraftforge.network.PacketDistributor; import java.io.File; import java.nio.charset.StandardCharsets; -import java.util.Locale; +import java.util.*; public class SideForge extends ISide { @@ -55,7 +54,7 @@ public class SideForge extends ISide { @Override public boolean checkPermission(String player, String permission) { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; @@ -65,24 +64,21 @@ public class SideForge extends ISide { @Override public boolean needPlay() { int online = getAllPlayer(); - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { online--; } } return online > 0; } - @Override - public void send(String data, String player) { - send(AllMusicForge.server.getPlayerList().getPlayerByName(player), data); - } - @Override protected void topSendStop() { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.stop); + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -93,10 +89,12 @@ public class SideForge extends ISide { @Override protected void topSendStop(String name) { try { - var player = AllMusicForge.server.getPlayerList().getPlayerByName(name); + ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); if (player == null) return; - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -106,10 +104,13 @@ public class SideForge extends ISide { @Override public void sendMusic(String url) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, false)) continue; - send(player, ComType.play + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player, buf); AllMusic.addNowPlayPlayer(player.getName().getString()); } } catch (Exception e) { @@ -121,12 +122,15 @@ public class SideForge extends ISide { @Override protected void topSendMusic(String player, String url) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player, null, false)) return; - send(ComType.play + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -136,14 +140,17 @@ public class SideForge extends ISide { @Override public void sendPic(String url) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnablePic) + if (!obj.pic.enable) continue; - send(player, ComType.img + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); @@ -154,12 +161,15 @@ public class SideForge extends ISide { @Override public void sendPic(String player, String url) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.img + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); e.printStackTrace(); @@ -169,12 +179,15 @@ public class SideForge extends ISide { @Override public void sendPos(String player, int pos) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.pos + pos, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -184,14 +197,17 @@ public class SideForge extends ISide { @Override public void sendHudLyric(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableLyric) + if (!obj.lyric.enable) continue; - send(player, ComType.lyric + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); @@ -202,14 +218,17 @@ public class SideForge extends ISide { @Override public void sendHudInfo(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableInfo) + if (!obj.info.enable) continue; - send(player, ComType.info + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); @@ -217,17 +236,69 @@ public class SideForge extends ISide { } } + @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); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); + } 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.isOK(name, null, true)) + return; + ByteBuf buf = Unpooled.buffer(); + switch (pos) { + case INFO: + buf.writeByte(ComType.INFO.ordinal()); + break; + case LIST: + buf.writeByte(ComType.LIST.ordinal()); + break; + case LYRIC: + buf.writeByte(ComType.LYRIC.ordinal()); + break; + } + writeString(buf, data); + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + @Override public void sendHudList(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableList) + if (!obj.list.enable) continue; - send(player, ComType.list + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); @@ -237,12 +308,15 @@ public class SideForge extends ISide { @Override public void sendHudUtilsAll() { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + 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, data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -252,7 +326,7 @@ public class SideForge extends ISide { @Override public void sendBar(String data) { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { try { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; @@ -267,7 +341,12 @@ public class SideForge extends ISide { @Override public void clearHud(String player) { try { - send(ComType.clear, player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + if (player1 == null) + return; + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -277,8 +356,10 @@ public class SideForge extends ISide { @Override public void clearHud() { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.clear); + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); @@ -288,27 +369,32 @@ public class SideForge extends ISide { @Override public void bq(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendSystemMessage(Component.literal(data)); } } } + @Override + public void bqRun(String message, String end, String command) { + ForgeApi.sendMessageBqRun(message, end, command); + } + @Override public void bqt(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } var finalData = Component.literal(data); runTask(() -> { - for (Player player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendSystemMessage(finalData); } } @@ -317,7 +403,7 @@ public class SideForge extends ISide { @Override public void sendMessaget(Object obj, String message) { - runTask(() -> ((CommandSource) obj).sendSystemMessage(Component.literal(message))); + runTask(() -> ((CommandSource) obj).sendSystemMessage( Component.literal(message))); } @Override @@ -363,15 +449,19 @@ public class SideForge extends ISide { } - private void send(ServerPlayer players, String data) { + @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; try { -// byte[] bytes = data.getBytes(StandardCharsets.UTF_8); -// ByteBuf buf = Unpooled.buffer(bytes.length + 1); -// buf.writeByte(666); -// buf.writeBytes(bytes); - runTask(() -> AllMusicForge.channel.send(PacketDistributor.PLAYER.with( () -> players ), data)); @@ -380,4 +470,10 @@ public class SideForge extends ISide { e.printStackTrace(); } } + + private void writeString(ByteBuf buf, String data) { + byte[] temp = data.getBytes(StandardCharsets.UTF_8); + buf.writeInt(temp.length) + .writeBytes(temp); + } } diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 255a4e7e..29217e36 100644 --- a/forge_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,51 +1,28 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.command.CommandEX; import com.coloryr.allmusic.server.side.forge.CommandForge; import com.coloryr.allmusic.server.side.forge.LogForge; import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.ParseResults; -import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.logging.LogUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.Commands; -import net.minecraft.commands.arguments.ComponentArgument; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTabs; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.CommandEvent; import net.minecraftforge.event.RegisterCommandsEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.event.server.ServerStoppingEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.network.NetworkEvent; import net.minecraftforge.network.NetworkRegistry; import net.minecraftforge.network.simple.SimpleChannel; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; -import net.minecraftforge.server.command.ForgeCommand; import org.slf4j.Logger; import java.io.File; @@ -53,8 +30,6 @@ import java.nio.charset.StandardCharsets; import java.util.Locale; import java.util.function.Supplier; -import static net.minecraftforge.server.command.ForgeCommand.*; - // The value here should match an entry in the META-INF/mods.toml file @Mod(AllMusicForge.MODID) public class AllMusicForge { @@ -79,7 +54,7 @@ public class AllMusicForge { } private void commonSetup(final FMLCommonSetupEvent event) { - channel.registerMessage(666, String.class, this::enc, this::dec, this::proc); + channel.registerMessage(0, String.class, this::enc, this::dec, this::proc); String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/Tasks.java index 816c6205..3ceeee68 100644 --- a/forge_1_20/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -2,8 +2,6 @@ package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; -import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.CopyOnWriteArrayList; public class Tasks { @@ -14,20 +12,16 @@ public class Tasks { } public static void tick() { - synchronized (taskItems) { - for(TaskItem item : taskItems){ - item.tick--; - if (item.tick == 0) { - taskItems.remove(item); - item.run.run(); - } + for (TaskItem item : new ArrayList<>(taskItems)) { + item.tick--; + if (item.tick <= 0) { + taskItems.remove(item); + item.run.run(); } } } public static void add(TaskItem item) { - synchronized (taskItems) { - taskItems.add(item); - } + taskItems.add(item); } -} +} \ No newline at end of file diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 19c9c946..27336a4e 100644 --- a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.core.command.CommandEX; -import com.coloryr.allmusic.server.core.command.TabCommand; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; @@ -12,7 +11,6 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; -import java.util.Iterator; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; @@ -56,7 +54,7 @@ public class CommandForge implements Command, Predicate results = TabCommand.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(context.getSource().getTextName(), arg); for (String s : results) { builder.suggest(s); 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 de0525b4..5b5d43c0 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,11 +1,10 @@ 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.arguments.ComponentArgument; -import net.minecraft.commands.arguments.EntityArgument; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.ComponentUtils; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; import net.minecraft.server.level.ServerPlayer; @@ -33,4 +32,16 @@ public class ForgeApi { var pack = new ClientboundSetActionBarTextPacket(Component.literal(message)); player.connection.send(pack); } + + public static void sendMessageBqRun(String message, String end, String command) { + MutableComponent send = Component.literal(message); + MutableComponent endtext = Component.literal(end); + 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); + } + } + } } diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java index ca84f904..9d9be9a7 100644 --- a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -1,6 +1,6 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; +import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { 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 3a020a09..38762dbe 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 @@ -1,15 +1,16 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.TaskItem; -import coloryr.allmusic.Tasks; +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.hud.HudUtils; 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.ComType; import com.coloryr.allmusic.server.core.side.ISide; +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; @@ -17,14 +18,14 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.commands.CommandSource; 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.minecraftforge.common.MinecraftForge; import net.minecraftforge.network.PacketDistributor; import java.io.File; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; import java.util.Locale; public class SideForge extends ISide { @@ -55,7 +56,7 @@ public class SideForge extends ISide { @Override public boolean checkPermission(String player, String permission) { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; @@ -65,24 +66,21 @@ public class SideForge extends ISide { @Override public boolean needPlay() { int online = getAllPlayer(); - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { online--; } } return online > 0; } - @Override - public void send(String data, String player) { - send(AllMusicForge.server.getPlayerList().getPlayerByName(player), data); - } - @Override protected void topSendStop() { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.stop); + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -93,10 +91,12 @@ public class SideForge extends ISide { @Override protected void topSendStop(String name) { try { - var player = AllMusicForge.server.getPlayerList().getPlayerByName(name); + ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); if (player == null) return; - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -106,10 +106,13 @@ public class SideForge extends ISide { @Override public void sendMusic(String url) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, false)) continue; - send(player, ComType.play + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player, buf); AllMusic.addNowPlayPlayer(player.getName().getString()); } } catch (Exception e) { @@ -121,12 +124,15 @@ public class SideForge extends ISide { @Override protected void topSendMusic(String player, String url) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player, null, false)) return; - send(ComType.play + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -136,14 +142,17 @@ public class SideForge extends ISide { @Override public void sendPic(String url) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnablePic) + if (!obj.pic.enable) continue; - send(player, ComType.img + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); @@ -154,12 +163,15 @@ public class SideForge extends ISide { @Override public void sendPic(String player, String url) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.img + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); e.printStackTrace(); @@ -169,12 +181,15 @@ public class SideForge extends ISide { @Override public void sendPos(String player, int pos) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.pos + pos, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -184,14 +199,17 @@ public class SideForge extends ISide { @Override public void sendHudLyric(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableLyric) + if (!obj.lyric.enable) continue; - send(player, ComType.lyric + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); @@ -202,14 +220,17 @@ public class SideForge extends ISide { @Override public void sendHudInfo(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableInfo) + if (!obj.info.enable) continue; - send(player, ComType.info + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); @@ -217,17 +238,69 @@ public class SideForge extends ISide { } } + @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); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); + } 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.isOK(name, null, true)) + return; + ByteBuf buf = Unpooled.buffer(); + switch (pos) { + case INFO: + buf.writeByte(ComType.INFO.ordinal()); + break; + case LIST: + buf.writeByte(ComType.LIST.ordinal()); + break; + case LYRIC: + buf.writeByte(ComType.LYRIC.ordinal()); + break; + } + writeString(buf, data); + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + @Override public void sendHudList(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableList) + if (!obj.list.enable) continue; - send(player, ComType.list + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); @@ -237,12 +310,15 @@ public class SideForge extends ISide { @Override public void sendHudUtilsAll() { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + 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, data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -252,7 +328,7 @@ public class SideForge extends ISide { @Override public void sendBar(String data) { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { try { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; @@ -267,7 +343,12 @@ public class SideForge extends ISide { @Override public void clearHud(String player) { try { - send(ComType.clear, player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + if (player1 == null) + return; + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -277,8 +358,10 @@ public class SideForge extends ISide { @Override public void clearHud() { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.clear); + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); @@ -288,27 +371,32 @@ public class SideForge extends ISide { @Override public void bq(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendSystemMessage(Component.literal(data)); } } } + @Override + public void bqRun(String message, String end, String command) { + ForgeApi.sendMessageBqRun(message, end, command); + } + @Override public void bqt(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } var finalData = Component.literal(data); runTask(() -> { - for (Player player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendSystemMessage(finalData); } } @@ -363,15 +451,19 @@ public class SideForge extends ISide { } - private void send(ServerPlayer players, String data) { + @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; try { -// byte[] bytes = data.getBytes(StandardCharsets.UTF_8); -// ByteBuf buf = Unpooled.buffer(bytes.length + 1); -// buf.writeByte(666); -// buf.writeBytes(bytes); - runTask(() -> AllMusicForge.channel.send(PacketDistributor.PLAYER.with( () -> players ), data)); @@ -380,4 +472,10 @@ public class SideForge extends ISide { e.printStackTrace(); } } + + private void writeString(ByteBuf buf, String data) { + byte[] temp = data.getBytes(StandardCharsets.UTF_8); + buf.writeInt(temp.length) + .writeBytes(temp); + } } diff --git a/forge_1_20_2/.gitattributes b/forge_1_20_4/.gitattributes similarity index 100% rename from forge_1_20_2/.gitattributes rename to forge_1_20_4/.gitattributes diff --git a/forge_1_20_2/.gitignore b/forge_1_20_4/.gitignore similarity index 100% rename from forge_1_20_2/.gitignore rename to forge_1_20_4/.gitignore diff --git a/forge_1_20_2/CREDITS.txt b/forge_1_20_4/CREDITS.txt similarity index 100% rename from forge_1_20_2/CREDITS.txt rename to forge_1_20_4/CREDITS.txt diff --git a/forge_1_20_2/LICENSE.txt b/forge_1_20_4/LICENSE.txt similarity index 100% rename from forge_1_20_2/LICENSE.txt rename to forge_1_20_4/LICENSE.txt diff --git a/forge_1_20_2/README.txt b/forge_1_20_4/README.txt similarity index 100% rename from forge_1_20_2/README.txt rename to forge_1_20_4/README.txt diff --git a/forge_1_20_2/build.gradle b/forge_1_20_4/build.gradle similarity index 100% rename from forge_1_20_2/build.gradle rename to forge_1_20_4/build.gradle diff --git a/forge_1_20_2/changelog.txt b/forge_1_20_4/changelog.txt similarity index 100% rename from forge_1_20_2/changelog.txt rename to forge_1_20_4/changelog.txt diff --git a/forge_1_20_2/gradle.properties b/forge_1_20_4/gradle.properties similarity index 94% rename from forge_1_20_2/gradle.properties rename to forge_1_20_4/gradle.properties index be31025f..142beeb1 100644 --- a/forge_1_20_2/gradle.properties +++ b/forge_1_20_4/gradle.properties @@ -6,17 +6,17 @@ org.gradle.daemon=false ## Environment Properties # The Minecraft version must agree with the Forge version to get a valid artifact -minecraft_version=1.20.2 +minecraft_version=1.20.4 # The Minecraft version range can use any release version of Minecraft as bounds. # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly # as they do not follow standard versioning conventions. -minecraft_version_range=[1.20.2,1.21) +minecraft_version_range=[1.20.4,1.21) # The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=48.1.0 +forge_version=49.0.46 # The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[48,) +forge_version_range=[0,) # The loader version range can only use the major version of Forge/FML as bounds -loader_version_range=[48,) +loader_version_range=[0,) # The mapping channel to use for mappings. # The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. # Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. @@ -34,11 +34,11 @@ loader_version_range=[48,) mapping_channel=official # The mapping version to query from the mapping channel. # This must match the format required by the mapping channel. -mapping_version=1.20.2 +mapping_version=1.20.4 ## Mod Properties -file_name = [Forge1.20.2]AllMusic_Server +file_name = [Forge1.20.4]AllMusic_Server # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} # Must match the String constant located in the main mod class annotated with @Mod. diff --git a/forge_1_20_2/gradle/wrapper/gradle-wrapper.jar b/forge_1_20_4/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from forge_1_20_2/gradle/wrapper/gradle-wrapper.jar rename to forge_1_20_4/gradle/wrapper/gradle-wrapper.jar diff --git a/forge_1_20_2/gradle/wrapper/gradle-wrapper.properties b/forge_1_20_4/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from forge_1_20_2/gradle/wrapper/gradle-wrapper.properties rename to forge_1_20_4/gradle/wrapper/gradle-wrapper.properties diff --git a/forge_1_20_2/gradlew b/forge_1_20_4/gradlew similarity index 100% rename from forge_1_20_2/gradlew rename to forge_1_20_4/gradlew diff --git a/forge_1_20_2/gradlew.bat b/forge_1_20_4/gradlew.bat similarity index 100% rename from forge_1_20_2/gradlew.bat rename to forge_1_20_4/gradlew.bat diff --git a/forge_1_20_2/settings.gradle b/forge_1_20_4/settings.gradle similarity index 100% rename from forge_1_20_2/settings.gradle rename to forge_1_20_4/settings.gradle diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java similarity index 60% rename from forge_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java rename to forge_1_20_4/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 255a4e7e..31f79aea 100644 --- a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,66 +1,43 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.command.CommandEX; import com.coloryr.allmusic.server.side.forge.CommandForge; import com.coloryr.allmusic.server.side.forge.LogForge; import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.ParseResults; -import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.logging.LogUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.Commands; -import net.minecraft.commands.arguments.ComponentArgument; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTabs; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.CommandEvent; import net.minecraftforge.event.RegisterCommandsEvent; import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.event.network.CustomPayloadEvent; import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.event.server.ServerStoppingEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.network.NetworkEvent; -import net.minecraftforge.network.NetworkRegistry; -import net.minecraftforge.network.simple.SimpleChannel; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; -import net.minecraftforge.server.command.ForgeCommand; +import net.minecraftforge.network.ChannelBuilder; +import net.minecraftforge.network.SimpleChannel; import org.slf4j.Logger; import java.io.File; -import java.nio.charset.StandardCharsets; import java.util.Locale; -import java.util.function.Supplier; - -import static net.minecraftforge.server.command.ForgeCommand.*; // The value here should match an entry in the META-INF/mods.toml file @Mod(AllMusicForge.MODID) public class AllMusicForge { public static MinecraftServer server; - public static final SimpleChannel channel = NetworkRegistry.newSimpleChannel(new ResourceLocation("allmusic", "channel"), - () -> "1.0", s -> true, s -> true); + public static final SimpleChannel channel = ChannelBuilder.named(new ResourceLocation("allmusic", "channel")) + .networkProtocolVersion(0) + .optional() + .clientAcceptedVersions(((status, i) -> true)) + .serverAcceptedVersions(((status, i) -> true)) + .simpleChannel(); // Define mod id in a common place for everything to reference public static final String MODID = "allmusic_server"; @@ -79,7 +56,11 @@ public class AllMusicForge { } private void commonSetup(final FMLCommonSetupEvent event) { - channel.registerMessage(666, String.class, this::enc, this::dec, this::proc); + channel.messageBuilder(FriendlyByteBuf.class) + .decoder(this::dec) + .encoder(this::enc) + .consumerNetworkThread(this::proc) + .add(); String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); @@ -89,17 +70,17 @@ public class AllMusicForge { new AllMusic().init(new File(path)); } - private void enc(String str, FriendlyByteBuf buffer) { - buffer.writeBytes(str.getBytes(StandardCharsets.UTF_8)); + private void enc(FriendlyByteBuf str, FriendlyByteBuf buffer) { + buffer.writeBytes(str); } - private String dec(FriendlyByteBuf buffer) { - return buffer.toString(StandardCharsets.UTF_8); + private FriendlyByteBuf dec(FriendlyByteBuf buffer) { + return buffer; } - private void proc(String str, Supplier supplier) { - NetworkEvent.Context context = supplier.get(); - context.setPacketHandled(true); + private void proc(FriendlyByteBuf buffer, CustomPayloadEvent.Context ctx) { + //ctx.enqueueWork(() -> handle(buffer)); + ctx.setPacketHandled(true); } @SubscribeEvent diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/TaskItem.java similarity index 100% rename from forge_1_20_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java rename to forge_1_20_4/src/main/java/com/coloryr/allmusic/server/TaskItem.java diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 53% rename from forge_1_20_2/src/main/java/com/coloryr/allmusic/server/Tasks.java rename to forge_1_20_4/src/main/java/com/coloryr/allmusic/server/Tasks.java index 816c6205..3ceeee68 100644 --- a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -2,8 +2,6 @@ package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; -import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.CopyOnWriteArrayList; public class Tasks { @@ -14,20 +12,16 @@ public class Tasks { } public static void tick() { - synchronized (taskItems) { - for(TaskItem item : taskItems){ - item.tick--; - if (item.tick == 0) { - taskItems.remove(item); - item.run.run(); - } + for (TaskItem item : new ArrayList<>(taskItems)) { + item.tick--; + if (item.tick <= 0) { + taskItems.remove(item); + item.run.run(); } } } public static void add(TaskItem item) { - synchronized (taskItems) { - taskItems.add(item); - } + taskItems.add(item); } -} +} \ No newline at end of file diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java similarity index 92% rename from forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java rename to forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 19c9c946..27336a4e 100644 --- a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.core.command.CommandEX; -import com.coloryr.allmusic.server.core.command.TabCommand; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; @@ -12,7 +11,6 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; -import java.util.Iterator; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; @@ -56,7 +54,7 @@ public class CommandForge implements Command, Predicate results = TabCommand.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(context.getSource().getTextName(), arg); for (String s : results) { builder.suggest(s); diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java similarity index 68% rename from forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java rename to forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index de0525b4..5b5d43c0 100644 --- a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,11 +1,10 @@ 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.arguments.ComponentArgument; -import net.minecraft.commands.arguments.EntityArgument; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.ComponentUtils; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; import net.minecraft.server.level.ServerPlayer; @@ -33,4 +32,16 @@ public class ForgeApi { var pack = new ClientboundSetActionBarTextPacket(Component.literal(message)); player.connection.send(pack); } + + public static void sendMessageBqRun(String message, String end, String command) { + MutableComponent send = Component.literal(message); + MutableComponent endtext = Component.literal(end); + 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); + } + } + } } diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java similarity index 87% rename from forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java rename to forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java index ca84f904..9d9be9a7 100644 --- a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java +++ b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -1,6 +1,6 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; +import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java similarity index 55% rename from forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java rename to forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 3a020a09..fe09459a 100644 --- a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -1,15 +1,16 @@ package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.TaskItem; -import coloryr.allmusic.Tasks; +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.hud.HudUtils; 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.ComType; import com.coloryr.allmusic.server.core.side.ISide; +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; @@ -17,14 +18,14 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.commands.CommandSource; 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.minecraftforge.common.MinecraftForge; import net.minecraftforge.network.PacketDistributor; import java.io.File; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; import java.util.Locale; public class SideForge extends ISide { @@ -55,7 +56,7 @@ public class SideForge extends ISide { @Override public boolean checkPermission(String player, String permission) { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; @@ -65,24 +66,21 @@ public class SideForge extends ISide { @Override public boolean needPlay() { int online = getAllPlayer(); - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { online--; } } return online > 0; } - @Override - public void send(String data, String player) { - send(AllMusicForge.server.getPlayerList().getPlayerByName(player), data); - } - @Override protected void topSendStop() { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.stop); + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -93,10 +91,12 @@ public class SideForge extends ISide { @Override protected void topSendStop(String name) { try { - var player = AllMusicForge.server.getPlayerList().getPlayerByName(name); + ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); if (player == null) return; - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -106,10 +106,13 @@ public class SideForge extends ISide { @Override public void sendMusic(String url) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, false)) continue; - send(player, ComType.play + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player, buf); AllMusic.addNowPlayPlayer(player.getName().getString()); } } catch (Exception e) { @@ -121,12 +124,15 @@ public class SideForge extends ISide { @Override protected void topSendMusic(String player, String url) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player, null, false)) return; - send(ComType.play + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -136,14 +142,17 @@ public class SideForge extends ISide { @Override public void sendPic(String url) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnablePic) + if (!obj.pic.enable) continue; - send(player, ComType.img + url); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); @@ -154,12 +163,15 @@ public class SideForge extends ISide { @Override public void sendPic(String player, String url) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.img + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); e.printStackTrace(); @@ -169,12 +181,15 @@ public class SideForge extends ISide { @Override public void sendPos(String player, int pos) { try { - var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.pos + pos, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -184,14 +199,17 @@ public class SideForge extends ISide { @Override public void sendHudLyric(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableLyric) + if (!obj.lyric.enable) continue; - send(player, ComType.lyric + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); @@ -202,14 +220,17 @@ public class SideForge extends ISide { @Override public void sendHudInfo(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableInfo) + if (!obj.info.enable) continue; - send(player, ComType.info + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); @@ -217,17 +238,69 @@ public class SideForge extends ISide { } } + @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); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); + } 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.isOK(name, null, true)) + return; + ByteBuf buf = Unpooled.buffer(); + switch (pos) { + case INFO: + buf.writeByte(ComType.INFO.ordinal()); + break; + case LIST: + buf.writeByte(ComType.LIST.ordinal()); + break; + case LYRIC: + buf.writeByte(ComType.LYRIC.ordinal()); + break; + } + writeString(buf, data); + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + @Override public void sendHudList(String data) { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableList) + if (!obj.list.enable) continue; - send(player, ComType.list + data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); + writeString(buf, data); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); @@ -237,12 +310,15 @@ public class SideForge extends ISide { @Override public void sendHudUtilsAll() { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + 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, data); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -252,7 +328,7 @@ public class SideForge extends ISide { @Override public void sendBar(String data) { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { try { if (AllMusic.isOK(player.getName().getString(), null, true)) continue; @@ -267,7 +343,12 @@ public class SideForge extends ISide { @Override public void clearHud(String player) { try { - send(ComType.clear, player); + ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + if (player1 == null) + return; + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -277,8 +358,10 @@ public class SideForge extends ISide { @Override public void clearHud() { try { - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - send(player, ComType.clear); + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); @@ -288,27 +371,32 @@ public class SideForge extends ISide { @Override public void bq(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendSystemMessage(Component.literal(data)); } } } + @Override + public void bqRun(String message, String end, String command) { + ForgeApi.sendMessageBqRun(message, end, command); + } + @Override public void bqt(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } var finalData = Component.literal(data); runTask(() -> { - for (Player player : AllMusicForge.server.getPlayerList().getPlayers()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendSystemMessage(finalData); } } @@ -363,21 +451,29 @@ public class SideForge extends ISide { } - private void send(ServerPlayer players, String data) { + @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; try { -// byte[] bytes = data.getBytes(StandardCharsets.UTF_8); -// ByteBuf buf = Unpooled.buffer(bytes.length + 1); -// buf.writeByte(666); -// buf.writeBytes(bytes); - - runTask(() -> AllMusicForge.channel.send(PacketDistributor.PLAYER.with( - () -> players - ), data)); + runTask(() -> AllMusicForge.channel.send(data, PacketDistributor.PLAYER.with(players))); } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); e.printStackTrace(); } } + + private void writeString(ByteBuf buf, String data) { + byte[] temp = data.getBytes(StandardCharsets.UTF_8); + buf.writeInt(temp.length) + .writeBytes(temp); + } } diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java similarity index 100% rename from forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java rename to forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java b/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java similarity index 100% rename from forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java rename to forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java diff --git a/forge_1_20_2/src/main/resources/META-INF/mods.toml b/forge_1_20_4/src/main/resources/META-INF/mods.toml similarity index 100% rename from forge_1_20_2/src/main/resources/META-INF/mods.toml rename to forge_1_20_4/src/main/resources/META-INF/mods.toml diff --git a/forge_1_20_2/src/main/resources/icon.png b/forge_1_20_4/src/main/resources/icon.png similarity index 100% rename from forge_1_20_2/src/main/resources/icon.png rename to forge_1_20_4/src/main/resources/icon.png diff --git a/forge_1_20_2/src/main/resources/pack.mcmeta b/forge_1_20_4/src/main/resources/pack.mcmeta similarity index 100% rename from forge_1_20_2/src/main/resources/pack.mcmeta rename to forge_1_20_4/src/main/resources/pack.mcmeta diff --git a/link.cmd b/link.cmd index 63712af9..92273496 100644 --- a/link.cmd +++ b/link.cmd @@ -8,7 +8,7 @@ setlocal enabledelayedexpansion set array=folia server_top server forge_1_20 forge_1_19_3 ^ forge_1_19_2 forge_1_18_2 forge_1_16_5 forge_1_12_2 ^ fabric_1_20_2 fabric_1_20 fabric_1_19_3 fabric_1_19_2 fabric_1_18_2 ^ -fabric_1_16_5 +fabric_1_16_5 forge_1_20_4 for %%i in (%array%) do ( if not exist "%%i\src\main\java\com\coloryr\allmusic\server\core" mklink /j "%%i\src\main\java\com\coloryr\allmusic\server\core" "core" diff --git a/remove.cmd b/remove.cmd index 371b44aa..c5a781a4 100644 --- a/remove.cmd +++ b/remove.cmd @@ -8,7 +8,7 @@ setlocal enabledelayedexpansion set array=folia server_top server forge_1_20 forge_1_19_3 ^ forge_1_19_2 forge_1_18_2 forge_1_16_5 forge_1_12_2 ^ fabric_1_20_2 fabric_1_20 fabric_1_19_3 fabric_1_19_2 fabric_1_18_2 ^ -fabric_1_16_5 +fabric_1_16_5 forge_1_20_4 for %%i in (%array%) do ( if exist "%%i\src\main\java\com\coloryr\allmusic\server\core" rmdir "%%i\src\main\java\com\coloryr\allmusic\server\core" "core"