imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 13:37:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make quilt mode suffix with _arch_quilt to not interfere with each other

Browse Source 
Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2022-04-21 14:14:07 +08:00
parent aa5029e6fb
commit 73a09f5802
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
View File

@@ -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);

6
src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
View File

@@ -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;