Only remap mods that have an original namespace that's different to the target namespace.

Superseeds #483

Author: AlexIIL

gradle.properties

@@ -5,7 +5,7 @@ group = org.quiltmc
 description = The mod loading component of Quilt
 url = https://github.com/quiltmc/quilt-loader
 # Don't forget to change this in QuiltLoaderImpl as well
-quilt_loader = 0.30.0-beta.2
+quilt_loader = 0.30.0-beta.3
 
 # Fabric & Quilt Libraries
 asm = 9.9

src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java

@@ -131,7 +131,7 @@ public final class QuiltLoaderImpl {
 
 	public static final int ASM_VERSION = Opcodes.ASM9;
 
-	public static final String VERSION = "0.30.0-beta.2";
+	public static final String VERSION = "0.30.0-beta.3";
 	public static final String MOD_ID = "quilt_loader";
 	public static final String DEFAULT_MODS_DIR = "mods";
 	public static final String DEFAULT_CACHE_DIR = ".cache";

src/main/java/org/quiltmc/loader/impl/transformer/RuntimeModRemapper.java

@@ -87,20 +87,22 @@ final class RuntimeModRemapper {
 			return;
 		}
 
-		boolean mojmapEnvironment = "mojang".equals(mappingConfiguration.getTargetNamespace());
+		String targetNamespace = mappingConfiguration.getTargetNamespace();
+		boolean mojmapEnvironment = "mojang".equals(targetNamespace);
 
 		for (ModLoadOption mod : mods) {
 			String namespace = mod.namespaceMappingFrom();
+			if (namespace == null || namespace.equals(targetNamespace)) {
+				continue;
+			}
 			if ("mojang".equals(namespace)) {
 				if (mojmapEnvironment) {
 					break;
 				}
 
 				throw new UnsupportedOperationException("Cannot remap mojang mods to another environment!");
 			}
-			if (namespace != null) {
-				modsToRemap.add(mod);
-			}
+			modsToRemap.add(mod);
 		}
 	}