From 3d911e347ef8a12463259c0c50c532d363e83d10 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Fri, 3 Apr 2026 15:35:29 +0800 Subject: [PATCH 1/9] =?UTF-8?q?up=20=E6=B7=BB=E5=8A=A0=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=8F=91=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/AllMusic.java | 11 +++++------ core/command/CommandEX.java | 1 + core/command/sub/CommandHelp.java | 2 ++ core/command/sub/CommandJoin.java | 11 +++++++++++ core/objs/config/ConfigObj.java | 6 ++++++ core/objs/message/HelpNormalObj.java | 5 +++++ core/side/BaseSide.java | 6 ++++++ .../server/side/velocity/ListenerVelocity.java | 10 ++++------ .../server/side/velocity/SideVelocity.java | 14 ++++++++++++++ version | 2 +- 10 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 core/command/sub/CommandJoin.java diff --git a/core/AllMusic.java b/core/AllMusic.java index db1bd190..432ff074 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -7,7 +7,6 @@ import com.coloryr.allmusic.server.core.music.PlayRuntime; import com.coloryr.allmusic.server.core.objs.CookieObj; import com.coloryr.allmusic.server.core.objs.config.ConfigObj; import com.coloryr.allmusic.server.core.objs.message.MessageObj; -import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.core.side.IAllMusicLogger; @@ -51,11 +50,11 @@ public class AllMusic { /** * 配置文件版本号 */ - public static final String configVersion = "206"; + public static final String configVersion = "207"; /** * 语言文件配置版本号 */ - public static final String messageVersion = "210"; + public static final String messageVersion = "211"; /** * 日志 */ @@ -348,9 +347,9 @@ public class AllMusic { AllMusic.side.sendHudPos(player1); AllMusic.side.sendMusic(player1, PlayMusic.url); AllMusic.side.sendPic(player1, music.getPicUrl()); - AllMusic.side.sendPos(player1, (int) PlayMusic.musicNowTime); + AllMusic.side.runTask(() -> AllMusic.side.sendPos(player1, (int) PlayMusic.musicNowTime), 20); } - }, 20); + }); }); } @@ -376,7 +375,7 @@ public class AllMusic { AllMusic.side.sendPic(player1, music.getPicUrl()); AllMusic.side.runTask(() -> AllMusic.side.sendPos(player1, (int) PlayMusic.musicNowTime), 50); } - }); + }, AllMusic.config.joinDelay); }); } diff --git a/core/command/CommandEX.java b/core/command/CommandEX.java index e4bacdd6..ebf9091e 100644 --- a/core/command/CommandEX.java +++ b/core/command/CommandEX.java @@ -41,6 +41,7 @@ public class CommandEX { commandList.put("lastpage", new CommandLastPage()); commandList.put("hud", new CommandHud()); commandList.put("push", new CommandPush()); + commandList.put("join", new CommandJoin()); commandList.put("cancel", new CommandCancel()); commandAdminList.put("reload", new CommandReload()); diff --git a/core/command/sub/CommandHelp.java b/core/command/sub/CommandHelp.java index cc72b24d..f1502381 100644 --- a/core/command/sub/CommandHelp.java +++ b/core/command/sub/CommandHelp.java @@ -56,6 +56,8 @@ public class CommandHelp extends ACommand { .append(AllMusic.miniMessageSuggest(AllMusic.getMessage().click.clickCheck, "/music hud pic rotate "))); AllMusic.side.sendMessage(sender, AllMusic.miniMessage(AllMusic.getMessage().help.normal.hud5) .append(AllMusic.miniMessageSuggest(AllMusic.getMessage().click.clickCheck, "/music hud pic speed "))); + AllMusic.side.sendMessage(sender, AllMusic.miniMessage(AllMusic.getMessage().help.normal.join) + .append(AllMusic.miniMessageRun(AllMusic.getMessage().click.clickRun, "/music join"))); if (AllMusic.side.checkPermission(sender)) { AllMusic.side.sendMessage(sender, AllMusic.miniMessage(AllMusic.getMessage().help.admin.reload) .append(AllMusic.miniMessageRun(AllMusic.getMessage().click.clickRun, "/music reload"))); diff --git a/core/command/sub/CommandJoin.java b/core/command/sub/CommandJoin.java new file mode 100644 index 00000000..30f518b8 --- /dev/null +++ b/core/command/sub/CommandJoin.java @@ -0,0 +1,11 @@ +package com.coloryr.allmusic.server.core.command.sub; + +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.command.ACommand; + +public class CommandJoin extends ACommand { + @Override + public void execute(Object sender, String name, String[] args) { + AllMusic.side.joinPlay(name); + } +} diff --git a/core/objs/config/ConfigObj.java b/core/objs/config/ConfigObj.java index 169d085b..09918a40 100644 --- a/core/objs/config/ConfigObj.java +++ b/core/objs/config/ConfigObj.java @@ -118,6 +118,10 @@ public class ConfigObj { * 信息更新延迟 */ public int sendDelay; + /** + * 中途加入延迟 + */ + public int joinDelay; public static ConfigObj make() { ConfigObj config = new ConfigObj(); @@ -165,6 +169,7 @@ public class ConfigObj { maxPlayList = 10; minVote = 3; voteTime = 30; + adminList = new HashSet<>(); adminList.add("color_yr"); muteServer = new HashSet<>(); @@ -188,6 +193,7 @@ public class ConfigObj { ktvLyricDelay = 0; lyricDelay = 0; sendDelay = 1000; + joinDelay = 1000; version = AllMusic.configVersion; } } \ No newline at end of file diff --git a/core/objs/message/HelpNormalObj.java b/core/objs/message/HelpNormalObj.java index 90c5157b..c3fb6c1c 100644 --- a/core/objs/message/HelpNormalObj.java +++ b/core/objs/message/HelpNormalObj.java @@ -26,6 +26,7 @@ public class HelpNormalObj { public String hud8; public String hud9; public String hud10; + public String join; public static HelpNormalObj make() { HelpNormalObj obj = new HelpNormalObj(); @@ -83,6 +84,8 @@ public class HelpNormalObj { return true; if (lastpage == null) return true; + if (join == null) + return true; return hud5 == null; } @@ -137,5 +140,7 @@ public class HelpNormalObj { hud4 = "[AllMusic3]/music hud pic rotate [开关] 设置图片旋转模式"; if (hud5 == null) hud5 = "[AllMusic3]/music hud pic speed [数值] 设置图片旋转速度"; + if (join == null) + join = "[AllMusic3]/music join 重新播放当前歌曲"; } } diff --git a/core/side/BaseSide.java b/core/side/BaseSide.java index b5d06933..f79f0caf 100644 --- a/core/side/BaseSide.java +++ b/core/side/BaseSide.java @@ -150,6 +150,12 @@ public abstract class BaseSide { */ public abstract void broadcast(Component data); + /** + * 重新发送播放包 + * @param data 播放包 + */ + public abstract void joinPlay(String data); + /** * 重载 */ diff --git a/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java b/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java index 9559f731..5db3b5b4 100644 --- a/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java +++ b/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java @@ -21,12 +21,10 @@ public class ListenerVelocity { @Subscribe public void onPostLoginEvent(PostLoginEvent event) { - AllMusic.side.runTask(() -> { - Player player = event.getPlayer(); - Optional serverConnection = player.getCurrentServer(); - serverConnection.ifPresent(connection -> - AllMusic.joinPlay(event.getPlayer().getUsername(), connection.getServerInfo().getName())); - }, 1000); + Player player = event.getPlayer(); + Optional serverConnection = player.getCurrentServer(); + serverConnection.ifPresent(connection -> + AllMusic.joinPlay(event.getPlayer().getUsername(), connection.getServerInfo().getName())); } @Subscribe diff --git a/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java b/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java index 1450e3b3..680bd6db 100644 --- a/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java +++ b/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java @@ -140,6 +140,20 @@ public class SideVelocity extends BaseSide implements IEconomy { } } + @Override + public void joinPlay(String name) { + Optional player = AllMusicVelocity.plugin.server.getPlayer(name); + if (player.isPresent()) { + Player player1 = player.get(); + Optional server = player1.getCurrentServer(); + if (server.isPresent()) { + AllMusic.joinPlay(name, server.get().getServerInfo().getName()); + } else { + AllMusic.joinPlay(name); + } + } + } + @Override public boolean needPlay(boolean islist) { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { diff --git a/version b/version index 4764627f..03d70eae 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.9.2 \ No newline at end of file +3.9.3 \ No newline at end of file From 25d5bd18a20d6f01ee0d30b212062904fb6e17a3 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Fri, 3 Apr 2026 16:59:01 +0800 Subject: [PATCH 2/9] =?UTF-8?q?up=20=E4=BF=AE=E6=94=B9=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/AllMusic.java | 37 +++++-------------- core/command/sub/CommandJoin.java | 2 +- core/side/BaseSide.java | 8 +--- .../side/velocity/ListenerVelocity.java | 5 +-- .../server/side/velocity/SideVelocity.java | 14 ------- version | 2 +- 6 files changed, 14 insertions(+), 54 deletions(-) diff --git a/core/AllMusic.java b/core/AllMusic.java index 432ff074..54e40097 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -332,9 +332,18 @@ public class AllMusic { * @param player 用户名 */ public static void joinPlay(String player) { + AllMusic.side.runTask(() -> joinPlayNow(player), AllMusic.config.joinDelay); + } + + public static void joinPlayNow(String player) { DataSql.task(() -> { String player1 = player.toLowerCase(); - if (DataSql.checkMutePlayer(player1) || PlayMusic.containNowPlay(player1)) { + Object player2 = AllMusic.side.getPlayer(player1); + String server = AllMusic.side.getPlayerServer(player2); + if (server != null && AllMusic.getConfig().muteServer.contains(server)) { + return; + } + if (DataSql.checkMutePlayer(player1)) { return; } if (DataSql.checkMuteListPlayer(player1)) { @@ -353,32 +362,6 @@ public class AllMusic { }); } - public static void joinPlay(String player, String server) { - DataSql.task(() -> { - if (server != null && AllMusic.getConfig().muteServer.contains(server)) { - return; - } - - String player1 = player.toLowerCase(); - if (DataSql.checkMutePlayer(player1)) { - return; - } - if (DataSql.checkMuteListPlayer(player1)) { - return; - } - - AllMusic.side.runTask(() -> { - SongInfoObj music = PlayMusic.nowPlayMusic; - if (music != null && PlayMusic.url != null) { - AllMusic.side.sendHudPos(player1); - AllMusic.side.sendMusic(player1, PlayMusic.url); - AllMusic.side.sendPic(player1, music.getPicUrl()); - AllMusic.side.runTask(() -> AllMusic.side.sendPos(player1, (int) PlayMusic.musicNowTime), 50); - } - }, AllMusic.config.joinDelay); - }); - } - public static Component miniMessage(String input) { MiniMessage mm = MiniMessage.miniMessage(); return mm.deserialize(input); diff --git a/core/command/sub/CommandJoin.java b/core/command/sub/CommandJoin.java index 30f518b8..e3f4b8aa 100644 --- a/core/command/sub/CommandJoin.java +++ b/core/command/sub/CommandJoin.java @@ -6,6 +6,6 @@ import com.coloryr.allmusic.server.core.command.ACommand; public class CommandJoin extends ACommand { @Override public void execute(Object sender, String name, String[] args) { - AllMusic.side.joinPlay(name); + AllMusic.joinPlayNow(name); } } diff --git a/core/side/BaseSide.java b/core/side/BaseSide.java index f79f0caf..217eb3a1 100644 --- a/core/side/BaseSide.java +++ b/core/side/BaseSide.java @@ -150,17 +150,11 @@ public abstract class BaseSide { */ public abstract void broadcast(Component data); - /** - * 重新发送播放包 - * @param data 播放包 - */ - public abstract void joinPlay(String data); - /** * 重载 */ public final void reload() { - new AllMusic().init(getFolder()); + AllMusic.init(getFolder()); } /** diff --git a/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java b/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java index 5db3b5b4..2646f751 100644 --- a/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java +++ b/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java @@ -21,10 +21,7 @@ public class ListenerVelocity { @Subscribe public void onPostLoginEvent(PostLoginEvent event) { - Player player = event.getPlayer(); - Optional serverConnection = player.getCurrentServer(); - serverConnection.ifPresent(connection -> - AllMusic.joinPlay(event.getPlayer().getUsername(), connection.getServerInfo().getName())); + AllMusic.joinPlay(event.getPlayer().getUsername()); } @Subscribe diff --git a/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java b/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java index 680bd6db..1450e3b3 100644 --- a/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java +++ b/velocity/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java @@ -140,20 +140,6 @@ public class SideVelocity extends BaseSide implements IEconomy { } } - @Override - public void joinPlay(String name) { - Optional player = AllMusicVelocity.plugin.server.getPlayer(name); - if (player.isPresent()) { - Player player1 = player.get(); - Optional server = player1.getCurrentServer(); - if (server.isPresent()) { - AllMusic.joinPlay(name, server.get().getServerInfo().getName()); - } else { - AllMusic.joinPlay(name); - } - } - } - @Override public boolean needPlay(boolean islist) { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { diff --git a/version b/version index 03d70eae..ed7555c7 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.9.3 \ No newline at end of file +3.9.4 \ No newline at end of file From faa7aff4d97b9d8325d2c9ab776d7217542a8bba Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Fri, 3 Apr 2026 17:53:41 +0800 Subject: [PATCH 3/9] Update client --- client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client b/client index 254df0a7..59221fc6 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 254df0a77ff5ce313dca955b8549d53d22fd95b1 +Subproject commit 59221fc6a03191d7674bfb263e3ae37d1d8cfe3b From 4b7fb0342cdda8e37e3c540a9304a351ee1e2aa6 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Fri, 3 Apr 2026 18:45:45 +0800 Subject: [PATCH 4/9] up --- fabric_1_21/build.gradle | 2 +- .../allmusic/server/CommandFabric.java | 22 +++++----- .../coloryr/allmusic/server/SideFabric.java | 38 ++++++++--------- .../com/coloryr/allmusic/server/Tasks.java | 2 +- .../allmusic/server/event/MusicAddEvent.java | 13 +++--- .../allmusic/server/event/MusicPlayEvent.java | 9 ++-- .../server/mixin/ServerPlayerMixin.java | 18 ++++---- fabric_1_21_6/build.gradle | 2 +- .../allmusic/server/CommandFabric.java | 24 +++++------ .../coloryr/allmusic/server/SideFabric.java | 41 +++++++++---------- .../com/coloryr/allmusic/server/Tasks.java | 2 +- .../allmusic/server/event/MusicAddEvent.java | 13 +++--- .../allmusic/server/event/MusicPlayEvent.java | 9 ++-- .../server/mixin/ServerPlayerMixin.java | 18 ++++---- .../allmusic/server/AllMusicFolia.java | 4 +- .../allmusic/server/hooks/AllMusicPAPI.java | 2 +- ...AllMusicBukkit.java => AllMusicPaper.java} | 15 ++++--- .../CommandBukkit.java => CommandPaper.java} | 4 +- .../server/{side/bukkit => }/FunCore.java | 2 +- ...ListenerBukkit.java => ListenerPaper.java} | 4 +- .../bukkit/LogBukkit.java => LogPaper.java} | 4 +- .../{side/bukkit => }/PluginMessage.java | 5 +-- .../bukkit/SideBukkit.java => SidePaper.java} | 23 +++++------ .../bukkit => }/event/MusicAddEvent.java | 2 +- .../bukkit => }/event/MusicPlayEvent.java | 2 +- .../{side/bukkit => }/hooks/AllMusicPAPI.java | 4 +- .../{side/bukkit => }/hooks/CitizensNPC.java | 2 +- .../{side/bukkit => }/hooks/VaultHook.java | 2 +- paper/src/main/resources/plugin.yml | 2 +- 29 files changed, 140 insertions(+), 150 deletions(-) rename paper/src/main/java/com/coloryr/allmusic/server/{AllMusicBukkit.java => AllMusicPaper.java} (88%) rename paper/src/main/java/com/coloryr/allmusic/server/{side/bukkit/CommandBukkit.java => CommandPaper.java} (89%) rename paper/src/main/java/com/coloryr/allmusic/server/{side/bukkit => }/FunCore.java (93%) rename paper/src/main/java/com/coloryr/allmusic/server/{side/bukkit/ListenerBukkit.java => ListenerPaper.java} (85%) rename paper/src/main/java/com/coloryr/allmusic/server/{side/bukkit/LogBukkit.java => LogPaper.java} (70%) rename paper/src/main/java/com/coloryr/allmusic/server/{side/bukkit => }/PluginMessage.java (95%) rename paper/src/main/java/com/coloryr/allmusic/server/{side/bukkit/SideBukkit.java => SidePaper.java} (89%) rename paper/src/main/java/com/coloryr/allmusic/server/{side/bukkit => }/event/MusicAddEvent.java (95%) rename paper/src/main/java/com/coloryr/allmusic/server/{side/bukkit => }/event/MusicPlayEvent.java (94%) rename paper/src/main/java/com/coloryr/allmusic/server/{side/bukkit => }/hooks/AllMusicPAPI.java (97%) rename paper/src/main/java/com/coloryr/allmusic/server/{side/bukkit => }/hooks/CitizensNPC.java (74%) rename paper/src/main/java/com/coloryr/allmusic/server/{side/bukkit => }/hooks/VaultHook.java (95%) diff --git a/fabric_1_21/build.gradle b/fabric_1_21/build.gradle index 2a3e9106..1aaa4edd 100644 --- a/fabric_1_21/build.gradle +++ b/fabric_1_21/build.gradle @@ -32,7 +32,7 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings loom.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/CommandFabric.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/CommandFabric.java index 32e8f46b..2f9ef462 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/CommandFabric.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/CommandFabric.java @@ -8,24 +8,24 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.suggestion.SuggestionProvider; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import net.minecraft.server.command.CommandManager; -import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; -public class CommandFabric implements Command, Predicate, SuggestionProvider { +public class CommandFabric implements Command, Predicate, SuggestionProvider { public static CommandFabric instance = new CommandFabric(); - public void register(CommandDispatcher dispatcher) { - dispatcher.register(((CommandManager.literal("music").requires(this)).executes(this)) - .then(CommandManager.argument("args", StringArgumentType.greedyString()) + public void register(CommandDispatcher dispatcher) { + dispatcher.register(((Commands.literal("music").requires(this)).executes(this)) + .then(Commands.argument("args", StringArgumentType.greedyString()) .suggests(this).executes(this))); } @Override - public int run(CommandContext context) { + public int run(CommandContext context) { var item = context.getSource(); var input = context.getInput(); @@ -33,18 +33,18 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) { var item = context.getSource(); var input = context.getInput(); @@ -54,7 +54,7 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(item, item.getName(), arg); + List results = CommandEX.getTabList(item, item.getTextName(), arg); String remaining = builder.getRemaining().trim(); diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/SideFabric.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/SideFabric.java index e25da801..b4ea7fc3 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/SideFabric.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/SideFabric.java @@ -11,10 +11,8 @@ import com.coloryr.allmusic.server.event.MusicAddEvent; import com.coloryr.allmusic.server.event.MusicPlayEvent; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.kyori.adventure.text.Component; -import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.Text; -import net.minecraft.util.ActionResult; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.server.level.ServerPlayer; import java.io.File; import java.util.Collection; @@ -36,14 +34,14 @@ public class SideFabric extends BaseSide { @Override public boolean checkPermission(Object player) { - ServerCommandSource source = (ServerCommandSource) player; - return source.hasPermissionLevel(2); + CommandSourceStack source = (CommandSourceStack) player; + return source.hasPermission(2); } @Override public boolean isPlayer(Object player) { - ServerCommandSource source = (ServerCommandSource) player; - return source.isExecutedByPlayer(); + CommandSourceStack source = (CommandSourceStack) player; + return source.isPlayer(); } @Override @@ -53,7 +51,7 @@ public class SideFabric extends BaseSide { @Override public boolean needPlay(boolean islist) { - for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { + for (var player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } @@ -63,12 +61,12 @@ public class SideFabric extends BaseSide { @Override public Collection getPlayers() { - return AllMusicServer.server.getPlayerManager().getPlayerList(); + return AllMusicServer.server.getPlayerList().getPlayers(); } @Override public String getPlayerName(Object player) { - if (player instanceof ServerPlayerEntity player1) { + if (player instanceof ServerPlayer player1) { return player1.getName().getString(); } @@ -82,19 +80,19 @@ public class SideFabric extends BaseSide { @Override public void send(Object player, CommandType type, String data, int data1) { - if (player instanceof ServerPlayerEntity player1) { + if (player instanceof ServerPlayer player1) { send(player1, new MusicPack(type, data, data1)); } } @Override public Object getPlayer(String player) { - return AllMusicServer.server.getPlayerManager().getPlayer(player); + return AllMusicServer.server.getPlayerList().getPlayerByName(player); } @Override public void sendBar(Object player, Component data) { - if (player instanceof ServerPlayerEntity player1) { + if (player instanceof ServerPlayer player1) { player1.sendActionBar(data); } } @@ -106,7 +104,7 @@ public class SideFabric extends BaseSide { @Override public void broadcast(Component message) { - for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { + for (var player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(message); } @@ -115,23 +113,23 @@ public class SideFabric extends BaseSide { @Override public void sendMessage(Object obj, Component message) { - if(obj instanceof ServerCommandSource source) { + if(obj instanceof CommandSourceStack source) { source.sendMessage(message); } } @Override public boolean onMusicPlay(SongInfoObj obj) { - return MusicPlayEvent.EVENT.invoker().interact(obj) != ActionResult.PASS; + return !MusicPlayEvent.EVENT.invoker().interact(obj); } @Override public boolean onMusicAdd(Object obj, PlayerAddMusicObj music) { - ServerCommandSource source = (ServerCommandSource) obj; - return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS; + CommandSourceStack source = (CommandSourceStack) obj; + return !MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music); } - private void send(ServerPlayerEntity players, MusicPack data) { + private void send(ServerPlayer players, MusicPack data) { if (players == null) return; runTask(() -> ServerPlayNetworking.send(players, new MusicCodec(data))); diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/Tasks.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/Tasks.java index a68ab552..d4e72d39 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -8,7 +8,7 @@ public class Tasks { private static final List taskItems = new CopyOnWriteArrayList<>(); public static void init() { - AllMusicServer.server.addServerGuiTickable(Tasks::tick); + AllMusicServer.server.addTickable(Tasks::tick); } public static void tick() { diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java index 50798753..52181595 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java @@ -3,22 +3,21 @@ package com.coloryr.allmusic.server.event; import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.ActionResult; +import net.minecraft.server.level.ServerPlayer; public interface MusicAddEvent { Event EVENT = EventFactory.createArrayBacked(MusicAddEvent.class, (listeners) -> (player, music) -> { for (MusicAddEvent listener : listeners) { - ActionResult result = listener.interact(player, music); + boolean result = listener.interact(player, music); - if (result != ActionResult.PASS) { - return result; + if (!result) { + return false; } } - return ActionResult.PASS; + return true; }); - ActionResult interact(ServerPlayerEntity player, PlayerAddMusicObj music); + boolean interact(ServerPlayer player, PlayerAddMusicObj music); } diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java index e0f12ba1..015adeee 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java @@ -3,21 +3,20 @@ package com.coloryr.allmusic.server.event; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.util.ActionResult; public interface MusicPlayEvent { Event EVENT = EventFactory.createArrayBacked(MusicPlayEvent.class, (listeners) -> (music) -> { for (MusicPlayEvent listener : listeners) { - ActionResult result = listener.interact(music); + boolean result = listener.interact(music); - if (result != ActionResult.PASS) { + if (!result) { return result; } } - return ActionResult.PASS; + return true; }); - ActionResult interact(SongInfoObj music); + boolean interact(SongInfoObj music); } diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index cdb23d00..4b48badb 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -2,24 +2,24 @@ package com.coloryr.allmusic.server.mixin; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.PlayMusic; -import net.minecraft.network.ClientConnection; -import net.minecraft.server.PlayerManager; -import net.minecraft.server.network.ConnectedClientData; -import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.network.Connection; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.network.CommonListenerCookie; +import net.minecraft.server.players.PlayerList; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(PlayerManager.class) +@Mixin(PlayerList.class) public class ServerPlayerMixin { @Inject(at = @At("HEAD"), method = "remove") - private void remove(ServerPlayerEntity entity, CallbackInfo info) { + private void remove(ServerPlayer entity, CallbackInfo info) { PlayMusic.removeNowPlayPlayer(entity.getName().getString()); } - @Inject(at = @At("TAIL"), method = "onPlayerConnect") - private void add(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) { - AllMusic.joinPlay(player.getName().getString()); + @Inject(at = @At("TAIL"), method = "placeNewPlayer") + private void add(Connection connection, ServerPlayer serverPlayer, CommonListenerCookie commonListenerCookie, CallbackInfo ci) { + AllMusic.joinPlay(serverPlayer.getName().getString()); } } diff --git a/fabric_1_21_6/build.gradle b/fabric_1_21_6/build.gradle index 2dbf476c..a961d290 100644 --- a/fabric_1_21_6/build.gradle +++ b/fabric_1_21_6/build.gradle @@ -32,7 +32,7 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings loom.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. diff --git a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/CommandFabric.java b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/CommandFabric.java index ad3c8d44..2f9ef462 100644 --- a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/CommandFabric.java +++ b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/CommandFabric.java @@ -8,24 +8,24 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.suggestion.SuggestionProvider; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import net.minecraft.server.command.CommandManager; -import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; -public class CommandFabric implements Command, Predicate, SuggestionProvider { +public class CommandFabric implements Command, Predicate, SuggestionProvider { public static CommandFabric instance = new CommandFabric(); - public void register(CommandDispatcher dispatcher) { - dispatcher.register(((CommandManager.literal("music").requires(this)).executes(this)) - .then(CommandManager.argument("args", StringArgumentType.greedyString()) + public void register(CommandDispatcher dispatcher) { + dispatcher.register(((Commands.literal("music").requires(this)).executes(this)) + .then(Commands.argument("args", StringArgumentType.greedyString()) .suggests(this).executes(this))); } @Override - public int run(CommandContext context) { + public int run(CommandContext context) { var item = context.getSource(); var input = context.getInput(); @@ -33,18 +33,18 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) { var item = context.getSource(); var input = context.getInput(); @@ -54,12 +54,12 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(item, item.getName(), arg); + List results = CommandEX.getTabList(item, item.getTextName(), arg); String remaining = builder.getRemaining().trim(); for (String s : results) { - if (s.startsWith(remaining)) { + if (s.startsWith(remaining)){ builder.suggest(s); } } diff --git a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/SideFabric.java b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/SideFabric.java index 3c51112a..b4ea7fc3 100644 --- a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/SideFabric.java +++ b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/SideFabric.java @@ -11,15 +11,14 @@ import com.coloryr.allmusic.server.event.MusicAddEvent; import com.coloryr.allmusic.server.event.MusicPlayEvent; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.kyori.adventure.text.Component; -import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.Text; -import net.minecraft.util.ActionResult; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.server.level.ServerPlayer; import java.io.File; import java.util.Collection; public class SideFabric extends BaseSide { + @Override public void runTask(Runnable run) { AllMusicServer.server.execute(run); @@ -35,14 +34,14 @@ public class SideFabric extends BaseSide { @Override public boolean checkPermission(Object player) { - ServerCommandSource source = (ServerCommandSource) player; - return source.hasPermissionLevel(2); + CommandSourceStack source = (CommandSourceStack) player; + return source.hasPermission(2); } @Override public boolean isPlayer(Object player) { - ServerCommandSource source = (ServerCommandSource) player; - return source.isExecutedByPlayer(); + CommandSourceStack source = (CommandSourceStack) player; + return source.isPlayer(); } @Override @@ -52,8 +51,8 @@ public class SideFabric extends BaseSide { @Override public boolean needPlay(boolean islist) { - for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { - if (!com.coloryr.allmusic.server.core.AllMusic.isSkip(player.getName().getString(), null, false, islist)) { + for (var player : AllMusicServer.server.getPlayerList().getPlayers()) { + if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -62,12 +61,12 @@ public class SideFabric extends BaseSide { @Override public Collection getPlayers() { - return AllMusicServer.server.getPlayerManager().getPlayerList(); + return AllMusicServer.server.getPlayerList().getPlayers(); } @Override public String getPlayerName(Object player) { - if (player instanceof ServerPlayerEntity player1) { + if (player instanceof ServerPlayer player1) { return player1.getName().getString(); } @@ -81,19 +80,19 @@ public class SideFabric extends BaseSide { @Override public void send(Object player, CommandType type, String data, int data1) { - if (player instanceof ServerPlayerEntity player1) { + if (player instanceof ServerPlayer player1) { send(player1, new MusicPack(type, data, data1)); } } @Override public Object getPlayer(String player) { - return AllMusicServer.server.getPlayerManager().getPlayer(player); + return AllMusicServer.server.getPlayerList().getPlayerByName(player); } @Override public void sendBar(Object player, Component data) { - if (player instanceof ServerPlayerEntity player1) { + if (player instanceof ServerPlayer player1) { player1.sendActionBar(data); } } @@ -105,7 +104,7 @@ public class SideFabric extends BaseSide { @Override public void broadcast(Component message) { - for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { + for (var player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(message); } @@ -114,23 +113,23 @@ public class SideFabric extends BaseSide { @Override public void sendMessage(Object obj, Component message) { - if (obj instanceof ServerCommandSource source) { + if(obj instanceof CommandSourceStack source) { source.sendMessage(message); } } @Override public boolean onMusicPlay(SongInfoObj obj) { - return MusicPlayEvent.EVENT.invoker().interact(obj) != ActionResult.PASS; + return !MusicPlayEvent.EVENT.invoker().interact(obj); } @Override public boolean onMusicAdd(Object obj, PlayerAddMusicObj music) { - ServerCommandSource source = (ServerCommandSource) obj; - return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS; + CommandSourceStack source = (CommandSourceStack) obj; + return !MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music); } - private void send(ServerPlayerEntity players, MusicPack data) { + private void send(ServerPlayer players, MusicPack data) { if (players == null) return; runTask(() -> ServerPlayNetworking.send(players, new MusicCodec(data))); diff --git a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/Tasks.java b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/Tasks.java index a68ab552..d4e72d39 100644 --- a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -8,7 +8,7 @@ public class Tasks { private static final List taskItems = new CopyOnWriteArrayList<>(); public static void init() { - AllMusicServer.server.addServerGuiTickable(Tasks::tick); + AllMusicServer.server.addTickable(Tasks::tick); } public static void tick() { diff --git a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java index ff450957..52181595 100644 --- a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java +++ b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java @@ -3,22 +3,21 @@ package com.coloryr.allmusic.server.event; import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.ActionResult; +import net.minecraft.server.level.ServerPlayer; public interface MusicAddEvent { Event EVENT = EventFactory.createArrayBacked(MusicAddEvent.class, (listeners) -> (player, music) -> { for (MusicAddEvent listener : listeners) { - ActionResult result = listener.interact(player, music); + boolean result = listener.interact(player, music); - if (result != ActionResult.PASS) { - return result; + if (!result) { + return false; } } - return ActionResult.PASS; + return true; }); - ActionResult interact(PlayerEntity player, PlayerAddMusicObj music); + boolean interact(ServerPlayer player, PlayerAddMusicObj music); } diff --git a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java index e0f12ba1..015adeee 100644 --- a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java +++ b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java @@ -3,21 +3,20 @@ package com.coloryr.allmusic.server.event; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.util.ActionResult; public interface MusicPlayEvent { Event EVENT = EventFactory.createArrayBacked(MusicPlayEvent.class, (listeners) -> (music) -> { for (MusicPlayEvent listener : listeners) { - ActionResult result = listener.interact(music); + boolean result = listener.interact(music); - if (result != ActionResult.PASS) { + if (!result) { return result; } } - return ActionResult.PASS; + return true; }); - ActionResult interact(SongInfoObj music); + boolean interact(SongInfoObj music); } diff --git a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index cdb23d00..4b48badb 100644 --- a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -2,24 +2,24 @@ package com.coloryr.allmusic.server.mixin; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.PlayMusic; -import net.minecraft.network.ClientConnection; -import net.minecraft.server.PlayerManager; -import net.minecraft.server.network.ConnectedClientData; -import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.network.Connection; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.network.CommonListenerCookie; +import net.minecraft.server.players.PlayerList; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(PlayerManager.class) +@Mixin(PlayerList.class) public class ServerPlayerMixin { @Inject(at = @At("HEAD"), method = "remove") - private void remove(ServerPlayerEntity entity, CallbackInfo info) { + private void remove(ServerPlayer entity, CallbackInfo info) { PlayMusic.removeNowPlayPlayer(entity.getName().getString()); } - @Inject(at = @At("TAIL"), method = "onPlayerConnect") - private void add(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) { - AllMusic.joinPlay(player.getName().getString()); + @Inject(at = @At("TAIL"), method = "placeNewPlayer") + private void add(Connection connection, ServerPlayer serverPlayer, CommonListenerCookie commonListenerCookie, CallbackInfo ci) { + AllMusic.joinPlay(serverPlayer.getName().getString()); } } diff --git a/folia/src/main/java/com/coloryr/allmusic/server/AllMusicFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/AllMusicFolia.java index 8dfd68fc..2feb5ff9 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/AllMusicFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/AllMusicFolia.java @@ -57,7 +57,7 @@ public class AllMusicFolia extends JavaPlugin { AllMusic.log.data("[AllMusic3]PAPI未挂钩"); } - if (AllMusic.getConfig().topPAPI) { + if (AllMusic.getConfig().topAPI) { PlayMusic.nowPlayMusic = new TopSongInfoObj(); PlayMusic.lyric = new TopLyricSave(); pluginMessage = new PluginMessage(); @@ -78,7 +78,7 @@ public class AllMusicFolia extends JavaPlugin { @Override public void onDisable() { AllMusic.isRun = false; - if (AllMusic.getConfig().topPAPI) + if (AllMusic.getConfig().topAPI) pluginMessage.stop(); else AllMusic.stop(); diff --git a/folia/src/main/java/com/coloryr/allmusic/server/hooks/AllMusicPAPI.java b/folia/src/main/java/com/coloryr/allmusic/server/hooks/AllMusicPAPI.java index 16532c45..a2c4766d 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/hooks/AllMusicPAPI.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/hooks/AllMusicPAPI.java @@ -55,7 +55,7 @@ public class AllMusicPAPI extends PlaceholderExpansion { @Override public String onRequest(OfflinePlayer player, @NotNull String identifier) { - if (AllMusic.getConfig().topPAPI) { + if (AllMusic.getConfig().topAPI) { if (!PluginMessage.update) { PluginMessage.startUpdate(); return ""; diff --git a/paper/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java b/paper/src/main/java/com/coloryr/allmusic/server/AllMusicPaper.java similarity index 88% rename from paper/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java rename to paper/src/main/java/com/coloryr/allmusic/server/AllMusicPaper.java index 53ab163d..1dbff84a 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/AllMusicPaper.java @@ -4,15 +4,14 @@ import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.PlayMusic; import com.coloryr.allmusic.server.core.music.TopLyricSave; import com.coloryr.allmusic.server.core.objs.music.TopSongInfoObj; -import com.coloryr.allmusic.server.side.bukkit.*; -import com.coloryr.allmusic.server.side.bukkit.hooks.AllMusicPAPI; -import com.coloryr.allmusic.server.side.bukkit.hooks.VaultHook; +import com.coloryr.allmusic.server.hooks.AllMusicPAPI; +import com.coloryr.allmusic.server.hooks.VaultHook; import org.bukkit.Bukkit; import org.bukkit.command.PluginCommand; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; -public class AllMusicBukkit extends JavaPlugin { +public class AllMusicPaper extends JavaPlugin { public static Plugin plugin; public static AllMusicPAPI PAPI; private static PluginMessage pluginMessage; @@ -20,8 +19,8 @@ public class AllMusicBukkit extends JavaPlugin { @Override public void onEnable() { plugin = this; - AllMusic.log = new LogBukkit(); - AllMusic.side = new SideBukkit(); + AllMusic.log = new LogPaper(); + AllMusic.side = new SidePaper(); AllMusic.init(plugin.getDataFolder()); if (!AllMusic.isRun) { @@ -66,12 +65,12 @@ public class AllMusicBukkit extends JavaPlugin { getServer().getMessenger().registerIncomingPluginChannel(this, AllMusic.channelBC, pluginMessage); AllMusic.log.data("[AllMusic3]设置为顶层模式"); } else { - CommandBukkit command = new CommandBukkit(); + CommandPaper command = new CommandPaper(); getServer().getMessenger().registerOutgoingPluginChannel(this, AllMusic.channel); PluginCommand command1 = Bukkit.getPluginCommand("music"); command1.setExecutor(command); command1.setTabCompleter(command); - Bukkit.getPluginManager().registerEvents(new ListenerBukkit(), this); + Bukkit.getPluginManager().registerEvents(new ListenerPaper(), this); AllMusic.start(); } } diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/CommandBukkit.java b/paper/src/main/java/com/coloryr/allmusic/server/CommandPaper.java similarity index 89% rename from paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/CommandBukkit.java rename to paper/src/main/java/com/coloryr/allmusic/server/CommandPaper.java index a831a6ee..406a9344 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/CommandBukkit.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/CommandPaper.java @@ -1,4 +1,4 @@ -package com.coloryr.allmusic.server.side.bukkit; +package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.command.CommandEX; import org.bukkit.command.Command; @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.Locale; -public class CommandBukkit implements CommandExecutor, TabExecutor { +public class CommandPaper implements CommandExecutor, TabExecutor { @Override public boolean onCommand(@NotNull CommandSender sender, Command command, @NotNull String label, @NotNull String[] args) { diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/FunCore.java b/paper/src/main/java/com/coloryr/allmusic/server/FunCore.java similarity index 93% rename from paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/FunCore.java rename to paper/src/main/java/com/coloryr/allmusic/server/FunCore.java index 61c73dbb..5c7913de 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/FunCore.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/FunCore.java @@ -1,4 +1,4 @@ -package com.coloryr.allmusic.server.side.bukkit; +package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; import org.bukkit.Bukkit; diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/ListenerBukkit.java b/paper/src/main/java/com/coloryr/allmusic/server/ListenerPaper.java similarity index 85% rename from paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/ListenerBukkit.java rename to paper/src/main/java/com/coloryr/allmusic/server/ListenerPaper.java index adc59a8d..1513b1d5 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/ListenerBukkit.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/ListenerPaper.java @@ -1,4 +1,4 @@ -package com.coloryr.allmusic.server.side.bukkit; +package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.PlayMusic; @@ -7,7 +7,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; -public class ListenerBukkit implements Listener { +public class ListenerPaper implements Listener { @EventHandler public void onPlayerQuitEvent(final PlayerQuitEvent e) { PlayMusic.removeNowPlayPlayer(e.getPlayer().getName()); diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java b/paper/src/main/java/com/coloryr/allmusic/server/LogPaper.java similarity index 70% rename from paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java rename to paper/src/main/java/com/coloryr/allmusic/server/LogPaper.java index cf9214b5..52ad5af3 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/LogPaper.java @@ -1,10 +1,10 @@ -package com.coloryr.allmusic.server.side.bukkit; +package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.side.IAllMusicLogger; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; -public class LogBukkit implements IAllMusicLogger { +public class LogPaper implements IAllMusicLogger { @Override public void data(Component data) { Bukkit.getConsoleSender().sendMessage(data); diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/PluginMessage.java b/paper/src/main/java/com/coloryr/allmusic/server/PluginMessage.java similarity index 95% rename from paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/PluginMessage.java rename to paper/src/main/java/com/coloryr/allmusic/server/PluginMessage.java index cd1ab08f..96c2007e 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/PluginMessage.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/PluginMessage.java @@ -1,6 +1,5 @@ -package com.coloryr.allmusic.server.side.bukkit; +package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.AllMusicBukkit; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.PlayMusic; import com.coloryr.allmusic.server.core.music.TopLyricSave; @@ -42,7 +41,7 @@ public class PluginMessage implements PluginMessageListener { Player player = Iterables.getFirst(Bukkit.getOnlinePlayers(), null); if (player == null) return; - player.sendPluginMessage(AllMusicBukkit.plugin, AllMusic.channelBC, out.toByteArray()); + player.sendPluginMessage(AllMusicPaper.plugin, AllMusic.channelBC, out.toByteArray()); } public static void startUpdate() { diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java b/paper/src/main/java/com/coloryr/allmusic/server/SidePaper.java similarity index 89% rename from paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java rename to paper/src/main/java/com/coloryr/allmusic/server/SidePaper.java index 4ed87fa1..f07e5a38 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/SidePaper.java @@ -1,14 +1,13 @@ -package com.coloryr.allmusic.server.side.bukkit; +package com.coloryr.allmusic.server; import com.coloryr.allmusic.codec.CommandType; -import com.coloryr.allmusic.server.AllMusicBukkit; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.side.bukkit.event.MusicAddEvent; -import com.coloryr.allmusic.server.side.bukkit.event.MusicPlayEvent; -import com.coloryr.allmusic.server.side.bukkit.hooks.CitizensNPC; +import com.coloryr.allmusic.server.event.MusicAddEvent; +import com.coloryr.allmusic.server.event.MusicPlayEvent; +import com.coloryr.allmusic.server.hooks.CitizensNPC; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -23,7 +22,7 @@ import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; import java.util.Collection; -public class SideBukkit extends BaseSide { +public class SidePaper extends BaseSide { private static Class ByteBufC; private static Class UnpooledC; private static Method bufferM; @@ -138,7 +137,7 @@ public class SideBukkit extends BaseSide { @Override public File getFolder() { - return AllMusicBukkit.plugin.getDataFolder(); + return AllMusicPaper.plugin.getDataFolder(); } @Override @@ -152,7 +151,7 @@ public class SideBukkit extends BaseSide { @Override public void runTask(Runnable run) { - Bukkit.getScheduler().runTask(AllMusicBukkit.plugin, run); + Bukkit.getScheduler().runTask(AllMusicPaper.plugin, run); } @Override @@ -186,13 +185,13 @@ public class SideBukkit extends BaseSide { @Override public void runTask(Runnable run, int delay) { - Bukkit.getScheduler().runTaskLater(AllMusicBukkit.plugin, run, delay); + Bukkit.getScheduler().runTaskLater(AllMusicPaper.plugin, run, delay); } @Override public boolean onMusicPlay(SongInfoObj obj) { MusicPlayEvent event = new MusicPlayEvent(obj); - Bukkit.getScheduler().callSyncMethod(AllMusicBukkit.plugin, () -> { + Bukkit.getScheduler().callSyncMethod(AllMusicPaper.plugin, () -> { Bukkit.getPluginManager().callEvent(event); if (!event.isCancel()) { FunCore.addMusic(); @@ -205,7 +204,7 @@ public class SideBukkit extends BaseSide { @Override public boolean onMusicAdd(Object obj, PlayerAddMusicObj music) { MusicAddEvent event = new MusicAddEvent(music, (CommandSender) obj); - Bukkit.getScheduler().callSyncMethod(AllMusicBukkit.plugin, () -> { + Bukkit.getScheduler().callSyncMethod(AllMusicPaper.plugin, () -> { Bukkit.getPluginManager().callEvent(event); return event; }); @@ -217,7 +216,7 @@ public class SideBukkit extends BaseSide { return; if (AllMusic.isRun) { - runTask(() -> players.sendPluginMessage(AllMusicBukkit.plugin, AllMusic.channel, data)); + runTask(() -> players.sendPluginMessage(AllMusicPaper.plugin, AllMusic.channel, data)); } } diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicAddEvent.java b/paper/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java similarity index 95% rename from paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicAddEvent.java rename to paper/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java index cf1ec7ba..218ab979 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicAddEvent.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java @@ -1,4 +1,4 @@ -package com.coloryr.allmusic.server.side.bukkit.event; +package com.coloryr.allmusic.server.event; import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj; import org.bukkit.command.CommandSender; diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicPlayEvent.java b/paper/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java similarity index 94% rename from paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicPlayEvent.java rename to paper/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java index 5f65d0a5..9c483a2c 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicPlayEvent.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java @@ -1,4 +1,4 @@ -package com.coloryr.allmusic.server.side.bukkit.event; +package com.coloryr.allmusic.server.event; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import org.bukkit.event.Event; diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java b/paper/src/main/java/com/coloryr/allmusic/server/hooks/AllMusicPAPI.java similarity index 97% rename from paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java rename to paper/src/main/java/com/coloryr/allmusic/server/hooks/AllMusicPAPI.java index 0f83ac04..a2c4766d 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/hooks/AllMusicPAPI.java @@ -1,8 +1,8 @@ -package com.coloryr.allmusic.server.side.bukkit.hooks; +package com.coloryr.allmusic.server.hooks; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.PlayMusic; -import com.coloryr.allmusic.server.side.bukkit.PluginMessage; +import com.coloryr.allmusic.server.PluginMessage; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/CitizensNPC.java b/paper/src/main/java/com/coloryr/allmusic/server/hooks/CitizensNPC.java similarity index 74% rename from paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/CitizensNPC.java rename to paper/src/main/java/com/coloryr/allmusic/server/hooks/CitizensNPC.java index 5fdc8137..72a7e015 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/CitizensNPC.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/hooks/CitizensNPC.java @@ -1,4 +1,4 @@ -package com.coloryr.allmusic.server.side.bukkit.hooks; +package com.coloryr.allmusic.server.hooks; import org.bukkit.entity.Entity; diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/VaultHook.java b/paper/src/main/java/com/coloryr/allmusic/server/hooks/VaultHook.java similarity index 95% rename from paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/VaultHook.java rename to paper/src/main/java/com/coloryr/allmusic/server/hooks/VaultHook.java index f4cbc6e8..bd6acd16 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/VaultHook.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/hooks/VaultHook.java @@ -1,4 +1,4 @@ -package com.coloryr.allmusic.server.side.bukkit.hooks; +package com.coloryr.allmusic.server.hooks; import com.coloryr.allmusic.server.core.sql.IEconomy; import net.milkbowl.vault.economy.Economy; diff --git a/paper/src/main/resources/plugin.yml b/paper/src/main/resources/plugin.yml index 27c5c485..e72c2d61 100644 --- a/paper/src/main/resources/plugin.yml +++ b/paper/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: AllMusic3 -main: com.coloryr.allmusic.server.AllMusicBukkit +main: com.coloryr.allmusic.server.AllMusicPaper author: Color_yr version: ${version} softdepend: [PlaceholderAPI, Vault, Essentials, CMI] From 071a8186b155ca4187120509447522d95f7a10b7 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Fri, 3 Apr 2026 19:08:04 +0800 Subject: [PATCH 5/9] =?UTF-8?q?up=20=E4=BD=BF=E7=94=A8mojang=E6=B7=B7?= =?UTF-8?q?=E6=B7=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fabric_1_20_1/build.gradle | 2 +- .../allmusic/server/AllMusicServer.java | 6 +-- .../allmusic/server/CommandFabric.java | 24 +++++------ .../coloryr/allmusic/server/SideFabric.java | 41 +++++++++---------- .../com/coloryr/allmusic/server/Tasks.java | 2 +- .../allmusic/server/event/MusicAddEvent.java | 13 +++--- .../allmusic/server/event/MusicPlayEvent.java | 9 ++-- .../server/mixin/ServerPlayerMixin.java | 16 ++++---- onejar/fabric_1_20_1/build.gradle | 2 +- onejar/fabric_1_21/build.gradle | 2 +- onejar/fabric_1_21_6/build.gradle | 2 +- 11 files changed, 56 insertions(+), 63 deletions(-) diff --git a/fabric_1_20_1/build.gradle b/fabric_1_20_1/build.gradle index 4511290e..8d0a31d0 100644 --- a/fabric_1_20_1/build.gradle +++ b/fabric_1_20_1/build.gradle @@ -32,7 +32,7 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings loom.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. diff --git a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 1506351a..6af9eb33 100644 --- a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -4,17 +4,15 @@ import com.coloryr.allmusic.server.core.AllMusic; import net.fabricmc.api.DedicatedServerModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.Identifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; public class AllMusicServer implements DedicatedServerModInitializer { public static MinecraftServer server; - public static final Identifier ID = new Identifier("allmusic", "channel"); + public static final ResourceLocation ID = new ResourceLocation("allmusic", "channel"); public static final String dir = "allmusic_server/"; diff --git a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/CommandFabric.java b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/CommandFabric.java index ad3c8d44..2f9ef462 100644 --- a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/CommandFabric.java +++ b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/CommandFabric.java @@ -8,24 +8,24 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.suggestion.SuggestionProvider; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import net.minecraft.server.command.CommandManager; -import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; -public class CommandFabric implements Command, Predicate, SuggestionProvider { +public class CommandFabric implements Command, Predicate, SuggestionProvider { public static CommandFabric instance = new CommandFabric(); - public void register(CommandDispatcher dispatcher) { - dispatcher.register(((CommandManager.literal("music").requires(this)).executes(this)) - .then(CommandManager.argument("args", StringArgumentType.greedyString()) + public void register(CommandDispatcher dispatcher) { + dispatcher.register(((Commands.literal("music").requires(this)).executes(this)) + .then(Commands.argument("args", StringArgumentType.greedyString()) .suggests(this).executes(this))); } @Override - public int run(CommandContext context) { + public int run(CommandContext context) { var item = context.getSource(); var input = context.getInput(); @@ -33,18 +33,18 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) { var item = context.getSource(); var input = context.getInput(); @@ -54,12 +54,12 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(item, item.getName(), arg); + List results = CommandEX.getTabList(item, item.getTextName(), arg); String remaining = builder.getRemaining().trim(); for (String s : results) { - if (s.startsWith(remaining)) { + if (s.startsWith(remaining)){ builder.suggest(s); } } diff --git a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java index 046e2d79..6b0d9242 100644 --- a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java +++ b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java @@ -11,11 +11,9 @@ import com.coloryr.allmusic.server.event.MusicPlayEvent; import io.netty.buffer.ByteBuf; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.kyori.adventure.text.Component; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.Text; -import net.minecraft.util.ActionResult; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.server.level.ServerPlayer; import java.io.File; import java.util.Collection; @@ -36,14 +34,13 @@ public class SideFabric extends BaseSide { @Override public boolean checkPermission(Object player) { - ServerCommandSource source = (ServerCommandSource) player; - return source.hasPermissionLevel(2); + ServerPlayer source = (ServerPlayer) player; + return source.hasPermissions(2); } @Override public boolean isPlayer(Object player) { - ServerCommandSource source = (ServerCommandSource) player; - return source.isExecutedByPlayer(); + return player instanceof ServerPlayer; } @Override @@ -53,7 +50,7 @@ public class SideFabric extends BaseSide { @Override public boolean needPlay(boolean islist) { - for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { + for (var player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } @@ -63,12 +60,12 @@ public class SideFabric extends BaseSide { @Override public Collection getPlayers() { - return AllMusicServer.server.getPlayerManager().getPlayerList(); + return AllMusicServer.server.getPlayerList().getPlayers(); } @Override public String getPlayerName(Object player) { - if (player instanceof ServerPlayerEntity player1) { + if (player instanceof ServerPlayer player1) { return player1.getName().getString(); } @@ -82,19 +79,19 @@ public class SideFabric extends BaseSide { @Override public void send(Object player, CommandType type, String data, int data1) { - if (player instanceof ServerPlayerEntity player1) { + if (player instanceof ServerPlayer player1) { send(player1, MusicPacketCodec.pack(type, data, data1)); } } @Override public Object getPlayer(String player) { - return AllMusicServer.server.getPlayerManager().getPlayer(player); + return AllMusicServer.server.getPlayerList().getPlayerByName(player); } @Override public void sendBar(Object player, Component data) { - if (player instanceof ServerPlayerEntity player1) { + if (player instanceof ServerPlayer player1) { player1.sendActionBar(data); } } @@ -106,7 +103,7 @@ public class SideFabric extends BaseSide { @Override public void broadcast(Component message) { - for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { + for (var player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(message); } @@ -115,25 +112,25 @@ public class SideFabric extends BaseSide { @Override public void sendMessage(Object obj, Component message) { - if (obj instanceof ServerCommandSource source) { + if (obj instanceof CommandSourceStack source) { source.sendMessage(message); } } @Override public boolean onMusicPlay(SongInfoObj obj) { - return MusicPlayEvent.EVENT.invoker().interact(obj) != ActionResult.PASS; + return !MusicPlayEvent.EVENT.invoker().interact(obj); } @Override public boolean onMusicAdd(Object obj, PlayerAddMusicObj music) { - ServerCommandSource source = (ServerCommandSource) obj; - return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS; + CommandSourceStack source = (CommandSourceStack) obj; + return !MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music); } - private void send(ServerPlayerEntity players, ByteBuf data) { + private void send(ServerPlayer players, ByteBuf data) { if (players == null) return; - runTask(() -> ServerPlayNetworking.send(players, AllMusicServer.ID, new PacketByteBuf(data))); + runTask(() -> ServerPlayNetworking.send(players, AllMusicServer.ID, new FriendlyByteBuf(data))); } } diff --git a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/Tasks.java b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/Tasks.java index a68ab552..d4e72d39 100644 --- a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -8,7 +8,7 @@ public class Tasks { private static final List taskItems = new CopyOnWriteArrayList<>(); public static void init() { - AllMusicServer.server.addServerGuiTickable(Tasks::tick); + AllMusicServer.server.addTickable(Tasks::tick); } public static void tick() { diff --git a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java index 50798753..52181595 100644 --- a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java +++ b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java @@ -3,22 +3,21 @@ package com.coloryr.allmusic.server.event; import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.ActionResult; +import net.minecraft.server.level.ServerPlayer; public interface MusicAddEvent { Event EVENT = EventFactory.createArrayBacked(MusicAddEvent.class, (listeners) -> (player, music) -> { for (MusicAddEvent listener : listeners) { - ActionResult result = listener.interact(player, music); + boolean result = listener.interact(player, music); - if (result != ActionResult.PASS) { - return result; + if (!result) { + return false; } } - return ActionResult.PASS; + return true; }); - ActionResult interact(ServerPlayerEntity player, PlayerAddMusicObj music); + boolean interact(ServerPlayer player, PlayerAddMusicObj music); } diff --git a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java index e0f12ba1..015adeee 100644 --- a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java +++ b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java @@ -3,21 +3,20 @@ package com.coloryr.allmusic.server.event; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.util.ActionResult; public interface MusicPlayEvent { Event EVENT = EventFactory.createArrayBacked(MusicPlayEvent.class, (listeners) -> (music) -> { for (MusicPlayEvent listener : listeners) { - ActionResult result = listener.interact(music); + boolean result = listener.interact(music); - if (result != ActionResult.PASS) { + if (!result) { return result; } } - return ActionResult.PASS; + return true; }); - ActionResult interact(SongInfoObj music); + boolean interact(SongInfoObj music); } diff --git a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index d029f241..e57989ef 100644 --- a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -2,23 +2,23 @@ package com.coloryr.allmusic.server.mixin; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.PlayMusic; -import net.minecraft.network.ClientConnection; -import net.minecraft.server.PlayerManager; -import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.network.Connection; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.players.PlayerList; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(PlayerManager.class) +@Mixin(PlayerList.class) public class ServerPlayerMixin { @Inject(at = @At("HEAD"), method = "remove") - private void remove(ServerPlayerEntity entity, CallbackInfo info) { + private void remove(ServerPlayer entity, CallbackInfo info) { PlayMusic.removeNowPlayPlayer(entity.getName().getString()); } - @Inject(at = @At("TAIL"), method = "onPlayerConnect") - private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { - AllMusic.joinPlay(player.getName().getString()); + @Inject(at = @At("TAIL"), method = "placeNewPlayer") + private void add(Connection connection, ServerPlayer serverPlayer, CallbackInfo ci) { + AllMusic.joinPlay(serverPlayer.getName().getString()); } } diff --git a/onejar/fabric_1_20_1/build.gradle b/onejar/fabric_1_20_1/build.gradle index 0b5f06d1..90194eb5 100644 --- a/onejar/fabric_1_20_1/build.gradle +++ b/onejar/fabric_1_20_1/build.gradle @@ -32,7 +32,7 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings loom.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. diff --git a/onejar/fabric_1_21/build.gradle b/onejar/fabric_1_21/build.gradle index dc698e5b..00349a4e 100644 --- a/onejar/fabric_1_21/build.gradle +++ b/onejar/fabric_1_21/build.gradle @@ -32,7 +32,7 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings loom.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. diff --git a/onejar/fabric_1_21_6/build.gradle b/onejar/fabric_1_21_6/build.gradle index 2dc21a69..4d7e74fa 100644 --- a/onejar/fabric_1_21_6/build.gradle +++ b/onejar/fabric_1_21_6/build.gradle @@ -32,7 +32,7 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings loom.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. From 31d17304f14675d688ce965710a21abe23096705 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Sat, 4 Apr 2026 12:33:44 +0800 Subject: [PATCH 6/9] =?UTF-8?q?up=20=E6=AD=8C=E8=AF=8D=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=92=8C=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/AllMusic.java | 18 ++++++++++- core/command/sub/CommandPush.java | 11 ++++--- core/command/sub/CommandVote.java | 10 ++++-- core/music/PlayRuntime.java | 14 ++++----- core/objs/config/ConfigObj.java | 12 ++++++-- core/objs/message/ARG.java | 1 + core/objs/message/PushObj.java | 4 +-- core/objs/message/VoteObj.java | 4 +-- core/utils/StringReplacer.java | 51 +++++++++++++++++++++++++++++++ netapi/LyricDecoder.java | 20 +++++++----- netapi/NetiApiMain.java | 12 ++++---- version | 2 +- 12 files changed, 123 insertions(+), 36 deletions(-) create mode 100644 core/utils/StringReplacer.java diff --git a/core/AllMusic.java b/core/AllMusic.java index 54e40097..e0f5b309 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -12,6 +12,7 @@ import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.core.side.IAllMusicLogger; import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.sql.IEconomy; +import com.coloryr.allmusic.server.core.utils.StringReplacer; import com.coloryr.allmusic.server.netapi.NetiApiMain; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -54,7 +55,7 @@ public class AllMusic { /** * 语言文件配置版本号 */ - public static final String messageVersion = "211"; + public static final String messageVersion = "212"; /** * 日志 */ @@ -95,6 +96,14 @@ public class AllMusic { * 语言文件 */ private static File messageFile; + /** + * 正则替换器 + */ + private static StringReplacer replacer; + + public static StringReplacer getReplacer() { + return replacer; + } /** * 检查配置文件完整性 @@ -320,6 +329,13 @@ public class AllMusic { if (!AllMusic.configVersion.equalsIgnoreCase(config.version)) { log.data("[AllMusic3]请及时更新配置文件"); } + + if (!config.lyricReplace.isEmpty()) { + for (Map.Entry item : config.lyricReplace.entrySet()) { + replacer.put(item.getKey(), item.getValue()); + replacer = new StringReplacer(); + } + } } catch (Exception e) { log.data("[AllMusic3]读取配置文件错误"); e.printStackTrace(); diff --git a/core/command/sub/CommandPush.java b/core/command/sub/CommandPush.java index 4a07a647..a5b6206c 100644 --- a/core/command/sub/CommandPush.java +++ b/core/command/sub/CommandPush.java @@ -4,6 +4,7 @@ import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.command.ACommand; import com.coloryr.allmusic.server.core.command.PermissionList; import com.coloryr.allmusic.server.core.music.PlayMusic; +import com.coloryr.allmusic.server.core.music.PlayRuntime; import com.coloryr.allmusic.server.core.objs.message.ARG; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.sql.DataSql; @@ -72,11 +73,12 @@ public class CommandPush extends ACommand { PlayMusic.startPush(name, music); AllMusic.side.sendMessage(sender, AllMusic.getMessage().push.doVote); String data = AllMusic.getMessage().push.bq; - AllMusic.side.broadcast(data - .replace(ARG.player, name) + data = data.replace(ARG.player, name) .replace(ARG.time, String.valueOf(AllMusic.getConfig().voteTime)) .replace(ARG.musicName, music.getName()) - .replace(ARG.musicAuthor, music.getAuthor())); + .replace(ARG.musicAuthor, music.getAuthor()) + .replace(ARG.countAll, String.valueOf(PlayRuntime.getMiniVote())); + AllMusic.side.broadcast(data); AllMusic.side.broadcast(AllMusic.miniMessage(AllMusic.getMessage().push.bq1) .append(AllMusic.miniMessageRun(AllMusic.getMessage().push.bq2, "/music push"))); } else { @@ -89,7 +91,8 @@ public class CommandPush extends ACommand { AllMusic.side.sendMessage(sender, AllMusic.getMessage().push.agree); String data = AllMusic.getMessage().push.bqAgree; data = data.replace(ARG.player, name) - .replace(ARG.count, String.valueOf(PlayMusic.getVoteCount())); + .replace(ARG.count, String.valueOf(PlayMusic.getVoteCount())) + .replace(ARG.countAll, String.valueOf(PlayRuntime.getMiniVote())); AllMusic.side.broadcast(data); } else { AllMusic.side.sendMessage(sender, AllMusic.getMessage().push.arAgree); diff --git a/core/command/sub/CommandVote.java b/core/command/sub/CommandVote.java index 4552c1f1..dc0e6a09 100644 --- a/core/command/sub/CommandVote.java +++ b/core/command/sub/CommandVote.java @@ -4,6 +4,7 @@ import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.command.ACommand; import com.coloryr.allmusic.server.core.command.PermissionList; import com.coloryr.allmusic.server.core.music.PlayMusic; +import com.coloryr.allmusic.server.core.music.PlayRuntime; import com.coloryr.allmusic.server.core.objs.message.ARG; import com.coloryr.allmusic.server.core.sql.DataSql; @@ -40,8 +41,10 @@ public class CommandVote extends ACommand { PlayMusic.startVote(name); AllMusic.side.sendMessage(sender, AllMusic.getMessage().vote.doVote); String data = AllMusic.getMessage().vote.bq; - AllMusic.side.broadcast(data.replace(ARG.player, name) - .replace(ARG.time, String.valueOf(AllMusic.getConfig().voteTime))); + data = data.replace(ARG.player, name) + .replace(ARG.time, String.valueOf(AllMusic.getConfig().voteTime)) + .replace(ARG.countAll, String.valueOf(PlayRuntime.getMiniVote())); + AllMusic.side.broadcast(data); AllMusic.side.broadcast(AllMusic.miniMessage(AllMusic.getMessage().vote.bq1) .append(AllMusic.miniMessageRun(AllMusic.getMessage().vote.bq2, "/music vote"))); } else { @@ -50,7 +53,8 @@ public class CommandVote extends ACommand { AllMusic.side.sendMessage(sender, AllMusic.getMessage().vote.agree); String data = AllMusic.getMessage().vote.bqAgree; data = data.replace(ARG.player, name) - .replace(ARG.count, String.valueOf(PlayMusic.getVoteCount())); + .replace(ARG.count, String.valueOf(PlayMusic.getVoteCount())) + .replace(ARG.countAll, String.valueOf(PlayRuntime.getMiniVote())); AllMusic.side.broadcast(data); } else { AllMusic.side.sendMessage(sender, AllMusic.getMessage().vote.arAgree); diff --git a/core/music/PlayRuntime.java b/core/music/PlayRuntime.java index f91a9dc1..db6d0a75 100644 --- a/core/music/PlayRuntime.java +++ b/core/music/PlayRuntime.java @@ -137,6 +137,10 @@ public class PlayRuntime { return false; } + public static int getMiniVote() { + return Math.min(AllMusic.getConfig().minVote, AllMusic.side.getPlayers().size()); + } + /** * 事务定时器 */ @@ -156,10 +160,7 @@ public class PlayRuntime { PlayMusic.clearPush(); AllMusic.side.broadcastInTask(AllMusic.getMessage().push.timeOut); } else { - int players = AllMusic.side.getPlayers().size(); - if (PlayMusic.getPushCount() >= AllMusic.getConfig().minVote - || (players <= AllMusic.getConfig().minVote - && players <= PlayMusic.getPushCount())) { + if (PlayMusic.getPushCount() >= getMiniVote()) { PlayMusic.pushMusic(); PlayMusic.clearPush(); AllMusic.side.broadcastInTask(AllMusic.getMessage().push.doPush); @@ -174,10 +175,7 @@ public class PlayRuntime { PlayMusic.clearVote(); AllMusic.side.broadcastInTask(AllMusic.getMessage().vote.timeOut); } else { - int players = AllMusic.side.getPlayers().size(); - if (PlayMusic.getVoteCount() >= AllMusic.getConfig().minVote - || (players <= AllMusic.getConfig().minVote - && players <= PlayMusic.getVoteCount())) { + if (PlayMusic.getVoteCount() >= getMiniVote()) { PlayMusic.musicLessTime = 0; PlayMusic.clearVote(); AllMusic.side.broadcastInTask(AllMusic.getMessage().vote.voteDone); diff --git a/core/objs/config/ConfigObj.java b/core/objs/config/ConfigObj.java index 09918a40..1188fe59 100644 --- a/core/objs/config/ConfigObj.java +++ b/core/objs/config/ConfigObj.java @@ -3,8 +3,7 @@ package com.coloryr.allmusic.server.core.objs.config; import com.coloryr.allmusic.codec.HudPosObj; import com.coloryr.allmusic.server.core.AllMusic; -import java.util.HashSet; -import java.util.Set; +import java.util.*; /** * 配置文件对象 @@ -122,6 +121,10 @@ public class ConfigObj { * 中途加入延迟 */ public int joinDelay; + /** + * 歌词正则替换 + */ + public Map lyricReplace; public static ConfigObj make() { ConfigObj config = new ConfigObj(); @@ -160,6 +163,10 @@ public class ConfigObj { saveConfig = true; cost = CostObj.make(); } + if (lyricReplace == null) { + saveConfig = true; + lyricReplace = new HashMap<>(); + } return saveConfig; } @@ -194,6 +201,7 @@ public class ConfigObj { lyricDelay = 0; sendDelay = 1000; joinDelay = 1000; + lyricReplace = new HashMap<>(); version = AllMusic.configVersion; } } \ No newline at end of file diff --git a/core/objs/message/ARG.java b/core/objs/message/ARG.java index 25fc0070..f3e2f504 100644 --- a/core/objs/message/ARG.java +++ b/core/objs/message/ARG.java @@ -24,5 +24,6 @@ public class ARG { public static String klyric = "%KLyric%"; public static String list = "%List%"; public static String count = "%Count%"; + public static String countAll = "%CountAll%"; public static String time = "%Time%"; } diff --git a/core/objs/message/PushObj.java b/core/objs/message/PushObj.java index 864b4b44..fdaa5073 100644 --- a/core/objs/message/PushObj.java +++ b/core/objs/message/PushObj.java @@ -71,7 +71,7 @@ public class PushObj { if (doVote == null) doVote = "[AllMusic3]已发起插歌投票"; if (bq == null) - bq = "[AllMusic3]" + ARG.player + "发起了插歌投票,将曲目" + ARG.musicName + "-" + ARG.musicAuthor + "调整到下一首播放," + ARG.time + "秒后结束,输入/music push 同意插歌。"; + bq = "[AllMusic3]" + ARG.player + "发起了插歌投票,将曲目" + ARG.musicName + "-" + ARG.musicAuthor + "调整到下一首播放," + ARG.time + "秒后结束,输入/music push 同意插歌,需要至少" + ARG.countAll + "名玩家同意才会插歌。"; if (bq1 == null) bq1 = "[AllMusic3]或者点击 "; if (bq2 == null) @@ -79,7 +79,7 @@ public class PushObj { if (agree == null) agree = "[AllMusic3]你同意插歌"; if (bqAgree == null) - bqAgree = "[AllMusic3]" + ARG.player + "同意插歌,共有" + ARG.count + "名玩家同意插歌。"; + bqAgree = "[AllMusic3]" + ARG.player + "同意插歌,共有" + ARG.count + "名玩家同意插歌,需要至少" + ARG.countAll + "名玩家同意才会插歌。"; if (arAgree == null) arAgree = "[AllMusic3]你已申请插歌"; if (timeOut == null) diff --git a/core/objs/message/VoteObj.java b/core/objs/message/VoteObj.java index c8c91e2e..c76a925f 100644 --- a/core/objs/message/VoteObj.java +++ b/core/objs/message/VoteObj.java @@ -59,7 +59,7 @@ public class VoteObj { if (doVote == null) doVote = "[AllMusic3]已发起切歌投票"; if (bq == null) - bq = "[AllMusic3]" + ARG.player + "发起了切歌投票," + ARG.time + "秒后结束,输入/music vote 同意切歌。"; + bq = "[AllMusic3]" + ARG.player + "发起了切歌投票," + ARG.time + "秒后结束,输入/music vote 同意切歌,需要至少" + ARG.countAll + "名玩家同意才会切歌。"; if (bq1 == null) bq1 = "[AllMusic3]或者点击 "; if (bq2 == null) @@ -67,7 +67,7 @@ public class VoteObj { if (agree == null) agree = "[AllMusic3]你同意切歌"; if (bqAgree == null) - bqAgree = "[AllMusic3]" + ARG.player + "同意切歌,共有" + ARG.count + "名玩家同意切歌。"; + bqAgree = "[AllMusic3]" + ARG.player + "同意切歌,共有" + ARG.count + "名玩家同意切歌,需要至少" + ARG.countAll + "名玩家同意才会切歌。"; if (arAgree == null) arAgree = "[AllMusic3]你已申请切歌"; if (timeOut == null) diff --git a/core/utils/StringReplacer.java b/core/utils/StringReplacer.java new file mode 100644 index 00000000..ae211336 --- /dev/null +++ b/core/utils/StringReplacer.java @@ -0,0 +1,51 @@ +package com.coloryr.allmusic.server.core.utils; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.regex.Pattern; + +public class StringReplacer { + private Map literalMap = new LinkedHashMap<>(); + private Map regexMap = new LinkedHashMap<>(); + + // 自动判断是否为正则表达式 + public void put(String search, String replacement) { + if (isRegex(search)) { + regexMap.put(Pattern.compile(search), replacement); + } else { + literalMap.put(search, replacement); + } + } + + // 判断字符串是否包含正则表达式特征 + private boolean isRegex(String str) { + return str.matches(".*[.\\[\\]{}(),*+?|^$\\\\].*"); + } + + // 强制添加为正则表达式 + public void putRegex(String regex, String replacement) { + regexMap.put(Pattern.compile(regex), replacement); + } + + // 强制添加为普通字符串 + public void putLiteral(String literal, String replacement) { + literalMap.put(literal, replacement); + } + + // 执行替换 + public String replace(String input) { + String result = input; + + // 先替换普通字符串(更快) + for (Map.Entry entry : literalMap.entrySet()) { + result = result.replace(entry.getKey(), entry.getValue()); + } + + // 再替换正则表达式 + for (Map.Entry entry : regexMap.entrySet()) { + result = entry.getKey().matcher(result).replaceAll(entry.getValue()); + } + + return result; + } +} diff --git a/netapi/LyricDecoder.java b/netapi/LyricDecoder.java index 8921fd9b..296664ed 100644 --- a/netapi/LyricDecoder.java +++ b/netapi/LyricDecoder.java @@ -11,13 +11,13 @@ import java.util.regex.Pattern; public class LyricDecoder { private static final Pattern p = Pattern.compile("\\(([0-9]+),[0-9]+.[0-9]\\)"); - private final Map temp = new LinkedHashMap<>(); + private final Map lyrics = new LinkedHashMap<>(); public boolean isHave = false; public boolean isHaveK = false; public Map kly = new LinkedHashMap<>(); - public Map getTemp() { - return temp; + public Map getLyrics() { + return lyrics; } public Map getKLyric() { @@ -62,12 +62,18 @@ public class LyricDecoder { isHaveK = true; } - for (Map.Entry item : temp.entrySet()) { - this.temp.put(item.getKey(), new LyricItemObj(item.getValue(), - haveT ? temp1.get(item.getKey()) : null)); + if (isHaveK) { + for (Map.Entry item : temp.entrySet()) { + this.lyrics.put(item.getKey(), new LyricItemObj(item.getValue(), haveT ? temp1.get(item.getKey()) : null)); + } + } else { + for (Map.Entry item : temp.entrySet()) { + String value = AllMusic.getReplacer().replace(item.getValue()); + String value1 = AllMusic.getReplacer().replace(temp1.get(item.getKey())); + this.lyrics.put(item.getKey(), new LyricItemObj(value, haveT ? value1 : null)); + } } - isHave = true; return false; } diff --git a/netapi/NetiApiMain.java b/netapi/NetiApiMain.java index 492d4405..d8abc95e 100644 --- a/netapi/NetiApiMain.java +++ b/netapi/NetiApiMain.java @@ -205,16 +205,16 @@ public class NetiApiMain implements IMusicApi { if (res != null && res.ok) { try { WLyricObj obj = AllMusic.gson.fromJson(res.data, WLyricObj.class); - LyricDecoder temp = new LyricDecoder(); + LyricDecoder docoder = new LyricDecoder(); for (int times = 0; times < 3; times++) { - if (temp.check(obj)) { + if (docoder.check(obj)) { AllMusic.log.data("[AllMusic3]歌词解析错误,正在进行第" + times + "重试"); } else { - if (temp.isHave) { + if (docoder.isHave) { lyric.setHaveLyric(AllMusic.getConfig().sendLyric); - lyric.setLyric(temp.getTemp()); - if (temp.isHaveK) { - lyric.setKlyric(temp.getKLyric()); + lyric.setLyric(docoder.getLyrics()); + if (docoder.isHaveK) { + lyric.setKlyric(docoder.getKLyric()); } } return lyric; diff --git a/version b/version index ed7555c7..ab6a255a 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.9.4 \ No newline at end of file +3.9.5 \ No newline at end of file From da1c5a823f2bdc96b24893f451d639a26df7b7d4 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Sat, 4 Apr 2026 15:13:08 +0800 Subject: [PATCH 7/9] =?UTF-8?q?up=20neoforge=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forge_1_16_5/build.gradle | 11 ++++--- neoforge_1_21/build.gradle | 7 ++-- neoforge_1_21_11/build.gradle | 7 ++-- .../allmusic/server/AllMusicServer.java | 33 ++++++++++++------- neoforge_1_21_6/build.gradle | 7 ++-- .../allmusic/server/AllMusicServer.java | 33 ++++++++++++------- .../META-INF/neoforge.mods.toml | 0 onejar/neoforge_1_21/build.gradle | 7 ++-- onejar/neoforge_1_21_11/build.gradle | 14 +++++--- onejar/neoforge_1_21_6/build.gradle | 7 ++-- 10 files changed, 70 insertions(+), 56 deletions(-) rename neoforge_1_21_6/src/main/{templates => resources}/META-INF/neoforge.mods.toml (100%) diff --git a/forge_1_16_5/build.gradle b/forge_1_16_5/build.gradle index 7fc859bf..66f0e160 100644 --- a/forge_1_16_5/build.gradle +++ b/forge_1_16_5/build.gradle @@ -175,11 +175,10 @@ dependencies { } shadowJar { -// relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' -// relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' -// relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' -// relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' -// relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' + relocate 'org.slf4j', 'com.coloryr.allmusic.server.lib.org.slf4j' + relocate 'net.kyori', 'com.coloryr.allmusic.server.lib.net.kyori' + relocate 'org.apache.httpcomponents', 'com.coloryr.allmusic.server.lib.org.apache.httpcomponents' + configurations = [project.configurations.shadow] archiveClassifier.set('') dependencies { @@ -197,6 +196,8 @@ shadowJar { include(dependency('net.kyori:examination-api:1.3.0')) include(dependency('net.kyori:examination-string:1.3.0')) include(dependency('net.kyori:option:1.1.0')) + include(dependency('org.slf4j:slf4j-api:1.7.36')) + include(dependency('org.slf4j:slf4j-simple:1.7.36')) } } diff --git a/neoforge_1_21/build.gradle b/neoforge_1_21/build.gradle index 71742682..94f1c4cf 100644 --- a/neoforge_1_21/build.gradle +++ b/neoforge_1_21/build.gradle @@ -120,13 +120,10 @@ dependencies { implementation('org.apache.httpcomponents.client5:httpclient5:5.6') implementation('org.xerial:sqlite-jdbc:3.51.1.0') - implementation('net.kyori:adventure-platform-mod-shared:6.0.0') + implementation('net.kyori:adventure-platform-neoforge:6.0.1') implementation('net.kyori:adventure-text-minimessage:4.26.1') - jarJar(group: 'net.kyori', name: 'adventure-platform-mod-shared', version: '[6.0,6.1)') - jarJar(group: 'net.kyori', name: 'adventure-text-minimessage', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-api', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-key', version: '[4.26.1,4.27)') + jarJar(group: 'net.kyori', name: 'adventure-platform-neoforge', version: '[6.0.1,6.1)') jarJar(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '[5.6,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '[5.4,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '[5.4,6.0)') diff --git a/neoforge_1_21_11/build.gradle b/neoforge_1_21_11/build.gradle index 8f2dcb9d..8c07a7ef 100644 --- a/neoforge_1_21_11/build.gradle +++ b/neoforge_1_21_11/build.gradle @@ -135,13 +135,10 @@ dependencies { implementation('org.apache.httpcomponents.client5:httpclient5:5.6') implementation('org.xerial:sqlite-jdbc:3.51.1.0') - compileOnly('net.kyori:adventure-platform-mod-shared:6.8.0') + compileOnly('net.kyori:adventure-platform-neoforge:6.8.0') compileOnly('net.kyori:adventure-text-minimessage:4.26.1') - jarJar(group: 'net.kyori', name: 'adventure-platform-mod-shared', version: '[6.0,6.1)') - jarJar(group: 'net.kyori', name: 'adventure-text-minimessage', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-api', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-key', version: '[4.26.1,4.27)') + jarJar(group: 'net.kyori', name: 'adventure-platform-neoforge', version: '[6.8.0,6.9)') jarJar(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '[5.6,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '[5.4,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '[5.4,6.0)') diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 3d32df7a..d549052e 100644 --- a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -7,6 +7,7 @@ import com.mojang.brigadier.CommandDispatcher; import net.kyori.adventure.platform.modcommon.MinecraftAudiences; import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences; import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; import net.minecraft.server.MinecraftServer; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; @@ -36,32 +37,42 @@ public class AllMusicServer { @SubscribeEvent public static void onRegisterCommands(RegisterCommandsEvent event) { - LOGGER.info("注册指令"); - CommandDispatcher dispatcher = event.getDispatcher(); - CommandNeoForge.instance.register(dispatcher); + if (event.getCommandSelection() != Commands.CommandSelection.INTEGRATED) { + LOGGER.info("注册指令"); + CommandDispatcher dispatcher = event.getDispatcher(); + CommandNeoForge.instance.register(dispatcher); + } } @SubscribeEvent public static void onServerStarting(ServerStartedEvent event) { - audiences = MinecraftServerAudiences.of(event.getServer()); - server = event.getServer(); - AllMusic.init(new File(dir)); - AllMusic.start(); - Tasks.init(); + if (event.getServer().isDedicatedServer()) { + audiences = MinecraftServerAudiences.of(event.getServer()); + server = event.getServer(); + AllMusic.init(new File(dir)); + AllMusic.start(); + Tasks.init(); + } } @SubscribeEvent public static void onServerStopping(ServerStoppingEvent event) { - AllMusic.stop(); + if (event.getServer().isDedicatedServer()) { + AllMusic.stop(); + } } @SubscribeEvent public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - PlayMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); + if (server != null) { + PlayMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); + } } @SubscribeEvent public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { - AllMusic.joinPlay(event.getEntity().getName().getString()); + if (server != null) { + AllMusic.joinPlay(event.getEntity().getName().getString()); + } } } diff --git a/neoforge_1_21_6/build.gradle b/neoforge_1_21_6/build.gradle index fe4a5a27..a6e0c648 100644 --- a/neoforge_1_21_6/build.gradle +++ b/neoforge_1_21_6/build.gradle @@ -117,13 +117,10 @@ dependencies { implementation('org.apache.httpcomponents.client5:httpclient5:5.6') implementation('org.xerial:sqlite-jdbc:3.51.1.0') - implementation('net.kyori:adventure-platform-mod-shared:6.6.0') + implementation('net.kyori:adventure-platform-neoforge:6.6.0') implementation('net.kyori:adventure-text-minimessage:4.26.1') - jarJar(group: 'net.kyori', name: 'adventure-platform-mod-shared', version: '[6.0,6.1)') - jarJar(group: 'net.kyori', name: 'adventure-text-minimessage', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-api', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-key', version: '[4.26.1,4.27)') + jarJar(group: 'net.kyori', name: 'adventure-platform-neoforge', version: '[6.6.0,6.7)') jarJar(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '[5.6,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '[5.4,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '[5.4,6.0)') diff --git a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 7bc3b098..1d3c4606 100644 --- a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -6,6 +6,7 @@ import com.coloryr.allmusic.server.core.music.PlayMusic; import com.mojang.brigadier.CommandDispatcher; import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences; import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; import net.minecraft.server.MinecraftServer; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; @@ -37,32 +38,42 @@ public class AllMusicServer { @SubscribeEvent public static void onRegisterCommands(RegisterCommandsEvent event) { - LOGGER.info("注册指令"); - CommandDispatcher dispatcher = event.getDispatcher(); - CommandNeoForge.instance.register(dispatcher); + if (event.getCommandSelection() != Commands.CommandSelection.INTEGRATED) { + LOGGER.info("注册指令"); + CommandDispatcher dispatcher = event.getDispatcher(); + CommandNeoForge.instance.register(dispatcher); + } } @SubscribeEvent public static void onServerStarting(ServerStartedEvent event) { - server = event.getServer(); - audiences = MinecraftServerAudiences.of(server); - AllMusic.init(new File(dir)); - AllMusic.start(); - Tasks.init(); + if (event.getServer().isDedicatedServer()) { + audiences = MinecraftServerAudiences.of(event.getServer()); + server = event.getServer(); + AllMusic.init(new File(dir)); + AllMusic.start(); + Tasks.init(); + } } @SubscribeEvent public static void onServerStopping(ServerStoppingEvent event) { - AllMusic.stop(); + if (event.getServer().isDedicatedServer()) { + AllMusic.stop(); + } } @SubscribeEvent public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - PlayMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); + if (server != null) { + PlayMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); + } } @SubscribeEvent public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { - AllMusic.joinPlay(event.getEntity().getName().getString()); + if (server != null) { + AllMusic.joinPlay(event.getEntity().getName().getString()); + } } } diff --git a/neoforge_1_21_6/src/main/templates/META-INF/neoforge.mods.toml b/neoforge_1_21_6/src/main/resources/META-INF/neoforge.mods.toml similarity index 100% rename from neoforge_1_21_6/src/main/templates/META-INF/neoforge.mods.toml rename to neoforge_1_21_6/src/main/resources/META-INF/neoforge.mods.toml diff --git a/onejar/neoforge_1_21/build.gradle b/onejar/neoforge_1_21/build.gradle index 606f32f6..3922f7f3 100644 --- a/onejar/neoforge_1_21/build.gradle +++ b/onejar/neoforge_1_21/build.gradle @@ -118,13 +118,10 @@ dependencies { implementation('org.apache.httpcomponents.client5:httpclient5:5.6') implementation('org.xerial:sqlite-jdbc:3.51.1.0') - implementation('net.kyori:adventure-platform-mod-shared:6.0.0') + implementation('net.kyori:adventure-platform-neoforge:6.0.1') implementation('net.kyori:adventure-text-minimessage:4.26.1') - jarJar(group: 'net.kyori', name: 'adventure-platform-mod-shared', version: '[6.0,6.1)') - jarJar(group: 'net.kyori', name: 'adventure-text-minimessage', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-api', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-key', version: '[4.26.1,4.27)') + jarJar(group: 'net.kyori', name: 'adventure-platform-neoforge', version: '[6.0.1,6.1)') jarJar(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '[5.6,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '[5.4,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '[5.4,6.0)') diff --git a/onejar/neoforge_1_21_11/build.gradle b/onejar/neoforge_1_21_11/build.gradle index 77a25f4e..ecfc2745 100644 --- a/onejar/neoforge_1_21_11/build.gradle +++ b/onejar/neoforge_1_21_11/build.gradle @@ -136,10 +136,16 @@ dependencies { compileOnly('net.kyori:adventure-platform-mod-shared:6.8.0') compileOnly('net.kyori:adventure-text-minimessage:4.26.1') - jarJar(group: 'net.kyori', name: 'adventure-platform-mod-shared', version: '[6.0,6.1)') - jarJar(group: 'net.kyori', name: 'adventure-text-minimessage', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-api', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-key', version: '[4.26.1,4.27)') +// jarJar(group: 'net.kyori', name: 'adventure-platform-mod-shared', version: '[6.0,6.1)') +// jarJar(group: 'net.kyori', name: 'adventure-text-minimessage', version: '[4.26.1,4.27)') +// jarJar(group: 'net.kyori', name: 'adventure-api', version: '[4.26.1,4.27)') +// jarJar(group: 'net.kyori', name: 'adventure-key', version: '[4.26.1,4.27)') +// jarJar(group: 'net.kyori', name: 'adventure-platform-api', version: '[4.4.1,)') +// jarJar(group: 'net.kyori', name: 'adventure-platform-neoforge-services', version: '[6.8.0,)') +// jarJar(group: 'net.kyori', name: 'adventure-text-logger-slf4j', version: '[4.25.0,)') +// jarJar(group: 'net.kyori', name: 'examination-api', version: '[1.3.0,)') +// jarJar(group: 'net.kyori', name: 'examination-string', version: '[1.3.0,)') +// jarJar(group: 'net.kyori', name: 'option', version: '[1.1.0,)') jarJar(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '[5.6,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '[5.4,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '[5.4,6.0)') diff --git a/onejar/neoforge_1_21_6/build.gradle b/onejar/neoforge_1_21_6/build.gradle index cc16e973..2620881c 100644 --- a/onejar/neoforge_1_21_6/build.gradle +++ b/onejar/neoforge_1_21_6/build.gradle @@ -121,13 +121,10 @@ dependencies { implementation('org.apache.httpcomponents.client5:httpclient5:5.6') implementation('org.xerial:sqlite-jdbc:3.51.1.0') - implementation('net.kyori:adventure-platform-mod-shared:6.6.0') + implementation('net.kyori:adventure-platform-neoforge:6.6.0') implementation('net.kyori:adventure-text-minimessage:4.26.1') - jarJar(group: 'net.kyori', name: 'adventure-platform-mod-shared', version: '[6.0,6.1)') - jarJar(group: 'net.kyori', name: 'adventure-text-minimessage', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-api', version: '[4.26.1,4.27)') - jarJar(group: 'net.kyori', name: 'adventure-key', version: '[4.26.1,4.27)') + jarJar(group: 'net.kyori', name: 'adventure-platform-neoforge', version: '[6.6.0,6.7)') jarJar(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '[5.6,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '[5.4,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '[5.4,6.0)') From cbe465e600edec05922a011ebf9635281d790354 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Mon, 6 Apr 2026 12:28:22 +0800 Subject: [PATCH 8/9] up --- client | 2 +- core/AllMusic.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client b/client index 59221fc6..d49f9893 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 59221fc6a03191d7674bfb263e3ae37d1d8cfe3b +Subproject commit d49f9893b5c5b3a94597cb992211ec2f05720ca0 diff --git a/core/AllMusic.java b/core/AllMusic.java index e0f5b309..da527e9d 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -330,10 +330,10 @@ public class AllMusic { log.data("[AllMusic3]请及时更新配置文件"); } + replacer = new StringReplacer(); if (!config.lyricReplace.isEmpty()) { for (Map.Entry item : config.lyricReplace.entrySet()) { replacer.put(item.getKey(), item.getValue()); - replacer = new StringReplacer(); } } } catch (Exception e) { From a8a51070bde96bcef58bef8ce00a57093953c095 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Mon, 6 Apr 2026 12:32:37 +0800 Subject: [PATCH 9/9] up --- .github/workflows/onejar.yml | 8 ++++++++ .github/workflows/server.yml | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/.github/workflows/onejar.yml b/.github/workflows/onejar.yml index d04a8fef..37c29eed 100644 --- a/.github/workflows/onejar.yml +++ b/.github/workflows/onejar.yml @@ -38,6 +38,7 @@ jobs: run: | link.cmd && cd onejar && cd fabric_1_16_5 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_onejar_fabric_1_16_5" @@ -63,6 +64,7 @@ jobs: run: | link.cmd && cd onejar && cd fabric_1_20_1 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_onejar_fabric_1_20_1" @@ -88,6 +90,7 @@ jobs: run: | link.cmd && cd onejar && cd fabric_1_21 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_onejar_fabric_1_21" @@ -113,6 +116,7 @@ jobs: run: | link.cmd && cd onejar && cd fabric_1_21_6 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_onejar_fabric_1_21_6" @@ -138,6 +142,7 @@ jobs: run: | link.cmd && cd onejar && cd fabric_1_21_11 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_onejar_fabric_1_21_11" @@ -163,6 +168,7 @@ jobs: run: | link.cmd && cd onejar && cd neoforge_1_21 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_onejar_neoforge_1_21" @@ -188,6 +194,7 @@ jobs: run: | link.cmd && cd onejar && cd neoforge_1_21_6 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_onejar_neoforge_1_21_6" @@ -213,6 +220,7 @@ jobs: run: | link.cmd && cd onejar && cd neoforge_1_21_11 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_onejar_neoforge_1_21_11" diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index fd69014b..479dea4e 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -38,6 +38,7 @@ jobs: run: | link.cmd && cd folia && gradlew shadowJar - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_folia" @@ -63,6 +64,7 @@ jobs: run: | link.cmd && cd paper && gradlew shadowJar - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_paper" @@ -88,6 +90,7 @@ jobs: run: | link.cmd && cd velocity && gradlew shadowJar - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_velocity" @@ -113,6 +116,7 @@ jobs: run: | link.cmd && cd fabric_1_16_5 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_fabric_1_16_5" @@ -138,6 +142,7 @@ jobs: run: | link.cmd && cd fabric_1_20_1 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_fabric_1_20_1" @@ -163,6 +168,7 @@ jobs: run: | link.cmd && cd fabric_1_21 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_fabric_1_21" @@ -213,6 +219,7 @@ jobs: run: | link.cmd && cd fabric_1_21_11 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_fabric_1_21_11" @@ -263,6 +270,7 @@ jobs: run: | link.cmd && cd forge_1_7_10 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_forge_1_7_10" @@ -288,6 +296,7 @@ jobs: run: | link.cmd && cd forge_1_12_2 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_forge_1_12_2" @@ -313,6 +322,7 @@ jobs: run: | link.cmd && cd forge_1_16_5 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_forge_1_16_5" @@ -338,6 +348,7 @@ jobs: run: | link.cmd && cd forge_1_20_1 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_forge_1_20_1" @@ -363,6 +374,7 @@ jobs: run: | link.cmd && cd neoforge_1_21 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_neoforge_1_21" @@ -388,6 +400,7 @@ jobs: run: | link.cmd && cd neoforge_1_21_6 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_neoforge_1_21_6" @@ -413,6 +426,7 @@ jobs: run: | link.cmd && cd neoforge_1_21_11 && gradlew build - name: update + if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref_name, 'debug') uses: actions/upload-artifact@v4 with: name: "allmusic_server_neoforge_1_21_11"