Skip to content

Commit 02f8cc9

Browse files
committedNov 29, 2024·
use dynamic placeholders, fix version
1 parent 90b4256 commit 02f8cc9

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed
 

‎build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if (!File("$rootDir/.git").exists()) {
2525
}
2626

2727
group = "net.onelitefeather"
28-
version = "1.0.0"
28+
version = "1.4.0"
2929

3030
val minecraftVersion = "1.20.6"
3131
val supportedMinecraftVersions = listOf(

‎src/main/kotlin/dev/themeinerlp/attollo/Attollo.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ open class Attollo : JavaPlugin() {
2626
elevatorBlock = material ?: Material.DAYLIGHT_DETECTOR
2727
logger.info("Using elevatorBlock: $elevatorBlock")
2828
server.pluginManager.registerEvents(AttolloListener(this), this)
29-
server.pluginManager.registerEvents(UpdateCheckerListener(this), this)
3029
updateChecker()
3130
}
3231

@@ -38,6 +37,7 @@ open class Attollo : JavaPlugin() {
3837
updateService = UpdateService(this)
3938
updateService.run()
4039
updateService.notifyConsole(componentLogger)
40+
server.pluginManager.registerEvents(UpdateCheckerListener(this), this)
4141
}
4242

4343
}

‎src/main/kotlin/dev/themeinerlp/attollo/service/UpdateService.kt

+18-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import com.github.zafarkhaja.semver.Version
44
import dev.themeinerlp.attollo.Attollo
55
import dev.themeinerlp.attollo.LATEST_RELEASE_VERSION_REQUEST
66
import dev.themeinerlp.attollo.NOTIFY_UPDATE_PERMISSION
7+
import net.kyori.adventure.text.Component
78
import net.kyori.adventure.text.logger.slf4j.ComponentLogger
89
import net.kyori.adventure.text.minimessage.MiniMessage
10+
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder
911
import org.bukkit.Bukkit
1012
import org.bukkit.entity.Player
1113
import org.slf4j.LoggerFactory
@@ -36,7 +38,14 @@ class UpdateService(plugin: Attollo) : Runnable {
3638

3739
fun notifyConsole(logger: ComponentLogger) {
3840
if (this.remoteVersion != null && remoteVersion?.isHigherThan(this.localVersion) == true) {
39-
logger.warn(MiniMessage.miniMessage().deserialize("<yellow>Your version (${localVersion}) is older than our latest published version (${remoteVersion.toString()}). Please update as soon as possible to get continued support. Or use this link ${DOWNLOAD_URL.format(remoteVersion.toString())}"))
41+
logger.warn(
42+
MiniMessage.miniMessage().deserialize(
43+
"<yellow>Your version (<local_version>) is older than our latest published version (<remote_version>). Please update as soon as possible to get continued support. Or use this link <download_url>.",
44+
Placeholder.component("local_version", Component.text(localVersion.toString())),
45+
Placeholder.component("remote_version", Component.text(remoteVersion.toString())),
46+
Placeholder.component("download_url", Component.text(DOWNLOAD_URL.format(remoteVersion.toString())))
47+
)
48+
)
4049
}
4150
}
4251

@@ -47,7 +56,14 @@ class UpdateService(plugin: Attollo) : Runnable {
4756
}
4857

4958
private fun notifyPlayer(localVersion: Version, remoteVersion: Version?, player: Player) {
50-
player.sendMessage(MiniMessage.miniMessage().deserialize("<yellow><click:open_url:'https://hangar.papermc.io/OneLiteFeather/Attollo'>Your version (${localVersion}) is older than our latest published version (${remoteVersion.toString()}). Please update as soon as possible to get continued support. Or click me to get on the download page!</click>"))
59+
player.sendMessage(
60+
MiniMessage.miniMessage().deserialize(
61+
"<yellow><click:open_url:'https://hangar.papermc.io/OneLiteFeather/Attollo'>Your version (<local_version>) is older than our latest published version (<remote_version>). Please update as soon as possible to get continued support. Or click me to get on the download page!</click>",
62+
Placeholder.component("local_version", Component.text(localVersion.toString())),
63+
Placeholder.component("remote_version", Component.text(remoteVersion.toString())),
64+
Placeholder.component("download_url", Component.text(DOWNLOAD_URL.format(remoteVersion.toString())))
65+
)
66+
)
5167
}
5268

5369
private fun getNewerVersion(): Version? {

0 commit comments

Comments
 (0)