From 76949aa88d26ebbbead9f89a552fd3f1164c8350 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Sat, 22 Apr 2023 09:57:36 +0200 Subject: [PATCH] removed Fix which is merged in Via since https://github.com/ViaVersion/ViaVersion/pull/3302 --- .../access/IInventoryTracker1_16.java | 25 -------- .../MixinEntityPackets.java | 44 ------------- .../MixinInventoryPackets.java | 61 ------------------- .../MixinInventoryTracker1_16.java | 49 --------------- src/main/resources/viafabricplus.mixins.json | 5 +- 5 files changed, 1 insertion(+), 183 deletions(-) delete mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/access/IInventoryTracker1_16.java delete mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinEntityPackets.java delete mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinInventoryPackets.java delete mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinInventoryTracker1_16.java diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IInventoryTracker1_16.java b/src/main/java/de/florianmichael/viafabricplus/injection/access/IInventoryTracker1_16.java deleted file mode 100644 index 1ebafffb..00000000 --- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IInventoryTracker1_16.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus - * Copyright (C) 2021-2023 FlorianMichael/EnZaXD and 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.access; - -public interface IInventoryTracker1_16 { - - boolean viafabricplus_isInventoryOpen(); - - void viafabricplus_setInventoryOpen(final boolean inventoryOpen); -} diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinEntityPackets.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinEntityPackets.java deleted file mode 100644 index 4a335a55..00000000 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinEntityPackets.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus - * Copyright (C) 2021-2023 FlorianMichael/EnZaXD and 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.viaversion.protocol1_16to1_15_2; - -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage.InventoryTracker1_16; -import de.florianmichael.viafabricplus.injection.access.IInventoryTracker1_16; -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(value = EntityPackets.class, remap = false) -public class MixinEntityPackets { - - @Inject(method = "register", at = @At("RETURN")) - private static void rewriteCheck(Protocol1_16To1_15_2 protocol, CallbackInfo ci) { - protocol.registerServerbound(ServerboundPackets1_16.ANIMATION, ServerboundPackets1_14.ANIMATION, wrapper -> { - final InventoryTracker1_16 inventoryTracker = wrapper.user().get(InventoryTracker1_16.class); - // Don't send an arm swing if the player has an inventory opened. - if (((IInventoryTracker1_16) inventoryTracker).viafabricplus_isInventoryOpen()) { - wrapper.cancel(); - } - }, true); - } -} diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinInventoryPackets.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinInventoryPackets.java deleted file mode 100644 index d12642fd..00000000 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinInventoryPackets.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus - * Copyright (C) 2021-2023 FlorianMichael/EnZaXD and 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.viaversion.protocol1_16to1_15_2; - -import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; -import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage.InventoryTracker1_16; -import com.viaversion.viaversion.rewriter.ItemRewriter; -import de.florianmichael.viafabricplus.injection.access.IInventoryTracker1_16; -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; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -@Mixin(value = InventoryPackets.class, remap = false) -public class MixinInventoryPackets extends ItemRewriter { - - protected MixinInventoryPackets(Protocol1_16To1_15_2 protocol) { - super(protocol); - } - - @Inject(method = "registerPackets", at = @At("RETURN"), locals = LocalCapture.CAPTURE_FAILHARD) - public void fixInventoryIssue(CallbackInfo ci, PacketHandler cursorRemapper) { - protocol.registerClientbound(ClientboundPackets1_15.CLOSE_WINDOW, ClientboundPackets1_16.CLOSE_WINDOW, new PacketHandlers() { - @Override - public void register() { - handler(cursorRemapper); - handler(wrapper -> { - InventoryTracker1_16 inventoryTracker = wrapper.user().get(InventoryTracker1_16.class); - ((IInventoryTracker1_16) inventoryTracker).viafabricplus_setInventoryOpen(false); - }); - } - }, true); - protocol.registerServerbound(ServerboundPackets1_16.CLOSE_WINDOW, ServerboundPackets1_14.CLOSE_WINDOW, wrapper -> { - InventoryTracker1_16 inventoryTracker = wrapper.user().get(InventoryTracker1_16.class); - ((IInventoryTracker1_16) inventoryTracker).viafabricplus_setInventoryOpen(false); - }, true); - } -} diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinInventoryTracker1_16.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinInventoryTracker1_16.java deleted file mode 100644 index 7eaeb2c5..00000000 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16to1_15_2/MixinInventoryTracker1_16.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus - * Copyright (C) 2021-2023 FlorianMichael/EnZaXD and 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.viaversion.protocol1_16to1_15_2; - -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage.InventoryTracker1_16; -import de.florianmichael.viafabricplus.injection.access.IInventoryTracker1_16; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -// If the server uses -1 as Window ID, it can break ViaVersion -@Mixin(value = InventoryTracker1_16.class, remap = false) -public class MixinInventoryTracker1_16 implements IInventoryTracker1_16 { - - @Unique - private boolean viafabricplus_inventoryOpen = false; - - @Inject(method = "setInventory", at = @At("RETURN")) - public void setInventoryOpen(short inventory, CallbackInfo ci) { - this.viafabricplus_inventoryOpen = true; - } - - @Override - public boolean viafabricplus_isInventoryOpen() { - return this.viafabricplus_inventoryOpen; - } - - @Override - public void viafabricplus_setInventoryOpen(boolean inventoryOpen) { - this.viafabricplus_inventoryOpen = inventoryOpen; - } -} diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index 8412e588..16b38c0d 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -157,10 +157,7 @@ "fixes.viaversion.protocol1_9to1_8.MixinViaIdleThread", "jsonwebtoken.MixinClasses", "jsonwebtoken.MixinDefaultCompressionCodecResolver", - "jsonwebtoken.MixinDefaultJwtParserBuilder", - "fixes.viaversion.protocol1_16to1_15_2.MixinEntityPackets", - "fixes.viaversion.protocol1_16to1_15_2.MixinInventoryPackets", - "fixes.viaversion.protocol1_16to1_15_2.MixinInventoryTracker1_16" + "jsonwebtoken.MixinDefaultJwtParserBuilder" ], "injectors": { "defaultRequire": 1