Skip to content

Updated VersionUtil #6604

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
GiansCode wants to merge 1 commit into
base: 2.x
Choose a base branch
from
+15 −2
Open

Updated VersionUtil #6604

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: 4 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ private static boolean isSupportedVersion(final BukkitVersion version) {
}

public static final class BukkitVersion implements Comparable<BukkitVersion> {
private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)\\.(\\d+)\\.?([0-9]*)?(?:-snapshot-(\\d+))?(?:-pre-?(\\d+))?(?:-rc-?(\\d+))?(?:\\.build\\.(\\d+)(?:-([a-z]+))?)?(?:-?R?([\\d.]+))?(?:(?:\\.local)?-SNAPSHOT)?");
// Paper/API jars may report a literal "+" build (e.g. "26.2.build.+") when the build number is unresolved.
private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)\\.(\\d+)\\.?([0-9]*)?(?:-snapshot-(\\d+))?(?:-pre-?(\\d+))?(?:-rc-?(\\d+))?(?:\\.build\\.(\\d+|\\+)(?:-([a-z]+))?)?(?:-?R?([\\d.]+))?(?:(?:\\.local)?-SNAPSHOT)?");
private static final Pattern LEGACY_SNAPSHOT_PATTERN = Pattern.compile("^(\\d{2})w(\\d{2})([a-z])(?:-?R?([\\d.]+))?(?:-SNAPSHOT)?");

private final int major;
Expand Down Expand Up @@ -302,7 +303,8 @@ private static BukkitVersion from(final String major, final String minor, String
if (snapshotRelease == null || snapshotRelease.isEmpty()) snapshotRelease = "-1";
if (preRelease == null || preRelease.isEmpty()) preRelease = "-1";
if (releaseCandidate == null || releaseCandidate.isEmpty()) releaseCandidate = "-1";
if (paperBuild == null || paperBuild.isEmpty()) paperBuild = "-1";
// "+" is used by some Paper/API jars when the build number is unresolved (e.g. "26.2.build.+").
if (paperBuild == null || paperBuild.isEmpty() || "+".equals(paperBuild)) paperBuild = "-1";
return new BukkitVersion(Integer.parseInt(major),
Integer.parseInt(minor),
Integer.parseInt(patch),
Expand Down
11 changes: 11 additions & 0 deletions Essentials/src/test/java/com/earth2me/essentials/UtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,5 +457,16 @@ public void testVer() {
.isHigherThan(VersionUtil.BukkitVersion.fromString("26.1-pre-1.build.99-alpha")));
assertTrue(VersionUtil.BukkitVersion.fromString("26.1.build.1-alpha")
.isHigherThan(VersionUtil.BukkitVersion.fromString("26.1-snapshot-99.build.99-alpha")));
// Unresolved Paper/API build placeholder (e.g. ASPaper reports "26.2.build.+")
v = VersionUtil.BukkitVersion.fromString("26.2.build.+");
assertEquals(v.getMajor(), 26);
assertEquals(v.getMinor(), 2);
assertEquals(v.getPatch(), 0);
assertEquals(v.getRevision(), 0.0);
assertEquals(v.getPaperBuild(), -1);
assertNull(v.getReleaseChannel());
assertTrue(v.equalsBaseVersion(VersionUtil.BukkitVersion.fromString("26.2-R0.1-SNAPSHOT")));
assertTrue(VersionUtil.BukkitVersion.fromString("26.2.build.+")
.equalsBaseVersion(VersionUtil.v26_2_R01));
}
}