Skip to content

Fix unobf version parsing #323

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
shartte merged 1 commit into from
Jan 9, 2026
Merged

Fix unobf version parsing #323

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
66 changes: 41 additions & 25 deletions src/main/java/net/neoforged/moddevgradle/internal/utils/VersionCapabilitiesInternal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.neoforged.moddevgradle.internal.generated.MinecraftVersionList;
import org.gradle.api.logging.Logger;
import org.gradle.api.logging.Logging;
import org.jetbrains.annotations.Nullable;

/**
* Models the changing capabilities of the modding platform and Vanilla, which we tie to the Minecraft version.
Expand All @@ -23,8 +24,10 @@ public record VersionCapabilitiesInternal(String minecraftVersion, int javaVersi
private static final Logger LOG = Logging.getLogger(VersionCapabilitiesInternal.class);

private static final Pattern NEOFORGE_PATTERN = Pattern.compile("^(\\d+\\.\\d+)\\.\\d+(|-.*)$");
// Strips NeoForm timestamp suffixes OR dynamic version markers
private static final Pattern NEOFORM_PATTERN = Pattern.compile("^(.*)-(?:\\+|\\d{8}\\.\\d{6})$");
private static final Pattern UNOBF_NEOFORGE_PATTERN = Pattern.compile("^(\\d+\\.\\d+\\.\\d+)\\.\\d+(|-.*)$");
private static final Pattern UNOBF_NEOFORGE_ALPHA_PATTERN = Pattern.compile("^(\\d+\\.\\d+\\.\\d+)\\.0-alpha\\.\\d+\\+([\\w-]+)$");
// Strips NeoForm timestamp suffixes OR dynamic version markers OR 26.1+ version suffix
private static final Pattern NEOFORM_PATTERN = Pattern.compile("^(.*)-(?:\\+|\\d{8}\\.\\d{6}|\\d+)$");

private static final int MC_1_21_11_INDEX = getReferenceVersionIndex("1.21.11");
private static final int MC_1_21_9_INDEX = getReferenceVersionIndex("1.21.9");
Expand Down Expand Up @@ -100,38 +103,51 @@ static boolean needsNeoForgeInMinecraftJar(int versionIndex) {
return versionIndex >= MC_1_21_11_INDEX;
}

static int indexOfNeoForgeVersion(String version) {
@Nullable
static String neoForgeVersionToMinecraftVersion(String version) {
// NeoForge omits the "1." at the start of the Minecraft version and just adds an incrementing last digit
var matcher = NEOFORGE_PATTERN.matcher(version);
if (!matcher.matches()) {
return -1;
if (matcher.matches()) {
var mcVersion = "1." + matcher.group(1);
// Versions such as 21.0.0 are for Minecraft 1.21 and NOT 1.21.0, therefore we strip the trailing .0
if (mcVersion.endsWith(".0")) {
mcVersion = mcVersion.substring(0, mcVersion.length() - 2);
}
return mcVersion;
}

var mcVersion = "1." + matcher.group(1);
// Versions such as 21.0.0 are for Minecraft 1.21 and NOT 1.21.0, therefore we strip the trailing .0
if (mcVersion.endsWith(".0")) {
mcVersion = mcVersion.substring(0, mcVersion.length() - 2);
// Alpha versions also match the regular unobf pattern, check them first
matcher = UNOBF_NEOFORGE_ALPHA_PATTERN.matcher(version);
if (matcher.matches()) {
var mcVersion = matcher.group(1);
if (mcVersion.endsWith(".0")) {
mcVersion = mcVersion.substring(0, mcVersion.length() - 2);
}
mcVersion += "-" + matcher.group(2);
return mcVersion;
}
return MinecraftVersionList.VERSIONS.indexOf(mcVersion);
matcher = UNOBF_NEOFORGE_PATTERN.matcher(version);
if (matcher.matches()) {
var mcVersion = matcher.group(1);
if (mcVersion.endsWith(".0")) {
mcVersion = mcVersion.substring(0, mcVersion.length() - 2);
}
return mcVersion;
}

return null;
}

public static VersionCapabilitiesInternal ofNeoForgeVersion(String version) {
var index = indexOfNeoForgeVersion(version);
var mcVersion = neoForgeVersionToMinecraftVersion(version);
if (mcVersion == null) {
LOG.lifecycle("Failed to parse MC version from NeoForge version {}. Using capabilities of latest known Minecraft version {}.", version, LATEST.minecraftVersion());
return LATEST;
}
var index = MinecraftVersionList.VERSIONS.indexOf(mcVersion);
if (index == -1) {
var capabilities = LATEST;
var m = NEOFORGE_PATTERN.matcher(version);
if (m.matches()) {
var minecraftVersion = "1." + m.group(1);
if (minecraftVersion.endsWith(".0")) {
minecraftVersion = minecraftVersion.substring(0, minecraftVersion.length() - 2);
}
capabilities = capabilities.withMinecraftVersion(minecraftVersion);
}

LOG.lifecycle("Failed to parse MC version from NeoForge version {}. Using capabilities of latest known Minecraft version with Minecraft version {}.", version, capabilities.minecraftVersion());
return capabilities;
LOG.lifecycle("Parsed unknown MC version {} from NeoForge version {}. Using capabilities of latest known Minecraft version {} with an updated Minecraft version.", mcVersion, version, LATEST.minecraftVersion());
return LATEST.withMinecraftVersion(mcVersion);
}

return ofVersionIndex(index);
}

Expand Down
7 changes: 7 additions & 0 deletions src/test/java/net/neoforged/moddevgradle/internal/utils/VersionCapabilitiesInternalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ public void testJavaVersion(String neoFormVersion, int javaVersion) {
"21.4.10,1.21.4",
"26.1.10,1.26.1",
"26.0.10,1.26",
"26.1.0.0-alpha.3+snapshot-1,26.1-snapshot-1",
"26.1.0.20-beta,26.1",
"26.1.0.40,26.1",
"26.1.1.0-alpha.3+snapshot-1,26.1.1-snapshot-1",
"26.1.1.20-beta,26.1.1",
"26.1.1.40,26.1.1",
})
public void testNeoForgeVersionParsing(String neoForgeVersion, String minecraftVersion) {
var caps = VersionCapabilitiesInternal.ofNeoForgeVersion(neoForgeVersion);
Expand Down Expand Up @@ -79,6 +85,7 @@ public void testForgeVersionParsing(String forgeVersion, String minecraftVersion
"1.20.1-rc1,1.20.1-rc1",
"1.99.1-20241017.134216,1.99.1",
"1.99.0-20241017.134216,1.99.0",
"26.1-snapshot-1000-1,26.1-snapshot-1000",
// Dynamic version
"1.99.0-+,1.99.0",
})
Expand Down
Loading