From 26d09eead0350d64f3699697aa0e42efbd9ef2bf Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Fri, 27 Mar 2026 23:24:14 +0800 Subject: [PATCH] fix --- client | 2 +- .../server/mixin/ServerPlayerMixin.java | 3 +- .../server/mixin/ServerPlayerMixin.java | 3 +- .../server/mixin/ServerPlayerMixin.java | 3 +- .../server/mixin/ServerPlayerMixin.java | 3 +- .../server/mixin/ServerPlayerMixin.java | 3 +- fabric_26_1/build.gradle | 10 ++- fabric_26_1/gradle.properties | 8 +- ...llMusicFabric.java => AllMusicServer.java} | 22 ++---- .../coloryr/allmusic/server/FabricApi.java | 42 ---------- .../coloryr/allmusic/server/LogFabric.java | 13 ++- .../coloryr/allmusic/server/PackPayload.java | 19 ----- .../coloryr/allmusic/server/SideFabric.java | 79 ++++++------------- .../com/coloryr/allmusic/server/Tasks.java | 2 +- .../server/mixin/ServerPlayerMixin.java | 3 +- .../resources/allmusic_server.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 5 +- .../allmusic/server/AllMusicServer.java | 3 +- .../allmusic/server/AllMusicServer.java | 3 +- .../allmusic/server/AllMusicServer.java | 3 +- .../allmusic/server/AllMusicServer.java | 3 +- link.cmd | 2 +- .../allmusic/server/AllMusicServer.java | 3 +- .../allmusic/server/AllMusicServer.java | 3 +- .../allmusic/server/AllMusicServer.java | 3 +- .../side/velocity/ListenerVelocity.java | 3 +- 26 files changed, 80 insertions(+), 168 deletions(-) rename fabric_26_1/src/main/java/com/coloryr/allmusic/server/{AllMusicFabric.java => AllMusicServer.java} (60%) delete mode 100644 fabric_26_1/src/main/java/com/coloryr/allmusic/server/FabricApi.java delete mode 100644 fabric_26_1/src/main/java/com/coloryr/allmusic/server/PackPayload.java diff --git a/client b/client index 1f5abbfc..b8163dd0 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 1f5abbfc1d1c9c9e82ec3f61b575e9bc30878625 +Subproject commit b8163dd07025dc0f7ab57d7548f078a143cf4a3c diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index 7cdf9636..fed55460 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,6 +1,7 @@ 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.Connection; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.players.PlayerList; @@ -13,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class ServerPlayerMixin { @Inject(at = @At("HEAD"), method = "remove") private void remove(ServerPlayer entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); + PlayMusic.removeNowPlayPlayer(entity.getName().getString()); } @Inject(at = @At("TAIL"), method = "placeNewPlayer") 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 07d591eb..d029f241 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 @@ -1,6 +1,7 @@ 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; @@ -13,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class ServerPlayerMixin { @Inject(at = @At("HEAD"), method = "remove") private void remove(ServerPlayerEntity entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); + PlayMusic.removeNowPlayPlayer(entity.getName().getString()); } @Inject(at = @At("TAIL"), method = "onPlayerConnect") 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 252906a5..cdb23d00 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 @@ -1,6 +1,7 @@ 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; @@ -14,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class ServerPlayerMixin { @Inject(at = @At("HEAD"), method = "remove") private void remove(ServerPlayerEntity entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); + PlayMusic.removeNowPlayPlayer(entity.getName().getString()); } @Inject(at = @At("TAIL"), method = "onPlayerConnect") diff --git a/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index 25cd5c4d..60e133d4 100644 --- a/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,6 +1,7 @@ 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.Connection; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.CommonListenerCookie; @@ -14,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class ServerPlayerMixin { @Inject(at = @At("HEAD"), method = "remove") private void remove(ServerPlayer entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); + PlayMusic.removeNowPlayPlayer(entity.getName().getString()); } @Inject(at = @At("TAIL"), method = "placeNewPlayer") 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 252906a5..cdb23d00 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 @@ -1,6 +1,7 @@ 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; @@ -14,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class ServerPlayerMixin { @Inject(at = @At("HEAD"), method = "remove") private void remove(ServerPlayerEntity entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); + PlayMusic.removeNowPlayPlayer(entity.getName().getString()); } @Inject(at = @At("TAIL"), method = "onPlayerConnect") diff --git a/fabric_26_1/build.gradle b/fabric_26_1/build.gradle index 14f673d8..bc19a926 100644 --- a/fabric_26_1/build.gradle +++ b/fabric_26_1/build.gradle @@ -35,10 +35,14 @@ dependencies { implementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. - implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" - include implementation('com.squareup.okio:okio-jvm:3.16.4') - include implementation('com.squareup.okhttp3:okhttp:5.3.2') + include implementation('net.kyori:adventure-text-minimessage:4.26.1') + include implementation('net.kyori:adventure-api:4.26.1') + include implementation('net.kyori:adventure-key:4.26.1') + include implementation('org.apache.httpcomponents.client5:httpclient5:5.6') + include implementation('org.apache.httpcomponents.core5:httpcore5:5.4') + include implementation('org.apache.httpcomponents.core5:httpcore5-h2:5.4') include implementation('org.xerial:sqlite-jdbc:3.51.1.0') } diff --git a/fabric_26_1/gradle.properties b/fabric_26_1/gradle.properties index a22e74d1..636200ea 100644 --- a/fabric_26_1/gradle.properties +++ b/fabric_26_1/gradle.properties @@ -4,13 +4,13 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=26.1-snapshot-1 -loader_version=0.18.3 -loom_version=1.14-SNAPSHOT +minecraft_version=26.1 +loader_version=0.18.5 +loom_version=1.15-SNAPSHOT # Mod Properties maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-26.1]AllMusic_Server # Dependencies -fabric_version=0.140.2+26.1 +fabric_api_version=0.144.3+26.1 diff --git a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/fabric_26_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java similarity index 60% rename from fabric_26_1/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java rename to fabric_26_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 4d08d9bd..9e8e8014 100644 --- a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ b/fabric_26_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -1,41 +1,29 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; -import net.fabricmc.api.ModInitializer; +import net.fabricmc.api.DedicatedServerModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; -import net.minecraft.resources.Identifier; import net.minecraft.server.MinecraftServer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; -public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; - public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server"); - - public static final Identifier ID = Identifier.fromNamespaceAndPath("allmusic", "channel"); - +public class AllMusicServer implements DedicatedServerModInitializer { public static final String dir = "allmusic_server/"; + public static MinecraftServer server; @Override - public void onInitialize() { + public void onInitializeServer() { AllMusic.log = new LogFabric(); AllMusic.side = new SideFabric(); - new AllMusic().init(new File(dir)); - CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); - PayloadTypeRegistry.playS2C().register(PackPayload.ID, PackPayload.CODEC); ServerLifecycleEvents.SERVER_STARTED.register((a) -> { server = a; - + AllMusic.init(new File(dir)); AllMusic.start(); - Tasks.init(); }); diff --git a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/FabricApi.java b/fabric_26_1/src/main/java/com/coloryr/allmusic/server/FabricApi.java deleted file mode 100644 index 4b8518af..00000000 --- a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/FabricApi.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.coloryr.allmusic.server; - -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.network.chat.ClickEvent; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; -import net.minecraft.server.level.ServerPlayer; - -public class FabricApi { - - public static void sendMessageRun(CommandSourceStack obj, String message, String end, String command) { - MutableComponent send = Component.literal(message); - var endText = Component.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent.RunCommand(command))); - send.append(endText); - obj.sendSystemMessage(send); - } - - public static void sendMessageSuggest(CommandSourceStack obj, String message, String end, String command) { - MutableComponent send = Component.literal(message); - var endText = Component.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); - send.append(endText); - obj.sendSystemMessage(send); - } - - public static void sendBar(ServerPlayer player, String message) { - var pack = new ClientboundSetActionBarTextPacket(Component.literal(message)); - player.connection.send(pack); - } - - public static void sendMessageBqRun(String message, String end, String command) { - MutableComponent send = Component.literal(message); - MutableComponent endText = Component.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); - send.append(endText); - for (var player : AllMusicFabric.server.getPlayerList().getPlayers()) { - player.sendSystemMessage(send); - } - } -} diff --git a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/LogFabric.java b/fabric_26_1/src/main/java/com/coloryr/allmusic/server/LogFabric.java index b1a201ff..6b749f8e 100644 --- a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/LogFabric.java +++ b/fabric_26_1/src/main/java/com/coloryr/allmusic/server/LogFabric.java @@ -1,15 +1,12 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IAllMusicLogger; +import net.kyori.adventure.text.Component; -public class LogFabric implements IMyLogger { - @Override - public void warning(String data) { - AllMusicFabric.LOGGER.warn(data); - } +public class LogFabric implements IAllMusicLogger { @Override - public void info(String data) { - AllMusicFabric.LOGGER.info(data); + public void data(Component data) { + AllMusicServer.server.sendMessage(data); } } diff --git a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/PackPayload.java b/fabric_26_1/src/main/java/com/coloryr/allmusic/server/PackPayload.java deleted file mode 100644 index 5866f5f0..00000000 --- a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/PackPayload.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.coloryr.allmusic.server; - -import com.coloryr.allmusic.server.codec.PacketCodec; -import com.coloryr.allmusic.server.core.objs.enums.ComType; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; - -public record PackPayload(ComType type1, String data, int data1) implements CustomPacketPayload { - public static final CustomPacketPayload.Type ID = new CustomPacketPayload.Type<>(AllMusicFabric.ID); - public static final StreamCodec CODEC = - StreamCodec.of((value, buf) -> PacketCodec.pack(value, buf.type1, buf.data, buf.data1), - buffer -> new PackPayload(ComType.CLEAR, null, 0)); - - @Override - public CustomPacketPayload.Type type() { - return ID; - } -} diff --git a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java b/fabric_26_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java index 8d4f5b96..dc9d8a96 100644 --- a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java +++ b/fabric_26_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java @@ -1,15 +1,16 @@ package com.coloryr.allmusic.server; +import com.coloryr.allmusic.codec.CommandType; +import com.coloryr.allmusic.codec.MusicPack; +import com.coloryr.allmusic.comm.MusicCodec; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.enums.ComType; -import com.coloryr.allmusic.server.core.objs.music.MusicObj; +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.event.MusicAddEvent; import com.coloryr.allmusic.server.event.MusicPlayEvent; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.commands.CommandSourceStack; -import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.permissions.PermissionSet; import net.minecraft.world.InteractionResult; @@ -20,7 +21,7 @@ import java.util.Collection; public class SideFabric extends BaseSide { @Override public void runTask(Runnable run) { - AllMusicFabric.server.execute(run); + AllMusicServer.server.execute(run); } @Override @@ -50,8 +51,8 @@ public class SideFabric extends BaseSide { @Override public boolean needPlay(boolean islist) { - for (var player : AllMusicFabric.server.getPlayerList().getPlayers()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { + for (var player : AllMusicServer.server.getPlayerList().getPlayers()) { + if (!com.coloryr.allmusic.server.core.AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } } @@ -60,7 +61,7 @@ public class SideFabric extends BaseSide { @Override public Collection getPlayers() { - return AllMusicFabric.server.getPlayerList().getPlayers(); + return AllMusicServer.server.getPlayerList().getPlayers(); } @Override @@ -78,72 +79,43 @@ public class SideFabric extends BaseSide { } @Override - public void send(Object player, ComType type, String data, int data1) { + public void send(Object player, CommandType type, String data, int data1) { if (player instanceof ServerPlayer player1) { - send(player1, new PackPayload(type, data, data1)); + send(player1, new MusicPack(type, data, data1)); } } @Override public Object getPlayer(String player) { - return AllMusicFabric.server.getPlayerList().getPlayer(player); + return AllMusicServer.server.getPlayerList().getPlayer(player); } @Override - public void sendBar(Object player, String data) { + public void sendBar(Object player, net.kyori.adventure.text.Component data) { if (player instanceof ServerPlayer player1) { - FabricApi.sendBar(player1, data); + player1.sendActionBar(data); } } @Override public File getFolder() { - return new File(AllMusicFabric.dir); + return new File(AllMusicServer.dir); } @Override - public void broadcast(String message) { - if (message == null || message.isEmpty()) { - return; - } - for (var player : AllMusicFabric.server.getPlayerList().getPlayers()) { + public void broadcast(net.kyori.adventure.text.Component message) { + for (var player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendSystemMessage(Component.literal(message), false); + player.sendMessage(message); } } } @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; + public void sendMessage(Object obj, net.kyori.adventure.text.Component message) { + if (obj instanceof CommandSourceStack source) { + source.sendMessage(message); } - FabricApi.sendMessageBqRun(message, end, command); - } - - @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) { - return; - } - CommandSourceStack source = (CommandSourceStack) obj; - source.sendSystemMessage(Component.literal(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageRun((CommandSourceStack) obj, message, end, command); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageSuggest((CommandSourceStack) obj, message, end, command); } @Override @@ -152,19 +124,14 @@ public class SideFabric extends BaseSide { } @Override - public boolean onMusicAdd(Object obj, MusicObj music) { + public boolean onMusicAdd(Object obj, PlayerAddMusicObj music) { CommandSourceStack source = (CommandSourceStack) obj; return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != InteractionResult.PASS; } - private void send(ServerPlayer players, PackPayload data) { + private void send(ServerPlayer players, MusicPack data) { if (players == null) return; - try { - runTask(() -> ServerPlayNetworking.send(players, data)); - } catch (Exception e) { - AllMusic.log.warning("§c数据发送发生错误"); - e.printStackTrace(); - } + runTask(() -> ServerPlayNetworking.send(players, new MusicCodec(data))); } } diff --git a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/Tasks.java b/fabric_26_1/src/main/java/com/coloryr/allmusic/server/Tasks.java index 57e1f3e3..d4e72d39 100644 --- a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/fabric_26_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() { - AllMusicFabric.server.addTickable(Tasks::tick); + AllMusicServer.server.addTickable(Tasks::tick); } public static void tick() { diff --git a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_26_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index 25cd5c4d..60e133d4 100644 --- a/fabric_26_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_26_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,6 +1,7 @@ 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.Connection; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.CommonListenerCookie; @@ -14,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class ServerPlayerMixin { @Inject(at = @At("HEAD"), method = "remove") private void remove(ServerPlayer entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); + PlayMusic.removeNowPlayPlayer(entity.getName().getString()); } @Inject(at = @At("TAIL"), method = "placeNewPlayer") diff --git a/fabric_26_1/src/main/resources/allmusic_server.mixins.json b/fabric_26_1/src/main/resources/allmusic_server.mixins.json index 864d9062..a4eb8db8 100644 --- a/fabric_26_1/src/main/resources/allmusic_server.mixins.json +++ b/fabric_26_1/src/main/resources/allmusic_server.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.coloryr.allmusic.server.mixin", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_25", "server": [ ], diff --git a/fabric_26_1/src/main/resources/fabric.mod.json b/fabric_26_1/src/main/resources/fabric.mod.json index fb30dcd6..bb3bf2aa 100644 --- a/fabric_26_1/src/main/resources/fabric.mod.json +++ b/fabric_26_1/src/main/resources/fabric.mod.json @@ -19,7 +19,10 @@ "environment": "*", "entrypoints": { "main": [ - "com.coloryr.allmusic.server.AllMusicFabric" + "com.coloryr.allmusic.comm.AllMusicInit" + ], + "server": [ + "com.coloryr.allmusic.server.AllMusicServer" ] }, "mixins": [ diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 8face3be..6ccd9e8a 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -1,6 +1,7 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.PlayMusic; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.minecraft.command.ServerCommandManager; @@ -70,7 +71,7 @@ public class AllMusicServer { @SubscribeEvent public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - AllMusic.removeNowPlayPlayer(event.player.getName()); + PlayMusic.removeNowPlayPlayer(event.player.getName()); } @SubscribeEvent diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index c0f23628..190eed75 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -1,6 +1,7 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.PlayMusic; import com.mojang.brigadier.CommandDispatcher; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; @@ -81,7 +82,7 @@ public class AllMusicServer { @SubscribeEvent public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - AllMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); + PlayMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); } @SubscribeEvent diff --git a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index b8680c4f..449d53ae 100644 --- a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -1,6 +1,7 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.PlayMusic; import com.mojang.brigadier.CommandDispatcher; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; @@ -81,7 +82,7 @@ public class AllMusicServer { @SubscribeEvent public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - AllMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); + PlayMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); } @SubscribeEvent diff --git a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 7f1230b5..a2062f64 100644 --- a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -1,6 +1,7 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.PlayMusic; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -75,7 +76,7 @@ public class AllMusicServer { @SubscribeEvent public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - AllMusic.removeNowPlayPlayer(event.player.getCommandSenderName()); + PlayMusic.removeNowPlayPlayer(event.player.getCommandSenderName()); } @SubscribeEvent diff --git a/link.cmd b/link.cmd index 052f1f73..50397ab5 100644 --- a/link.cmd +++ b/link.cmd @@ -48,7 +48,7 @@ for %%i in (%array3%) do ( if not exist "onejar\%%i\src\main\resources\com\coloryr\allmusic\client\core\player\decoder\mp3" mklink /j "onejar\%%i\src\main\resources\com\coloryr\allmusic\client\core\player\decoder\mp3" "client\mp3" ) -set array4=fabric_1_21 fabric_1_21_6 fabric_1_21_11 ^ +set array4=fabric_1_21 fabric_1_21_6 fabric_1_21_11 fabric_26_1 ^ neoforge_1_21 neoforge_1_21_6 neoforge_1_21_11 for %%i in (%array4%) do ( diff --git a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index c2b7bb0e..ee34dea9 100644 --- a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -2,6 +2,7 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.comm.AllMusicInit; import com.coloryr.allmusic.server.core.AllMusic; +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; @@ -58,7 +59,7 @@ public class AllMusicServer { @SubscribeEvent public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - AllMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); + PlayMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); } @SubscribeEvent 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 f0241ef0..3d32df7a 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 @@ -2,6 +2,7 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.comm.AllMusicInit; import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.PlayMusic; import com.mojang.brigadier.CommandDispatcher; import net.kyori.adventure.platform.modcommon.MinecraftAudiences; import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences; @@ -56,7 +57,7 @@ public class AllMusicServer { @SubscribeEvent public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - AllMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); + PlayMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); } @SubscribeEvent 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 d5fe0378..7bc3b098 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 @@ -2,6 +2,7 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.comm.AllMusicInit; import com.coloryr.allmusic.server.core.AllMusic; +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; @@ -57,7 +58,7 @@ public class AllMusicServer { @SubscribeEvent public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - AllMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); + PlayMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); } @SubscribeEvent 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 88e44097..1a3d52b0 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 @@ -1,6 +1,7 @@ package com.coloryr.allmusic.server.side.velocity; import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.PlayMusic; import com.google.common.io.ByteArrayDataInput; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.DisconnectEvent; @@ -11,7 +12,7 @@ import com.velocitypowered.api.proxy.ServerConnection; public class ListenerVelocity { @Subscribe public void onDisconnectEvent(final DisconnectEvent event) { - AllMusic.removeNowPlayPlayer(event.getPlayer().getUsername()); + PlayMusic.removeNowPlayPlayer(event.getPlayer().getUsername()); } @Subscribe