Skip to content

Commit 9ae03c0

Browse files
Merge pull request #84 from SLNE-Development/fix/downgrade-miniplacehoder
refactor: remove `miniplaceholder-kotlin` dependency and adjust `Mini…
2 parents 08b2706 + ad06448 commit 9ae03c0

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
[versions]
22
playerholder-api = "2.11.6"
3-
miniplaceholder-api = "3.0.1"
4-
miniplaceholder-kotlin = "3.0.1"
3+
miniplaceholder-api = "2.3.0"
54
surf-database = "2.0.4-SNAPSHOT"
65

76
[libraries]
87
playerholder-api = { module = "me.clip:placeholderapi", version.ref = "playerholder-api" }
98
miniplaceholder-api = { module = "io.github.miniplaceholders:miniplaceholders-api", version.ref = "miniplaceholder-api" }
10-
miniplaceholder-kotlin = { module = "io.github.miniplaceholders:miniplaceholders-kotlin-ext", version.ref = "miniplaceholder-kotlin" }
119
surf-database = { module = "dev.slne.surf:surf-database", version.ref = "surf-database" }

surf-chat-bukkit/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ dependencies {
1111

1212
compileOnly(libs.playerholder.api)
1313
compileOnly(libs.miniplaceholder.api)
14-
compileOnly(libs.miniplaceholder.kotlin)
1514

1615
runtimeOnly(project(":surf-chat-fallback"))
1716
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object MiniPlaceholdersHook {
1414
return MiniMessage.miniMessage().deserialize(input)
1515
}
1616

17-
val resolver = MiniPlaceholders.audiencePlaceholders()
17+
val resolver = MiniPlaceholders.getAudienceGlobalPlaceholders(player)
1818
return MiniMessage.miniMessage().deserialize(input, player, resolver)
1919
}
2020

@@ -23,7 +23,7 @@ object MiniPlaceholdersHook {
2323
return MiniMessage.miniMessage().deserialize(input)
2424
}
2525

26-
val resolver = MiniPlaceholders.globalPlaceholders()
26+
val resolver = MiniPlaceholders.getGlobalPlaceholders()
2727
return MiniMessage.miniMessage().deserialize(input, resolver)
2828
}
2929
}

0 commit comments

Comments
 (0)