More Fixes

Author: Aspw-w

gradle.properties

@@ -19,8 +19,8 @@ okhttp_version=4.9.1
 snake_yml_version=2.2
 slf4j_version=2.0.12
 
-viaversion_version=4.10.2-SNAPSHOT
-viabackwards_version=4.10.2-SNAPSHOT
-viarewind_version=3.1.2-SNAPSHOT
+viaversion_version=4.10.2
+viabackwards_version=4.10.2
+viarewind_version=3.1.2
 vialoader_version=2.2.14-SNAPSHOT
 vialegacy_version=2.2.23-SNAPSHOT

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

@@ -17,6 +17,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
 public class ProtocolBase {
 
@@ -47,7 +48,9 @@ public static void init(final VFPlatform platform) {
 
         versions.removeIf(i -> i == ProtocolVersion.unknown || i.olderThan(ProtocolVersion.v1_7_2));
 
-        ProtocolFixer.transactionFix1_17();
+        ProtocolFixer.doFix();
+
+        Logger.getLogger("ViaVersion Injected!");
     }
 
     public void inject(final Channel channel, final VFNetworkManager networkManager) {

src/main/java/net/aspw/viaforgeplus/ProtocolInject.kt

@@ -10,7 +10,7 @@ import net.aspw.viaforgeplus.network.APIConnecter
 
 object ProtocolInject {
 
-    const val modVersion = "1.0.4"
+    const val modVersion = "1.0.5"
 
     lateinit var eventManager: EventManager
 

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

@@ -1,12 +1,24 @@
 package net.aspw.viaforgeplus.api;
 
+import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13;
+import com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.Protocol1_15_2To1_16;
 import com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.Protocol1_16_4To1_17;
+import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.Protocol1_18_2To1_19;
+import com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.Protocol1_19_1To1_19_3;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
+import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
+import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
 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_16to1_15_2.ClientboundPackets1_16;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17;
+import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18;
+import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1;
+import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3;
+import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ClientboundPackets1_19;
 import net.aspw.viaforgeplus.ProtocolBase;
 import net.aspw.viaforgeplus.network.MinecraftInstance;
 import net.minecraft.client.Minecraft;
@@ -34,14 +46,38 @@ public static void sendFixedAttack(final EntityPlayer entityIn, final Entity tar
     }
 
     /**
-     * @author toidicakhia
+     * @author As_pw, toidicakhia
      */
-    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 -> {
+    public static void doFix() {
+        // Transaction Fixes
+        final Protocol1_16_4To1_17 transaction1_17 = Via.getManager().getProtocolManager().getProtocol(Protocol1_16_4To1_17.class);
+        assert transaction1_17 != null;
+        transaction1_17.registerClientbound(ClientboundPackets1_17.PING, ClientboundPackets1_16_2.WINDOW_CONFIRMATION, wrapper -> {
         }, true);
-        protocol.registerServerbound(ServerboundPackets1_16_2.WINDOW_CONFIRMATION, ServerboundPackets1_17.PONG, wrapper -> {
+        transaction1_17.registerServerbound(ServerboundPackets1_16_2.WINDOW_CONFIRMATION, ServerboundPackets1_17.PONG, wrapper -> {
+        }, true);
+
+        // Connection Fixes
+        final Protocol1_12_2To1_13 connection1_13 = Via.getManager().getProtocolManager().getProtocol(Protocol1_12_2To1_13.class);
+        assert connection1_13 != null;
+        connection1_13.registerClientbound(ClientboundPackets1_13.PLAYER_INFO, ClientboundPackets1_12_1.PLAYER_INFO, wrapper -> {
+        }, true);
+
+        final Protocol1_15_2To1_16 connection1_16 = Via.getManager().getProtocolManager().getProtocol(Protocol1_15_2To1_16.class);
+        assert connection1_16 != null;
+        connection1_16.registerClientbound(ClientboundPackets1_16.PLAYER_INFO, ClientboundPackets1_15.PLAYER_INFO, wrapper -> {
+        }, true);
+
+        final Protocol1_18_2To1_19 connection1_19 = Via.getManager().getProtocolManager().getProtocol(Protocol1_18_2To1_19.class);
+        assert connection1_19 != null;
+        connection1_19.registerClientbound(ClientboundPackets1_19.PLAYER_INFO, ClientboundPackets1_18.PLAYER_INFO, wrapper -> {
+        }, true);
+
+        final Protocol1_19_1To1_19_3 connection1_19_3 = Via.getManager().getProtocolManager().getProtocol(Protocol1_19_1To1_19_3.class);
+        assert connection1_19_3 != null;
+        connection1_19_3.registerClientbound(ClientboundPackets1_19_3.PLAYER_INFO_UPDATE, ClientboundPackets1_19_1.PLAYER_INFO, wrapper -> {
+        }, true);
+        connection1_19_3.registerClientbound(ClientboundPackets1_19_3.PLAYER_INFO_REMOVE, ClientboundPackets1_19_1.PLAYER_INFO, wrapper -> {
         }, true);
     }
 

…ns/packets/client/MixinC00Handshake.java …ge/mixins/packets/MixinC00Handshake.javasrc/main/java/net/aspw/viaforgeplus/injection/forge/mixins/packets/client/MixinC00Handshake.java renamed to src/main/java/net/aspw/viaforgeplus/injection/forge/mixins/packets/MixinC00Handshake.java src/main/java/net/aspw/viaforgeplus/injection/forge/mixins/packets/client/MixinC00Handshake.java renamed to src/main/java/net/aspw/viaforgeplus/injection/forge/mixins/packets/MixinC00Handshake.java

@@ -1,4 +1,4 @@
-package net.aspw.viaforgeplus.injection.forge.mixins.packets.client;
+package net.aspw.viaforgeplus.injection.forge.mixins.packets;
 
 import net.aspw.viaforgeplus.network.MinecraftInstance;
 import net.minecraft.network.handshake.client.C00Handshake;

src/main/java/net/aspw/viaforgeplus/injection/forge/mixins/packets/client/MixinC0FPacketConfirmTransaction.java

@@ -20,9 +20,7 @@
     "network.MixinNetworkManager",
     "network.MixinNetworkManager$5",
     "network.MixinServerData",
-    "packets.client.MixinC00Handshake",
-    "packets.client.MixinC0FPacketConfirmTransaction",
-    "packets.server.MixinS32PacketConfirmTransaction",
+    "packets.MixinC00Handshake",
     "render.MixinEntityRenderer",
     "render.MixinLayerArmorBase",
     "render.MixinModelBiped"