Skip to content

Commit 6d374a2

Browse files
committed
Support new number system release candidates
1 parent d6a72f9 commit 6d374a2

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/main/java/net/minecraftforge/srgutils/MinecraftVersion.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ else if (lower.startsWith("rd-")) {
152152
String nearest = version;
153153
// The new versioning system https://www.minecraft.net/en-us/article/minecraft-new-version-numbering-system
154154
// They did not specify pre-release or release candidate naming system.
155-
// The only one we've seen so far is snapshot and pre-release. So i'll add that and add the others when they show up
156155
if (version.contains("-snapshot-")) {
157156
String[] pts = version.split("-snapshot-");
158157
return new MinecraftVersion(Type.SNAPSHOT, version, Integer.parseInt(pts[1]), -1, 0, null, splitDots(pts[0]));
@@ -172,6 +171,10 @@ else if (lower.startsWith("rd-")) {
172171
String[] pts = version.split(" Pre-Release ");
173172
pre = Integer.parseInt(pts[1]);
174173
nearest = pts[0];
174+
} else if (version.contains("-rc-")) { // New versioning for rc's have a - seperator
175+
String[] pts = version.split("-rc-");
176+
pre = -1 * Integer.parseInt(pts[1]);
177+
nearest = pts[0];
175178
} else if (version.contains("-rc")) {
176179
String[] pts = version.split("-rc");
177180
pre = -1 * Integer.parseInt(pts[1]);

src/test/java/net/minecraftforge/srgutils/test/VersionList.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ public class VersionList {
1919
//Just copy pasted with a little resorting from Mojang's version manifest, https://launchermeta.mojang.com/mc/game/version_manifest.json
2020
//We can't read this file directly, because its in strict release date order, not target version order
2121
private final String[] versions = new String[] {
22+
"26.1-rc-2",
23+
"26.1-rc-1",
24+
"26.1-pre-3",
25+
"26.1-pre-2",
2226
"26.1-pre-1",
2327
"26.1-snapshot-11",
2428
"26.1-snapshot-10",

0 commit comments

Comments
 (0)