Fix mod addition feature not recognizing Quilt mods (#789)

- Fix drag-n-drop not supporting Quilt mods
TerraformersMC · Oct 14, 2024 · fcca915 · fcca915
1 parent 54c9ef0
commit fcca915
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/com/terraformersmc/modmenu/gui/ModsScreen.java b/src/main/java/com/terraformersmc/modmenu/gui/ModsScreen.java
@@ -600,7 +600,7 @@ public void filesDragged(List<Path> paths) {
 		Path modsDirectory = FabricLoader.getInstance().getGameDir().resolve("mods");
 
 		// Filter out none mods
-		List<Path> mods = paths.stream().filter(ModsScreen::isFabricMod).collect(Collectors.toList());
+		List<Path> mods = paths.stream().filter(ModsScreen::isValidMod).collect(Collectors.toList());
 
 		if (mods.isEmpty()) {
 			return;
@@ -638,9 +638,15 @@ public void filesDragged(List<Path> paths) {
 		}, ModMenuScreenTexts.DROP_CONFIRM, Text.literal(modList)));
 	}
 
-	private static boolean isFabricMod(Path mod) {
+	private static boolean isValidMod(Path mod) {
 		try (JarFile jarFile = new JarFile(mod.toFile())) {
-			return jarFile.getEntry("fabric.mod.json") != null;
+			var isFabricMod = jarFile.getEntry("fabric.mod.json") != null;
+
+			if (!ModMenu.RUNNING_QUILT) {
+				return isFabricMod;
+			} else {
+				return isFabricMod || jarFile.getEntry("quilt.mod.json") != null;
+			}
 		} catch (IOException e) {
 			return false;
 		}