From 2df553a4cbba0ae17e49e9f15f844b4a2ca3cb5f Mon Sep 17 00:00:00 2001
From: NinjaPhenix <5214513+NinjaPhenix@users.noreply.github.com>
Date: Sun, 24 Apr 2022 13:41:45 +0100
Subject: [PATCH] Some minor bug fixes for iface injection & refmaps in mixins
 for quilt. (#81)

---
 .../configuration/ifaceinject/InterfaceInjectionProcessor.java | 2 +-
 src/main/java/net/fabricmc/loom/task/RemapJarTask.java         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java b/src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java
index 2ada1000..6ebad08a 100644
--- a/src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java
+++ b/src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java
@@ -230,7 +230,7 @@ public class InterfaceInjectionProcessor implements JarProcessor, GenerateSource
 
 				try {
 					quiltModJson = sourceSet.getResources()
-							.matching(patternFilterable -> patternFilterable.include("quilt.mods.json"))
+							.matching(patternFilterable -> patternFilterable.include("quilt.mod.json"))
 							.getSingleFile();
 
 					final String jsonString;
diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
index acbefec0..f6756f9a 100644
--- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
@@ -252,7 +252,8 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
 
 			if (allMixinConfigs == null && getReadMixinConfigsFromManifest().get()) {
 				allMixinConfigs = readMixinConfigsFromManifest();
-			} else {
+			}
+			if (allMixinConfigs == null) {
 				if (extension.getPlatform().get() == ModPlatform.QUILT) {
 					getProject().getLogger().warn("Could not find quilt.mod.json file in: " + getInputFile().getAsFile().get().getName());
 					return;