diff options
author | modmuss50 <modmuss50@gmail.com> | 2021-11-11 18:28:15 +0000 |
---|---|---|
committer | modmuss50 <modmuss50@gmail.com> | 2021-11-11 18:28:15 +0000 |
commit | 2994c2d4883b4740ed0e86a82c00843b65708baa (patch) | |
tree | c5e9bdaaf77d2745857b62a0e117051071aa0eab /src/main/java | |
parent | e2b4bc89858d4796ac48e0b7692e95fe3d9ed5f1 (diff) | |
download | architectury-loom-2994c2d4883b4740ed0e86a82c00843b65708baa.tar.gz architectury-loom-2994c2d4883b4740ed0e86a82c00843b65708baa.tar.bz2 architectury-loom-2994c2d4883b4740ed0e86a82c00843b65708baa.zip |
Fix for 1.18-pre1 server bundler.
In the bundler its called 1.18 Pre-release 1 not 1.18-pre1, so we just assume there is only ever going to be 1 version per jar.
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java b/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java index 466543b1..4cda3be7 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java @@ -281,8 +281,13 @@ public class MinecraftProviderImpl extends DependencyProvider implements Minecra } String jarPath = null; + String[] versions = versionsList.split("\n"); - for (String version : versionsList.split("\n")) { + if (versions.length != 1) { + throw new UnsupportedOperationException("Expected only 1 version in META-INF/versions.list, but got %d".formatted(versions.length)); + } + + for (String version : versions) { if (version.isBlank()) continue; String[] split = version.split("\t"); @@ -293,10 +298,9 @@ public class MinecraftProviderImpl extends DependencyProvider implements Minecra final String id = split[1]; final String path = split[2]; - if (minecraftVersion().equals(id)) { - jarPath = path; - break; - } + // Take the first (only) version we find. + jarPath = path; + break; } Objects.requireNonNull(jarPath, "Could not find minecraft server jar for " + minecraftVersion()); |