From 31b565c227c39191f610899805ea114cb176a419 Mon Sep 17 00:00:00 2001 From: FlorianMichael Date: Tue, 30 Jul 2024 12:28:16 +0200 Subject: [PATCH] Remove duplicated mixin --- .../MixinClientCommonNetworkHandler.java | 52 ------------------- .../MixinClientCommonNetworkHandler.java | 19 +++++++ src/main/resources/viafabricplus.mixins.json | 1 - 3 files changed, 19 insertions(+), 53 deletions(-) delete mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientCommonNetworkHandler.java diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientCommonNetworkHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientCommonNetworkHandler.java deleted file mode 100644 index 7cf34ff8..00000000 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientCommonNetworkHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus - * Copyright (C) 2021-2024 FlorianMichael/EnZaXD and RK_01/RaphiMC - * Copyright (C) 2023-2024 contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; - -import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator; -import de.florianmichael.viafabricplus.settings.impl.DebugSettings; -import net.minecraft.client.network.ClientCommonNetworkHandler; -import net.minecraft.network.ClientConnection; -import net.minecraft.network.DisconnectionInfo; -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.CallbackInfoReturnable; - -import java.nio.file.Path; -import java.util.Optional; - -@Mixin(ClientCommonNetworkHandler.class) -public abstract class MixinClientCommonNetworkHandler { - - @Inject(method = "savePacketErrorReport", at = @At("HEAD"), cancellable = true) - private void dontCreatePacketErrorCrashReports(CallbackInfoReturnable> cir) { - if (DebugSettings.global().dontCreatePacketErrorCrashReports.isEnabled()) { - cir.setReturnValue(Optional.empty()); - } - } - - @WrapWithCondition(method = "onPacketException", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;disconnect(Lnet/minecraft/network/DisconnectionInfo;)V")) - private boolean dontDisconnectOnPacketException(ClientConnection instance, DisconnectionInfo disconnectionInfo) { - return ProtocolTranslator.getTargetVersion().newerThan(ProtocolVersion.v1_20_3); - } - -} diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java index 6e52f07e..fe8c913d 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java @@ -19,15 +19,18 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.protocols.v1_16_4to1_17.storage.InventoryAcknowledgements; import de.florianmichael.viafabricplus.fixes.ClientsideFixes; import de.florianmichael.viafabricplus.injection.access.IClientConnection; import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator; +import de.florianmichael.viafabricplus.settings.impl.DebugSettings; import de.florianmichael.viafabricplus.util.DataCustomPayload; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientCommonNetworkHandler; import net.minecraft.network.ClientConnection; +import net.minecraft.network.DisconnectionInfo; import net.minecraft.network.listener.ServerPacketListener; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.c2s.common.ResourcePackStatusC2SPacket; @@ -43,9 +46,12 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.net.URL; +import java.nio.file.Path; import java.time.Duration; +import java.util.Optional; import java.util.function.BooleanSupplier; @Mixin(value = ClientCommonNetworkHandler.class, priority = 1 /* Has to be applied before Fabric's Networking API, so it doesn't cancel our custom-payload packets */) @@ -71,6 +77,19 @@ public abstract class MixinClientCommonNetworkHandler { return null; } + + @Inject(method = "savePacketErrorReport", at = @At("HEAD"), cancellable = true) + private void dontCreatePacketErrorCrashReports(CallbackInfoReturnable> cir) { + if (DebugSettings.global().dontCreatePacketErrorCrashReports.isEnabled()) { + cir.setReturnValue(Optional.empty()); + } + } + + @WrapWithCondition(method = "onPacketException", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;disconnect(Lnet/minecraft/network/DisconnectionInfo;)V")) + private boolean dontDisconnectOnPacketException(ClientConnection instance, DisconnectionInfo disconnectionInfo) { + return ProtocolTranslator.getTargetVersion().newerThan(ProtocolVersion.v1_20_3); + } + @Inject(method = "onResourcePackSend", at = @At("HEAD"), cancellable = true) private void validateUrlInNetworkThread(ResourcePackSendS2CPacket packet, CallbackInfo ci) { if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_20_2)) { diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index e5dd8322..3b246060 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -43,7 +43,6 @@ "fixes.minecraft.MixinCamera", "fixes.minecraft.MixinChatInputSuggestor", "fixes.minecraft.MixinClientCommandSource", - "fixes.minecraft.MixinClientCommonNetworkHandler", "fixes.minecraft.MixinClientWorld", "fixes.minecraft.MixinFlowableFluid", "fixes.minecraft.MixinFontStorage",