From cc05052fcb84fa692ea64dcdb7438bb54ec41006 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Sun, 7 Apr 2019 22:39:08 +0200 Subject: [PATCH] tweak mixin json findin heuristic --- .../net/fabricmc/loom/util/MixinRefmapHelper.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/util/MixinRefmapHelper.java b/src/main/java/net/fabricmc/loom/util/MixinRefmapHelper.java index c503857..f351349 100644 --- a/src/main/java/net/fabricmc/loom/util/MixinRefmapHelper.java +++ b/src/main/java/net/fabricmc/loom/util/MixinRefmapHelper.java @@ -86,9 +86,16 @@ public final class MixinRefmapHelper { InputStreamReader inputStreamReader = new InputStreamReader(stream); try { JsonObject json = GSON.fromJson(inputStreamReader, JsonObject.class); - if (json != null && json.has("mixins") && json.get("mixins").isJsonArray()) { - if (!onlyWithoutRefmap || !json.has("refmap") || !json.has("minVersion")) { - mixinFilename.add(entry.getName()); + + if (json != null) { + boolean hasMixins = json.has("mixins") && json.get("mixins").isJsonArray(); + boolean hasClient = json.has("client") && json.get("client").isJsonArray(); + boolean hasServer = json.has("server") && json.get("server").isJsonArray(); + + if (json.has("package") && (hasMixins || hasClient || hasServer)) { + if (!onlyWithoutRefmap || !json.has("refmap") || !json.has("minVersion")) { + mixinFilename.add(entry.getName()); + } } } } catch (Exception e) {