Skip to content

Commit b205c7f

Browse files
refactor: update miniplaceholder-api to 3.0.1 and adjust MiniPlaceholders API usage
1 parent 9ae03c0 commit b205c7f

File tree

5 files changed

+7
-16
lines changed

5 files changed

+7
-16
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
playerholder-api = "2.11.6"
3-
miniplaceholder-api = "2.3.0"
3+
miniplaceholder-api = "3.0.1"
44
surf-database = "2.0.4-SNAPSHOT"
55

66
[libraries]

surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/hook/MiniPlaceholdersHook.kt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,12 @@ import org.bukkit.entity.Player
99
object MiniPlaceholdersHook {
1010
private fun isEnabled() = Bukkit.getPluginManager().isPluginEnabled("MiniPlaceholders")
1111

12-
fun parseAudience(player: Player, input: String): Component {
12+
fun parse(player: Player, input: String): Component {
1313
if (!this.isEnabled()) {
1414
return MiniMessage.miniMessage().deserialize(input)
1515
}
1616

17-
val resolver = MiniPlaceholders.getAudienceGlobalPlaceholders(player)
17+
val resolver = MiniPlaceholders.audienceGlobalPlaceholders()
1818
return MiniMessage.miniMessage().deserialize(input, player, resolver)
1919
}
20-
21-
fun parseGlobal(input: String): Component {
22-
if (!this.isEnabled()) {
23-
return MiniMessage.miniMessage().deserialize(input)
24-
}
25-
26-
val resolver = MiniPlaceholders.getGlobalPlaceholders()
27-
return MiniMessage.miniMessage().deserialize(input, resolver)
28-
}
2920
}

surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/listener/ConnectListener.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ConnectListener : Listener {
2828

2929
if (plugin.connectionMessageConfig.enabled) {
3030
event.joinMessage(
31-
MiniPlaceholdersHook.parseAudience(
31+
MiniPlaceholdersHook.parse(
3232
event.player,
3333
plugin.connectionMessageConfig.joinMessage
3434
)
@@ -38,7 +38,7 @@ class ConnectListener : Listener {
3838
if (plugin.chatMotdConfig.enabled) {
3939
event.player.sendText {
4040
append(
41-
MiniPlaceholdersHook.parseAudience(
41+
MiniPlaceholdersHook.parse(
4242
event.player,
4343
plugin.chatMotdConfig.message
4444
)

surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/listener/DisconnectListener.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class DisconnectListener : Listener {
1919

2020
if (plugin.connectionMessageConfig.enabled) {
2121
event.quitMessage(
22-
MiniPlaceholdersHook.parseAudience(
22+
MiniPlaceholdersHook.parse(
2323
event.player,
2424
plugin.connectionMessageConfig.leaveMessage
2525
)

surf-chat-bukkit/src/main/kotlin/dev/slne/surf/chat/bukkit/util/components.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fun SurfComponentBuilder.appendMessageData(messageData: MessageData) = append(bu
6767

6868
fun SurfComponentBuilder.appendName(player: Player) = append {
6969
append(
70-
MiniPlaceholdersHook.parseAudience(player, "<luckperms_prefix> <player_name>")
70+
MiniPlaceholdersHook.parse(player, "<luckperms_prefix> <player_name>")
7171
)
7272
}
7373

0 commit comments

Comments
 (0)