Skip to content

Minecraft 26.1 #6473

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
JRoy merged 5 commits into from
Mar 23, 2026
+100 −21
Merged

Minecraft 26.1 #6473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9eda84e
Support new MC version scheme
JRoy Mar 23, 2026
0038e97
Minecraft 26.1 Items
JRoy Mar 23, 2026
09b62d4
update readme
JRoy Mar 23, 2026
c7ffece
test
JRoy Mar 23, 2026
e50bfc4
rename
JRoy Mar 23, 2026
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
59 changes: 40 additions & 19 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 @@ -46,8 +46,9 @@ public final class VersionUtil {
public static final BukkitVersion v1_21_5_R01 = BukkitVersion.fromString("1.21.5-R0.1-SNAPSHOT");
public static final BukkitVersion v1_21_8_R01 = BukkitVersion.fromString("1.21.8-R0.1-SNAPSHOT");
public static final BukkitVersion v1_21_11_R01 = BukkitVersion.fromString("1.21.11-R0.1-SNAPSHOT");
public static final BukkitVersion v26_1_R01 = BukkitVersion.fromString("26.1-R0.1-SNAPSHOT");

private static final Set<BukkitVersion> supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01, v1_16_5_R01, v1_17_1_R01, v1_18_2_R01, v1_19_4_R01, v1_20_6_R01, v1_21_11_R01);
private static final Set<BukkitVersion> supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01, v1_16_5_R01, v1_17_1_R01, v1_18_2_R01, v1_19_4_R01, v1_20_6_R01, v1_21_11_R01, v26_1_R01);

public static final boolean PRE_FLATTENING = VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01);

Expand Down Expand Up @@ -189,11 +190,12 @@ public static String getSupportStatusClass() {
}

public static final class BukkitVersion implements Comparable<BukkitVersion> {
private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)\\.(\\d+)\\.?([0-9]*)?(?:-pre(\\d))?(?:-rc(\\d+))?(?:-?R?([\\d.]+))?(?:-SNAPSHOT)?");
private static final Pattern SNAPSHOT_PATTERN = Pattern.compile("^(\\d{2})w(\\d{2})([a-z])(?:-?R?([\\d.]+))?(?:-SNAPSHOT)?");
private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)\\.(\\d+)\\.?([0-9]*)?(?:-snapshot-(\\d+))?(?:-pre-?(\\d+))?(?:-rc-?(\\d+))?(?:-?R?([\\d.]+))?(?:-SNAPSHOT)?");
private static final Pattern LEGACY_SNAPSHOT_PATTERN = Pattern.compile("^(\\d{2})w(\\d{2})([a-z])(?:-?R?([\\d.]+))?(?:-SNAPSHOT)?");

private final int major;
private final int minor;
private final int snapshotRelease;
private final int preRelease;
private final int releaseCandidate;
private final int patch;
Expand All @@ -204,11 +206,12 @@ public static final class BukkitVersion implements Comparable<BukkitVersion> {
private final int snapshotWeek;
private final char snapshotLetter;

private BukkitVersion(final int major, final int minor, final int patch, final double revision, final int preRelease, final int releaseCandidate) {
private BukkitVersion(final int major, final int minor, final int patch, final double revision, final int snapshotRelease, final int preRelease, final int releaseCandidate) {
this.major = major;
this.minor = minor;
this.patch = patch;
this.revision = revision;
this.snapshotRelease = snapshotRelease;
this.preRelease = preRelease;
this.releaseCandidate = releaseCandidate;
this.snapshot = false;
Expand All @@ -217,12 +220,13 @@ private BukkitVersion(final int major, final int minor, final int patch, final d
this.snapshotLetter = '\0';
}

private BukkitVersion(final int major, final int minor, final int patch, final double revision, final int preRelease, final int releaseCandidate,
private BukkitVersion(final int major, final int minor, final int patch, final double revision, final int snapshotRelease, final int preRelease, final int releaseCandidate,
final boolean snapshot, final int snapshotYear, final int snapshotWeek, final char snapshotLetter) {
this.major = major;
this.minor = minor;
this.patch = patch;
this.revision = revision;
this.snapshotRelease = snapshotRelease;
this.preRelease = preRelease;
this.releaseCandidate = releaseCandidate;
this.snapshot = snapshot;
Expand All @@ -237,11 +241,11 @@ public static BukkitVersion fromString(final String string) {
// Try standard release format first
Matcher matcher = VERSION_PATTERN.matcher(string);
if (matcher.matches()) {
return from(matcher.group(1), matcher.group(2), matcher.group(3), matcher.group(6), matcher.group(4), matcher.group(5));
return from(matcher.group(1), matcher.group(2), matcher.group(3), matcher.group(7), matcher.group(4), matcher.group(5), matcher.group(6));
}

// Try snapshot format (e.g., 25w32a-R0.1-SNAPSHOT)
final Matcher snapshotMatcher = SNAPSHOT_PATTERN.matcher(string);
final Matcher snapshotMatcher = LEGACY_SNAPSHOT_PATTERN.matcher(string);
if (snapshotMatcher.matches()) {
final int year = Integer.parseInt(snapshotMatcher.group(1));
final int week = Integer.parseInt(snapshotMatcher.group(2));
Expand All @@ -259,24 +263,26 @@ public static BukkitVersion fromString(final String string) {
}
matcher = VERSION_PATTERN.matcher(v1_16_1_R01.toString());
Preconditions.checkArgument(matcher.matches(), string + " is not in valid version format. e.g. 1.8.8-R0.1");
return from(matcher.group(1), matcher.group(2), matcher.group(3), matcher.group(6), matcher.group(4), matcher.group(5));
return from(matcher.group(1), matcher.group(2), matcher.group(3), matcher.group(7), matcher.group(4), matcher.group(5), matcher.group(6));
}

private static BukkitVersion from(final String major, final String minor, String patch, String revision, String preRelease, String releaseCandidate) {
private static BukkitVersion from(final String major, final String minor, String patch, String revision, String snapshotRelease, String preRelease, String releaseCandidate) {
if (patch == null || patch.isEmpty()) patch = "0";
if (revision == null || revision.isEmpty()) revision = "0";
if (snapshotRelease == null || snapshotRelease.isEmpty()) snapshotRelease = "-1";
if (preRelease == null || preRelease.isEmpty()) preRelease = "-1";
if (releaseCandidate == null || releaseCandidate.isEmpty()) releaseCandidate = "-1";
return new BukkitVersion(Integer.parseInt(major),
Integer.parseInt(minor),
Integer.parseInt(patch),
Double.parseDouble(revision),
Integer.parseInt(snapshotRelease),
Integer.parseInt(preRelease),
Integer.parseInt(releaseCandidate));
}

private static BukkitVersion fromSnapshot(final int year, final int week, final char letter, final double revision) {
return new BukkitVersion(-1, -1, -1, revision, -1, -1, true, year, week, letter);
return new BukkitVersion(-1, -1, -1, revision, -1, -1, -1, true, year, week, letter);
}

public boolean isHigherThan(final BukkitVersion o) {
Expand Down Expand Up @@ -319,6 +325,10 @@ public int getReleaseCandidate() {
return releaseCandidate;
}

public int getSnapshotRelease() {
return snapshotRelease;
}

public boolean isSnapshot() {
return snapshot;
}
Expand All @@ -343,15 +353,17 @@ public boolean equals(final Object o) {
minor == that.minor &&
patch == that.patch &&
revision == that.revision &&
preRelease == that.preRelease;
snapshotRelease == that.snapshotRelease &&
preRelease == that.preRelease &&
releaseCandidate == that.releaseCandidate;
}

@Override
public int hashCode() {
if (snapshot) {
return Objects.hashCode("snapshot", snapshotYear, snapshotWeek, snapshotLetter, revision);
}
return Objects.hashCode(major, minor, patch, revision, preRelease, releaseCandidate);
return Objects.hashCode(major, minor, patch, revision, snapshotRelease, preRelease, releaseCandidate);
}

@Override
Expand All @@ -363,6 +375,9 @@ public String toString() {
if (patch != 0) {
sb.append(".").append(patch);
}
if (snapshotRelease != -1) {
sb.append("-snapshot-").append(snapshotRelease);
}
if (preRelease != -1) {
sb.append("-pre").append(preRelease);
}
Expand Down Expand Up @@ -407,17 +422,23 @@ public int compareTo(final BukkitVersion o) {
} else if (patch > o.patch) {
return 1;
} else { // equal patch
if (preRelease < o.preRelease) {
if (snapshotRelease < o.snapshotRelease) {
return -1;
} else if (preRelease > o.preRelease) {
} else if (snapshotRelease > o.snapshotRelease) {
return 1;
} else { // equal prerelease
if (releaseCandidate < o.releaseCandidate) {
} else { // equal snapshot release
if (preRelease < o.preRelease) {
return -1;
} else if (releaseCandidate > o.releaseCandidate) {
} else if (preRelease > o.preRelease) {
return 1;
} else { // equal release candidate
return Double.compare(revision, o.revision);
} else { // equal prerelease
if (releaseCandidate < o.releaseCandidate) {
return -1;
} else if (releaseCandidate > o.releaseCandidate) {
return 1;
} else { // equal release candidate
return Double.compare(revision, o.revision);
}
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion Essentials/src/main/resources/items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8620,6 +8620,12 @@
"gshirt": "golden_chestplate",
"gtunic": "golden_chestplate",
"minecraft:golden_chestplate": "golden_chestplate",
"golden_dandelion": {
"name": "golden_dandelion",
"material": "GOLDEN_DANDELION"
},
"goldendandelion": "golden_dandelion",
"minecraft:golden_dandelion": "golden_dandelion",
"golden_helmet": {
"material": "GOLDEN_HELMET"
},
Expand Down Expand Up @@ -50980,4 +50986,4 @@
"zpmanmonsterspawner": "zombified_piglin_spawner",
"zpmanmspawner": "zombified_piglin_spawner",
"zpmanspawner": "zombified_piglin_spawner"
}
}
52 changes: 52 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 @@ -249,5 +249,57 @@ public void testVer() {
assertEquals(v.getRevision(), 0.1);
assertEquals(v.getPrerelease(), -1);
assertEquals(v.getReleaseCandidate(), 3);
// New versioning format (26.x)
v = VersionUtil.BukkitVersion.fromString("26.1-R0.1-SNAPSHOT");
assertEquals(v.getMajor(), 26);
assertEquals(v.getMinor(), 1);
assertEquals(v.getPatch(), 0);
assertEquals(v.getRevision(), 0.1);
assertEquals(v.getSnapshotRelease(), -1);
assertEquals(v.getPrerelease(), -1);
assertEquals(v.getReleaseCandidate(), -1);
v = VersionUtil.BukkitVersion.fromString("26.1.1-R0.1-SNAPSHOT");
assertEquals(v.getMajor(), 26);
assertEquals(v.getMinor(), 1);
assertEquals(v.getPatch(), 1);
assertEquals(v.getRevision(), 0.1);
assertEquals(v.getSnapshotRelease(), -1);
assertEquals(v.getPrerelease(), -1);
assertEquals(v.getReleaseCandidate(), -1);
v = VersionUtil.BukkitVersion.fromString("26.1-snapshot-11-R0.1-SNAPSHOT");
assertEquals(v.getMajor(), 26);
assertEquals(v.getMinor(), 1);
assertEquals(v.getPatch(), 0);
assertEquals(v.getRevision(), 0.1);
assertEquals(v.getSnapshotRelease(), 11);
assertEquals(v.getPrerelease(), -1);
assertEquals(v.getReleaseCandidate(), -1);
v = VersionUtil.BukkitVersion.fromString("26.1-pre-3-R0.1-SNAPSHOT");
assertEquals(v.getMajor(), 26);
assertEquals(v.getMinor(), 1);
assertEquals(v.getPatch(), 0);
assertEquals(v.getRevision(), 0.1);
assertEquals(v.getSnapshotRelease(), -1);
assertEquals(v.getPrerelease(), 3);
assertEquals(v.getReleaseCandidate(), -1);
v = VersionUtil.BukkitVersion.fromString("26.1-rc-2-R0.1-SNAPSHOT");
assertEquals(v.getMajor(), 26);
assertEquals(v.getMinor(), 1);
assertEquals(v.getPatch(), 0);
assertEquals(v.getRevision(), 0.1);
assertEquals(v.getSnapshotRelease(), -1);
assertEquals(v.getPrerelease(), -1);
assertEquals(v.getReleaseCandidate(), 2);
// Old format versions are always lower than new format versions
assertTrue(VersionUtil.BukkitVersion.fromString("1.21.11-R0.1-SNAPSHOT")
.isLowerThan(VersionUtil.BukkitVersion.fromString("26.1-R0.1-SNAPSHOT")));
assertTrue(VersionUtil.BukkitVersion.fromString("26.1-R0.1-SNAPSHOT")
.isHigherThan(VersionUtil.BukkitVersion.fromString("1.21.11-R0.1-SNAPSHOT")));
assertTrue(VersionUtil.BukkitVersion.fromString("1.21.11-R0.1-SNAPSHOT")
.isLowerThan(VersionUtil.BukkitVersion.fromString("26.1-snapshot-1-R0.1-SNAPSHOT")));
assertTrue(VersionUtil.BukkitVersion.fromString("1.21.11-R0.1-SNAPSHOT")
.isLowerThan(VersionUtil.BukkitVersion.fromString("26.1-pre-1-R0.1-SNAPSHOT")));
assertTrue(VersionUtil.BukkitVersion.fromString("1.21.11-R0.1-SNAPSHOT")
.isLowerThan(VersionUtil.BukkitVersion.fromString("26.1-rc-1-R0.1-SNAPSHOT")));
}
}
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ however, have some new requirements:
* **EssentialsX requires CraftBukkit, Spigot or Paper to run.** Other server software may work, but these are not tested
by the team and we may not be able to help with any issues that occur.
* **EssentialsX currently supports Minecraft versions 1.8.8, 1.9.4, 1.10.2, 1.11.2, 1.12.2, 1.13.2, 1.14.4, 1.15.2,
1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.6, and 1.21.11.**
1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.6, 1.21.11, and 26.1.**
* **EssentialsX currently requires Java 8 or higher.** We recommend using the latest Java version supported by your
server software.
* **EssentialsX requires [Vault](http://dev.bukkit.org/bukkit-plugins/vault/) to enable using chat prefix/suffixes and
Expand Down
Loading