diff --git a/client b/client index 502105c5..77d47807 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 502105c5962a464c8e8f019efdbac31186f7f427 +Subproject commit 77d47807ffa078edba87cb9148e88453c2f23403 diff --git a/link.cmd b/link.cmd index 9390a621..ea1b4166 100644 --- a/link.cmd +++ b/link.cmd @@ -34,10 +34,11 @@ set array3=neoforge_1_21_6 fabric_1_21_6 forge_1_20_1 fabric_1_20_1 for %%i in (%array3%) do ( if not exist "onejar\%%i\build" mkdir "onejar\%%i\build" - if not exist "onejar\%%i\src\main\java\com\coloryr\allmusic\client" mkdir "onejar\%%i\src\main\java\com\coloryr\allmusic\client" if not exist "onejar\%%i\src\main\resources\com\coloryr\allmusic\client\core\player\decoder" mkdir "onejar\%%i\src\main\resources\com\coloryr\allmusic\client\core\player\decoder" if not exist "onejar\%%i\build\libs" mklink /j "onejar\%%i\build\libs" "build\libs" + if not exist "onejar\%%i\src\main\java\com\coloryr\allmusic\server" mklink /j "onejar\%%i\src\main\java\com\coloryr\allmusic\server" "%%i\src\main\java\com\coloryr\allmusic\server" + if not exist "onejar\%%i\src\main\java\com\coloryr\allmusic\client" mklink /j "onejar\%%i\src\main\java\com\coloryr\allmusic\client" "client\%%i\src\main\java\com\coloryr\allmusic\client" if not exist "onejar\%%i\src\main\java\com\coloryr\allmusic\server\core" mklink /j "onejar\%%i\src\main\java\com\coloryr\allmusic\server\core" "core" if not exist "onejar\%%i\src\main\java\com\coloryr\allmusic\server\codec" mklink /j "onejar\%%i\src\main\java\com\coloryr\allmusic\server\codec" "codec" if not exist "onejar\%%i\src\main\java\com\coloryr\allmusic\client\core" mklink /j "onejar\%%i\src\main\java\com\coloryr\allmusic\client\core" "client\core" diff --git a/onejar/fabric_1_20_1/build.gradle b/onejar/fabric_1_20_1/build.gradle index 6d8d12b8..dc735dbf 100644 --- a/onejar/fabric_1_20_1/build.gradle +++ b/onejar/fabric_1_20_1/build.gradle @@ -39,8 +39,9 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" - include modImplementation('com.squareup.okio:okio-jvm:3.16.4') - include modImplementation('com.squareup.okhttp3:okhttp:5.3.2') + include modImplementation('org.apache.httpcomponents.client5:httpclient5:5.6') + include modImplementation('org.apache.httpcomponents.core5:httpcore5:5.4') + include modImplementation('org.apache.httpcomponents.core5:httpcore5-h2:5.4') include modImplementation('org.xerial:sqlite-jdbc:3.51.1.0') // Uncomment the following line to enable the deprecated Fabric API modules. diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusic.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusic.java deleted file mode 100644 index c45f8a7f..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusic.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.coloryr.allmusic.client; - -import com.coloryr.allmusic.client.core.AllMusicBridge; -import com.coloryr.allmusic.client.core.AllMusicCore; -import com.coloryr.allmusic.server.AllMusicFabric; -import com.mojang.blaze3d.systems.RenderSystem; -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.render.*; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.sound.SoundCategory; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.joml.Matrix4f; -import org.joml.Quaternionf; - -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; - -public class AllMusic implements ClientModInitializer, AllMusicBridge { - private static DrawContext context; - - @Override - public Object genTexture(int size) { - return AllMusicCore.genGLTexture(size); - } - - @Override - public void updateTexture(Object tex, int size, ByteBuffer byteBuffer) { - AllMusicCore.updateGLTexture((int) tex, size, byteBuffer); - } - - public int getScreenWidth() { - return MinecraftClient.getInstance().getWindow().getScaledWidth(); - } - - public int getScreenHeight() { - return MinecraftClient.getInstance().getWindow().getScaledHeight(); - } - - public int getTextWidth(String item) { - return MinecraftClient.getInstance().textRenderer.getWidth(item); - } - - public int getFontHeight() { - return MinecraftClient.getInstance().textRenderer.fontHeight; - } - - public void drawText(String item, int x, int y, int color, boolean shadow) { - var hud = MinecraftClient.getInstance().textRenderer; - context.drawText(hud, item, x, y, color, shadow); - } - - public void drawPic(Object texture, int size, int x, int y, int ang) { - RenderSystem.setShader(GameRenderer::getPositionTexProgram); - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.setShaderTexture(0, (int) texture); - - MatrixStack stack = new MatrixStack(); - Matrix4f matrix = stack.peek().getPositionMatrix(); - - int a = size / 2; - - if (ang > 0) { - matrix = matrix.translationRotate(x + a, y + a, 0, - new Quaternionf().fromAxisAngleDeg(0, 0, 1, ang)); - } else { - matrix = matrix.translation(x + a, y + a, 0); - } - - int x0 = -a; - int x1 = a; - int y0 = -a; - int y1 = a; - int z = 0; - int u0 = 0; - float u1 = 1; - float v0 = 0; - float v1 = 1; - - RenderSystem.setShader(GameRenderer::getPositionTexProgram); - BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer(); - bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE); - bufferBuilder.vertex(matrix, (float) x0, (float) y1, (float) z).texture(u0, v1).next(); - bufferBuilder.vertex(matrix, (float) x1, (float) y1, (float) z).texture(u1, v1).next(); - bufferBuilder.vertex(matrix, (float) x1, (float) y0, (float) z).texture(u1, v0).next(); - bufferBuilder.vertex(matrix, (float) x0, (float) y0, (float) z).texture(u0, v0).next(); - - BufferRenderer.drawWithGlobalProgram(bufferBuilder.end()); - } - - public void sendMessage(String data) { - data = "[AllMusic Client]" + data; - AllMusicFabric.LOGGER.warn(data); - String finalData = data; - MinecraftClient.getInstance().execute(() -> { - if (MinecraftClient.getInstance().player == null) - return; - MinecraftClient.getInstance().player.sendMessage(Text.of(finalData)); - }); - } - - public float getVolume() { - return MinecraftClient.getInstance().options.getSoundVolume(SoundCategory.RECORDS); - } - - @Override - public void stopPlayMusic() { - MinecraftClient.getInstance().getSoundManager().stopSounds(null, SoundCategory.MUSIC); - MinecraftClient.getInstance().getSoundManager().stopSounds(null, SoundCategory.RECORDS); - } - - public static void update(DrawContext draw) { - context = draw; - AllMusicCore.hudUpdate(); - } - - @Override - public void onInitializeClient() { - ClientPlayNetworking.registerGlobalReceiver(AllMusicFabric.ID, (client, handler, buffer, responseSender) -> { - try { - AllMusicCore.packRead(buffer); - } catch (Exception e) { - e.printStackTrace(); - } - }); - - AllMusicCore.init(FabricLoader.getInstance().getConfigDir(), this); - RenderSystem.recordRenderCall(AllMusicCore::glInit); - } -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/GuiShow.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/GuiShow.java deleted file mode 100644 index 2e951dca..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/GuiShow.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.coloryr.allmusic.client.mixin; - -import com.coloryr.allmusic.client.AllMusic; -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.hud.InGameHud; -import net.minecraft.client.util.math.MatrixStack; -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(InGameHud.class) -public class GuiShow { - @Inject(method = {"render"}, at = {@At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/InGameHud;renderStatusEffectOverlay(Lnet/minecraft/client/gui/DrawContext;)V")}) - public void Gui(DrawContext context, float tickDelta, CallbackInfo ci) { - AllMusic.update(context); - } -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/QuitServer.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/QuitServer.java deleted file mode 100644 index aea16659..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/QuitServer.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.coloryr.allmusic.client.mixin; - -import com.coloryr.allmusic.client.core.AllMusicCore; -import net.minecraft.client.MinecraftClient; -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(MinecraftClient.class) -public class QuitServer { - @Inject(method = "disconnect()V", at = @At("TAIL")) - public void Quit(CallbackInfo info) { - AllMusicCore.onServerQuit(); - } -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/SoundEvent.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/SoundEvent.java deleted file mode 100644 index 254c2712..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/SoundEvent.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.coloryr.allmusic.client.mixin; - -import com.coloryr.allmusic.client.core.AllMusicCore; -import net.minecraft.client.sound.SoundInstance; -import net.minecraft.client.sound.SoundSystem; -import net.minecraft.sound.SoundCategory; -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(SoundSystem.class) -public class SoundEvent { - @Inject(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", at = @At("HEAD"), cancellable = true) - public void play(SoundInstance soundInstance, CallbackInfo info) { - if (AllMusicCore.isPlay()) { - SoundCategory data = soundInstance.getCategory(); - switch (data) { - case RECORDS, MUSIC -> info.cancel(); - } - } - } - - @Inject(method = "play(Lnet/minecraft/client/sound/SoundInstance;I)V", at = @At("HEAD"), cancellable = true) - public void play(SoundInstance soundInstance, int delay, CallbackInfo info) { - if (AllMusicCore.isPlay()) { - SoundCategory data = soundInstance.getCategory(); - switch (data) { - case RECORDS, MUSIC -> info.cancel(); - } - } - } - - @Inject(method = "reloadSounds", at = @At("RETURN")) - public void reload(CallbackInfo info){ - AllMusicCore.reload(); - } -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/Tick.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/Tick.java deleted file mode 100644 index 7d15797e..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixin/Tick.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.coloryr.allmusic.client.mixin; - -import com.coloryr.allmusic.client.core.AllMusicCore; -import net.minecraft.client.MinecraftClient; -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(MinecraftClient.class) -public class Tick { - - @Inject(method = "tick", at = @At("TAIL")) - public void tick(CallbackInfo info) { - AllMusicCore.tick(); - } -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java deleted file mode 100644 index b56ebb02..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.coloryr.allmusic.server; - -import com.coloryr.allmusic.server.core.AllMusic; -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.Identifier; -import okio.Buffer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; - -public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; - public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic"); - - public static final Identifier ID = new Identifier("allmusic", "channel"); - - public static final String dir = "allmusic_server/"; - - @Override - public void onInitialize() { - AllMusic.log = new LogFabric(); - AllMusic.side = new SideFabric(); - - new AllMusic().init(new File(dir)); - - CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); - - Buffer buffer = new Buffer(); - buffer.close(); - - ServerLifecycleEvents.SERVER_STARTED.register((a) -> { - server = a; - AllMusic.start(); - Tasks.init(); - }); - - ServerLifecycleEvents.SERVER_STOPPING.register((a) -> { - AllMusic.stop(); - }); - } -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/CommandFabric.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/CommandFabric.java deleted file mode 100644 index 32e8f46b..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/CommandFabric.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.coloryr.allmusic.server; - -import com.coloryr.allmusic.server.core.command.CommandEX; -import com.mojang.brigadier.Command; -import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.arguments.StringArgumentType; -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 java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.function.Predicate; - -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()) - .suggests(this).executes(this))); - } - - @Override - public int run(CommandContext context) { - var item = context.getSource(); - - var input = context.getInput(); - var temp = input.split(" "); - var arg = new String[temp.length - 1]; - System.arraycopy(temp, 1, arg, 0, arg.length); - - CommandEX.execute(item, context.getSource().getName(), arg); - - return 0; - } - - @Override - public boolean test(ServerCommandSource stack) { - return true; - } - - @Override - public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) { - var item = context.getSource(); - - var input = context.getInput(); - var temp = input.split(" "); - var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; - System.arraycopy(temp, 1, arg, 0, temp.length - 1); - - builder = builder.createOffset(builder.getInput().lastIndexOf(32) + 1); - - List results = CommandEX.getTabList(item, item.getName(), arg); - - String remaining = builder.getRemaining().trim(); - - for (String s : results) { - if (s.startsWith(remaining)){ - builder.suggest(s); - } - } - - return builder.buildFuture(); - } -} \ No newline at end of file diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/FabricApi.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/FabricApi.java deleted file mode 100644 index 35d3024c..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/FabricApi.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.coloryr.allmusic.server; - -import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.ClickEvent; -import net.minecraft.text.MutableText; -import net.minecraft.text.Text; - -public class FabricApi { - - public static void sendMessageRun(ServerCommandSource obj, String message, String end, String command) { - MutableText send = Text.literal(message); - var endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command))); - send.append(endText); - obj.sendMessage(send); - } - - public static void sendMessageSuggest(ServerCommandSource obj, String message, String end, String command) { - MutableText send = Text.literal(message); - var endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); - send.append(endText); - obj.sendMessage(send); - } - - public static void sendBar(ServerPlayerEntity player, String message) { - var pack = new OverlayMessageS2CPacket(Text.literal(message)); - player.networkHandler.sendPacket(pack); - } - - public static void sendMessageBqRun(String message, String end, String command) { - MutableText send = Text.literal(message); - MutableText endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); - send.append(endText); - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - player.sendMessage(send, false); - } - } -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/LogFabric.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/LogFabric.java deleted file mode 100644 index b1a201ff..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/LogFabric.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.coloryr.allmusic.server; - -import com.coloryr.allmusic.server.core.side.IMyLogger; - -public class LogFabric implements IMyLogger { - @Override - public void warning(String data) { - AllMusicFabric.LOGGER.warn(data); - } - - @Override - public void info(String data) { - AllMusicFabric.LOGGER.info(data); - } -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java deleted file mode 100644 index 25cc0704..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.coloryr.allmusic.server; - -import com.coloryr.allmusic.server.codec.PacketCodec; -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; -import com.coloryr.allmusic.server.event.MusicAddEvent; -import com.coloryr.allmusic.server.event.MusicPlayEvent; -import io.netty.buffer.ByteBuf; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -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 java.io.File; -import java.util.Collection; - -public class SideFabric extends BaseSide { - @Override - public void runTask(Runnable run) { - AllMusicFabric.server.execute(run); - } - - @Override - public void runTask(Runnable run1, int delay) { - Tasks.add(new TaskItem() {{ - tick = delay; - run = run1; - }}); - } - - @Override - public boolean checkPermission(Object player) { - ServerCommandSource source = (ServerCommandSource) player; - return source.hasPermissionLevel(2); - } - - @Override - public boolean isPlayer(Object player) { - ServerCommandSource source = (ServerCommandSource) player; - return source.isExecutedByPlayer(); - } - - @Override - public boolean checkPermission(Object player, String permission) { - return checkPermission(player); - } - - @Override - public boolean needPlay(boolean islist) { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) { - return true; - } - } - return false; - } - - @Override - public Collection getPlayers() { - return AllMusicFabric.server.getPlayerManager().getPlayerList(); - } - - @Override - public String getPlayerName(Object player) { - if (player instanceof ServerPlayerEntity player1) { - return player1.getName().getString(); - } - - return null; - } - - @Override - public String getPlayerServer(Object player) { - return null; - } - - @Override - public void send(Object player, ComType type, String data, int data1) { - if (player instanceof ServerPlayerEntity player1) { - send(player1, PacketCodec.pack(type, data, data1)); - } - } - - @Override - public Object getPlayer(String player) { - return AllMusicFabric.server.getPlayerManager().getPlayer(player); - } - - @Override - public void sendBar(Object player, String data) { - if (player instanceof ServerPlayerEntity player1) { - FabricApi.sendBar(player1, data); - } - } - - @Override - public File getFolder() { - return new File(AllMusicFabric.dir); - } - - @Override - public void broadcast(String message) { - if (message == null || message.isEmpty()) { - return; - } - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(message), false); - } - } - } - - @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageBqRun(message, end, command); - } - - @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) { - return; - } - ServerCommandSource source = (ServerCommandSource) obj; - source.sendMessage(Text.of(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageRun((ServerCommandSource) obj, message, end, command); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageSuggest((ServerCommandSource) obj, message, end, command); - } - - @Override - public boolean onMusicPlay(SongInfoObj obj) { - return MusicPlayEvent.EVENT.invoker().interact(obj) != ActionResult.PASS; - } - - @Override - public boolean onMusicAdd(Object obj, MusicObj music) { - ServerCommandSource source = (ServerCommandSource) obj; - return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS; - } - - private void send(ServerPlayerEntity players, ByteBuf data) { - if (players == null) - return; - try { - runTask(() -> ServerPlayNetworking.send(players, AllMusicFabric.ID, new PacketByteBuf(data))); - } catch (Exception e) { - AllMusic.log.warning("§c数据发送发生错误"); - e.printStackTrace(); - } - } -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/TaskItem.java deleted file mode 100644 index 40f9a5b9..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/TaskItem.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.coloryr.allmusic.server; - -public class TaskItem { - public int tick; - public Runnable run; -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/Tasks.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/Tasks.java deleted file mode 100644 index c70e7f5e..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.coloryr.allmusic.server; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - -public class Tasks { - private static final List taskItems = new CopyOnWriteArrayList<>(); - - public static void init() { - AllMusicFabric.server.addServerGuiTickable(Tasks::tick); - } - - public static void tick() { - for (var item : new ArrayList<>(taskItems)) { - item.tick--; - if (item.tick <= 0) { - taskItems.remove(item); - item.run.run(); - } - } - } - - public static void add(TaskItem item) { - taskItems.add(item); - } -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java deleted file mode 100644 index 7a9c38e5..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.coloryr.allmusic.server.event; - -import com.coloryr.allmusic.server.core.objs.music.MusicObj; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.ActionResult; - -public interface MusicAddEvent { - Event EVENT = EventFactory.createArrayBacked(MusicAddEvent.class, - (listeners) -> (player, music) -> { - for (MusicAddEvent listener : listeners) { - ActionResult result = listener.interact(player, music); - - if (result != ActionResult.PASS) { - return result; - } - } - - return ActionResult.PASS; - }); - - ActionResult interact(ServerPlayerEntity player, MusicObj music); -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java deleted file mode 100644 index e0f12ba1..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -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); - - if (result != ActionResult.PASS) { - return result; - } - } - - return ActionResult.PASS; - }); - - ActionResult interact(SongInfoObj music); -} diff --git a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java deleted file mode 100644 index 07d591eb..00000000 --- a/onejar/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.coloryr.allmusic.server.mixin; - -import com.coloryr.allmusic.server.core.AllMusic; -import net.minecraft.network.ClientConnection; -import net.minecraft.server.PlayerManager; -import net.minecraft.server.network.ServerPlayerEntity; -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) -public class ServerPlayerMixin { - @Inject(at = @At("HEAD"), method = "remove") - private void remove(ServerPlayerEntity entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); - } - - @Inject(at = @At("TAIL"), method = "onPlayerConnect") - private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { - AllMusic.joinPlay(player.getName().getString()); - } -} diff --git a/onejar/fabric_1_20_1/src/main/resources/fabric.mod.json b/onejar/fabric_1_20_1/src/main/resources/fabric.mod.json index 0374a9fc..25b643bf 100644 --- a/onejar/fabric_1_20_1/src/main/resources/fabric.mod.json +++ b/onejar/fabric_1_20_1/src/main/resources/fabric.mod.json @@ -34,8 +34,7 @@ "fabricloader": ">=0.15.11", "fabric-api": "*", "minecraft": "~1.20", - "java": ">=17", - "fabric-language-kotlin": ">=1.10.19" + "java": ">=17" }, "suggests": {