Merge remote-tracking branch 'remotes/origin/dev/0.2' into dev/0.2.1

dev/0.11
modmuss50 2019-04-07 20:44:10 +01:00
commit 36750634eb
1 changed files with 10 additions and 3 deletions

View File

@ -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) {