aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorLogic <38597904+LogicFan@users.noreply.github.com>2021-08-22 10:03:09 -0400
committerGitHub <noreply@github.com>2021-08-22 15:03:09 +0100
commit9a470a49d819446c995a7cc5d636acd786677a2a (patch)
tree855a071cebc3b5107afc463056bfefd4df910de4 /src/main
parent97a629eef9e3907b43dca21fc785233cf1b39c55 (diff)
downloadarchitectury-loom-9a470a49d819446c995a7cc5d636acd786677a2a.tar.gz
architectury-loom-9a470a49d819446c995a7cc5d636acd786677a2a.tar.bz2
architectury-loom-9a470a49d819446c995a7cc5d636acd786677a2a.zip
update mapping-io, fix #473 (#474)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingsDependency.java2
-rw-r--r--src/main/java/net/fabricmc/loom/configuration/providers/mappings/parchment/ParchmentPrefixStripingMappingVisitor.java3
-rw-r--r--src/main/java/net/fabricmc/loom/configuration/providers/mappings/parchment/ParchmentTreeV1.java11
3 files changed, 9 insertions, 7 deletions
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 a5ed75b5..878a37e4 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 f3d1d823..ade77109 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 e41f8a83..081c9257 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;