diff options
| author | Jonas Herzig <jonas@spark-squared.com> | 2022-01-06 13:52:59 +0100 |
|---|---|---|
| committer | Jonas Herzig <jonas@spark-squared.com> | 2022-01-06 13:52:59 +0100 |
| commit | ea44973702d6f26d4095ec7d7622506ad473f78c (patch) | |
| tree | e41047a4516c9f022c4fb3554f4d856a99915262 /src/main/java | |
| parent | b2b0221cb1c0dd539e3009efeb76ccee331ab26b (diff) | |
| download | architectury-loom-ea44973702d6f26d4095ec7d7622506ad473f78c.tar.gz architectury-loom-ea44973702d6f26d4095ec7d7622506ad473f78c.tar.bz2 architectury-loom-ea44973702d6f26d4095ec7d7622506ad473f78c.zip | |
Simplify `MinecraftPatchedProvider.getGlobalCaches()`
Way easier to read than the previous array-copy implementation and trivial to
extend when more file are optional (see next commit).
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java index fadf7d33..9313fcee 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java @@ -223,14 +223,9 @@ public class MinecraftPatchedProvider extends DependencyProvider { minecraftServerPatchedSrgJar, minecraftMergedPatchedSrgJar, minecraftClientExtra, + forgeMergedJar }; - - if (forgeMergedJar != null) { - Arrays.copyOf(files, files.length + 1); - files[files.length - 1] = forgeMergedJar; - } - - return files; + return Arrays.stream(files).filter(Objects::nonNull).toArray(File[]::new); } public void cleanProjectCache() { |