diff --git a/.github/workflows/onejar.yml b/.github/workflows/onejar.yml index 2380ad1e..25ccd10c 100644 --- a/.github/workflows/onejar.yml +++ b/.github/workflows/onejar.yml @@ -5,7 +5,7 @@ # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle -name: Java CI with Gradle +name: AllMusic OneJar on: push: diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 18fb4ec9..c666ee73 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -5,7 +5,7 @@ # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle -name: Java CI with Gradle +name: AllMusic Server on: push: diff --git a/client b/client index e461cf8f..2b1ee655 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit e461cf8f3546ad0d8abac8267ec655e2ac5a4b44 +Subproject commit 2b1ee655e5cd4122ec0b6413ad244c3245e4c418 diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java similarity index 97% rename from forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java rename to forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index c27cbb32..1d7e73c1 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -17,10 +17,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.File; -import java.util.Locale; @Mod(modid = "allmusic_server", version = AllMusic.version, acceptableRemoteVersions = "*", acceptedMinecraftVersions = "[1.12,)") -public class AllMusicForge { +public class AllMusicServer { public static final Logger LOGGER = LogManager.getLogger("AllMusic Server"); public static MinecraftServer server; public static FMLEventChannel channel; diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/ForgeApi.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/ForgeApi.java index fdd55841..3ef20c72 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/ForgeApi.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/ForgeApi.java @@ -33,7 +33,7 @@ public class ForgeApi { TextComponentString endtext = new TextComponentString(end); endtext.setStyle(endtext.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.appendSibling(endtext); - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (EntityPlayerMP player : AllMusicServer.server.getPlayerList().getPlayers()) { player.sendMessage(send); } } diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/LogForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/LogForge.java index bd61bef4..fa1d0461 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/LogForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/LogForge.java @@ -5,11 +5,11 @@ import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { @Override public void warning(String data) { - AllMusicForge.LOGGER.warn(data); + AllMusicServer.LOGGER.warn(data); } @Override public void info(String data) { - AllMusicForge.LOGGER.info(data); + AllMusicServer.LOGGER.info(data); } } diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/SideForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/SideForge.java index 18616c98..82c4cb0b 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/SideForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/SideForge.java @@ -1,8 +1,8 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.codec.PacketCodec; +import com.coloryr.allmusic.buffercodec.MusicPacketCodec; +import com.coloryr.allmusic.codec.CommandType; 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.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; @@ -20,12 +20,11 @@ import net.minecraftforge.fml.relauncher.Side; import java.io.File; import java.util.Collection; -import java.util.Locale; public class SideForge extends BaseSide { @Override public void runTask(Runnable run) { - AllMusicForge.server.addScheduledTask(run); + AllMusicServer.server.addScheduledTask(run); } @Override @@ -60,7 +59,7 @@ public class SideForge extends BaseSide { @Override public boolean needPlay(boolean islist) { - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (EntityPlayerMP player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName(), null, false, islist)) { return true; } @@ -70,7 +69,7 @@ public class SideForge extends BaseSide { @Override public Collection getPlayers() { - return AllMusicForge.server.getPlayerList().getPlayers(); + return AllMusicServer.server.getPlayerList().getPlayers(); } @Override @@ -89,16 +88,16 @@ public class SideForge 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 EntityPlayerMP) { EntityPlayerMP player1 = (EntityPlayerMP) player; - send(player1, PacketCodec.pack(type, data, data1)); + send(player1, MusicPacketCodec.pack(type, data, data1)); } } @Override public Object getPlayer(String player) { - return AllMusicForge.server.getPlayerList().getPlayerByUsername(player); + return AllMusicServer.server.getPlayerList().getPlayerByUsername(player); } @Override @@ -111,7 +110,7 @@ public class SideForge extends BaseSide { @Override public File getFolder() { - return new File(AllMusicForge.dir); + return new File(AllMusicServer.dir); } @Override @@ -119,7 +118,7 @@ public class SideForge extends BaseSide { if (message == null || message.isEmpty()) { return; } - for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (EntityPlayerMP player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName(), null, false)) { player.sendMessage(new TextComponentString(message)); } @@ -177,7 +176,7 @@ public class SideForge extends BaseSide { try { FMLProxyPacket packet = new FMLProxyPacket(new PacketBuffer(data), "allmusic:channel"); packet.setTarget(Side.CLIENT); - runTask(() -> AllMusicForge.channel.sendTo(packet, players)); + runTask(() -> AllMusicServer.channel.sendTo(packet, players)); } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); e.printStackTrace(); diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/Tasks.java index 1550fcfa..bf63ec43 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/forge_1_12_2/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() { - AllMusicForge.server.addScheduledTask(Tasks::tick); + AllMusicServer.server.addScheduledTask(Tasks::tick); } public static void tick() { diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java similarity index 97% rename from forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java rename to forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 94d447cf..727cdfb1 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -21,8 +21,8 @@ import org.apache.logging.log4j.Logger; import java.io.File; // The value here should match an entry in the META-INF/mods.toml file -@Mod(AllMusicForge.MODID) -public class AllMusicForge { +@Mod(AllMusicServer.MODID) +public class AllMusicServer { public static final ResourceLocation channel = new ResourceLocation("allmusic", "channel"); // Define mod id in a common place for everything to reference public static final String MODID = "allmusic_server"; @@ -33,7 +33,7 @@ public class AllMusicForge { public static final String dir = "config/allmusic_server/"; - public AllMusicForge() { + public AllMusicServer() { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); // Register the commonSetup method for modloading diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/ForgeApi.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/ForgeApi.java index fed35f1c..d3d3e105 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/ForgeApi.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/ForgeApi.java @@ -35,7 +35,7 @@ public class ForgeApi { StringTextComponent endtext = new StringTextComponent(end); endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endtext); - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayerEntity player : AllMusicServer.server.getPlayerList().getPlayers()) { player.sendMessage(send, UUID.randomUUID()); } } diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/LogForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/LogForge.java index bd61bef4..fa1d0461 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/LogForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/LogForge.java @@ -5,11 +5,11 @@ import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { @Override public void warning(String data) { - AllMusicForge.LOGGER.warn(data); + AllMusicServer.LOGGER.warn(data); } @Override public void info(String data) { - AllMusicForge.LOGGER.info(data); + AllMusicServer.LOGGER.info(data); } } diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/SideForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/SideForge.java index 59d11efa..a34020fc 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/SideForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/SideForge.java @@ -1,8 +1,8 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.codec.PacketCodec; +import com.coloryr.allmusic.buffercodec.MusicPacketCodec; +import com.coloryr.allmusic.codec.CommandType; 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.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; @@ -25,7 +25,7 @@ public class SideForge extends BaseSide { @Override public void runTask(Runnable run) { - AllMusicForge.server.execute(run); + AllMusicServer.server.execute(run); } @Override @@ -55,7 +55,7 @@ public class SideForge extends BaseSide { @Override public boolean needPlay(boolean islist) { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayerEntity player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null,false, islist)) { return true; } @@ -65,7 +65,7 @@ public class SideForge extends BaseSide { @Override public Collection getPlayers() { - return AllMusicForge.server.getPlayerList().getPlayers(); + return AllMusicServer.server.getPlayerList().getPlayers(); } @Override @@ -84,16 +84,16 @@ public class SideForge 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 ServerPlayerEntity) { ServerPlayerEntity player1 = (ServerPlayerEntity) player; - send(player1, PacketCodec.pack(type, data, data1)); + send(player1, MusicPacketCodec.pack(type, data, data1)); } } @Override public Object getPlayer(String player) { - return AllMusicForge.server.getPlayerList().getPlayerByName(player); + return AllMusicServer.server.getPlayerList().getPlayerByName(player); } @Override @@ -106,7 +106,7 @@ public class SideForge extends BaseSide { @Override public File getFolder() { - return new File(AllMusicForge.dir); + return new File(AllMusicServer.dir); } @Override @@ -114,7 +114,7 @@ public class SideForge extends BaseSide { if (message == null || message.isEmpty()) { return; } - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayerEntity player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendMessage(new StringTextComponent(message), UUID.randomUUID()); } @@ -171,7 +171,7 @@ public class SideForge extends BaseSide { return; try { runTask(() -> PacketDistributor.PLAYER.with(() -> players) - .send(new SCustomPayloadPlayPacket(AllMusicForge.channel, new PacketBuffer(data)))); + .send(new SCustomPayloadPlayPacket(AllMusicServer.channel, new PacketBuffer(data)))); } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); e.printStackTrace(); diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java index f6ca6f5b..4601f390 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -8,7 +8,7 @@ public class Tasks { private static final List taskItems = new CopyOnWriteArrayList<>(); public static void init() { - AllMusicForge.server.addTickable(Tasks::tick); + AllMusicServer.server.addTickable(Tasks::tick); } public static void tick() { diff --git a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java similarity index 97% rename from forge_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java rename to forge_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index c95d5ad6..7200182f 100644 --- a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory; import java.io.File; // The value here should match an entry in the META-INF/mods.toml file -@Mod(AllMusicForge.MODID) -public class AllMusicForge { +@Mod(AllMusicServer.MODID) +public class AllMusicServer { public static final ResourceLocation channel = new ResourceLocation("allmusic", "channel"); // Define mod id in a common place for everything to reference public static final String MODID = "allmusic_server"; @@ -33,7 +33,7 @@ public class AllMusicForge { public static final String dir = "config/allmusic_server/"; - public AllMusicForge() { + public AllMusicServer() { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); // Register the commonSetup method for modloading diff --git a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/ForgeApi.java b/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/ForgeApi.java index 5cc72049..ded4f98c 100644 --- a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/ForgeApi.java +++ b/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/ForgeApi.java @@ -34,7 +34,7 @@ public class ForgeApi { MutableComponent endtext = Component.literal(end); endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); send.append(endtext); - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { player.sendSystemMessage(send); } } diff --git a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/LogForge.java b/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/LogForge.java index bd61bef4..fa1d0461 100644 --- a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/LogForge.java +++ b/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/LogForge.java @@ -5,11 +5,11 @@ import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { @Override public void warning(String data) { - AllMusicForge.LOGGER.warn(data); + AllMusicServer.LOGGER.warn(data); } @Override public void info(String data) { - AllMusicForge.LOGGER.info(data); + AllMusicServer.LOGGER.info(data); } } diff --git a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/SideForge.java b/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/SideForge.java index 909fb412..754a0158 100644 --- a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/SideForge.java +++ b/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/SideForge.java @@ -1,8 +1,8 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.codec.PacketCodec; +import com.coloryr.allmusic.buffercodec.MusicPacketCodec; +import com.coloryr.allmusic.codec.CommandType; 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.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; @@ -19,13 +19,12 @@ import net.minecraftforge.network.PacketDistributor; import java.io.File; import java.util.Collection; -import java.util.Locale; public class SideForge extends BaseSide { @Override public void runTask(Runnable run) { - AllMusicForge.server.execute(run); + AllMusicServer.server.execute(run); } @Override @@ -55,7 +54,7 @@ public class SideForge extends BaseSide { @Override public boolean needPlay(boolean islist) { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } @@ -65,7 +64,7 @@ public class SideForge extends BaseSide { @Override public Collection getPlayers() { - return AllMusicForge.server.getPlayerList().getPlayers(); + return AllMusicServer.server.getPlayerList().getPlayers(); } @Override @@ -83,15 +82,15 @@ public class SideForge 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, PacketCodec.pack(type, data, data1)); + send(player1, MusicPacketCodec.pack(type, data, data1)); } } @Override public Object getPlayer(String player) { - return AllMusicForge.server.getPlayerList().getPlayerByName(player); + return AllMusicServer.server.getPlayerList().getPlayerByName(player); } @Override @@ -103,7 +102,7 @@ public class SideForge extends BaseSide { @Override public File getFolder() { - return new File(AllMusicForge.dir); + return new File(AllMusicServer.dir); } @Override @@ -111,7 +110,7 @@ public class SideForge extends BaseSide { if (message == null || message.isEmpty()) { return; } - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendSystemMessage(Component.literal(message)); } @@ -174,7 +173,7 @@ public class SideForge extends BaseSide { try { runTask(() -> PacketDistributor.PLAYER.with( () -> players - ).send(new ClientboundCustomPayloadPacket(AllMusicForge.channel, + ).send(new ClientboundCustomPayloadPacket(AllMusicServer.channel, new FriendlyByteBuf(data)))); } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); diff --git a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/Tasks.java index 3ceeee68..b861abcc 100644 --- a/forge_1_20_1/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/forge_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() { - AllMusicForge.server.addTickable(Tasks::tick); + AllMusicServer.server.addTickable(Tasks::tick); } public static void tick() { diff --git a/link.cmd b/link.cmd index 43291c4f..bf3981bf 100644 --- a/link.cmd +++ b/link.cmd @@ -51,7 +51,8 @@ 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 ^ +neoforge_1_21_6 for %%i in (%array4%) do ( if not exist "%%i\src\main\java\com\coloryr\allmusic\comm" mklink /j "%%i\src\main\java\com\coloryr\allmusic\comm" "client\%%i\src\main\java\com\coloryr\allmusic\comm" diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicNeoForge.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java similarity index 90% rename from neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicNeoForge.java rename to neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 4637d4bc..34c0ccc2 100644 --- a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicNeoForge.java +++ b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -25,8 +25,8 @@ import org.slf4j.LoggerFactory; import java.io.File; // The value here should match an entry in the META-INF/mods.toml file -@Mod(AllMusicNeoForge.MODID) -public class AllMusicNeoForge { +@Mod(AllMusicServer.MODID) +public class AllMusicServer { public static final Identifier channel = Identifier.fromNamespaceAndPath("allmusic", "channel"); // Define mod id in a common place for everything to reference public static final String MODID = "allmusic_server"; @@ -37,7 +37,7 @@ public class AllMusicNeoForge { public static final String dir = "config/allmusic_server/"; - public AllMusicNeoForge(IEventBus modEventBus) { + public AllMusicServer(IEventBus modEventBus) { // Register the commonSetup method for modloading modEventBus.addListener(this::commonSetup); modEventBus.addListener(this::register); @@ -56,7 +56,7 @@ public class AllMusicNeoForge { public void register(final RegisterPayloadHandlersEvent event) { LOGGER.info("注册插件信道"); final PayloadRegistrar registrar = event.registrar("1.0"); - registrar.optional().playToClient(PackData.TYPE, PackData.CODEC, new HandelPack()); + registrar.optional().playToClient(MusicCodec.TYPE, MusicCodec.CODEC, new HandelPack()); } @SubscribeEvent @@ -90,9 +90,9 @@ public class AllMusicNeoForge { AllMusic.joinPlay(event.getEntity().getName().getString()); } - private static class HandelPack implements IPayloadHandler { + private static class HandelPack implements IPayloadHandler { @Override - public void handle(@NotNull PackData payload, IPayloadContext context) { + public void handle(@NotNull MusicCodec payload, IPayloadContext context) { //context.handle(payload); } } diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java index bddda272..a44af856 100644 --- a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java +++ b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java @@ -5,11 +5,11 @@ import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogNeoForge implements IMyLogger { @Override public void warning(String data) { - AllMusicNeoForge.LOGGER.warn(data); + AllMusicServer.LOGGER.warn(data); } @Override public void info(String data) { - AllMusicNeoForge.LOGGER.info(data); + AllMusicServer.LOGGER.info(data); } } diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/MusicCodec.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/MusicCodec.java new file mode 100644 index 00000000..34cbd568 --- /dev/null +++ b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/MusicCodec.java @@ -0,0 +1,22 @@ +package com.coloryr.allmusic.server; + +import com.coloryr.allmusic.buffercodec.MusicPacketCodec; +import com.coloryr.allmusic.codec.MusicPack; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import org.jetbrains.annotations.NotNull; + +public record MusicCodec(MusicPack pack) implements CustomPacketPayload { + public static final Type TYPE = new Type<>(AllMusicServer.channel); + public static final StreamCodec CODEC = StreamCodec.of((buf, value) -> { + MusicPacketCodec.pack(buf, value.pack); + }, (buf -> { + return new MusicCodec(MusicPacketCodec.decode(buf)); + })); + + @Override + public @NotNull Type type() { + return TYPE; + } +} diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java index e190e141..596e4efc 100644 --- a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java +++ b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java @@ -34,7 +34,7 @@ public class NeoForgeApi { MutableComponent endtext = Component.literal(end); endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); send.append(endtext); - for (ServerPlayer player : AllMusicNeoForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { player.sendSystemMessage(send); } } diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/PackData.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/PackData.java deleted file mode 100644 index 65a2aaac..00000000 --- a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/PackData.java +++ /dev/null @@ -1,31 +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.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import org.jetbrains.annotations.NotNull; - -public record PackData(ComType cmd, String data, int data1) implements CustomPacketPayload { - public static final Type TYPE = new Type<>(AllMusicNeoForge.channel); - public static final StreamCodec CODEC = new PackCodec(); - - @Override - public @NotNull Type type() { - return TYPE; - } - - public static class PackCodec implements StreamCodec { - @Override - public @NotNull PackData decode(RegistryFriendlyByteBuf pack) { - pack.clear(); - return new PackData(ComType.CLEAR, "", 0); - } - - @Override - public void encode(@NotNull RegistryFriendlyByteBuf pack, PackData buffer) { - PacketCodec.pack(pack, buffer.cmd, buffer.data, buffer.data1); - } - } -} diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java index 25f78600..98bb54a1 100644 --- a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java +++ b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java @@ -1,7 +1,8 @@ package com.coloryr.allmusic.server; +import com.coloryr.allmusic.codec.CommandType; +import com.coloryr.allmusic.codec.MusicPack; 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.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; @@ -16,12 +17,11 @@ import net.neoforged.neoforge.network.PacketDistributor; import java.io.File; import java.util.Collection; -import java.util.Locale; public class SideNeoForge extends BaseSide { @Override public void runTask(Runnable run) { - AllMusicNeoForge.server.execute(run); + AllMusicServer.server.execute(run); } @Override @@ -51,7 +51,7 @@ public class SideNeoForge extends BaseSide { @Override public boolean needPlay(boolean islist) { - for (ServerPlayer player : AllMusicNeoForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } @@ -61,7 +61,7 @@ public class SideNeoForge extends BaseSide { @Override public Collection getPlayers() { - return AllMusicNeoForge.server.getPlayerList().getPlayers(); + return AllMusicServer.server.getPlayerList().getPlayers(); } @Override @@ -79,15 +79,15 @@ public class SideNeoForge 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 PackData(type, data, data1)); + send(player1, new MusicPack(type, data, data1)); } } @Override public Object getPlayer(String player) { - return AllMusicNeoForge.server.getPlayerList().getPlayerByName(player); + return AllMusicServer.server.getPlayerList().getPlayerByName(player); } @Override @@ -99,7 +99,7 @@ public class SideNeoForge extends BaseSide { @Override public File getFolder() { - return new File(AllMusicNeoForge.dir); + return new File(AllMusicServer.dir); } @Override @@ -107,7 +107,7 @@ public class SideNeoForge extends BaseSide { if (message == null || message.isEmpty()) { return; } - for (ServerPlayer player : AllMusicNeoForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendSystemMessage(Component.literal(message)); } @@ -162,11 +162,11 @@ public class SideNeoForge extends BaseSide { return event.isCancel(); } - private void send(ServerPlayer players, PackData data) { + private void send(ServerPlayer players, MusicPack data) { if (players == null) return; try { - runTask(() -> PacketDistributor.sendToPlayer(players, data)); + runTask(() -> PacketDistributor.sendToPlayer(players, new MusicCodec(data))); } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); e.printStackTrace(); diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/Tasks.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/Tasks.java index e8d53047..b861abcc 100644 --- a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/neoforge_1_21_11/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() { - AllMusicNeoForge.server.addTickable(Tasks::tick); + AllMusicServer.server.addTickable(Tasks::tick); } public static void tick() { diff --git a/neoforge_1_21_6/build.gradle b/neoforge_1_21_6/build.gradle index 8a6a9e7e..fb6f0aa5 100644 --- a/neoforge_1_21_6/build.gradle +++ b/neoforge_1_21_6/build.gradle @@ -121,12 +121,7 @@ dependencies { implementation('org.apache.httpcomponents.client5:httpclient5:5.6') implementation('org.xerial:sqlite-jdbc:3.51.1.0') -// implementation "thedarkcolour:kotlinforforge:$kff_version" -// jarJar (group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: '[2.0, 2.1)') -// jarJar (group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk7', version: '[2.0, 2.1)') -// jarJar (group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '[2.0, 2.1)') -// jarJar (group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-common', version: '[2.0, 2.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_6/src/main/java/com/coloryr/allmusic/server/AllMusicNeoForge.java b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicNeoForge.java deleted file mode 100644 index 8033b9e7..00000000 --- a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicNeoForge.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.coloryr.allmusic.server; - -import com.coloryr.allmusic.server.core.AllMusic; -import com.mojang.brigadier.CommandDispatcher; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.MinecraftServer; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; -import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; -import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.event.RegisterCommandsEvent; -import net.neoforged.neoforge.event.entity.player.PlayerEvent; -import net.neoforged.neoforge.event.server.ServerStartedEvent; -import net.neoforged.neoforge.event.server.ServerStoppingEvent; -import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; -import net.neoforged.neoforge.network.handling.IPayloadContext; -import net.neoforged.neoforge.network.handling.IPayloadHandler; -import net.neoforged.neoforge.network.registration.PayloadRegistrar; -import org.jetbrains.annotations.NotNull; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; - -// The value here should match an entry in the META-INF/mods.toml file -@Mod(AllMusicNeoForge.MODID) -public class AllMusicNeoForge { - public static final ResourceLocation channel = ResourceLocation.fromNamespaceAndPath("allmusic", "channel"); - // Define mod id in a common place for everything to reference - public static final String MODID = "allmusic_server"; - // Directly reference a slf4j logger - public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server"); - public static MinecraftServer server; - // Create a Deferred Register to hold Blocks which will all be registered under the "examplemod" namespace - - public static final String dir = "config/allmusic_server/"; - - public AllMusicNeoForge(IEventBus modEventBus) { - // Register the commonSetup method for modloading - modEventBus.addListener(this::commonSetup); - modEventBus.addListener(this::register); - - // Register ourselves for server and other game events we are interested in - NeoForge.EVENT_BUS.register(this); - } - - private void commonSetup(final FMLCommonSetupEvent event) { - AllMusic.log = new LogNeoForge(); - AllMusic.side = new SideNeoForge(); - - new AllMusic().init(new File(dir)); - } - - public void register(final RegisterPayloadHandlersEvent event) { - LOGGER.info("注册插件信道"); - final PayloadRegistrar registrar = event.registrar("1.0"); - registrar.optional().playToClient(PackData.TYPE, PackData.CODEC, new HandelPack()); - } - - @SubscribeEvent - public void onRegisterCommands(RegisterCommandsEvent event) { - LOGGER.info("注册指令"); - CommandDispatcher dispatcher = event.getDispatcher(); - CommandNeoForge.instance.register(dispatcher); - } - - // You can use SubscribeEvent and let the Event Bus discover methods to call - @SubscribeEvent - public void onServerStarting(ServerStartedEvent event) { - server = event.getServer(); - - AllMusic.start(); - Tasks.init(); - } - - @SubscribeEvent - public void onServerStopping(ServerStoppingEvent event) { - AllMusic.stop(); - } - - @SubscribeEvent - public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - AllMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); - } - - @SubscribeEvent - public void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { - AllMusic.joinPlay(event.getEntity().getName().getString()); - } - - private static class HandelPack implements IPayloadHandler { - @Override - public void handle(@NotNull PackData payload, IPayloadContext context) { - //context.handle(payload); - } - } -} 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 new file mode 100644 index 00000000..6e49a036 --- /dev/null +++ b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -0,0 +1,66 @@ +package com.coloryr.allmusic.server; + +import com.coloryr.allmusic.comm.AllMusicInit; +import com.coloryr.allmusic.server.core.AllMusic; +import com.mojang.brigadier.CommandDispatcher; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.server.MinecraftServer; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; +import net.neoforged.neoforge.event.RegisterCommandsEvent; +import net.neoforged.neoforge.event.entity.player.PlayerEvent; +import net.neoforged.neoforge.event.server.ServerStartedEvent; +import net.neoforged.neoforge.event.server.ServerStoppingEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; + +@EventBusSubscriber(modid = AllMusicInit.MODID, value = Dist.DEDICATED_SERVER) +public class AllMusicServer { + + public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server"); + public static MinecraftServer server; + + public static final String dir = "config/allmusic_server/"; + + @SubscribeEvent + public static void commonSetup(final FMLCommonSetupEvent event) { + AllMusic.log = new LogNeoForge(); + AllMusic.side = new SideNeoForge(); + + new AllMusic().init(new File(dir)); + } + + @SubscribeEvent + public static void onRegisterCommands(RegisterCommandsEvent event) { + LOGGER.info("注册指令"); + CommandDispatcher dispatcher = event.getDispatcher(); + CommandNeoForge.instance.register(dispatcher); + } + + @SubscribeEvent + public static void onServerStarting(ServerStartedEvent event) { + server = event.getServer(); + + AllMusic.start(); + Tasks.init(); + } + + @SubscribeEvent + public static void onServerStopping(ServerStoppingEvent event) { + AllMusic.stop(); + } + + @SubscribeEvent + public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { + AllMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); + } + + @SubscribeEvent + public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { + AllMusic.joinPlay(event.getEntity().getName().getString()); + } +} diff --git a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java index bddda272..a44af856 100644 --- a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java +++ b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java @@ -5,11 +5,11 @@ import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogNeoForge implements IMyLogger { @Override public void warning(String data) { - AllMusicNeoForge.LOGGER.warn(data); + AllMusicServer.LOGGER.warn(data); } @Override public void info(String data) { - AllMusicNeoForge.LOGGER.info(data); + AllMusicServer.LOGGER.info(data); } } diff --git a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java index e190e141..596e4efc 100644 --- a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java +++ b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java @@ -34,7 +34,7 @@ public class NeoForgeApi { MutableComponent endtext = Component.literal(end); endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); send.append(endtext); - for (ServerPlayer player : AllMusicNeoForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { player.sendSystemMessage(send); } } diff --git a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/PackData.java b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/PackData.java deleted file mode 100644 index 65a2aaac..00000000 --- a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/PackData.java +++ /dev/null @@ -1,31 +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.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import org.jetbrains.annotations.NotNull; - -public record PackData(ComType cmd, String data, int data1) implements CustomPacketPayload { - public static final Type TYPE = new Type<>(AllMusicNeoForge.channel); - public static final StreamCodec CODEC = new PackCodec(); - - @Override - public @NotNull Type type() { - return TYPE; - } - - public static class PackCodec implements StreamCodec { - @Override - public @NotNull PackData decode(RegistryFriendlyByteBuf pack) { - pack.clear(); - return new PackData(ComType.CLEAR, "", 0); - } - - @Override - public void encode(@NotNull RegistryFriendlyByteBuf pack, PackData buffer) { - PacketCodec.pack(pack, buffer.cmd, buffer.data, buffer.data1); - } - } -} diff --git a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java index 95f4975b..92b73221 100644 --- a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java +++ b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java @@ -1,7 +1,9 @@ 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.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; @@ -15,12 +17,11 @@ import net.neoforged.neoforge.network.PacketDistributor; import java.io.File; import java.util.Collection; -import java.util.Locale; public class SideNeoForge extends BaseSide { @Override public void runTask(Runnable run) { - AllMusicNeoForge.server.execute(run); + AllMusicServer.server.execute(run); } @Override @@ -50,7 +51,7 @@ public class SideNeoForge extends BaseSide { @Override public boolean needPlay(boolean islist) { - for (ServerPlayer player : AllMusicNeoForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { return true; } @@ -60,7 +61,7 @@ public class SideNeoForge extends BaseSide { @Override public Collection getPlayers() { - return AllMusicNeoForge.server.getPlayerList().getPlayers(); + return AllMusicServer.server.getPlayerList().getPlayers(); } @Override @@ -78,15 +79,15 @@ public class SideNeoForge 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 PackData(type, data, data1)); + send(player1, new MusicPack(type, data, data1)); } } @Override public Object getPlayer(String player) { - return AllMusicNeoForge.server.getPlayerList().getPlayerByName(player); + return AllMusicServer.server.getPlayerList().getPlayerByName(player); } @Override @@ -98,7 +99,7 @@ public class SideNeoForge extends BaseSide { @Override public File getFolder() { - return new File(AllMusicNeoForge.dir); + return new File(AllMusicServer.dir); } @Override @@ -106,7 +107,7 @@ public class SideNeoForge extends BaseSide { if (message == null || message.isEmpty()) { return; } - for (ServerPlayer player : AllMusicNeoForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { player.sendSystemMessage(Component.literal(message)); } @@ -161,11 +162,11 @@ public class SideNeoForge extends BaseSide { return event.isCancel(); } - private void send(ServerPlayer players, PackData data) { + private void send(ServerPlayer players, MusicPack data) { if (players == null) return; try { - runTask(() -> PacketDistributor.sendToPlayer(players, data)); + runTask(() -> PacketDistributor.sendToPlayer(players, new MusicCodec(data))); } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); e.printStackTrace(); diff --git a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/Tasks.java b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/Tasks.java index e8d53047..b861abcc 100644 --- a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/neoforge_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() { - AllMusicNeoForge.server.addTickable(Tasks::tick); + AllMusicServer.server.addTickable(Tasks::tick); } public static void tick() { diff --git a/onejar/neoforge_1_21_6/build.gradle b/onejar/neoforge_1_21_6/build.gradle index 97149f37..d50f56ff 100644 --- a/onejar/neoforge_1_21_6/build.gradle +++ b/onejar/neoforge_1_21_6/build.gradle @@ -119,17 +119,12 @@ dependencies { // We add the full version to localRuntime, not runtimeOnly, so that we do not publish a dependency on it // localRuntime "mezz.jei:jei-${mc_version}-neoforge:${jei_version}" - implementation('com.squareup.okhttp3:okhttp:5.3.2') - implementation('com.squareup.okio:okio-jvm:3.16.4') + implementation('org.apache.httpcomponents.client5:httpclient5:5.6') implementation('org.xerial:sqlite-jdbc:3.51.1.0') -// implementation "thedarkcolour:kotlinforforge:$kff_version" -// jarJar (group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: '[2.0, 2.1)') -// jarJar (group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk7', version: '[2.0, 2.1)') -// jarJar (group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '[2.0, 2.1)') -// jarJar (group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-common', version: '[2.0, 2.1)') - jarJar(group: 'com.squareup.okhttp3', name: 'okhttp', version: '[5.3.2,6.0)') - jarJar(group: 'com.squareup.okio', name: 'okio-jvm', version: '[3.16.4,4.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)') jarJar(group: 'org.xerial', name: 'sqlite-jdbc', version: '[3.51.1.0,4.0)') // Example mod dependency using a mod jar from ./libs with a flat dir repository diff --git a/onejar/neoforge_1_21_6/gradle.properties b/onejar/neoforge_1_21_6/gradle.properties index 0db66442..de24fc65 100644 --- a/onejar/neoforge_1_21_6/gradle.properties +++ b/onejar/neoforge_1_21_6/gradle.properties @@ -26,7 +26,7 @@ kff_version=5.7.0 ## Mod Properties -file_name = [neoforge-1.21.6]AllMusic +file_name = [neoforge-1.21.6]AllMusic_OneJar # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} # Must match the String constant located in the main mod class annotated with @Mod. diff --git a/onejar/neoforge_1_21_6/settings.gradle b/onejar/neoforge_1_21_6/settings.gradle index 2d869ce7..38982615 100644 --- a/onejar/neoforge_1_21_6/settings.gradle +++ b/onejar/neoforge_1_21_6/settings.gradle @@ -10,4 +10,4 @@ plugins { id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0' } -rootProject.name = 'AllMusic' \ No newline at end of file +rootProject.name = 'AllMusic_OneJar' \ No newline at end of file