Skip to content

Version ordering fixes #48

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
0x189D7997 wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Version ordering fixes #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f049d6f
Fix order in getParentVersionIds
0x189D7997 Dec 27, 2025
c7e6753
Exclude 15w14a april fools from mainline
0x189D7997 Dec 27, 2025
bd85dee
Fix NORMAL_SNAPSHOT_PATTERN
0x189D7997 Dec 27, 2025
dcf294a
Filter out alpha servers from Skyrising parent versions
0x189D7997 Dec 28, 2025
d88c119
Fail explicitly if a null parent version is found
0x189D7997 Dec 28, 2025
e7bb92e
Additional types for OrderedVersion
0x189D7997 Dec 28, 2025
ce4d97c
Use correct version for tests
0x189D7997 Dec 28, 2025
5e1a158
Merge branch 'master' into fix-version-ordering
0x189D7997 Dec 29, 2025
e8fcf92
Fix spacing [no ci]
0x189D7997 Dec 29, 2025
1887bda
Fix spacing again [no ci]
0x189D7997 Dec 29, 2025
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
15 changes: 12 additions & 3 deletions ...in/groovy/com/github/winplay02/gitcraft/manifest/skyrising/SkyrisingMetadataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,26 @@ protected boolean isExistingVersionMetadataValid(SkyrisingManifest.VersionEntry
@Override
public List<OrderedVersion> getParentVersions(OrderedVersion mcVersion) {
return this.getVersionDetails(mcVersion.launcherFriendlyVersionName()).previous().stream()
.filter(it -> !isClassicOrAlphaServer(it))
.map(this::getVersionByVersionID)
.filter(Objects::nonNull)
.peek(ver -> {
if (ver == null) {
MiscHelper.panic("One or more of the parent versions were not found for %s", mcVersion.friendlyVersion());
}
})
.toList();
}

private static final Pattern NORMAL_SNAPSHOT_PATTERN = Pattern.compile("(^\\d\\dw\\d\\d[a-z](-\\d+)?$)|(^(1|\\d\\d).\\d+(.\\d+)?(-(pre|rc|snapshot)((-\\d+|\\d+)(-\\d+)?)?|_[a-z_\\-]+snapshot-\\d+| Pre-Release \\d+)?$)");
private static final Pattern NORMAL_SNAPSHOT_PATTERN = Pattern.compile("(^\\d\\dw\\d\\d[a-z](-\\d+)?$)|(^(1|\\d\\d).\\d+(.\\d+)?(-(pre|rc|snapshot)((-\\d+|\\d+)(-\\d+)?)?| Pre-Release \\d+)?$)");

private static boolean isClassicOrAlphaServer(String versionId) {
return versionId.startsWith("server-");
}

@Override
public boolean shouldExclude(OrderedVersion mcVersion) {
// classic and alpha servers don't work well with the version graph right now
return mcVersion.launcherFriendlyVersionName().startsWith("server-");
return isClassicOrAlphaServer(mcVersion.launcherFriendlyVersionName());
}

@Override
Expand Down
46 changes: 24 additions & 22 deletions ...groovy/com/github/winplay02/gitcraft/manifest/vanilla/MojangLauncherMetadataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,14 @@ private String fixupSemver(String proposedSemVer) {
@Override
public List<OrderedVersion> getParentVersions(OrderedVersion mcVersion) {
List<String> parentVersionIds = this.getParentVersionIds(mcVersion.friendlyVersion());
return parentVersionIds == null ? null : parentVersionIds.stream().map(this::getVersionByVersionID).toList();
return parentVersionIds == null ? null : parentVersionIds.stream()
.map(this::getVersionByVersionID)
.peek(ver -> {
if (ver == null) {
MiscHelper.panic("One or more of the parent versions were not found for %s", mcVersion.friendlyVersion());
}
})
.toList();
}

protected List<String> getParentVersionIds(String versionId) {
Expand All @@ -320,22 +327,22 @@ protected List<String> getParentVersionIds(String versionId) {
return List.of("1.14.3-pre4");
}
case "1.14_combat-0" -> {
return List.of("1.14.4", "1.14_combat-212796");
return List.of("1.14_combat-212796", "1.14.4");
}
case "1.14_combat-3" -> {
return List.of("1.14_combat-0");
}
case "1.15_combat-1" -> {
return List.of("1.15-pre3", "1.14_combat-3");
return List.of("1.14_combat-3", "1.15-pre3");
}
case "1.15_combat-6" -> {
return List.of("1.15.2-pre2", "1.15_combat-1");
return List.of("1.15_combat-1", "1.15.2-pre2");
}
case "1.16_combat-0" -> {
return List.of("1.16.2-pre3", "1.15_combat-6");
return List.of("1.15_combat-6", "1.16.2-pre3");
}
case "1.16_combat-1" -> {
return List.of("1.16.2", "1.16_combat-0");
return List.of("1.16_combat-0", "1.16.2");
}
case "1.16_combat-2" -> {
return List.of("1.16_combat-1");
Expand All @@ -354,7 +361,7 @@ protected List<String> getParentVersionIds(String versionId) {
}
// Experimental 1.18
case "1.18_experimental-snapshot-1" -> {
return List.of("1.17.1");
return List.of("1.17.1-pre1");
}
case "1.18_experimental-snapshot-2" -> {
return List.of("1.18_experimental-snapshot-1");
Expand All @@ -381,9 +388,6 @@ protected List<String> getParentVersionIds(String versionId) {
case "1.19_deep_dark_experimental_snapshot-1" -> {
return List.of("1.18.1");
}
case "22w11a" -> {
return List.of("1.18.2", "1.19_deep_dark_experimental_snapshot-1");
}
// Unobfuscated
case "25w45a_unobfuscated" -> {
return List.of("25w44a");
Expand Down Expand Up @@ -435,40 +439,38 @@ protected List<String> getParentVersionIds(String versionId) {
return List.of("20w13b");
}
case "22w13oneblockatatime" -> {
return List.of("22w13a");
}
case "23w13a_or_b" -> {
return List.of("23w13a_or_b_original", "23w13a");
return List.of("1.18.2");
}
case "23w13a_or_b_original" -> {
return List.of("23w13a");
}
case "24w14potato" -> {
return List.of("24w14potato_original", "24w12a");
case "23w13a_or_b" -> {
return List.of("23w13a_or_b_original");
}
case "24w14potato_original" -> {
return List.of("24w12a");
}
case "24w14potato" -> {
return List.of("24w14potato_original");
}
case "25w14craftmine" -> {
return List.of("1.21.5");
}
// Special case to make version graph not contain a cycle
case "1.9.2" -> {
return List.of("1.9.1");
}
default -> {
return null;
}
}
}

private static final Pattern NORMAL_SNAPSHOT_PATTERN = Pattern.compile("(^\\d\\dw\\d\\d[a-z]$)|(^(1|\\d\\d).\\d+(.\\d+)?(-(pre|rc|snapshot-)\\d+|_[a-z_\\-]+snapshot-\\d+| Pre-Release \\d+)?$)");
private static final Pattern NORMAL_SNAPSHOT_PATTERN = Pattern.compile("(^\\d\\dw\\d\\d[a-z]$)|(^(1|\\d\\d).\\d+(.\\d+)?(-(pre|rc|snapshot-)\\d+| Pre-Release \\d+)?$)");

@Override
public boolean shouldExcludeFromMainBranch(OrderedVersion mcVersion) {
return super.shouldExcludeFromMainBranch(mcVersion)
// filter out april fools snapshots and experimental versions,
// which often have typical ids that do not match normal snapshots
|| (mcVersion.isSnapshotOrPending() && !NORMAL_SNAPSHOT_PATTERN.matcher(mcVersion.launcherFriendlyVersionName()).matches());
|| (mcVersion.isSnapshotOrPending() && !NORMAL_SNAPSHOT_PATTERN.matcher(mcVersion.launcherFriendlyVersionName()).matches())
// Exclude april fools that looks like regular snapshot
|| Objects.equals(mcVersion.launcherFriendlyVersionName(), "15w14a");
}
}
25 changes: 24 additions & 1 deletion src/main/groovy/com/github/winplay02/gitcraft/types/OrderedVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,20 @@ public int javaVersion() {

private static final Pattern UNOBFUSCATED_SNAPSHOT_PATTERN = Pattern.compile("^((\\d\\dw\\d\\d[a-z])|(1.\\d+(.\\d+)?-(pre|rc)\\d+))(_unobfuscated|-unobf)$");

// Found in all manifests
public boolean isSnapshot() {
return Objects.equals(this.versionInfo().type(), "snapshot")
// special case required because the manifest for experimental unobfuscated versions
// does not specify their snapshot status and always uses 'unobfuscated' as version type
|| (this.isUnobfuscated() && UNOBFUSCATED_SNAPSHOT_PATTERN.matcher(this.versionInfo().id()).matches());
}

// Can be found in Mojang and Skyrising manifests
public boolean isPending() {
return Objects.equals(this.versionInfo().type(), "pending");
}

// Mojang and Skyrising
/**
* This method is <i>specifically</i> for checking if this is an <i>experimental</i> <c>"unobfuscated"</c> version.
* To determine whether this version has no obfuscation use {@link OrderedVersion#isNotObfuscated()}.
Expand All @@ -136,7 +139,27 @@ public boolean isUnobfuscated() {
|| (this.isSpecial() && this.versionInfo().id().endsWith("-unobf"));
}

// Can be found in Omniarchive manifest
// Mojang and Skyrising
public boolean isOldBeta() {
return Objects.equals(this.versionInfo().type(), "old_beta");
}

// Mojang and Skyrising
public boolean isOldAlpha() {
return Objects.equals(this.versionInfo().type(), "old_alpha");
}

// Skyrising
public boolean isAlphaServer() {
return Objects.equals(this.versionInfo().type(), "alpha_server");
}

// Skyrising
public boolean isClassicServer() {
return Objects.equals(this.versionInfo().type(), "classic_server");
}

// Omniarchive
public boolean isSpecial() {
return Objects.equals(this.versionInfo().type(), "special");
}
Expand Down
12 changes: 6 additions & 6 deletions src/test/groovy/com/github/winplay02/gitcraft/GitCraftTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ public void pipeline() throws Exception {
}
Configuration.reset();
//
GitCraft.main(new String[]{"--only-version=1.17.1,1.18_experimental-snapshot-1,21w37a,1.18,22w13oneblockatatime,25w45a_unobfuscated,1.21.11,26.1-snapshot-1"});
GitCraft.main(new String[]{"--only-version=1.17.1-pre1,1.18_experimental-snapshot-1,21w37a,1.18,22w13oneblockatatime,25w45a_unobfuscated,1.21.11,26.1-snapshot-1"});
try (RepoWrapper repoWrapper = GitCraft.getRepository()) {
assertNotNull(repoWrapper);
assertNotNull(repoWrapper.getGit().getRepository().getRefDatabase().findRef(GitCraft.getRepositoryConfiguration().gitMainlineLinearBranch()));
Expand All @@ -336,8 +336,8 @@ public void pipeline() throws Exception {
assertEquals(1, Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.18"))).getParentCount());
assertEquals(2, Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("21w37a"))).getParentCount());
assertEquals(1, Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.18_experimental-snapshot-1"))).getParentCount());
assertEquals(0, Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.17.1"))).getParentCount());
RevCommit targetCommit = Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.17.1")));
assertEquals(0, Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.17.1-pre1"))).getParentCount());
RevCommit targetCommit = Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.17.1-pre1")));
try (TreeWalk walk = TreeWalk.forPath(repoWrapper.getGit().getRepository(), "minecraft/resources/assets", targetCommit.getTree())) { //
assertNotNull(walk);
}
Expand Down Expand Up @@ -520,7 +520,7 @@ public void pipelineOldSnapshotSkyrisingOrnithe() throws Exception {
@Test
public void pipelineReset() throws Exception {
Configuration.reset();
GitCraft.main(new String[]{"--only-version=1.17.1,1.18_experimental-snapshot-1,21w37a,1.18,22w13oneblockatatime,25w45a_unobfuscated,1.21.11,26.1-snapshot-1", "--refresh", "--refresh-min-version=1.18"});
GitCraft.main(new String[]{"--only-version=1.17.1-pre1,1.18_experimental-snapshot-1,21w37a,1.18,22w13oneblockatatime,25w45a_unobfuscated,1.21.11,26.1-snapshot-1", "--refresh", "--refresh-min-version=1.18"});
try (RepoWrapper repoWrapper = GitCraft.getRepository()) {
assertNotNull(repoWrapper);
assertNotNull(repoWrapper.getGit().getRepository().getRefDatabase().findRef(GitCraft.getRepositoryConfiguration().gitMainlineLinearBranch()));
Expand All @@ -532,8 +532,8 @@ public void pipelineReset() throws Exception {
assertEquals(1, Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.18"))).getParentCount());
assertEquals(2, Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("21w37a"))).getParentCount());
assertEquals(1, Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.18_experimental-snapshot-1"))).getParentCount());
assertEquals(0, Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.17.1"))).getParentCount());
RevCommit targetCommit = Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.17.1")));
assertEquals(0, Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.17.1-pre1"))).getParentCount());
RevCommit targetCommit = Objects.requireNonNull(findCommit(repoWrapper, GitCraft.versionGraph.getMinecraftVersionByName("1.17.1-pre1")));
try (TreeWalk walk = TreeWalk.forPath(repoWrapper.getGit().getRepository(), "minecraft/resources/assets", targetCommit.getTree())) { //
assertNotNull(walk);
}
Expand Down