From 73a09f58029abfd04a075408190a472d663246db Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 21 Apr 2022 14:14:07 +0800 Subject: [PATCH] Make quilt mode suffix with _arch_quilt to not interfere with each other Signed-off-by: shedaniel --- .../fabricmc/loom/configuration/LoomDependencyManager.java | 2 +- .../providers/mappings/MappingsProviderImpl.java | 6 +++++- 2 files changed, 6 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 98c600c4..1e6a96fd 100644 --- a/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java +++ b/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java @@ -86,7 +86,7 @@ public class LoomDependencyManager { } SourceRemapper sourceRemapper = new SourceRemapper(project, true); - String platformSuffix = extension.isForge() ? "_forge" : ""; + String platformSuffix = extension.isForge() ? "_forge" : extension.isQuilt() ? "_arch_quilt" : ""; String mappingsIdentifier = extension.getMappingsProvider().mappingsIdentifier() + platformSuffix; ModCompileRemapper.remapDependencies(project, mappingsIdentifier, extension, sourceRemapper); diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java index fdfb0512..d44772c5 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java @@ -147,7 +147,7 @@ public class MappingsProviderImpl implements MappingsProvider, SharedService { }); final LoomGradleExtension extension = LoomGradleExtension.get(project); - final String mappingsIdentifier; + String mappingsIdentifier; if (extension.isForge()) { mappingsIdentifier = FieldMigratedMappingsProvider.createForgeMappingsIdentifier(extension, mappingsName, version, getMappingsClassifier(dependency, jarInfo.v2()), minecraftProvider.minecraftVersion()); @@ -155,6 +155,10 @@ public class MappingsProviderImpl implements MappingsProvider, SharedService { mappingsIdentifier = createMappingsIdentifier(mappingsName, version, getMappingsClassifier(dependency, jarInfo.v2()), minecraftProvider.minecraftVersion()); } + if (extension.isQuilt()) { + mappingsIdentifier += "-arch-quilt"; + } + final Path workingDir = minecraftProvider.dir(mappingsIdentifier).toPath(); MappingsProviderImpl mappingProvider;