Fix NeoForge versions not matching major mc release correctly

minecraft-dev · Aug 9, 2024 · 0fcf7a7 · 0fcf7a7
1 parent abee07f
commit 0fcf7a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -28,6 +28,7 @@
 - [#2282](https://github.com/minecraft-dev/MinecraftDev/issues/2282) Mixin support confusion with `$` and `.` separators in class names
 - Recent NeoModDev version import errors
 - Recommended Artifact ID value was not sanitized properly
+- NeoForge versions in the Architectury were not being matched correctly for the first version of a major Minecraft release
 
 ## [1.8.0]
 

diff --git a/src/main/kotlin/platform/neoforge/version/NeoForgeVersion.kt b/src/main/kotlin/platform/neoforge/version/NeoForgeVersion.kt
@@ -48,7 +48,11 @@ class NeoForgeVersion private constructor(val versions: List<String>) {
     fun getNeoForgeVersions(mcVersion: SemanticVersion): List<SemanticVersion> {
         val versionText = mcVersion.toString()
         // Drop the 1. part of the mc version
-        val shortMcVersion = versionText.substringAfter('.')
+        var shortMcVersion = versionText.substringAfter('.')
+        if (!shortMcVersion.contains('.')) {
+            // Ensure we have the .0 part
+            shortMcVersion = "$shortMcVersion.0"
+        }
         val toList = versions.asSequence()
             .filter { it.substringBeforeLast('.') == shortMcVersion }
             .mapNotNull(SemanticVersion::tryParse)