Skip to content

[WIP] 26.1+ Support and Bug Fixes #185

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

Draft
hypherionmc wants to merge 3 commits into
base: lts/1.4
Choose a base branch
from
Draft

[WIP] 26.1+ Support and Bug Fixes #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da69322
[BUG] Fix NeoForge 26.1 being unable to set up
hypherionmc Jan 8, 2026
d6cb7a7
[BUG] Fix Fabric still trying to pull intermediary on 26.1
hypherionmc Jan 8, 2026
a915431
More Fixes for AccessWideners, mappings and experimental support for …
hypherionmc Feb 21, 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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gson = "2.13.1"
asm = "9.8"

tiny-remapper = "0.11.1"
unimined-mapping-library = "1.2.1"
unimined-mapping-library = "1.2.2"

binarypatcher = "1.1.1"
neo_binarypatcher = "4.0.7"
Expand Down
2 changes: 1 addition & 1 deletion src/api/kotlin/xyz/wagyourtail/unimined/api/mapping/MappingsConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ abstract class MappingsConfig<T: MappingsConfig<T>>(val project: Project, val mi
}) {

private var innerDevNamespace: Namespace by FinalizeOnRead(LazyMutable {
if (minecraft.minecraftData.mcVersionCompare("1.21.11", minecraft.version) <= 0) {
if (minecraft.minecraftData.mcVersionCompare("1.21.11", minecraft.version) < 0) {
return@LazyMutable Namespace("official")
}
namespaces.entries.firstOrNull { it.value }?.key ?: error("No \"Named\" namespace found for devNamespace, if this is correct, set devNamespace explicitly")
Expand Down
7 changes: 7 additions & 0 deletions src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,13 @@ open class MappingsProvider(project: Project, minecraft: MinecraftConfig, subKey


override fun mojmap() {
// 26.1+ is unmapped. We return here otherwise Neo and Forge try to download mappings
if (!minecraft.obfuscated) {
devNamespace("official")
devFallbackNamespace("official")
return
}

mojmapIvy()
val mappings = when (envType) {
EnvType.CLIENT, EnvType.JOINED -> "client"
Expand Down
2 changes: 2 additions & 0 deletions src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/aw/AccessWidenerApplier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ object AccessWidenerApplier {
fun nsName(config: MappingsConfig<*>, namespace: Namespace) =
if (config.devNamespace != namespace) {
"intermediary" // -_-
} else if (config.minecraft.minecraftData.mcVersionCompare(config.minecraft.version, "1.21.11") > 0) {
"official"
} else {
"named"
}
Expand Down
2 changes: 1 addition & 1 deletion src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
description = "Remaps $inputTask's output jar"
asJar.archiveClassifier.set(classifier)
}
project.tasks.getByName("assemble").dependsOn("remap" + inputTask.name.capitalized())
project.tasks.getByName("build").dependsOn("remap" + inputTask.name.capitalized())
} else {
project.logger.warn(
"[Unimined/Minecraft ${project.path}:${sourceSet.name}] Could not find default task '${inputTaskName.withSourceSet(sourceSet)} for $sourceSet."
Expand Down
13 changes: 12 additions & 1 deletion ...ined/internal/minecraft/patch/access/transformer/AccessTransformerMinecraftTransformer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ interface AccessTransformerMinecraftTransformer : AccessTransformerPatcher, Acce

companion object {
fun getDefaultDependency(project: Project, provider: MinecraftProvider): Dependency {
return if (provider.minecraftData.metadata.javaVersion >= JavaVersion.VERSION_21)
return if (provider.minecraftData.metadata.javaVersion >= JavaVersion.VERSION_25)
project.dependencies.create("net.neoforged.accesstransformers:at-cli:13.0.3")
else if (provider.minecraftData.metadata.javaVersion >= JavaVersion.VERSION_21)
project.dependencies.create("net.neoforged.accesstransformers:at-cli:11.0.2")
else
project.dependencies.create("net.neoforged:accesstransformers:9.0.3")
Expand Down Expand Up @@ -124,6 +126,15 @@ interface AccessTransformerMinecraftTransformer : AccessTransformerPatcher, Acce
).use {
ATWriter.writeData(list, it::append)
}

// Fix whitespaces in ATs that can cause forge to fail on 1.8.9+
if (!legacyATFormat) {
val lines = temp.bufferedReader().readLines()
temp.bufferedWriter().use {
writer -> lines.filter { s -> !s.startsWith(" ") }.forEach { writer.write(it) }
Copy link
Contributor

@dima-dencep dima-dencep Feb 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here you need to add \n (new line) without this, AT is generated as continuous text:

Image

Copy link
Contributor

@dima-dencep dima-dencep Feb 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

something like

if (!legacyATFormat) {
    val lines = temp.bufferedReader().readLines()
    temp.bufferedWriter().use { writer ->
        lines.filter { s -> !s.startsWith(" ") }.forEach {
            writer.write(it)
            writer.newLine()
        }
    }
}

Copy link
Contributor Author

@hypherionmc hypherionmc Feb 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, weird. Didn't see that happen in the IDE where I tested it. Probably had something autoformatting it

}
}

try {
project.execOps.javaexec { spec ->
if (useToolchains) {
Expand Down
2 changes: 1 addition & 1 deletion ...yz/wagyourtail/unimined/internal/minecraft/patch/fabric/FabricLikeMinecraftTransformer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ abstract class FabricLikeMinecraftTransformer(
var mainClass: JsonObject? = null

override fun beforeMappingsResolve() {
if (!customIntermediaries) {
if (!customIntermediaries && provider.obfuscated) {
addIntermediaryMappings()
}
}
Expand Down
5 changes: 4 additions & 1 deletion .../xyz/wagyourtail/unimined/internal/minecraft/patch/forge/NeoForgedMinecraftTransformer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ open class NeoForgedMinecraftTransformer(project: Project, provider: MinecraftPr
project.dependencies.create("net.neoforged:forge:${provider.version}-$dep:universal")
} else {
var version = provider.version.removePrefix("1.")
if (!version.contains(".")) {

if (provider.minecraftData.mcVersionCompare(provider.version, "26.1") <= 0) {
version = "${provider.version}.0"
} else if (!version.contains(".")) {
version = "$version.0"
}
project.dependencies.create("net.neoforged:neoforge:$version.$dep:universal")
Expand Down
23 changes: 16 additions & 7 deletions ...in/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg3/FG3MinecraftTransformer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
project, parent.provider, jarModProvider = "forge", providerName = "${parent.providerName}-FG3"
) {

val isModernNeo by lazy {
providerName.equals("NeoForged-FG3", true) && !provider.obfuscated
}

val cacheDir by lazy {
val forgeUniversal = parent.forge.dependencies.last()
provider.minecraftData.mcVersionFolder.resolve(providerName).resolve(forgeUniversal.version!!)
Expand Down Expand Up @@ -86,6 +90,7 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
}

override fun defaultProdNamespace(): Namespace {
if (!provider.obfuscated) return provider.mappings.checkedNs("official")
return if (userdevCfg["mcp"].asString.contains("neoform") || provider.minecraftData.mcVersionCompare(
provider.version,
"1.20.5"
Expand Down Expand Up @@ -129,7 +134,7 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
}

open val obfNamespace by lazy {
if (userdevCfg["notchObf"]?.asBoolean == true) "official"
if (userdevCfg["notchObf"]?.asBoolean == true || !provider.obfuscated) "official"
else if (userdevCfg["mcp"].asString.contains("neoform")) "mojmap"
else "searge"
}
Expand Down Expand Up @@ -179,15 +184,16 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
config.insertBefore(
"forgeInject", config.FunctionStep(
"mcpCleanup", null, mutableMapOf(), MCPConfig.Function(
"net.minecraftforge:mcpcleanup:2.3.6",
listOf("net.minecraftforge:mcpcleanup:2.3.6"),
null,
listOf(
"--input",
"{input}",
"--output",
"{output}"
),
listOf()
listOf(),
null
)
),
mapOf("input" to {
Expand Down Expand Up @@ -313,6 +319,7 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr

override fun beforeMappingsResolve() {
project.logger.info("[Unimined/ForgeTransformer] FG3: beforeMappingsResolve")
if (!provider.obfuscated) return
provider.mappings {
if (obfNamespace == "mojmap") {
mojmap()
Expand Down Expand Up @@ -362,7 +369,7 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
val mainClass = get("main").asString
if (!mainClass.startsWith("net.minecraftforge.legacydev")) {
project.logger.info("[Unimined/ForgeTransformer] Inserting mcp mappings")
if (obfNamespace != "mojmap") {
if (obfNamespace != "mojmap" && provider.obfuscated) {
provider.minecraftLibraries.dependencies.add(
project.dependencies.create(project.files(parent.srgToMCPAsMCP))
)
Expand Down Expand Up @@ -405,6 +412,8 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
}
if (userdevCfg["notchObf"]?.asBoolean == true) {
executeMcp("merge", output.path)
} else if (isModernNeo) {
executeMcp("preProcessJar", output.path)
} else {
executeMcp("rename", output.path)
}
Expand Down Expand Up @@ -786,9 +795,8 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
}

private fun fixForge(baseMinecraft: MinecraftJar): MinecraftJar {
if (!baseMinecraft.patches.contains("fixForge") && baseMinecraft.mappingNamespace != provider.mappings.checkedNs(
"official"
)
if (!baseMinecraft.patches.contains("fixForge") &&
(!provider.obfuscated || baseMinecraft.mappingNamespace != provider.mappings.checkedNs("official"))
) {
val target = MinecraftJar(
baseMinecraft,
Expand All @@ -803,6 +811,7 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
try {
target.path.openZipFileSystem(mapOf("mutable" to true)).use { out ->
out.getPath("binpatches.pack.lzma").deleteIfExists()
out.getPath("binpatches-joined.lzma").deleteIfExists()
}
} catch (e: Throwable) {
target.path.deleteIfExists()
Expand Down
Loading
Loading