again

Author: Aspw-w

README.md

@@ -34,3 +34,9 @@ GitHub Releases: https://github.com/Aspw-w/ViaForgePlus
 - ViaFabricPlus - https://github.com/ViaVersion/ViaFabricPlus (Includes additional modifications to make the experience better)
 - ViaProxy (App) - https://github.com/ViaVersion/ViaProxy
 - ViaaaS (Proxy) - https://github.com/ViaVersion/ViaaaS
+
+# Contributors
+- Aspw (Owner of ViaForgePlus, NightX)
+- ViaVersion
+- ViaMCP
+- toidicakhia (Owner of MinusBounce)

src/main/java/net/aspw/viaforgeplus/ProtocolBase.java

@@ -46,6 +46,8 @@ public static void init(final VFPlatform platform) {
         versions.addAll(ProtocolVersion.getProtocols());
 
         versions.removeIf(i -> i == ProtocolVersion.unknown || i.olderThan(ProtocolVersion.v1_7_2));
+
+        ProtocolFixer.transactionFix1_17();
     }
 
     public void inject(final Channel channel, final VFNetworkManager networkManager) {

src/main/java/net/aspw/viaforgeplus/api/ProtocolFixer.java

@@ -1,6 +1,12 @@
 package net.aspw.viaforgeplus.api;
 
+import com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.Protocol1_16_4To1_17;
+import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
+import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2;
+import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17;
+import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17;
 import net.aspw.viaforgeplus.ProtocolBase;
 import net.aspw.viaforgeplus.network.MinecraftInstance;
 import net.minecraft.client.Minecraft;
@@ -27,6 +33,13 @@ public static void sendFixedAttack(final EntityPlayer entityIn, final Entity tar
         }
     }
 
+    public static void transactionFix1_17() {
+        final Protocol1_16_4To1_17 protocol = Via.getManager().getProtocolManager().getProtocol(Protocol1_16_4To1_17.class);
+        assert protocol != null;
+        protocol.registerClientbound(ClientboundPackets1_17.PING, ClientboundPackets1_16_2.WINDOW_CONFIRMATION, wrapper -> {}, true);
+        protocol.registerServerbound(ServerboundPackets1_16_2.WINDOW_CONFIRMATION, ServerboundPackets1_17.PONG, wrapper -> {}, true);
+    }
+
     public static boolean newerThanOrEqualsTo1_8() {
         return ProtocolBase.getManager().getTargetVersion().newerThanOrEqualTo(ProtocolVersion.v1_8) && !MinecraftInstance.mc.isIntegratedServerRunning() || MinecraftInstance.mc.isIntegratedServerRunning();
     }

src/main/java/net/aspw/viaforgeplus/injection/forge/mixins/network/MixinNetHandlerPlayClient.java

@@ -0,0 +1,27 @@
+package net.aspw.viaforgeplus.injection.forge.mixins.network;
+
+import net.aspw.viaforgeplus.api.ProtocolFixer;
+import net.aspw.viaforgeplus.network.MinecraftInstance;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C0FPacketConfirmTransaction;
+import net.minecraft.network.play.server.S32PacketConfirmTransaction;
+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 = NetHandlerPlayClient.class, priority = 1001)
+public class MixinNetHandlerPlayClient {
+
+    /**
+     * @author As_pw
+     * @reason 1.17+ Transaction fix
+     */
+    @Inject(method = "handleConfirmTransaction", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/PacketThreadUtil;checkThreadAndEnqueue(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V", shift = At.Shift.AFTER), cancellable=true)
+    private void handleConfirmTransaction(S32PacketConfirmTransaction packetIn, CallbackInfo ci) {
+        if (ProtocolFixer.newerThanOrEqualsTo1_17()) {
+            MinecraftInstance.mc.getNetHandler().addToSendQueue(new C0FPacketConfirmTransaction(packetIn.getWindowId(), (short) 0, false));
+            ci.cancel();
+        }
+    }
+}

src/main/resources/viaforgeplus.forge.mixins.json

@@ -16,6 +16,7 @@
     "gui.MixinGuiOverlayDebug",
     "item.MixinItemBlock",
     "network.MixinGuiConnecting_1",
+    "network.MixinNetHandlerPlayClient",
     "network.MixinNetworkManager",
     "network.MixinNetworkManager$5",
     "network.MixinServerData",