Upstream/ViaForge
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaForge.git synced 2024-11-22 12:05:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ViaVersion loading

Browse Source
This commit is contained in:
FlorianMichael 2023-06-08 21:21:48 +02:00
parent 57fde74508
commit 110264b312
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mc1122/build.gradle
View File

@ -98,7 +98,7 @@ dependencies {
include "org.spongepowered:mixin:${mixin_version}" include "org.spongepowered:mixin:${mixin_version}"
for (final def via in viaLibs) { for (final def via in viaLibs) {
implementation(via) include(via)
} }
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor" annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"

30
mc1122/src/main/java/de/florianmichael/viaforge/ViaForge.java
View File

@ -22,24 +22,22 @@ import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.version.VersionProvider; import com.viaversion.viaversion.api.protocol.version.VersionProvider;
import com.viaversion.viaversion.protocols.base.BaseVersionProvider; import com.viaversion.viaversion.protocols.base.BaseVersionProvider;
import net.minecraft.client.Minecraft; 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.ViaLoader;
import net.raphimc.vialoader.impl.platform.ViaBackwardsPlatformImpl; import net.raphimc.vialoader.impl.platform.ViaBackwardsPlatformImpl;
import net.raphimc.vialoader.impl.platform.ViaRewindPlatformImpl; 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.impl.viaversion.VLLoader;
import net.raphimc.vialoader.netty.VLLegacyPipeline;
import net.raphimc.vialoader.util.VersionEnum; import net.raphimc.vialoader.util.VersionEnum;
@Mod(modid = "viaforge", name = "ViaForge", version = "3.3.3")
public class ViaForge { public class ViaForge {
public final static VersionEnum NATIVE_VERSION = VersionEnum.r1_12_2; public final static VersionEnum NATIVE_VERSION = VersionEnum.r1_12_2;
public static VersionEnum targetVersion = VersionEnum.r1_12_2; public static VersionEnum targetVersion = VersionEnum.r1_12_2;
@Mod.EventHandler private static boolean loaded;
public void init(FMLPreInitializationEvent event) {
VersionEnum.SORTED_VERSIONS.remove(VersionEnum.r1_7_6tor1_7_10); public static void initViaVersion() {
VersionEnum.SORTED_VERSIONS.remove(VersionEnum.r1_7_2tor1_7_5); if (loaded) return;
ViaLoader.init( ViaLoader.init(
null, null,
@ -56,11 +54,25 @@ public class ViaForge {
return super.getClosestServerProtocol(connection); 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,
null,
ViaBackwardsPlatformImpl::new, ViaRewindPlatformImpl::new ViaBackwardsPlatformImpl::new, ViaRewindPlatformImpl::new
); );
loaded = true;
} }
} }

3
mc1122/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinGuiMainMenu.java
View File

@ -17,6 +17,7 @@
*/ */
package de.florianmichael.viaforge.mixin.impl; package de.florianmichael.viaforge.mixin.impl;
import de.florianmichael.viaforge.ViaForge;
import de.florianmichael.viaforge.gui.GuiProtocolSelector; import de.florianmichael.viaforge.gui.GuiProtocolSelector;
import net.minecraft.client.gui.*; import net.minecraft.client.gui.*;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@ -30,6 +31,8 @@ public class MixinGuiMainMenu extends GuiScreen {
@Inject(method = "initGui", at = @At("RETURN")) @Inject(method = "initGui", at = @At("RETURN"))
public void hookCustomButton(CallbackInfo ci) { public void hookCustomButton(CallbackInfo ci) {
buttonList.add(new GuiButton(1337, 5, 6, 98, 20, "ViaForge")); buttonList.add(new GuiButton(1337, 5, 6, 98, 20, "ViaForge"));
ViaForge.initViaVersion();
} }
@Inject(method = "actionPerformed", at = @At("RETURN")) @Inject(method = "actionPerformed", at = @At("RETURN"))