diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java index e7e7c59e..a51ece78 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java @@ -78,7 +78,8 @@ public abstract class MixinClientPlayNetworkHandler extends ClientCommonNetworkH @Shadow protected abstract boolean isSecureChatEnforced(); - @Shadow public abstract void sendChatCommand(String command); + @Shadow + public abstract void sendChatCommand(String command); protected MixinClientPlayNetworkHandler(MinecraftClient client, ClientConnection connection, ClientConnectionState connectionState) { super(client, connection, connectionState); @@ -94,7 +95,7 @@ public abstract class MixinClientPlayNetworkHandler extends ClientCommonNetworkH } @Inject(method = "sendCommand", at = @At("HEAD"), cancellable = true) - public void alwaysSendSignedCommand(String command, CallbackInfoReturnable cir) { + private void alwaysSendSignedCommand(String command, CallbackInfoReturnable cir) { if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_20_3)) { sendChatCommand(command); cir.setReturnValue(true); diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_5.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_5.java index 499756a0..63f844d1 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_5.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_5.java @@ -40,7 +40,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public abstract class MixinProtocol1_20_3To1_20_5 extends AbstractProtocol { @Inject(method = "registerPackets", at = @At("RETURN")) - public void removeCommandHandlers(CallbackInfo ci) { + private void removeCommandHandlers(CallbackInfo ci) { // Don't fake acknowledgements for chat messages. registerClientbound(ClientboundPackets1_20_3.PLAYER_CHAT, ClientboundPackets1_20_5.PLAYER_CHAT, wrapper -> {}, true); registerServerbound(ServerboundPackets1_20_5.CHAT, ServerboundPackets1_20_3.CHAT, wrapper -> {}, true); diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index 725f4676..b115ad9e 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -186,6 +186,7 @@ "fixes.viaversion.MixinParticleIdMappings1_13", "fixes.viaversion.MixinProtocol1_10To1_11", "fixes.viaversion.MixinProtocol1_11_1To1_12", + "fixes.viaversion.MixinProtocol1_20_3To1_20_5", "fixes.viaversion.MixinProtocol1_20To1_20_2", "fixes.viaversion.MixinTagType", "fixes.viaversion.MixinUserConnectionImpl", @@ -195,8 +196,7 @@ "viabedrock.MixinBedrockProtocol", "viabedrock.MixinJoinPackets", "vialegacy.MixinExtensionProtocolMetadataStorage", - "vialegacy.MixinViaLegacyConfig", - "fixes.viaversion.MixinProtocol1_20_3To1_20_5" + "vialegacy.MixinViaLegacyConfig" ], "injectors": { "defaultRequire": 1