From c380b3673974de065016843906b246f08a90d80a Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Thu, 14 Oct 2021 17:04:40 +0100
Subject: [PATCH] Update tiny-remapper and enable "inferNameFromSameLvIndex" to
 fix issues with decompiling some locals.

---
 build.gradle                                                 | 2 +-
 src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 78b3d18..625dc9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,7 +78,7 @@ dependencies {
 	}
 
 	// tinyfile management
-	implementation ('net.fabricmc:tiny-remapper:0.6.0')
+	implementation ('net.fabricmc:tiny-remapper:0.7.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 c94c801..d534f97 100644
--- a/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java
+++ b/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java
@@ -79,6 +79,7 @@ public final class TinyRemapperHelper {
 				.renameInvalidLocals(true)
 				.rebuildSourceFilenames(true)
 				.invalidLvNamePattern(MC_LV_PATTERN)
+				.inferNameFromSameLvIndex(true)
 				.extraPreApplyVisitor((cls, next) -> {
 					if (fixRecords && !cls.isRecord() && "java/lang/Record".equals(cls.getSuperName())) {
 						return new RecordComponentFixVisitor(next, mappingTree, intermediaryNsId);