Fixed ViaVersion loading

ViaVersion · Jun 8, 2023 · 110264b · 110264b
1 parent 57fde74
commit 110264b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/mc1122/build.gradle b/mc1122/build.gradle
@@ -98,7 +98,7 @@ dependencies {
     include "org.spongepowered:mixin:${mixin_version}"
 
     for (final def via in viaLibs) {
-        implementation(via)
+        include(via)
     }
 
     annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"

diff --git a/mc1122/src/main/java/de/florianmichael/viaforge/ViaForge.java b/mc1122/src/main/java/de/florianmichael/viaforge/ViaForge.java
@@ -22,24 +22,22 @@
 import com.viaversion.viaversion.api.protocol.version.VersionProvider;
 import com.viaversion.viaversion.protocols.base.BaseVersionProvider;
 import net.minecraft.client.Minecraft;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.raphimc.vialoader.ViaLoader;
 import net.raphimc.vialoader.impl.platform.ViaBackwardsPlatformImpl;
 import net.raphimc.vialoader.impl.platform.ViaRewindPlatformImpl;
+import net.raphimc.vialoader.impl.viaversion.VLInjector;
 import net.raphimc.vialoader.impl.viaversion.VLLoader;
+import net.raphimc.vialoader.netty.VLLegacyPipeline;
 import net.raphimc.vialoader.util.VersionEnum;
 
-@Mod(modid = "viaforge", name = "ViaForge", version = "3.3.3")
 public class ViaForge {
     public final static VersionEnum NATIVE_VERSION = VersionEnum.r1_12_2;
-
     public static VersionEnum targetVersion = VersionEnum.r1_12_2;
 
-    @Mod.EventHandler
-    public void init(FMLPreInitializationEvent event) {
-        VersionEnum.SORTED_VERSIONS.remove(VersionEnum.r1_7_6tor1_7_10);
-        VersionEnum.SORTED_VERSIONS.remove(VersionEnum.r1_7_2tor1_7_5);
+    private static boolean loaded;
+
+    public static void initViaVersion() {
+        if (loaded) return;
 
         ViaLoader.init(
                 null,
@@ -56,11 +54,25 @@ public int getClosestServerProtocol(UserConnection connection) throws Exception
                                 return super.getClosestServerProtocol(connection);
                             }
                         });
+
+                        VersionEnum.SORTED_VERSIONS.remove(VersionEnum.r1_7_6tor1_7_10);
+                        VersionEnum.SORTED_VERSIONS.remove(VersionEnum.r1_7_2tor1_7_5);
+                    }
+                },
+                new VLInjector() {
+                    @Override
+                    public String getDecoderName() {
+                        return VLLegacyPipeline.VIA_DECODER_NAME;
+                    }
+
+                    @Override
+                    public String getEncoderName() {
+                        return VLLegacyPipeline.VIA_ENCODER_NAME;
                     }
                 },
-                null,
                 null,
                 ViaBackwardsPlatformImpl::new, ViaRewindPlatformImpl::new
         );
+        loaded = true;
     }
 }
diff --git a/mc1122/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinGuiMainMenu.java b/mc1122/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinGuiMainMenu.java
@@ -17,6 +17,7 @@
  */
 package de.florianmichael.viaforge.mixin.impl;
 
+import de.florianmichael.viaforge.ViaForge;
 import de.florianmichael.viaforge.gui.GuiProtocolSelector;
 import net.minecraft.client.gui.*;
 import org.spongepowered.asm.mixin.Mixin;
@@ -30,6 +31,8 @@ public class MixinGuiMainMenu extends GuiScreen {
     @Inject(method = "initGui", at = @At("RETURN"))
     public void hookCustomButton(CallbackInfo ci) {
         buttonList.add(new GuiButton(1337, 5, 6, 98, 20, "ViaForge"));
+
+        ViaForge.initViaVersion();
     }
 
     @Inject(method = "actionPerformed", at = @At("RETURN"))