mapping io jank

CoolCrabs · Nov 21, 2021 · 421617e · 421617e
1 parent b307efa
commit 421617e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/brachyura/pom.xml b/brachyura/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>io.github.coolcrabs</groupId>
     <artifactId>brachyura</artifactId>
-    <version>0.17</version>
+    <version>0.18</version>
 
     <properties>
         <java.version>1.8</java.version>

diff --git a/brachyura/src/main/java/io/github/coolcrabs/brachyura/fabric/FabricProject.java b/brachyura/src/main/java/io/github/coolcrabs/brachyura/fabric/FabricProject.java
@@ -88,6 +88,7 @@
 import net.fabricmc.accesswidener.AccessWidenerReader;
 import net.fabricmc.accesswidener.AccessWidenerWriter;
 import net.fabricmc.mappingio.MappingReader;
+import net.fabricmc.mappingio.adapter.MappingSourceNsSwitch;
 import net.fabricmc.mappingio.format.MappingFormat;
 import net.fabricmc.mappingio.format.Tiny2Writer;
 import net.fabricmc.mappingio.tree.MappingTree;
@@ -312,7 +313,7 @@ public boolean build() {
             try (AtomicFile atomicFile = new AtomicFile(target)) {
                 Files.deleteIfExists(atomicFile.tempPath);
                 MemoryMappingTree compmappings = new MemoryMappingTree(true);
-                mappings.get().accept(compmappings);
+                mappings.get().accept(new MappingSourceNsSwitch(compmappings, Namespaces.NAMED)); // Works arround mapping io not merging if a class doesn't have a "src" name
                 if (Files.exists(mixinOut)) MappingReader.read(mixinOut, MappingFormat.TINY, compmappings);
                 TinyRemapper remapper = TinyRemapper.newRemapper()
                     .withMappings(new MappingTreeMappingProvider(compmappings, Namespaces.NAMED, Namespaces.INTERMEDIARY))