fix transitive-aw issues (x2)
All checks were successful
Publish to snapshot maven / build (push) Successful in 24s

This commit is contained in:
moehreag 2024-06-13 00:33:57 +02:00
parent ad2e3798f3
commit 3b88625edf
2 changed files with 5 additions and 9 deletions

View file

@ -7,7 +7,7 @@ plugins {
} }
group = "dev.frogmc" group = "dev.frogmc"
version = "0.0.1-alpha.2" version = "0.0.1-alpha.3"
repositories { repositories {
maven { maven {

View file

@ -51,13 +51,9 @@ object AccessWidener {
}.map { it.file.toPath() }.filter { it.exists() && it.isRegularFile() }.map { }.map { it.file.toPath() }.filter { it.exists() && it.isRegularFile() }.map {
FileSystems.newFileSystem(it).use {fs -> FileSystems.newFileSystem(it).use {fs ->
val metadata = fs.getPath(Constants.MOD_METADATA_FILE) val metadata = fs.getPath(Constants.MOD_METADATA_FILE)
if (metadata.exists()) { PARSER.parse(metadata, FileNotFoundAction.READ_NOTHING)
return@map null
} else {
PARSER.parse(it, FileNotFoundAction.READ_NOTHING)
.get<String>("frog.extensions.accesswidener")?.let { name -> .get<String>("frog.extensions.accesswidener")?.let { name ->
return@map it.resolveSibling(name) return@map metadata.resolveSibling(name)
}
} }
} }
}.toList()).filterNotNull().also { println(it) } }.toList()).filterNotNull().also { println(it) }