Skip to content

Commit d190ab1

Browse files
authored
Merge pull request #179 from hypherionmc/1.4-unobfuscatedmc
Add support for 26.1 being completely unobfuscated
2 parents 47afa4f + cbc3ebf commit d190ab1

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/api/kotlin/xyz/wagyourtail/unimined/api/mapping/MappingsConfig.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ abstract class MappingsConfig<T: MappingsConfig<T>>(val project: Project, val mi
3535
}) {
3636

3737
private var innerDevNamespace: Namespace by FinalizeOnRead(LazyMutable {
38+
if (minecraft.minecraftData.mcVersionCompare("1.21.11", minecraft.version) <= 0) {
39+
return@LazyMutable Namespace("official")
40+
}
3841
namespaces.entries.firstOrNull { it.value }?.key ?: error("No \"Named\" namespace found for devNamespace, if this is correct, set devNamespace explicitly")
3942
})
4043

src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
8585

8686
override val minecraftData = MinecraftDownloader(project, this)
8787

88-
override val obfuscated = true
88+
override val obfuscated: Boolean by FinalizeOnRead(LazyMutable {
89+
minecraftData.mcVersionCompare("1.21.11", minecraftData.version) >= 0
90+
})
8991

9092
/**
9193
* Whether to apply fixes to inner classes
@@ -94,7 +96,9 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
9496
* They don't need fixes, there are no fixes available,
9597
* and Gradle will throw a cryptic error if you try!
9698
*/
97-
open val fixInners = obfuscated
99+
open val fixInners: Boolean by LazyMutable {
100+
obfuscated
101+
}
98102

99103
override val mappings = MappingsProvider(project, this)
100104

0 commit comments

Comments
 (0)