Merge pull request FabricMC#2 from zml2008/fix/next-inheritance

fix mappings propogation from merge

Author: shedaniel

src/main/java/net/fabricmc/tinyremapper/TinyRemapper.java

@@ -877,15 +877,15 @@ private void mergeInput(MrjState state) {
 				.collect(Collectors.toList())) {
 			assert node.getSuperName() != null;
 
-			ClassInstance parent = state.classes.get(node.getSuperName());
+			ClassInstance parent = state.getClass(node.getSuperName());
 
 			if (parent != null) {
 				node.parents.add(parent);
 				parent.children.add(node);
 			}
 
-			for (ClassInstance interfaceInstance : node.getInterfaces()) {
-				parent = interfaceInstance;
+			for (String iface : node.getInterfaceNames0()) {
+				parent = state.getClass(iface);
 
 				if (parent != null) {
 					node.parents.add(parent);
@@ -1235,6 +1235,9 @@ private void refresh() {
 
 		_prepareClasses();
 		loadMappings(!cacheMappings);
+
+		assert dirty;
+		dirty = false;
 	}
 
 	private void mrjRefresh(MrjState state) {