From 61ce05e522a6001109783478f1777eb3e1b9755f Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 20 Apr 2022 19:51:26 +0100 Subject: [PATCH 1/2] Update ASM and TR. --- build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 0d4b5667..2db6d937 100644 --- a/build.gradle +++ b/build.gradle @@ -71,11 +71,11 @@ dependencies { implementation ('com.google.code.gson:gson:2.8.9') implementation ('com.fasterxml.jackson.core:jackson-databind:2.13.0') implementation ('com.google.guava:guava:31.0.1-jre') - implementation ('org.ow2.asm:asm:9.2') - implementation ('org.ow2.asm:asm-analysis:9.2') - implementation ('org.ow2.asm:asm-commons:9.2') - implementation ('org.ow2.asm:asm-tree:9.2') - implementation ('org.ow2.asm:asm-util:9.2') + implementation ('org.ow2.asm:asm:9.3') + implementation ('org.ow2.asm:asm-analysis:9.3') + implementation ('org.ow2.asm:asm-commons:9.3') + implementation ('org.ow2.asm:asm-tree:9.3') + implementation ('org.ow2.asm:asm-util:9.3') // game handling utils implementation ('net.fabricmc:stitch:0.6.1') { @@ -83,7 +83,7 @@ dependencies { } // tinyfile management - implementation ('net.fabricmc:tiny-remapper:0.8.1') + implementation ('net.fabricmc:tiny-remapper:0.8.2') implementation 'net.fabricmc:access-widener:2.1.0' implementation 'net.fabricmc:mapping-io:0.2.1' From 9e57a4fc549638468f757ec02ded6a578ca2aefd Mon Sep 17 00:00:00 2001 From: KosmX Date: Thu, 21 Apr 2022 21:54:29 +0200 Subject: [PATCH 2/2] Create MixinMappingsService for every target MC version. (#631) * Create MixinMappingsService for every target MC version. * Use mappings identifier to identify MixinMappingsService. --- .../fabricmc/loom/task/service/MixinMappingsService.java | 7 ++++--- .../fabricmc/loom/task/service/TinyRemapperService.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/service/MixinMappingsService.java b/src/main/java/net/fabricmc/loom/task/service/MixinMappingsService.java index 37466a19..a1a7336f 100644 --- a/src/main/java/net/fabricmc/loom/task/service/MixinMappingsService.java +++ b/src/main/java/net/fabricmc/loom/task/service/MixinMappingsService.java @@ -31,6 +31,7 @@ import org.gradle.api.Project; import org.gradle.api.tasks.SourceSet; import net.fabricmc.loom.LoomGradleExtension; +import net.fabricmc.loom.configuration.providers.mappings.MappingsProviderImpl; import net.fabricmc.loom.util.service.SharedService; import net.fabricmc.loom.util.service.SharedServiceManager; import net.fabricmc.tinyremapper.IMappingProvider; @@ -47,13 +48,13 @@ public final class MixinMappingsService implements SharedService { final LoomGradleExtension extension = LoomGradleExtension.get(project); File mixinMapping = new File(extension.getFiles().getProjectBuildCache(), "mixin-map-" + extension.getMappingsProvider().mappingsIdentifier() + "." + sourceSet.getName() + ".tiny"); - getService(SharedServiceManager.get(project)).mixinMappings.add(mixinMapping); + getService(SharedServiceManager.get(project), extension.getMappingsProvider()).mixinMappings.add(mixinMapping); return mixinMapping; } - static synchronized MixinMappingsService getService(SharedServiceManager sharedServiceManager) { - return sharedServiceManager.getOrCreateService("MixinMappings", () -> new MixinMappingsService(sharedServiceManager)); + static synchronized MixinMappingsService getService(SharedServiceManager sharedServiceManager, MappingsProviderImpl mappingsProvider) { + return sharedServiceManager.getOrCreateService("MixinMappings-" + mappingsProvider.mappingsIdentifier(), () -> new MixinMappingsService(sharedServiceManager)); } IMappingProvider getMappingProvider(String from, String to) { diff --git a/src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java b/src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java index 54d974a6..94daabe6 100644 --- a/src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java +++ b/src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java @@ -76,7 +76,7 @@ public class TinyRemapperService implements SharedService { mappings.add(MappingsService.createDefault(project, from, to).getMappingsProvider()); if (legacyMixin) { - mappings.add(MixinMappingsService.getService(SharedServiceManager.get(project)).getMappingProvider(from, to)); + mappings.add(MixinMappingsService.getService(SharedServiceManager.get(project), extension.getMappingsProvider()).getMappingProvider(from, to)); } return new TinyRemapperService(mappings, !legacyMixin, useKotlinExtension);