diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-07-20 18:03:33 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-07-20 18:03:33 +0800 |
| commit | cea80b01195be2ab6bd5cdadbcf7fa7b2972e131 (patch) | |
| tree | b6f97f33698429025a33ea5e185f8f99f1deed7a /src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java | |
| parent | 9d0f6526694ef18a657c1df0b4a23917344c3567 (diff) | |
| parent | d32acb3370b7dc8dbf1688315028ecb1a0191de1 (diff) | |
| download | architectury-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/LoomDependencyManager.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java b/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java index a33d7293..b0568731 100644 --- a/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java +++ b/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java @@ -89,7 +89,7 @@ public class LoomDependencyManager { MappingsProviderImpl mappingsProvider = null; project.getLogger().info(":setting up loom dependencies"); - LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); + LoomGradleExtension extension = LoomGradleExtension.get(project); Map<String, ProviderList> providerListMap = new HashMap<>(); List<ProviderList> targetProviders = new ArrayList<>(); @@ -178,7 +178,7 @@ public class LoomDependencyManager { } private static void handleInstallerJson(JsonObject jsonObject, Project project) { - LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); + LoomGradleExtension extension = LoomGradleExtension.get(project); JsonObject libraries = jsonObject.get("libraries").getAsJsonObject(); Configuration loaderDepsConfig = project.getConfigurations().getByName(Constants.Configurations.LOADER_DEPENDENCIES); |