refactor: replace setup with manual userdev parsing

Author: ishland

gradle/runtime.libs.versions.toml

@@ -37,3 +37,4 @@ enigma-swing = { module = "cuchaz:enigma-swing", version.ref = "enigma" }
 
 # Forge runtime libs
 unprotect-fancymodloader10 = { module = "io.github.juuxel:unprotect-fancymodloader10", version.ref = "unprotect" }
+unprotect-modlauncher = { module = "io.github.juuxel:unprotect-modlauncher", version.ref = "unprotect" }

src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java

@@ -94,7 +94,7 @@ public void run() {
 		registerNonTransitive(Constants.Configurations.LOADER_DEPENDENCIES, Role.RESOLVABLE);
 
 		registerNonTransitive(Constants.Configurations.MINECRAFT, Role.NONE);
-		registerNonTransitive(Constants.Configurations.NEOFORGE, Role.NONE);
+		registerNonTransitive(Constants.Configurations.FORGE_USERDEV, Role.NONE);
 
 		register(Constants.Configurations.NFRT_TOOL, Role.RESOLVABLE).configure(configuration -> {
 			configuration.defaultDependencies(dependencies -> {

src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMetadataProvider.java

@@ -61,12 +61,12 @@ private MinecraftMetadataProvider(Options options, Function<String, DownloadBuil
 
 	public static MinecraftMetadataProvider create(ConfigContext configContext) {
 		final String minecraftVersion = resolveMinecraftVersion(configContext.project());
-		final @Nullable ExternalModuleDependency neoForgeDependency = resolveNeoForgeDependency(configContext.project());
+		final @Nullable ExternalModuleDependency forgeUserdevDependency = resolveForgeUserdevDependency(configContext.project());
 
 		return new MinecraftMetadataProvider(
 				MinecraftMetadataProvider.Options.create(
 						minecraftVersion,
-						neoForgeDependency,
+						forgeUserdevDependency,
 						configContext.project()
 				),
 				configContext.extension()::download
@@ -78,8 +78,8 @@ private static String resolveMinecraftVersion(Project project) {
 		return dependency.getDependency().getVersion();
 	}
 
-	private static @Nullable ExternalModuleDependency resolveNeoForgeDependency(Project project) {
-		final Optional<DependencyInfo> dependency = DependencyInfo.createOptional(project, Constants.Configurations.NEOFORGE);
+	private static @Nullable ExternalModuleDependency resolveForgeUserdevDependency(Project project) {
+		final Optional<DependencyInfo> dependency = DependencyInfo.createOptional(project, Constants.Configurations.FORGE_USERDEV);
 		Dependency dep1 = dependency.map(dependencyInfo -> dependencyInfo.getDependency()).orElse(null);
 
 		if (dep1 != null && !(dep1 instanceof ExternalModuleDependency)) {
@@ -93,8 +93,8 @@ public String getMinecraftVersion() {
 		return options.minecraftVersion();
 	}
 
-	public @Nullable ExternalModuleDependency getNeoForgeDependency() {
-		return options.neoforgeDependency();
+	public @Nullable ExternalModuleDependency getForgeUserdevDependency() {
+		return options.forgeUserdevDependency();
 	}
 
 	public MinecraftVersionMeta getVersionMeta() {
@@ -199,28 +199,28 @@ private String getVersionMetaFileName() {
 	}
 
 	public record Options(String minecraftVersion,
-					@Nullable ExternalModuleDependency neoforgeDependency,
+					@Nullable ExternalModuleDependency forgeUserdevDependency,
 					ManifestLocations versionsManifests,
 					@Nullable String customManifestUrl,
 					Path userCache,
-					@Nullable Path neoForgeCache,
+					@Nullable Path forgeCache,
 					Path workingDir) {
-		public static Options create(String minecraftVersion, @Nullable ExternalModuleDependency neoForgeDependency, Project project) {
+		public static Options create(String minecraftVersion, @Nullable ExternalModuleDependency forgeUserdevDependency, Project project) {
 			final LoomGradleExtension extension = LoomGradleExtension.get(project);
 			final Path userCache = extension.getFiles().getUserCache().toPath();
 			final Path workingDir = MinecraftProvider.minecraftWorkingDirectory(project, minecraftVersion).toPath();
-			final Path neoForgeCache = neoForgeDependency != null ? MinecraftProvider.neoForgeWorkingDirectory(project, minecraftVersion, neoForgeDependency).toPath() : null;
+			final Path forgeCache = forgeUserdevDependency != null ? MinecraftProvider.forgeWorkingDirectory(project, minecraftVersion, forgeUserdevDependency).toPath() : null;
 
 			final ManifestLocations manifestLocations = extension.getVersionsManifests();
 			final Property<String> customMetaUrl = extension.getCustomMinecraftMetadata();
 
 			return new Options(
 					minecraftVersion,
-					neoForgeDependency,
+					forgeUserdevDependency,
 					manifestLocations,
 					customMetaUrl.getOrNull(),
 					userCache,
-					neoForgeCache,
+					forgeCache,
 					workingDir
 			);
 		}

src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java

@@ -310,13 +310,13 @@ public static File minecraftWorkingDirectory(Project project, String version) {
 		return workingDir;
 	}
 
-	public static File neoForgeWorkingDirectory(Project project, String minecraftVersion, ExternalModuleDependency neoForgeVersion) {
-		File workingDir = new File(minecraftWorkingDirectory(project, minecraftVersion), mangleNeoForgeVersion(neoForgeVersion));
+	public static File forgeWorkingDirectory(Project project, String minecraftVersion, ExternalModuleDependency neoForgeVersion) {
+		File workingDir = new File(minecraftWorkingDirectory(project, minecraftVersion), mangleForgeVersion(neoForgeVersion));
 		workingDir.mkdirs();
 		return workingDir;
 	}
 
-	public static String mangleNeoForgeVersion(ExternalModuleDependency neoForgeVersion) {
+	public static String mangleForgeVersion(ExternalModuleDependency neoForgeVersion) {
 		return neoForgeVersion.getGroup() + "." + neoForgeVersion.getName() + "_" + neoForgeVersion.getVersion();
 	}
 }

src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java

@@ -176,7 +176,7 @@ protected LoomGradleExtensionApiImpl(Project project, LoomFiles directories) {
 
 					// if no configuration is selected by the user, attempt to select one
 					// based on the mc version and which sides are present for it
-					if (metadataProvider.getNeoForgeDependency() != null) {
+					if (metadataProvider.getForgeUserdevDependency() != null) {
 						return MinecraftJarConfiguration.NEOFORGE_MERGED;
 					} else if (!metadataProvider.getVersionMeta().hasServer()) {
 						return MinecraftJarConfiguration.CLIENT_ONLY;

src/main/java/net/fabricmc/loom/util/Constants.java

@@ -57,7 +57,7 @@ public static final class Configurations {
 		public static final String INCLUDE_INTERNAL = "includeInternal";
 		public static final String MINECRAFT = "minecraft";
 
-		public static final String NEOFORGE = "neoForge";
+		public static final String FORGE_USERDEV = "forgeUserdev";
 		public static final String NFRT_TOOL = "neoFormRuntimeTool";
 
 		public static final String MINECRAFT_COMPILE_LIBRARIES = "minecraftLibraries";

src/main/java/org/relativitymc/neoloom/neoforge/NFRTMergedMinecraftProvider.java

@@ -224,7 +224,7 @@ public File getMinecraftServerJar() {
 
 	@Override
 	public File workingDir() {
-		return neoForgeWorkingDirectory(configContext.project(), minecraftVersion(), neoForgeDependency());
+		return forgeWorkingDirectory(configContext.project(), minecraftVersion(), forgeUserdevDependency());
 	}
 
 	@Override
@@ -234,7 +234,7 @@ public ModPlatform getModPlatform() {
 
 	@Override
 	public String getJarPrefix() {
-		return "nfrt-" + mangleNeoForgeVersion(neoForgeDependency()) + "-";
+		return "nfrt-" + mangleForgeVersion(forgeUserdevDependency()) + "-";
 	}
 
 	@Override
@@ -247,10 +247,10 @@ public ForgeLaunchConfigs.Config getLaunchConfig() {
 	}
 
 	protected @NonNull String neoForgeNotation() {
-		return neoForgeDependency().getGroup() + ":" + neoForgeDependency().getName() + ":" + neoForgeDependency().getVersion();
+		return forgeUserdevDependency().getGroup() + ":" + forgeUserdevDependency().getName() + ":" + forgeUserdevDependency().getVersion();
 	}
 
-	protected ExternalModuleDependency neoForgeDependency() {
-		return Objects.requireNonNull(Objects.requireNonNull(metadataProvider, "Metadata provider not setup").getNeoForgeDependency(), "NeoForge version not setup");
+	protected ExternalModuleDependency forgeUserdevDependency() {
+		return Objects.requireNonNull(Objects.requireNonNull(metadataProvider, "Metadata provider not setup").getForgeUserdevDependency(), "NeoForge version not setup");
 	}
 }