Skip to content

♻️ refactor(service-util): improve service loader fallback mechanism #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twisti-dev merged 2 commits into from
Jun 21, 2026
Merged

♻️ refactor(service-util): improve service loader fallback mechanism #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70d1671
♻️ refactor(service-util): improve service loader fallback mechanism
twisti-dev Jun 21, 2026
9c72b0c
Merge branch 'version/26.2' into fix/adventure-4-backwards-comp
twisti-dev Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
javaVersion=25
mcVersion=26.2
group=dev.slne.surf.api
version=3.27.3
version=3.27.4
relocationPrefix=dev.slne.surf.api.libs
snapshot=false
4 changes: 2 additions & 2 deletions surf-api-core/surf-api-core/src/main/kotlin/dev/slne/surf/api/core/util/service-util.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import java.util.*
inline fun <reified T : Any> requiredService(): T = ServiceUtil.serviceWithFallback<T>(
ServiceLoader.load(
T::class.java,
getCallerClass()?.classLoader ?: T::class.java.classLoader
getCallerClass(-1)?.classLoader ?: T::class.java.classLoader
), T::class.java
) ?: throw ServiceConfigurationError("Service ${T::class.java.name} not available")

Expand All @@ -25,7 +25,7 @@ object ServiceUtil {
private val SERVICE_LOAD_FAILURES_ARE_FATAL = AdventureProperties.SERVICE_LOAD_FAILURES_ARE_FATAL.value() == true

@PublishedApi
internal fun <T> serviceWithFallback(loader: ServiceLoader<T>, type: Class<T>): T? {
internal fun <T : Any> serviceWithFallback(loader: ServiceLoader<T>, type: Class<T>): T? {
val iterator = loader.iterator()
var firstFallback: T? = null

Expand Down