From 8f33803331179ed882a96de0073507fa017f6564 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Sun, 30 Apr 2023 13:58:58 +0300
Subject: [PATCH] JarManifestService: Fix "Could not determine fabric loader
 version" log spam

...by restoring this file to exactly how it is upstream.
---
 .../loom/task/service/JarManifestService.java     | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/task/service/JarManifestService.java b/src/main/java/net/fabricmc/loom/task/service/JarManifestService.java
index c6b93492..9651c2b2 100644
--- a/src/main/java/net/fabricmc/loom/task/service/JarManifestService.java
+++ b/src/main/java/net/fabricmc/loom/task/service/JarManifestService.java
@@ -41,6 +41,7 @@ import org.gradle.util.GradleVersion;
 
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.LoomGradlePlugin;
+import net.fabricmc.loom.configuration.InstallerData;
 import net.fabricmc.loom.util.Constants;
 
 public abstract class JarManifestService implements BuildService<JarManifestService.Params> {
@@ -65,7 +66,7 @@ public abstract class JarManifestService implements BuildService<JarManifestServ
 				params.getMCEVersion().set(Constants.Dependencies.Versions.MIXIN_COMPILE_EXTENSIONS);
 				params.getMinecraftVersion().set(project.provider(() -> extension.getMinecraftProvider().minecraftVersion()));
 				params.getTinyRemapperVersion().set(tinyRemapperVersion.orElse("unknown"));
-				params.getFabricLoaderVersion().set(getLoaderVersion(project).orElse("unknown"));
+				params.getFabricLoaderVersion().set(project.provider(() -> Optional.ofNullable(extension.getInstallerData()).map(InstallerData::version).orElse("unknown")));
 				params.getMixinVersion().set(getMixinVersion(project));
 			});
 		});
@@ -98,18 +99,6 @@ public abstract class JarManifestService implements BuildService<JarManifestServ
 		}
 	}
 
-	private static Optional<String> getLoaderVersion(Project project) {
-		LoomGradleExtension extension = LoomGradleExtension.get(project);
-		if (extension.isForge()) return Optional.empty();
-
-		if (extension.getInstallerData() == null) {
-			project.getLogger().warn("Could not determine fabric loader version for jar manifest");
-			return Optional.empty();
-		}
-
-		return Optional.of(extension.getInstallerData().version());
-	}
-
 	private record MixinVersion(String group, String version) implements Serializable { }
 
 	private static Provider<MixinVersion> getMixinVersion(Project project) {