From 79d6f254e1f8308473c9d02bfd8924342dac0c2e Mon Sep 17 00:00:00 2001 From: Su5eD Date: Thu, 16 May 2024 18:51:49 +0200 Subject: [PATCH] Update to NeoForge 20.6.63-beta --- gradle.properties | 2 +- .../impl/bootstrap/FabricLoaderHackyInjector.java | 12 +++++++----- ...eoforged.neoforgespi.language.IModLanguageLoader} | 0 3 files changed, 8 insertions(+), 6 deletions(-) rename src/main/resources/META-INF/services/{net.neoforged.neoforgespi.language.IModLanguageProvider => net.neoforged.neoforgespi.language.IModLanguageLoader} (100%) diff --git a/gradle.properties b/gradle.properties index 37cedce..d4993df 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,6 @@ org.gradle.jvmargs=-Xmx3G versionMc=1.20.6 -versionForge=20.6.18-beta +versionForge=20.6.63-beta versionLoaderUpstream=0.15.10 versionYarn=1.20.6+build.1 \ No newline at end of file diff --git a/src/main/java/net/fabricmc/loader/impl/bootstrap/FabricLoaderHackyInjector.java b/src/main/java/net/fabricmc/loader/impl/bootstrap/FabricLoaderHackyInjector.java index 9d46d07..155cf18 100644 --- a/src/main/java/net/fabricmc/loader/impl/bootstrap/FabricLoaderHackyInjector.java +++ b/src/main/java/net/fabricmc/loader/impl/bootstrap/FabricLoaderHackyInjector.java @@ -19,17 +19,19 @@ import cpw.mods.modlauncher.LaunchPluginHandler; import cpw.mods.modlauncher.Launcher; import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; -import net.neoforged.neoforgespi.language.IModLanguageProvider; +import net.neoforged.fml.ModContainer; +import net.neoforged.fml.ModLoadingException; +import net.neoforged.fml.loading.BuiltInLanguageLoader; +import net.neoforged.neoforgespi.language.IModInfo; import net.neoforged.neoforgespi.language.ModFileScanData; import java.lang.reflect.Field; import java.util.Map; -import java.util.function.Consumer; /** * Terribly ugly hack to bootstrap fml mods into fabric loader before modloading starts, in a way that can be loaded from JarJar. */ -public class FabricLoaderHackyInjector implements IModLanguageProvider { +public class FabricLoaderHackyInjector extends BuiltInLanguageLoader { public static final String NAME = "__fabric_loader_bootstrap"; public FabricLoaderHackyInjector() { @@ -54,7 +56,7 @@ public String name() { } @Override - public Consumer getFileVisitor() { - return data -> {}; + public ModContainer loadMod(IModInfo info, ModFileScanData modFileScanResults, ModuleLayer layer) throws ModLoadingException { + throw new UnsupportedOperationException(); } } diff --git a/src/main/resources/META-INF/services/net.neoforged.neoforgespi.language.IModLanguageProvider b/src/main/resources/META-INF/services/net.neoforged.neoforgespi.language.IModLanguageLoader similarity index 100% rename from src/main/resources/META-INF/services/net.neoforged.neoforgespi.language.IModLanguageProvider rename to src/main/resources/META-INF/services/net.neoforged.neoforgespi.language.IModLanguageLoader