Merge branch 'Fabric-1.19.4' into dev

Author: GregTaoo

build.gradle

@@ -3,8 +3,8 @@ plugins {
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 project.mod_version += "-mc" + project.minecraft_version
@@ -55,7 +55,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
+	it.options.release = 17
 }
 
 java {

gradle.properties

@@ -1,12 +1,12 @@
 org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
+minecraft_version=1.19.4
+yarn_mappings=1.19.4+build.2
 loader_version=0.16.10
 
 # Fabric API
-fabric_version=0.115.1+1.21.4
+fabric_version=0.87.2+1.19.4
 
 # Mod Properties
 mod_version=1.3.2

src/main/java/top/gregtao/concerto/ConcertoServer.java

@@ -12,7 +12,6 @@
 import top.gregtao.concerto.command.ConcertoServerCommand;
 import top.gregtao.concerto.config.PresetRadioConfig;
 import top.gregtao.concerto.config.ServerConfig;
-import top.gregtao.concerto.network.ConcertoNetworking;
 import top.gregtao.concerto.network.ServerMusicNetworkHandler;
 
 public class ConcertoServer implements ModInitializer {
@@ -22,7 +21,6 @@ public class ConcertoServer implements ModInitializer {
     @Override
     public void onInitialize() {
         CommandRegistrationCallback.EVENT.register(ConcertoServerCommand::register);
-        ConcertoNetworking.register();
         ServerMusicNetworkHandler.register();
 
         ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(new SimpleSynchronousResourceReloadListener() {

src/main/java/top/gregtao/concerto/mixin/ChatHudMixin.java

@@ -1,9 +1,9 @@
 package top.gregtao.concerto.mixin;
 
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.ChatHud;
 import net.minecraft.client.gui.hud.MessageIndicator;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.network.message.MessageSignatureData;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
@@ -61,8 +61,8 @@ public void addMessageInject2(Text message, MessageSignatureData signature, Mess
         MusicPlayer.run(() -> handleMessage(message));
     }
 
-    @Inject(method = "render(Lnet/minecraft/client/gui/DrawContext;IIIZ)V", at = @At("HEAD"))
-    public void renderInject(DrawContext context, int currentTick, int mouseX, int mouseY, boolean focused, CallbackInfo ci) {
-        InGameHudRenderer.render(context);
+    @Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;III)V", at = @At("HEAD"))
+    public void renderInject(MatrixStack matrices, int currentTick, int mouseX, int mouseY, CallbackInfo ci) {
+        InGameHudRenderer.render(matrices);
     }
 }

src/main/java/top/gregtao/concerto/mixin/DrawContextAccessor.java

@@ -15,8 +15,8 @@
 @Mixin(MinecraftClient.class)
 public class MinecraftClientMixin {
 
-    @Inject(at = @At("TAIL"), method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V")
-    public void disconnectInject(Screen disconnectionScreen, boolean transferring, CallbackInfo ci) {
+    @Inject(at = @At("TAIL"), method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;)V")
+    public void disconnectInject(Screen screen, CallbackInfo ci) {
         ConcertoClient.serverAvailable = false;
         ClientMusicNetworkHandler.WAIT_CONFIRMATION.clear();
         MusicAuditionScreen.WAIT_AUDITION.clear();

src/main/java/top/gregtao/concerto/mixin/MinecraftClientMixin.java

@@ -2,7 +2,6 @@
 
 import net.minecraft.network.ClientConnection;
 import net.minecraft.server.PlayerManager;
-import net.minecraft.server.network.ConnectedClientData;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -20,8 +19,8 @@
 @Mixin(PlayerManager.class)
 public class PlayerManagerMixin {
 
-    @Inject(at = @At("TAIL"), method = "onPlayerConnect(Lnet/minecraft/network/ClientConnection;Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/server/network/ConnectedClientData;)V")
-    public void onPlayerConnectInject(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) {
+    @Inject(at = @At("TAIL"), method = "onPlayerConnect(Lnet/minecraft/network/ClientConnection;Lnet/minecraft/server/network/ServerPlayerEntity;)V")
+    public void onPlayerConnectInject(ClientConnection connection, ServerPlayerEntity player, CallbackInfo ci) {
         ServerMusicNetworkHandler.playerJoinHandshake(player);
     }
 

src/main/java/top/gregtao/concerto/mixin/PlayerManagerMixin.java

@@ -2,9 +2,13 @@
 
 import com.google.gson.JsonObject;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.PacketByteBuf;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
@@ -28,7 +32,12 @@
 public class ClientMusicNetworkHandler {
 
     public static void register() {
-        ClientPlayNetworking.registerGlobalReceiver(ConcertoPayload.ID, ClientMusicNetworkHandler::generalReceiver);
+        ClientPlayNetworking.registerGlobalReceiver(ConcertoNetworking.MUSIC_DATA, ClientMusicNetworkHandler::musicDataReceiver);
+        ClientPlayNetworking.registerGlobalReceiver(ConcertoNetworking.HANDSHAKE, ClientMusicNetworkHandler::playerJoinHandshake);
+        ClientPlayNetworking.registerGlobalReceiver(ConcertoNetworking.AUDITION_SYNC, ClientMusicNetworkHandler::auditionDataSyncReceiver);
+        ClientPlayNetworking.registerGlobalReceiver(ConcertoNetworking.MUSIC_ROOM, MusicRoom::clientReceiver);
+        ClientPlayNetworking.registerGlobalReceiver(ConcertoNetworking.PRESET_RADIOS, ClientMusicNetworkHandler::presetRadiosReceiver);
+        ClientPlayNetworking.registerGlobalReceiver(ConcertoNetworking.MUSIC_AGENT, ClientMusicNetworkHandler::musicAgentMusicReceiver);
     }
 
     public static final Map<UUID, MusicDataPacket> WAIT_CONFIRMATION = new HashMap<>();
@@ -39,17 +48,6 @@ public static void removeFirst() {
         iterator.remove();
     }
 
-    public static void generalReceiver(ConcertoPayload payload, ClientPlayNetworking.Context context) {
-        switch (payload.channel) {
-            case MUSIC_DATA -> musicDataReceiver(payload, context);
-            case HANDSHAKE -> playerJoinHandshake(payload, context);
-            case AUDITION_SYNC -> auditionDataSyncReceiver(payload, context);
-            case MUSIC_ROOM -> MusicRoom.clientReceiver(payload, context);
-            case PRESET_RADIOS -> presetRadiosReceiver(payload, context);
-            case MUSIC_AGENT -> musicAgentMusicReceiver(payload, context);
-        }
-    }
-
     public static void sendC2SMusicData(MusicDataPacket packet) {
         if (!ConcertoClient.isServerAvailable()) {
             ClientPlayerEntity player = MinecraftClient.getInstance().player;
@@ -73,8 +71,8 @@ public static void sendC2SMusicData(MusicDataPacket packet) {
             throw new RuntimeException("You are NULL, bro :)");
         }
         packet.music.load();
-        ConcertoPayload buf = packet.toPacket(player.getName().getString());
-        ClientPlayNetworking.send(buf);
+        PacketByteBuf buf = packet.toPacket(player.getName().getString());
+        ClientPlayNetworking.send(ConcertoNetworking.MUSIC_DATA, buf);
     }
 
     public static void accept(PlayerEntity player, UUID uuid, MinecraftClient client) {
@@ -137,12 +135,13 @@ public static void addToWaitList(MinecraftClient client, MusicDataPacket packet,
         });
     }
 
-    public static void musicDataReceiver(ConcertoPayload payload, ClientPlayNetworking.Context context) {
+    public static void musicDataReceiver(MinecraftClient client, ClientPlayNetworkHandler handler,
+                                         PacketByteBuf buf, PacketSender packetSender) {
         try {
-            MusicDataPacket packet = MusicDataPacket.fromPacket(payload, true);
-            PlayerEntity self = context.player();
+            MusicDataPacket packet = MusicDataPacket.fromPacket(buf, true);
+            PlayerEntity self = client.player;
             if (packet != null && packet.music != null && self != null) {
-                addToWaitList(context.client(), packet, self);
+                addToWaitList(client, packet, self);
             } else {
                 ConcertoClient.LOGGER.warn("Received an unknown music data packet");
             }
@@ -152,18 +151,19 @@ public static void musicDataReceiver(ConcertoPayload payload, ClientPlayNetworki
         }
     }
 
-    public static void playerJoinHandshake(ConcertoPayload payload, ClientPlayNetworking.Context context) {
-        String str = payload.string;
+    public static void playerJoinHandshake(MinecraftClient client, ClientPlayNetworkHandler handler,
+                                           PacketByteBuf buf, PacketSender packetSender) {
+        String str = buf.readString(Short.MAX_VALUE << 4);
         if (!str.startsWith(ConcertoNetworking.HANDSHAKE_STRING)) return;
         String[] args = str.split(":");
         if (args.length < 3) return;
         if (args[1].equals("CallJoin")) {
             String playerName = args[2];
-            ClientPlayerEntity player = context.player();
+            ClientPlayerEntity player = client.player;
             if (player != null && playerName.equals(player.getName().getString())) {
                 ConcertoClient.serverAvailable = true;
                 ConcertoClient.LOGGER.info("Concerto has been installed in this server");
-                if (args.length > 3 && !MinecraftClient.getInstance().isInSingleplayer() && args[3].equals("Invite")) {
+                if (args.length > 3 && !client.isInSingleplayer() && args[3].equals("Invite")) {
                     if (ClientConfig.INSTANCE.options.joinAgentWhenInvited) {
                         player.networkHandler.sendChatCommand("/musicroom agent join");
                     } else {
@@ -180,8 +180,9 @@ public static void playerJoinHandshake(ConcertoPayload payload, ClientPlayNetwor
         }
     }
 
-    public static void auditionDataSyncReceiver(ConcertoPayload payload, ClientPlayNetworking.Context context) {
-        String str = payload.string;
+    public static void auditionDataSyncReceiver(MinecraftClient client, ClientPlayNetworkHandler handler,
+                                                PacketByteBuf buf, PacketSender packetSender) {
+        String str = buf.readString(Short.MAX_VALUE << 4);
         String[] args = str.split(";");
         if (args.length != 3) return;
         try {
@@ -196,37 +197,44 @@ public static void auditionDataSyncReceiver(ConcertoPayload payload, ClientPlayN
         }
     }
 
-    public static void presetRadiosReceiver(ConcertoPayload payload, ClientPlayNetworking.Context context) {
-        MusicPlayer.run(() -> ConcertoClient.presetRadios = PresetRadioConfig.fromJson(payload.string).stream().filter(playlist ->
+    public static void presetRadiosReceiver(MinecraftClient client, ClientPlayNetworkHandler handler,
+                                            PacketByteBuf buf, PacketSender packetSender) {
+        String str = buf.readString(Short.MAX_VALUE << 4);
+        MusicPlayer.run(() -> ConcertoClient.presetRadios = PresetRadioConfig.fromJson(str).stream().filter(playlist ->
                         playlist.getList().stream().allMatch(MusicDataPacket::isMusicSafe))
                 .peek(playlist -> MusicPlayerHandler.loadInThreadPool(playlist.getList())).toList(), () -> {
-            MinecraftClient client = context.client();
             if (client != null && client.currentScreen instanceof PresetRadiosScreen screen) {
                 screen.reset();
             }
         });
     }
 
+    public static void musicAgentSender(String command) {
+        PacketByteBuf buf = PacketByteBufs.create();
+        buf.writeString(command);
+        ClientPlayNetworking.send(ConcertoNetworking.MUSIC_AGENT, buf);
+    }
+
     public static void musicAgentJoin() {
-        ClientPlayNetworking.send(new ConcertoPayload(ConcertoPayload.Channel.MUSIC_AGENT, "Join"));
+        musicAgentSender("Join");
         ConcertoClient.clientState = ConcertoClient.ClientState.MUSIC_AGENT;
     }
 
     public static void musicAgentQuit() {
-        ClientPlayNetworking.send(new ConcertoPayload(ConcertoPayload.Channel.MUSIC_AGENT, "Quit"));
+        musicAgentSender("Quit");
         ConcertoClient.clientState = ConcertoClient.ClientState.LOCAL;
     }
 
     public static void musicAgentNewVote() {
-        ClientPlayNetworking.send(new ConcertoPayload(ConcertoPayload.Channel.MUSIC_AGENT, "Vote:New"));
+        musicAgentSender("Vote:New");
     }
 
     public static void musicAgentQuery() {
-        ClientPlayNetworking.send(new ConcertoPayload(ConcertoPayload.Channel.MUSIC_AGENT, "Query"));
+        musicAgentSender("Query");
     }
 
     public static void musicAgentVote(boolean vote) {
-        ClientPlayNetworking.send(new ConcertoPayload(ConcertoPayload.Channel.MUSIC_AGENT, "Vote:" + (vote ? "1" : "0")));
+        musicAgentSender("Vote:" + (vote ? "1" : "0"));
     }
 
     public static boolean musicAgentAddCurrentMusic() {
@@ -237,15 +245,16 @@ public static boolean musicAgentAddCurrentMusic() {
     public static boolean musicAgentAddMusic(Music music) {
         JsonObject object = MusicJsonParsers.to(music);
         if (object == null) return false;
-        ClientPlayNetworking.send(new ConcertoPayload(ConcertoPayload.Channel.MUSIC_AGENT,
-                "Add:" +  TextUtil.toBase64(object.toString())));
+        musicAgentSender("Add:" +  TextUtil.toBase64(object.toString()));
         return true;
     }
 
-    public static void musicAgentMusicReceiver(ConcertoPayload payload, ClientPlayNetworking.Context context) {
+    public static void musicAgentMusicReceiver(MinecraftClient client, ClientPlayNetworkHandler handler,
+                                               PacketByteBuf buf, PacketSender packetSender) {
+        String str = buf.readString(Short.MAX_VALUE << 4);
         if (ConcertoClient.clientState != ConcertoClient.ClientState.MUSIC_AGENT) return;
         MusicPlayer.run(() -> {
-            Music music = MusicJsonParsers.from(TextUtil.fromBase64(payload.string));
+            Music music = MusicJsonParsers.from(TextUtil.fromBase64(str));
             if (music != null) {
                 MusicPlayer.INSTANCE.playTempMusic(music);
             }

src/main/java/top/gregtao/concerto/network/ClientMusicNetworkHandler.java

@@ -1,15 +1,22 @@
 package top.gregtao.concerto.network;
 
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
+import net.minecraft.util.Identifier;
+import top.gregtao.concerto.ConcertoClient;
 
 public class ConcertoNetworking {
 
+    public static final Identifier MUSIC_DATA = createChannel("0");
+    public static final Identifier HANDSHAKE = createChannel("1");
+    public static final Identifier AUDITION_SYNC = createChannel("2");
+    public static final Identifier MUSIC_ROOM = createChannel("3");
+    public static final Identifier PRESET_RADIOS = createChannel("4");
+    public static final Identifier MUSIC_AGENT = createChannel("5");
+
     public static final String HANDSHAKE_STRING = "CONCERTO:";
 
     public static final int WAIT_LIST_MAX_SIZE = 300;
 
-    public static void register() {
-        PayloadTypeRegistry.playS2C().register(ConcertoPayload.ID, ConcertoPayload.CODEC);
-        PayloadTypeRegistry.playC2S().register(ConcertoPayload.ID, ConcertoPayload.CODEC);
+    public static Identifier createChannel(String name) {
+        return new Identifier(ConcertoClient.MOD_ID, name);
     }
 }