Skip to content

Commit 77ffcc8

Browse files
authored
Fix version parser not ignoring the patch component of a Minecraft version if it is zero (#207)
1 parent 2f75594 commit 77ffcc8

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/main/java/net/neoforged/moddevgradle/internal/utils/VersionCapabilities.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,13 @@ static int indexOfNeoForgeVersion(String version) {
6767
if (!matcher.matches()) {
6868
return -1;
6969
}
70-
return MinecraftVersionList.VERSIONS.indexOf("1." + matcher.group(1));
70+
71+
var mcVersion = "1." + matcher.group(1);
72+
// Versions such as 21.0.0 are for Minecraft 1.21 and NOT 1.21.0, therefore we strip the trailing .0
73+
if (mcVersion.endsWith(".0")) {
74+
mcVersion = mcVersion.substring(0, mcVersion.length() - 2);
75+
}
76+
return MinecraftVersionList.VERSIONS.indexOf(mcVersion);
7177
}
7278

7379
public static VersionCapabilities ofNeoForgeVersion(String version) {

src/test/java/net/neoforged/moddevgradle/internal/utils/VersionCapabilitiesTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public void testJavaVersion(String neoFormVersion, int javaVersion) {
3636

3737
@ParameterizedTest()
3838
@CsvSource({
39+
"21.0.3-beta,1.21",
3940
"21.4.8-beta,1.21.4",
4041
"21.4.10-beta-pr-1744-gh-1582,1.21.4",
4142
"21.4.10,1.21.4",

0 commit comments

Comments
 (0)