From 9a470a49d819446c995a7cc5d636acd786677a2a Mon Sep 17 00:00:00 2001
From: Logic <38597904+LogicFan@users.noreply.github.com>
Date: Sun, 22 Aug 2021 10:03:09 -0400
Subject: [PATCH] update mapping-io, fix #473 (#474)

---
 build.gradle                                          |  2 +-
 .../providers/mappings/LayeredMappingsDependency.java |  2 +-
 .../ParchmentPrefixStripingMappingVisitor.java        |  3 ++-
 .../providers/mappings/parchment/ParchmentTreeV1.java | 11 ++++++-----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1bcbe24..4d0502a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,7 +81,7 @@ dependencies {
 	implementation ('net.fabricmc:tiny-mappings-parser:0.3.0+build.17')
 
 	implementation 'net.fabricmc:access-widener:1.1.0'
-	implementation 'net.fabricmc:mapping-io:0.1.3'
+	implementation 'net.fabricmc:mapping-io:0.2.0'
 
 	implementation ('net.fabricmc:lorenz-tiny:3.0.0') {
 		transitive = false
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingsDependency.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingsDependency.java
index a5ed75b..878a37e 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingsDependency.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingsDependency.java
@@ -76,7 +76,7 @@ public class LayeredMappingsDependency implements SelfResolvingDependency {
 					Tiny2Writer tiny2Writer = new Tiny2Writer(writer, false);
 
 					MappingDstNsReorder nsReorder = new MappingDstNsReorder(tiny2Writer, Collections.singletonList(MappingNamespace.NAMED.stringValue()));
-					MappingSourceNsSwitch nsSwitch = new MappingSourceNsSwitch(nsReorder, MappingNamespace.INTERMEDIARY.stringValue());
+					MappingSourceNsSwitch nsSwitch = new MappingSourceNsSwitch(nsReorder, MappingNamespace.INTERMEDIARY.stringValue(), true);
 					mappings.accept(nsSwitch);
 
 					Files.deleteIfExists(mappingsFile);
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/parchment/ParchmentPrefixStripingMappingVisitor.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/parchment/ParchmentPrefixStripingMappingVisitor.java
index f3d1d82..ade7710 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/parchment/ParchmentPrefixStripingMappingVisitor.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/parchment/ParchmentPrefixStripingMappingVisitor.java
@@ -24,6 +24,7 @@
 
 package net.fabricmc.loom.configuration.providers.mappings.parchment;
 
+import java.io.IOException;
 import java.util.Locale;
 
 import net.fabricmc.mappingio.MappingVisitor;
@@ -35,7 +36,7 @@ public final class ParchmentPrefixStripingMappingVisitor extends ForwardingMappi
 	}
 
 	@Override
-	public boolean visitMethodArg(int argPosition, int lvIndex, String srcName) {
+	public boolean visitMethodArg(int argPosition, int lvIndex, String srcName) throws IOException {
 		return super.visitMethodArg(argPosition, lvIndex, stripMethodArg(srcName));
 	}
 
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/parchment/ParchmentTreeV1.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/parchment/ParchmentTreeV1.java
index e41f8a8..081c925 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/parchment/ParchmentTreeV1.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/parchment/ParchmentTreeV1.java
@@ -24,6 +24,7 @@
 
 package net.fabricmc.loom.configuration.providers.mappings.parchment;
 
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
@@ -39,7 +40,7 @@ public record ParchmentTreeV1(
 		@Nullable
 		List<Package> packages
 ) {
-	public void visit(MappingVisitor visitor, String srcNamespace) {
+	public void visit(MappingVisitor visitor, String srcNamespace) throws IOException {
 		while (true) {
 			if (visitor.visitHeader()) {
 				visitor.visitNamespaces(srcNamespace, Collections.emptyList());
@@ -68,7 +69,7 @@ public record ParchmentTreeV1(
 			@Nullable
 			List<String> javadoc
 	) {
-		public void visit(MappingVisitor visitor) {
+		public void visit(MappingVisitor visitor) throws IOException {
 			if (visitor.visitClass(name())) {
 				if (!visitor.visitElementContent(MappedElementKind.CLASS)) {
 					return;
@@ -99,7 +100,7 @@ public record ParchmentTreeV1(
 			@Nullable
 			List<String> javadoc
 	) {
-		public void visit(MappingVisitor visitor) {
+		public void visit(MappingVisitor visitor) throws IOException {
 			if (visitor.visitField(name, descriptor)) {
 				if (!visitor.visitElementContent(MappedElementKind.FIELD)) {
 					return;
@@ -120,7 +121,7 @@ public record ParchmentTreeV1(
 			@Nullable
 			List<String> javadoc
 	) {
-		public void visit(MappingVisitor visitor) {
+		public void visit(MappingVisitor visitor) throws IOException {
 			if (visitor.visitMethod(name, descriptor)) {
 				if (!visitor.visitElementContent(MappedElementKind.METHOD)) {
 					return;
@@ -145,7 +146,7 @@ public record ParchmentTreeV1(
 			@Nullable
 			String javadoc
 	) {
-		public void visit(MappingVisitor visitor) {
+		public void visit(MappingVisitor visitor) throws IOException {
 			if (visitor.visitMethodArg(index, index, name)) {
 				if (!visitor.visitElementContent(MappedElementKind.METHOD_ARG)) {
 					return;