MinecraftConfig.obfuscated

unimined · Jul 27, 2024 · dd215d9 · dd215d9
1 parent 33ffc0c
commit dd215d9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/MinecraftConfig.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/MinecraftConfig.kt
@@ -103,6 +103,10 @@ abstract class MinecraftConfig(val project: Project, val sourceSet: SourceSet) :
     @set:ApiStatus.Internal
     abstract var mcPatcher: MinecraftPatcher
 
+    /**
+     * Whether the provided jars are generally obfuscated when downloaded
+     */
+    abstract val obfuscated: Boolean
     abstract val mappings: MappingsConfig
     abstract val mods: ModsConfig
     abstract val runs: RunsConfig

diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt
@@ -72,6 +72,8 @@ import kotlin.io.path.*
 open class MinecraftProvider(project: Project, sourceSet: SourceSet) : MinecraftConfig(project, sourceSet) {
     override val minecraftData = MinecraftDownloader(project, this)
 
+    override val obfuscated = true
+
     override val mappings = MappingsProvider(project, this)
 
     override var mcPatcher: MinecraftPatcher by FinalizeOnRead(FinalizeOnWrite(NoTransformMinecraftTransformer(project, this)))

diff --git a/...yz/wagyourtail/unimined/internal/minecraft/patch/fabric/FabricLikeMinecraftTransformer.kt b/...yz/wagyourtail/unimined/internal/minecraft/patch/fabric/FabricLikeMinecraftTransformer.kt
@@ -65,7 +65,7 @@ abstract class FabricLikeMinecraftTransformer(
 
     private val include: Configuration = project.configurations.maybeCreate("include".withSourceSet(provider.sourceSet))
 
-    override var customIntermediaries: Boolean by FinalizeOnRead(provider is ReIndevProvider)
+    override var customIntermediaries: Boolean by FinalizeOnRead(!provider.obfuscated)
 
     override var skipInsertAw: Boolean by FinalizeOnRead(false)
 
@@ -97,14 +97,14 @@ abstract class FabricLikeMinecraftTransformer(
     )
 
     override var prodNamespace by FinalizeOnRead(LazyMutable {
-        if (provider is ReIndevProvider) return@LazyMutable provider.mappings.OFFICIAL
+        if (!provider.obfuscated) return@LazyMutable provider.mappings.OFFICIAL
         provider.mappings.getNamespace("intermediary")
     })
 
     @get:ApiStatus.Internal
     @set:ApiStatus.Experimental
     override var devMappings: Path? by FinalizeOnRead(LazyMutable {
-        if (provider is ReIndevProvider) return@LazyMutable null
+        if (!provider.obfuscated) return@LazyMutable null
         provider.localCache
             .resolve("mappings")
             .createDirectories()

diff --git a/...craft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/reindev/ReIndevProvider.kt b/...craft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/reindev/ReIndevProvider.kt
@@ -11,7 +11,9 @@ import kotlin.io.path.exists
 
 class ReIndevProvider(project: Project, sourceSet: SourceSet) : MinecraftProvider(project, sourceSet) {
 
-    override val minecraftData: MinecraftDownloader = ReIndevDownloader(project, this)
+    override val obfuscated = false
+
+    override val minecraftData = ReIndevDownloader(project, this)
 
     init {
         // Required for the following [2.9.4+legacyfabric.8,) dependency