Skip to content

Commit 723f413

Browse files
refactor: update dependencies, improve player lookup logic, and simplify version casting in build scripts
1 parent 5de218e commit 723f413

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ buildscript {
44
maven("https://repo.slne.dev/repository/maven-public/") { name = "maven-public" }
55
}
66
dependencies {
7-
classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.10+")
7+
classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.11+")
88
}
99
}
1010

1111
allprojects {
1212
group = "dev.slne.surf.chat"
13-
version = findProperty("version")!!
13+
version = findProperty("version") as String
1414
}

surf-chat-bukkit/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ surfPaperPluginApi {
3131
foliaSupported(true)
3232
generateLibraryLoader(false)
3333

34+
withCorePaper()
35+
3436
serverDependencies {
3537
registerSoft("MiniPlaceholders")
3638
}

surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/command/argument/UserArgument.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import dev.jorel.commandapi.arguments.CustomArgument
77
import dev.jorel.commandapi.arguments.StringArgument
88
import dev.slne.surf.chat.api.entity.User
99
import dev.slne.surf.chat.core.service.userService
10+
import dev.slne.surf.core.api.common.surfCoreApi
1011
import dev.slne.surf.surfapi.core.api.messages.adventure.buildText
11-
import org.bukkit.Bukkit
1212

1313
class UserArgument(nodeName: String) :
1414
CustomArgument<User, String>(StringArgument(nodeName), { info ->
@@ -22,7 +22,7 @@ class UserArgument(nodeName: String) :
2222
}) {
2323
init {
2424
replaceSuggestions(ArgumentSuggestions.stringCollection {
25-
Bukkit.getOnlinePlayers().map { it.name }
25+
surfCoreApi.getOnlinePlayers().mapNotNull { it.lastKnownName }
2626
})
2727
}
2828
}

surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/command/argument/UserStringArgument.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import dev.jorel.commandapi.arguments.Argument
55
import dev.jorel.commandapi.arguments.ArgumentSuggestions
66
import dev.jorel.commandapi.arguments.CustomArgument
77
import dev.jorel.commandapi.arguments.StringArgument
8-
import org.bukkit.Bukkit
8+
import dev.slne.surf.core.api.common.surfCoreApi
99

1010
class UserStringArgument(nodeName: String) :
1111
CustomArgument<String, String>(StringArgument(nodeName), { info ->
1212
info.input
1313
}) {
1414
init {
1515
replaceSuggestions(ArgumentSuggestions.stringCollection {
16-
Bukkit.getOnlinePlayers().map { it.name }
16+
surfCoreApi.getOnlinePlayers().mapNotNull { it.lastKnownName }
1717
})
1818
}
1919
}

0 commit comments

Comments
 (0)