aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2021-07-20 18:03:33 +0800
committershedaniel <daniel@shedaniel.me>2021-07-20 18:03:33 +0800
commitcea80b01195be2ab6bd5cdadbcf7fa7b2972e131 (patch)
treeb6f97f33698429025a33ea5e185f8f99f1deed7a /src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java
parent9d0f6526694ef18a657c1df0b4a23917344c3567 (diff)
parentd32acb3370b7dc8dbf1688315028ecb1a0191de1 (diff)
downloadarchitectury-loom-cea80b01195be2ab6bd5cdadbcf7fa7b2972e131.tar.gz
architectury-loom-cea80b01195be2ab6bd5cdadbcf7fa7b2972e131.tar.bz2
architectury-loom-cea80b01195be2ab6bd5cdadbcf7fa7b2972e131.zip
Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9
# Conflicts: # src/main/java/net/fabricmc/loom/LoomGradleExtension.java # src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java # src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java # src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java # src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java # src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java # src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java # src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java')
-rw-r--r--src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java
index 728a109f..408081d7 100644
--- a/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java
@@ -43,7 +43,7 @@ public final record JarManifestConfiguration(Project project) {
return;
}
- LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
+ LoomGradleExtension extension = LoomGradleExtension.get(project);
Attributes attributes = manifest.getMainAttributes();
var tinyRemapperVersion = Optional.ofNullable(TinyRemapper.class.getPackage().getImplementationVersion());
@@ -79,7 +79,7 @@ public final record JarManifestConfiguration(Project project) {
}
private Optional<String> getLoaderVersion() {
- LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
+ LoomGradleExtension extension = LoomGradleExtension.get(project);
if (extension.getInstallerData() == null) {
project.getLogger().warn("Could not determine fabric loader version for jar manifest");