Skip to content

Commit

Permalink
[WIP] Unknown Thingy mappings
Browse files Browse the repository at this point in the history
  • Loading branch information
halotroop2288 committed Aug 9, 2024
1 parent d2a54d4 commit 6d7cee3
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,24 @@ abstract class MappingsConfig<T: MappingResolver<T>>(val project: Project, val m
}
}

@JvmOverloads
abstract fun unknownThingy(version: String, format: String = "tsrg", key: String = "unknownThingy", action: MappingEntry.() -> Unit = {})

@JvmOverloads
fun unknownThingy(
version: String = minecraft.version,
key: String = "unknownThingy",
format: String = "tsrg",
@DelegatesTo(value = MappingEntry::class, strategy = Closure.DELEGATE_FIRST)
action: Closure<*>
) {
unknownThingy(version, format, key) {
action.delegate = this
action.resolveStrategy = Closure.DELEGATE_FIRST
action.call()
}
}

@JvmOverloads
abstract fun yarn(build: Int, key: String = "yarn", action: MappingEntry.() -> Unit = {})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import okio.source
import okio.use
import org.gradle.api.Project
import org.gradle.api.artifacts.Dependency
import org.gradle.api.internal.provider.MappingProvider
import org.gradle.internal.extensions.stdlib.toDefaultLowerCase
import xyz.wagyourtail.unimined.api.UniminedExtension
import xyz.wagyourtail.unimined.api.mapping.MappingsConfig
import xyz.wagyourtail.unimined.api.mapping.dsl.MappingDSL
Expand Down Expand Up @@ -292,7 +292,7 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig, subKey: Str
})
}


override fun retroMCP(version: String, key: String, action: MappingEntry.() -> Unit) {
unimined.mcphackersIvy()
addDependency(key, MappingEntry(contentOf(MavenCoords("io.github.mcphackers", "mcp", version, extension = "zip")), "$key-$version").apply {
Expand Down Expand Up @@ -322,6 +322,28 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig, subKey: Str
})
}

override fun unknownThingy(version: String, format: String, key: String, action: MappingEntry.() -> Unit) {
if (minecraft.version != "1.4.7") throw UnsupportedOperationException("Unknown Thingy is only supported for Minecraft 1.4.7")
unimined.sleepingTownMaven()
val entry = MappingEntry(contentOf(
when (format.toDefaultLowerCase()) {
"tinyV2" -> MavenCoords("com.unascribed", "unknownthingy", version, "v2")
"tsrg2" -> MavenCoords("com.unascribed", "unknownthingy", version, extension = "tsrg2")
else -> MavenCoords("com.unascribed", "unknownthingy", version, extension = "tsrg")
}
), "$key-$version").apply {
requires("searge")
mapNamespace("named" to "unknownThingy")
provides("unknownThingy" to true)
action()
}
addDependency(key, entry)

afterLoad.add {
renest(entry.requires.name, *entry.provides.map { it.first.name }.toTypedArray())
}
}


override fun yarn(build: Int, key: String, action: MappingEntry.() -> Unit) {
unimined.fabricMaven()
Expand Down Expand Up @@ -403,7 +425,7 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig, subKey: Str
}
}


override fun legacyYarn(build: Int, key: String, action: MappingEntry.() -> Unit) {
unimined.legacyFabricMaven()
val entry = MappingEntry(
Expand Down

0 comments on commit 6d7cee3

Please sign in to comment.