Skip to content

Fix version normalization for Minecraft classic #1041

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −2
Open

Fix version normalization for Minecraft classic #1041

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
18 changes: 16 additions & 2 deletions minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/McVersionLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ public final class McVersionLookup {
private static final Pattern BETA_PATTERN = Pattern.compile("(?:b|Beta v?)1\\.(\\d+(\\.\\d+)?[a-z]?(_\\d+)?[a-z]?)");
private static final Pattern ALPHA_PATTERN = Pattern.compile("(?:a|Alpha v?)[01]\\.(\\d+(\\.\\d+)?[a-z]?(_\\d+)?[a-z]?)");
private static final Pattern INDEV_PATTERN = Pattern.compile("(?:inf?-|Inf?dev )(?:0\\.31 )?(\\d+(-\\d+)?)");
private static final Pattern EARLY_CLASSIC_PATTERN = Pattern.compile("(?:c?0\\.)(0\\.\\d\\d?)a(?:_(\\d\\d))?");
private static final Pattern LATE_CLASSIC_PATTERN = Pattern.compile("(?:c?)(0\\.\\d\\d?)(?:_(\\d\\d))?(?:_st)?(?:_(\\d\\d))?(?:\\-[a-zA-Z]+)*");
private static final String STRING_DESC = "Ljava/lang/String;";

public static McVersion getVersion(List<Path> gameJars, String entrypointClass, String versionName) {
Expand Down Expand Up @@ -465,8 +467,20 @@ private static String normalizeVersion(String version) {
version = "1.0.0-alpha." + matcher.group(1);
} else if ((matcher = INDEV_PATTERN.matcher(version)).matches()) { // indev/infdev 12345678: 0.31.12345678
version = "0.31." + matcher.group(1);
} else if (version.startsWith("c0.")) { // classic: unchanged, except remove prefix
version = version.substring(1);
} else if ((matcher = EARLY_CLASSIC_PATTERN.matcher(version)).matches()) { // early classic c0.0.13a_03: 0.13.3
if ((version = matcher.group(2)) != null) { // try get patch number
while (version.charAt(0) == '0') version = version.substring(1); // remove leading 0s for patch number
version = matcher.group(1) + "." + version;
} else {
version = matcher.group(1) + ".0";
}
} else if ((matcher = LATE_CLASSIC_PATTERN.matcher(version)).matches()) { // late classic c0.24_st_03: 0.24.3
if ((version = matcher.group(2)) != null || (version = matcher.group(3)) != null) { // try get patch number before and after _st
while (version.charAt(0) == '0') version = version.substring(1); // remove leading 0s for patch number
version = matcher.group(1) + "." + version;
} else {
version = matcher.group(1) + ".0";
}
} else if (version.startsWith("rd-")) { // pre-classic
version = version.substring("rd-".length());
if ("20090515".equals(version)) version = "150000"; // account for a weird exception to the pre-classic versioning scheme
Expand Down