diff --git a/src/main/java/net/fabricmc/loom/util/srg/MappingException.java b/src/main/java/net/fabricmc/loom/util/MappingException.java similarity index 97% rename from src/main/java/net/fabricmc/loom/util/srg/MappingException.java rename to src/main/java/net/fabricmc/loom/util/MappingException.java index 5bf2a63b..de70536e 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/MappingException.java +++ b/src/main/java/net/fabricmc/loom/util/MappingException.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util.srg; +package net.fabricmc.loom.util; /** * An exception that occurs when processing obfuscation mappings. diff --git a/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java b/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java index 60c718e0..04f65c5a 100644 --- a/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java +++ b/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java @@ -155,7 +155,10 @@ public final class TinyRemapperHelper { final int toId = mappings.getNamespaceId(to); if (toId == MappingTreeView.NULL_NAMESPACE_ID) { - System.out.println("Warning: Trying to remap to unknown namespace: " + to); + throw new MappingException( + "Trying to remap from '%s' (id: %d) to unknown namespace '%s'. Available namespaces: [%s -> %s]" + .formatted(from, fromId, to, mappings.getSrcNamespace(), String.join(", ", mappings.getDstNamespaces())) + ); } for (MappingTree.ClassMapping classDef : mappings.getClasses()) { diff --git a/src/main/java/net/fabricmc/loom/util/srg/SrgMerger.java b/src/main/java/net/fabricmc/loom/util/srg/SrgMerger.java index 0db8bc80..ad37d30c 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/SrgMerger.java +++ b/src/main/java/net/fabricmc/loom/util/srg/SrgMerger.java @@ -42,6 +42,7 @@ import com.google.common.collect.ListMultimap; import org.jetbrains.annotations.Nullable; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; +import net.fabricmc.loom.util.MappingException; import net.fabricmc.loom.util.function.CollectionUtil; import net.fabricmc.mappingio.FlatMappingVisitor; import net.fabricmc.mappingio.MappingReader;