imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

JarManifestService: Fix "Could not determine fabric loader version" log spam

Browse Source 
...by restoring this file to exactly how it is upstream.
This commit is contained in:
Juuz
2023-04-30 13:58:58 +03:00
parent d731734507
commit 8f33803331
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/fabricmc/loom/task/service/JarManifestService.java
View File

@@ -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) {