Skip to content

fix: support two-component Minecraft versions #6621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Big-Iron-Cheems merged 1 commit into from
Aug 29, 2026
+6 −6
Merged

fix: support two-component Minecraft versions #6621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/main/java/meteordevelopment/meteorclient/MeteorClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@

import java.io.File;
import java.lang.invoke.MethodHandles;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

public class MeteorClient implements ClientModInitializer {
public static final String MOD_ID = "meteor-client";
Expand All @@ -71,9 +69,9 @@ public class MeteorClient implements ClientModInitializer {
LOG = LoggerFactory.getLogger(NAME);

String versionString = MOD_META.getVersion().getFriendlyString();
Matcher matcher = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)").matcher(versionString);
if (versionString.contains("-")) versionString = versionString.split("-")[0];
// When building and running through IntelliJ and not Gradle it doesn't replace the version so just use a dummy
versionString = !matcher.find() ? "0.0.0" : "%s.%s.%s".formatted(matcher.group(1), matcher.group(2), matcher.group(3));
if (versionString.equals("${version}")) versionString = "0.0.0";

VERSION = new Version(versionString);
BUILD_NUMBER = MOD_META.getCustomValue(MeteorClient.MOD_ID + ":build_number").getAsString();
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/meteordevelopment/meteorclient/utils/misc/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ public Version(String string) {
this.numbers = new int[3];

String[] split = string.split("\\.");
if (split.length != 3) throw new IllegalArgumentException("Version string needs to have 3 numbers.");
if (split.length < 2 || split.length > 3) {
throw new IllegalArgumentException("Version string needs to have 2 or 3 numbers.");
}

for (int i = 0; i < 3; i++) {
for (int i = 0; i < split.length; i++) {
try {
numbers[i] = Integer.parseInt(split[i]);
} catch (NumberFormatException _) {
Expand Down
Loading