From 99235bcba97b4284a4e785371d208d1160675cf2 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sun, 24 Apr 2022 19:37:06 +0300 Subject: [PATCH] Fix code style --- .../loom/configuration/accesswidener/AccessWidenerFile.java | 2 ++ .../processors/dependency/ModDependencyInfo.java | 6 ++++-- src/main/java/net/fabricmc/loom/task/RemapJarTask.java | 1 + .../fabricmc/loom/task/launch/GenerateDLIConfigTask.java | 2 +- src/main/java/net/fabricmc/loom/util/ModPlatform.java | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java b/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java index 6a243627..31ebc2dc 100644 --- a/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java +++ b/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java @@ -109,9 +109,11 @@ public record AccessWidenerFile( if (jsonObject.has("access_widener")) { if (jsonObject.get("access_widener").isJsonArray()) { JsonArray array = jsonObject.get("access_widener").getAsJsonArray(); + if (array.size() != 1) { throw new UnsupportedOperationException("Loom does not support multiple access wideners in one mod!"); } + awPath = array.get(0).getAsString(); } else { awPath = jsonObject.get("access_widener").getAsString(); diff --git a/src/main/java/net/fabricmc/loom/configuration/processors/dependency/ModDependencyInfo.java b/src/main/java/net/fabricmc/loom/configuration/processors/dependency/ModDependencyInfo.java index f96de92b..7108f65c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/processors/dependency/ModDependencyInfo.java +++ b/src/main/java/net/fabricmc/loom/configuration/processors/dependency/ModDependencyInfo.java @@ -219,17 +219,19 @@ public class ModDependencyInfo { } String accessWidenerPath; - + if (fieldName.equals("access_widener") && jsonObject.get(fieldName).isJsonArray()) { JsonArray array = jsonObject.get(fieldName).getAsJsonArray(); + if (array.size() != 1) { throw new UnsupportedOperationException("Loom does not support multiple access wideners in one mod!"); } + accessWidenerPath = array.get(0).getAsString(); } else { accessWidenerPath = jsonObject.get(fieldName).getAsString(); } - + byte[] accessWidener = ZipUtils.unpack(inputJar, accessWidenerPath); AccessWidenerReader.Header header = AccessWidenerReader.readHeader(accessWidener); diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java index f6756f9a..e4f1630c 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java @@ -253,6 +253,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask { if (allMixinConfigs == null && getReadMixinConfigsFromManifest().get()) { allMixinConfigs = readMixinConfigsFromManifest(); } + if (allMixinConfigs == null) { if (extension.getPlatform().get() == ModPlatform.QUILT) { getProject().getLogger().warn("Could not find quilt.mod.json file in: " + getInputFile().getAsFile().get().getName()); diff --git a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java index 28fdac41..51f66a1a 100644 --- a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java +++ b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java @@ -65,7 +65,7 @@ public abstract class GenerateDLIConfigTask extends AbstractLoomTask { .argument("client", "--assetsDir") .argument("client", new File(getExtension().getFiles().getUserCache(), "assets").getAbsolutePath()); } - + if (getExtension().isQuilt()) { launchConfig .argument("client", "--version") diff --git a/src/main/java/net/fabricmc/loom/util/ModPlatform.java b/src/main/java/net/fabricmc/loom/util/ModPlatform.java index 856ff465..2b1a196a 100644 --- a/src/main/java/net/fabricmc/loom/util/ModPlatform.java +++ b/src/main/java/net/fabricmc/loom/util/ModPlatform.java @@ -37,7 +37,7 @@ public enum ModPlatform { FABRIC(false), FORGE(false), QUILT(true); - + boolean experimental; ModPlatform(boolean experimental) {