diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-06-17 23:44:48 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-06-17 23:44:48 +0800 |
| commit | 24a515270a87c92c52192fdf03baedfe84639545 (patch) | |
| tree | 438a4083f0a5b21543ad02f5879e85b8903e12d4 /src/main/java/net/fabricmc/loom/configuration/mods | |
| parent | ce3c96ca869975ad443026b92130764ac3135384 (diff) | |
| parent | 147af48879c725f422b99ea15a9e6f3ce1a496f3 (diff) | |
| download | architectury-loom-24a515270a87c92c52192fdf03baedfe84639545.tar.gz architectury-loom-24a515270a87c92c52192fdf03baedfe84639545.tar.bz2 architectury-loom-24a515270a87c92c52192fdf03baedfe84639545.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9
# Conflicts:
# build.gradle
# src/main/java/net/fabricmc/loom/LoomGradleExtension.java
# src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
# src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
# src/main/java/net/fabricmc/loom/util/SourceRemapper.java
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/mods')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java index 160d467b..25607f5c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java +++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java @@ -64,7 +64,7 @@ import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.LoomGradlePlugin; import net.fabricmc.loom.configuration.RemappedConfigurationEntry; import net.fabricmc.loom.configuration.processors.dependency.ModDependencyInfo; -import net.fabricmc.loom.configuration.providers.mappings.MappingsProvider; +import net.fabricmc.loom.configuration.providers.mappings.MappingsProviderImpl; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftMappedProvider; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.LoggerFilter; @@ -142,7 +142,7 @@ public class ModProcessor { String toM = "named"; MinecraftMappedProvider mappedProvider = extension.getMinecraftMappedProvider(); - MappingsProvider mappingsProvider = extension.getMappingsProvider(); + MappingsProviderImpl mappingsProvider = extension.getMappingsProvider(); Path mc = extension.isForge() ? mappedProvider.getSrgJar().toPath() : mappedProvider.getIntermediaryJar().toPath(); Path[] mcDeps = project.getConfigurations().getByName(Constants.Configurations.LOADER_DEPENDENCIES).getFiles() |