Skip to content

Commit efb23fd

Browse files
feat: enhance logging for NmsProvider and NmsVersion detection
1 parent dce266e commit efb23fd

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

  • surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-common/src/main/kotlin/dev/slne/surf/api/paper/nms/common

surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-common/src/main/kotlin/dev/slne/surf/api/paper/nms/common/NmsProvider.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ interface NmsProvider {
103103
NmsProvider::class.java.classLoader
104104
)
105105

106-
// Iterate safely — skip providers whose classes can't be loaded
107-
// (e.g. version-specific NMS classes not present on this server)
108106
val providers = buildList {
109107
val iterator = serviceLoader.iterator()
110108
while (iterator.hasNext()) {
@@ -127,7 +125,8 @@ interface NmsProvider {
127125
log.atInfo().log("Found matching NmsProvider: %s", matched.version.name)
128126
matched
129127
} else {
130-
log.atWarning().log("No exact match for NmsProvider version %s, using fallback", version)
128+
log.atWarning()
129+
.log("No exact match for NmsProvider version %s, using fallback", version)
131130
val fallback = providers.maxByOrNull { it.version.versionPrefix }
132131
?: error(
133132
"No NmsProvider implementations found for version $version. " +

surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-common/src/main/kotlin/dev/slne/surf/api/paper/nms/common/NmsVersion.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,16 @@ enum class NmsVersion(val versionPrefix: String) {
2323
*/
2424
val current: NmsVersion by lazy {
2525
val mcVersion = Bukkit.getMinecraftVersion()
26-
log.atInfo().log("Detected Minecraft version from Bukkit: '%s'", mcVersion)
27-
log.atInfo().log("Available NMS versions: %s", entries.joinToString(", ") { "${it.name}(${it.versionPrefix})" })
28-
2926
val matched = entries.firstOrNull { mcVersion.startsWith(it.versionPrefix) }
3027
if (matched != null) {
31-
log.atInfo().log("Selected NMS version: %s", matched.name)
3228
matched
3329
} else {
34-
log.atWarning().log("No exact NMS version match found, using fallback (maxByOrNull)")
35-
val fallback = entries.maxByOrNull { it.versionPrefix } ?: error("No NMS versions defined!")
36-
log.atWarning().log("Fallback NMS version selected: %s", fallback.name)
30+
val fallback =
31+
entries.maxByOrNull { it.versionPrefix } ?: error("No NMS versions defined!")
32+
log.atWarning().log(
33+
"There is no matching nms version, using fallback NMS version: %s",
34+
fallback.name
35+
)
3736
fallback
3837
}
3938
}

0 commit comments

Comments
 (0)