diff options
author | shedaniel <daniel@shedaniel.me> | 2021-08-14 14:48:02 +0800 |
---|---|---|
committer | shedaniel <daniel@shedaniel.me> | 2021-08-14 15:06:05 +0800 |
commit | 00d6ed71a18bf20244a3ffd2954db2e6168babd9 (patch) | |
tree | bbfa1628f60ce68f386c29dcff0f810f71a2b481 /src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java | |
parent | 6d9065eb1e040df556e6c738ca3093cbed606ad5 (diff) | |
parent | 97a629eef9e3907b43dca21fc785233cf1b39c55 (diff) | |
download | architectury-loom-00d6ed71a18bf20244a3ffd2954db2e6168babd9.tar.gz architectury-loom-00d6ed71a18bf20244a3ffd2954db2e6168babd9.tar.bz2 architectury-loom-00d6ed71a18bf20244a3ffd2954db2e6168babd9.zip |
Merge remote-tracking branch 'FabricMC/exp/0.10' into dev/future
Signed-off-by: shedaniel <daniel@shedaniel.me>
# Conflicts:
# src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/GradleMappingContext.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingsDependency.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/extension/LoomGradleExtensionApiImpl.java
Diffstat (limited to 'src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java')
-rw-r--r-- | src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java index feb6bc21..730d683b 100644 --- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java +++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java @@ -81,7 +81,7 @@ public class LoomGradleExtensionImpl extends LoomGradleExtensionApiImpl implemen @Override public synchronized File getNextMixinMappings() { - File mixinMapping = new File(getFiles().getProjectBuildCache(), "mixin-map-" + getMinecraftProvider().minecraftVersion() + "-" + getMappingsProvider().mappingsVersion + "." + mixinMappings.size() + ".tiny"); + File mixinMapping = new File(getFiles().getProjectBuildCache(), "mixin-map-" + getMappingsProvider().mappingsIdentifier() + "." + mixinMappings.size() + ".tiny"); mixinMappings.add(mixinMapping); return mixinMapping; } |