frogmc/phytotelma
6
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

rework dsl, add mod configurations (remapped), add support for other mappings #3

Merged
Ecorous merged 11 commits from owlsys/other-mappings into mistress 2024-07-04 14:39:40 -04:00
Conversation 0 Commits 11 Files changed 17 +5 -3
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit dc570b9331 - Show all commits

6
src/main/kotlin/dev/frogmc/phytotelma/ext/MinecraftConfiguration.kt
View file

@ -42,6 +42,7 @@ abstract class MinecraftConfiguration @Inject constructor(
conf.version = ParchmentProvider.findForMinecraftVersion(conf.gameVersion) conf.version = ParchmentProvider.findForMinecraftVersion(conf.gameVersion)
} }
mappingsName = "mojmap($version)+parchment(${conf.gameVersion}, ${conf.version})" mappingsName = "mojmap($version)+parchment(${conf.gameVersion}, ${conf.version})"
targetNamespace = "mojmap"
return@provider MappingBundle.merge( return@provider MappingBundle.merge(
MojmapProvider.get( MojmapProvider.get(
@ -52,7 +53,7 @@ abstract class MinecraftConfiguration @Inject constructor(
version, version,
cacheDir.resolve("org/parchmentmc/parchment/${conf.gameVersion}/${conf.version}") cacheDir.resolve("org/parchmentmc/parchment/${conf.gameVersion}/${conf.version}")
) )
) ).renameDstNamespace(targetNamespace)
} }
} }
@ -60,10 +61,11 @@ abstract class MinecraftConfiguration @Inject constructor(
return project.provider { return project.provider {
val cacheDir = PhytotelmaPlugin.globalCacheDir val cacheDir = PhytotelmaPlugin.globalCacheDir
mappingsName = "mojmap($version)" mappingsName = "mojmap($version)"
targetNamespace = "mojmap"
return@provider MojmapProvider.get( return@provider MojmapProvider.get(
version, version,
cacheDir.resolve("net/minecraft/client/$version/client-$version.txt") cacheDir.resolve("net/minecraft/client/$version/client-$version.txt")
).orElseThrow().reverse() ).orElseThrow().reverse().renameDstNamespace(targetNamespace)
} }
} }

2
src/main/kotlin/dev/frogmc/phytotelma/ext/PhytotelmaGradleExtensionImpl.kt
View file

@ -151,7 +151,7 @@ abstract class PhytotelmaGradleExtensionImpl @Inject constructor(
it.isCanBeConsumed = false it.isCanBeConsumed = false
} }
project.afterEvaluate { project.afterEvaluate {
remapModDependencies(configuration) //remapModDependencies(configuration)
} }
} }