Update fabric mapping-io to v0.6.1

Fixes errors caused by other mods including newer versions of mapping-io which contain breaking changes
booky10 · Jul 7, 2024 · 3308a11 · 3308a11
1 parent 4bdee4d
commit 3308a11
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/common/src/main/java/dev/booky/stackdeobf/mappings/MappingCacheVisitor.java b/common/src/main/java/dev/booky/stackdeobf/mappings/MappingCacheVisitor.java
@@ -3,6 +3,7 @@
 
 import net.fabricmc.mappingio.MappedElementKind;
 import net.fabricmc.mappingio.MappingVisitor;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
@@ -54,7 +55,7 @@ public boolean visitMethodArg(int argPosition, int lvIndex, String srcName) {
     }
 
     @Override
-    public boolean visitMethodVar(int lvtRowIndex, int lvIndex, int startOpIdx, String srcName) {
+    public boolean visitMethodVar(int lvtRowIndex, int lvIndex, int startOpIdx, int endOpIdx, @Nullable String srcName) {
         return false;
     }
 

diff --git a/common/src/main/java/dev/booky/stackdeobf/mappings/providers/BuildBasedMappingProvider.java b/common/src/main/java/dev/booky/stackdeobf/mappings/providers/BuildBasedMappingProvider.java
@@ -43,7 +43,7 @@ public BuildBasedMappingProvider(VersionData versionData, String name, MavenArti
     }
 
     protected MappingFormat getMappingFormat() {
-        return MappingFormat.TINY_2;
+        return MappingFormat.TINY_2_FILE;
     }
 
     public VerifiableUrl.HashType getMetaHashType() {

diff --git a/...on/src/main/java/dev/booky/stackdeobf/mappings/providers/IntermediaryMappingProvider.java b/...on/src/main/java/dev/booky/stackdeobf/mappings/providers/IntermediaryMappingProvider.java
@@ -71,7 +71,7 @@ public CompletableFuture<Void> parseMappings0(Executor executor) {
             try (InputStream fileInput = Files.newInputStream(this.path);
                  GZIPInputStream gzipInput = new GZIPInputStream(fileInput);
                  Reader reader = new InputStreamReader(gzipInput)) {
-                MappingReader.read(reader, MappingFormat.TINY_2, mappings);
+                MappingReader.read(reader, MappingFormat.TINY_2_FILE, mappings);
             } catch (IOException exception) {
                 throw new RuntimeException(exception);
             }

diff --git a/common/src/main/java/dev/booky/stackdeobf/mappings/providers/MojangMappingProvider.java b/common/src/main/java/dev/booky/stackdeobf/mappings/providers/MojangMappingProvider.java
@@ -217,7 +217,7 @@ protected CompletableFuture<Void> parseMappings0(Executor executor) {
                 try (InputStream fileInput = Files.newInputStream(this.path);
                      GZIPInputStream gzipInput = new GZIPInputStream(fileInput);
                      Reader reader = new InputStreamReader(gzipInput)) {
-                    MappingReader.read(reader, MappingFormat.PROGUARD, rawMappings);
+                    MappingReader.read(reader, MappingFormat.PROGUARD_FILE, rawMappings);
                 }
 
                 rawMappings.setSrcNamespace("named");

diff --git a/common/src/main/java/dev/booky/stackdeobf/mappings/providers/QuiltMappingProvider.java b/common/src/main/java/dev/booky/stackdeobf/mappings/providers/QuiltMappingProvider.java
@@ -119,7 +119,8 @@ protected CompletableFuture<Void> parseMappings0(Executor executor) {
                     try (InputStream fileInput = Files.newInputStream(this.hashedPath);
                          GZIPInputStream gzipInput = new GZIPInputStream(fileInput);
                          Reader reader = new InputStreamReader(gzipInput)) {
-                        MappingReader.read(reader, MappingFormat.TINY_2, mappings);
+                        MappingReader.read(reader, MappingFormat.TINY_2_FILE
+                                , mappings);
                     } catch (IOException exception) {
                         throw new RuntimeException(exception);
                     }

diff --git a/common/src/main/java/dev/booky/stackdeobf/mappings/providers/YarnMappingProvider.java b/common/src/main/java/dev/booky/stackdeobf/mappings/providers/YarnMappingProvider.java
@@ -79,7 +79,7 @@ public VerifiableUrl.HashType getMetaHashType() {
     @Override
     protected MappingFormat getMappingFormat() {
         return getVersionFlags(this.versionData).contains(VersionFlag.NO_V2)
-                ? MappingFormat.TINY : MappingFormat.TINY_2;
+                ? MappingFormat.TINY_FILE : MappingFormat.TINY_2_FILE;
     }
 
     private enum VersionFlag {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ loom = "1.7-SNAPSHOT"
 shadow = "8.1.1"
 
 fabric-loader = "0.14.21"
-fabric-mappingio = "0.3.0"
+fabric-mappingio = "0.6.1"
 minecraft = "1.20.1"
 
 # built in minecraft, required for compiling