Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Crashing when launching without jade

Browse Source
This commit is contained in:
Linnea Gräf
2025-03-18 11:06:17 +01:00
parent 0169939b6e
commit bab85b9a2f
2 changed files with 76 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -163,7 +163,7 @@ fun createIsolatedSourceSet(name: String, path: String = "compat/$name", isEnabl
extendsFrom(getByName(mainSS.annotationProcessorConfigurationName)) extendsFrom(getByName(mainSS.annotationProcessorConfigurationName))
} }
(mainSS.runtimeOnlyConfigurationName) { (mainSS.runtimeOnlyConfigurationName) {
extendsFrom(getByName(ss.runtimeClasspathConfigurationName)) // extendsFrom(getByName(ss.runtimeClasspathConfigurationName))
} }
("ksp$upperName") { ("ksp$upperName") {
extendsFrom(ksp.get()) extendsFrom(ksp.get())

9
src/main/kotlin/features/FeatureManager.kt
View File

@@ -82,13 +82,18 @@ object FeatureManager : DataHolder<FeatureManager.Config>(serializer(), "feature
} }
fun subscribeEvents() { fun subscribeEvents() {
SubscriptionList.allLists.forEach { SubscriptionList.allLists.forEach { list ->
it.provideSubscriptions { runCatching {
list.provideSubscriptions {
it.owner.javaClass.classes.forEach { it.owner.javaClass.classes.forEach {
runCatching { it.getDeclaredField("INSTANCE").get(null) } runCatching { it.getDeclaredField("INSTANCE").get(null) }
} }
subscribeSingleEvent(it) subscribeSingleEvent(it)
} }
}.getOrElse {
// TODO: allow annotating source sets to specifically opt out of loading for mods, maybe automatically
Firmament.logger.info("Ignoring events from $list, likely due to a missing compat mod.", it)
}
} }
} }