Update to filament 0.7.1 and mapping-io 0.5.1

build.gradle

@@ -25,8 +25,8 @@ dependencies {
 	implementation "org.ow2.asm:asm:${project.asm_version}"
 	implementation "org.ow2.asm:asm-tree:${project.asm_version}"
 	implementation "net.fabricmc.unpick:unpick-format-utils:${project.unpick_version}"
-	implementation "net.fabricmc:mapping-io:0.4.2"
-	implementation "net.fabricmc:fabric-filament:0.6.2"
+	implementation "net.fabricmc:mapping-io:0.5.1"
+	implementation "net.fabricmc:fabric-filament:0.7.1"
 	implementation("net.fabricmc:fabric-loader:0.15.6")
 	implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2'
 }

gradle.properties

@@ -1,4 +1,4 @@
-multi_filament_version=0.2.8
+multi_filament_version=0.3.0
 
-asm_version=9.5
+asm_version=9.6
 unpick_version=2.3.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/main/java/net/legacyfabric/multifilament/mappingsio/ExcludingMappingVisitor.java

@@ -5,6 +5,7 @@
 import net.fabricmc.mappingio.MappingVisitor;
 import net.fabricmc.mappingio.tree.MappingTree;
 import net.fabricmc.mappingio.tree.MemoryMappingTree;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.List;
@@ -92,8 +93,8 @@ public boolean visitMethodArg(int argPosition, int lvIndex, String srcName) thro
 	}
 
 	@Override
-	public boolean visitMethodVar(int lvtRowIndex, int lvIndex, int startOpIdx, String srcName) throws IOException {
-		return parent.visitMethodVar(lvtRowIndex, lvIndex, startOpIdx, srcName);
+	public boolean visitMethodVar(int lvtRowIndex, int lvIndex, int startOpIdx, int endOpIdx, @Nullable String srcName) throws IOException {
+		return parent.visitMethodVar(lvtRowIndex, lvIndex, startOpIdx, endOpIdx, srcName);
 	}
 
 	@Override

src/main/java/net/legacyfabric/multifilament/mappingsio/FilteringMappingVisitor.java

@@ -5,6 +5,7 @@
 import net.fabricmc.mappingio.MappingVisitor;
 import net.fabricmc.mappingio.tree.MappingTree;
 import net.fabricmc.mappingio.tree.MemoryMappingTree;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.List;
@@ -96,8 +97,8 @@ public boolean visitMethodArg(int argPosition, int lvIndex, String srcName) thro
 	}
 
 	@Override
-	public boolean visitMethodVar(int lvtRowIndex, int lvIndex, int startOpIdx, String srcName) throws IOException {
-		return parent.visitMethodVar(lvtRowIndex, lvIndex, startOpIdx, srcName);
+	public boolean visitMethodVar(int lvtRowIndex, int lvIndex, int startOpIdx, int endOpIdx, @Nullable String srcName) throws IOException {
+		return parent.visitMethodVar(lvtRowIndex, lvIndex, startOpIdx, endOpIdx, srcName);
 	}
 
 	@Override

src/main/java/net/legacyfabric/multifilament/mappingsio/SimpleMappingVisitor.java

@@ -3,6 +3,7 @@
 import net.fabricmc.mappingio.MappedElementKind;
 import net.fabricmc.mappingio.MappingFlag;
 import net.fabricmc.mappingio.MappingVisitor;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.List;
@@ -65,8 +66,8 @@ public boolean visitMethodArg(int argPosition, int lvIndex, String srcName) thro
 	}
 
 	@Override
-	public boolean visitMethodVar(int lvtRowIndex, int lvIndex, int startOpIdx, String srcName) throws IOException {
-		return parent.visitMethodVar(lvtRowIndex, lvIndex, startOpIdx, srcName);
+	public boolean visitMethodVar(int lvtRowIndex, int lvIndex, int startOpIdx, int endOpIdx, @Nullable String srcName) throws IOException {
+		return parent.visitMethodVar(lvtRowIndex, lvIndex, startOpIdx, endOpIdx, srcName);
 	}
 
 	@Override

src/main/java/net/legacyfabric/multifilament/task/DeduplicateMappingsTask.java

@@ -26,7 +26,7 @@
 public abstract class DeduplicateMappingsTask extends MappingOutputTask {
 	@Inject
 	public DeduplicateMappingsTask() {
-		this.getOutputFormat().convention(MappingFormat.ENIGMA);
+		this.getOutputFormat().convention(MappingFormat.ENIGMA_DIR);
 	}
 
 	@InputDirectory

src/main/java/net/legacyfabric/multifilament/task/UnifyMappingsTask.java

@@ -31,7 +31,7 @@
 public abstract class UnifyMappingsTask extends MappingOutputTask {
 	@Inject
 	public UnifyMappingsTask() {
-		this.getOutputFormat().convention(MappingFormat.ENIGMA);
+		this.getOutputFormat().convention(MappingFormat.ENIGMA_DIR);
 	}
 
 	@InputDirectory

src/main/java/net/legacyfabric/multifilament/task/VersionifyExcludeMappingsTask.java

@@ -25,7 +25,7 @@
 public abstract class VersionifyExcludeMappingsTask extends MappingOutputTask {
 	@Inject
 	public VersionifyExcludeMappingsTask() {
-		this.getOutputFormat().convention(MappingFormat.ENIGMA);
+		this.getOutputFormat().convention(MappingFormat.ENIGMA_DIR);
 	}
 
 	@InputFile

src/main/java/net/legacyfabric/multifilament/task/VersionifyFilterMappingsTask.java

@@ -21,7 +21,7 @@
 public abstract class VersionifyFilterMappingsTask extends MappingOutputTask {
 	@Inject
 	public VersionifyFilterMappingsTask() {
-		this.getOutputFormat().convention(MappingFormat.ENIGMA);
+		this.getOutputFormat().convention(MappingFormat.ENIGMA_DIR);
 	}
 
 	@InputFile