From 2ec1dd032f99aea361c45cba42e1a6d8d2bbd4b6 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 16 Sep 2021 20:35:10 +0100 Subject: [PATCH 1/2] Update tiny remapper, register the new LV pattern as invalid with TR. --- build.gradle | 2 +- .../java/net/fabricmc/loom/util/TinyRemapperHelper.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6f989e27..6f79a75c 100644 --- a/build.gradle +++ b/build.gradle @@ -78,7 +78,7 @@ dependencies { } // tinyfile management - implementation ('net.fabricmc:tiny-remapper:0.5.0') + implementation ('net.fabricmc:tiny-remapper:0.6.0') implementation 'net.fabricmc:access-widener:2.0.0' implementation 'net.fabricmc:mapping-io:0.2.1' diff --git a/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java b/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java index aa295f0c..77f710d1 100644 --- a/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java +++ b/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java @@ -28,6 +28,7 @@ import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.util.Map; +import java.util.regex.Pattern; import com.google.common.collect.ImmutableMap; import org.gradle.api.Project; @@ -47,6 +48,11 @@ public final class TinyRemapperHelper { .put("javax/annotation/concurrent/Immutable", "org/jetbrains/annotations/Unmodifiable") .build(); + /** + * Matches the new local variable naming format introduced in 21w37a. + */ + private static final Pattern MC_LV_PATTERN = Pattern.compile("\\$\\$\\d+"); + private TinyRemapperHelper() { } @@ -58,6 +64,7 @@ public final class TinyRemapperHelper { .withMappings(out -> JSR_TO_JETBRAINS.forEach(out::acceptClass)) .renameInvalidLocals(true) .rebuildSourceFilenames(true) + .invalidLvNamePattern(MC_LV_PATTERN) .build(); } From ae9a9e120d525afac3e8ad49b80a0507c010f052 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 17 Sep 2021 15:44:41 +0100 Subject: [PATCH 2/2] Update lorenz-tiny --- build.gradle | 2 +- .../net/fabricmc/loom/test/integration/FabricAPITest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6f79a75c..d654f8e4 100644 --- a/build.gradle +++ b/build.gradle @@ -82,7 +82,7 @@ dependencies { implementation 'net.fabricmc:access-widener:2.0.0' implementation 'net.fabricmc:mapping-io:0.2.1' - implementation ('net.fabricmc:lorenz-tiny:4.0.0') { + implementation ('net.fabricmc:lorenz-tiny:4.0.1') { transitive = false } diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy index cbefa2e0..893817ec 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy @@ -44,7 +44,7 @@ class FabricAPITest extends Specification implements GradleProjectTestTrait { setup: def gradle = gradleProject( repo: "https://github.com/FabricMC/fabric.git", - commit: "fc40aa9d88e9457957bdf3f8cec9698846828cd3", + commit: "46582230fb580d4c1f71e4b0737df27417ec9cb1", version: version, patch: "fabric_api" )