From 7fdc6a97ef3f22863046963cf5e93ca1172cd4b4 Mon Sep 17 00:00:00 2001 From: gnembon <41132274+gnembon@users.noreply.github.com> Date: Tue, 8 Aug 2023 13:10:35 +0200 Subject: [PATCH] fixed server connection --- .../ClientboundCustomPayloadPacket_customPacketMixin.java | 5 ++++- .../carpet/mixins/ServerboundCustomPayloadPacket_mixin.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/carpet/mixins/ClientboundCustomPayloadPacket_customPacketMixin.java b/src/main/java/carpet/mixins/ClientboundCustomPayloadPacket_customPacketMixin.java index 22d99c39..6933c13e 100644 --- a/src/main/java/carpet/mixins/ClientboundCustomPayloadPacket_customPacketMixin.java +++ b/src/main/java/carpet/mixins/ClientboundCustomPayloadPacket_customPacketMixin.java @@ -17,7 +17,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(ClientboundCustomPayloadPacket.class) public class ClientboundCustomPayloadPacket_customPacketMixin { - @Inject(method = "readUnknownPayload", at = @At("HEAD"), cancellable = true) + @Inject(method = "readPayload", at = @At( + value = "INVOKE", + target = "Lnet/minecraft/network/protocol/common/ClientboundCustomPayloadPacket;readUnknownPayload(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/network/FriendlyByteBuf;)Lnet/minecraft/network/protocol/common/custom/DiscardedPayload;"), + cancellable = true) private static void onOnCustomPayloadR(ResourceLocation resourceLocation, FriendlyByteBuf friendlyByteBuf, CallbackInfoReturnable cir) { if (resourceLocation.equals(CarpetClient.CARPET_CHANNEL)) diff --git a/src/main/java/carpet/mixins/ServerboundCustomPayloadPacket_mixin.java b/src/main/java/carpet/mixins/ServerboundCustomPayloadPacket_mixin.java index d8abb503..2408ad38 100644 --- a/src/main/java/carpet/mixins/ServerboundCustomPayloadPacket_mixin.java +++ b/src/main/java/carpet/mixins/ServerboundCustomPayloadPacket_mixin.java @@ -13,7 +13,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(ServerboundCustomPayloadPacket.class) public class ServerboundCustomPayloadPacket_mixin { - @Inject(method = "readUnknownPayload", at = @At(value = "HEAD"), cancellable = true) + @Inject(method = "readPayload", at = @At( + value = "INVOKE", + target = "Lnet/minecraft/network/protocol/common/ServerboundCustomPayloadPacket;readUnknownPayload(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/network/FriendlyByteBuf;)Lnet/minecraft/network/protocol/common/custom/DiscardedPayload;" + ), cancellable = true) private static void onOnCustomPayload(ResourceLocation resourceLocation, FriendlyByteBuf friendlyByteBuf, CallbackInfoReturnable cir) { if (CarpetClient.CARPET_CHANNEL.equals(resourceLocation))