Merge branch 'develop' into feature/drop-bukkit-support

OneLiteFeather · web-flow · commit a00c586037a7 · 2025-05-30T20:00:13.000+02:00
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -12,11 +12,11 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Build on ${{ matrix.os }}
-        run: ./gradlew clean build -x test
+        run: ./gradlew clean build -x test
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ Discord: https://discord.onelitefeather.net
 
 ## Permissions
 - `attollo.use` - Allows the player to use the elevator
+- `attollo.update` - Allows the player to receive update notifications
 
 ## Configuration
 ```yaml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ import net.minecrell.pluginyml.bukkit.BukkitPluginDescription.Permission.Default
 import xyz.jpenilla.runpaper.task.RunServer
 
 plugins {
-    kotlin("jvm") version "2.0.0"
+    kotlin("jvm") version "2.1.0"
     alias(libs.plugins.publishdata)
     alias(libs.plugins.shadow)
     alias(libs.plugins.paper.run)
@@ -34,7 +34,7 @@ val supportedMinecraftVersions = listOf(
 
 repositories {
     mavenCentral()
-    maven("https://papermc.io/repo/repository/maven-public/")
+    maven("https://repo.papermc.io/repository/maven-public/")
 }
 
 dependencies {
@@ -65,6 +65,10 @@ paper {
             description = "Allows the player to use the plugin"
             default = Default.TRUE
         }
+        register("attollo.update") {
+            description = "Allows the player to see update notifications"
+            default = Default.OP
+        }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -14,10 +14,9 @@ dependencyResolutionManagement {
             version("publishdata", "1.4.0")
             version("modrinth", "2.+")
             version("hangar", "0.1.2")
-            version("paper.yml", "0.6.0")
-            version("paper.run", "2.3.0")
+            version("bukkit.yml", "0.6.0")
+            version("paper.run", "2.3.1")
             version("shadow", "8.1.7")
-
             version("paper", "1.21-R0.1-SNAPSHOT")
             version("adventure", "4.17.0")
             version("mockk", "1.13.11")
diff --git a/src/main/kotlin/dev/themeinerlp/attollo/Attollo.kt b/src/main/kotlin/dev/themeinerlp/attollo/Attollo.kt
@@ -1,20 +1,43 @@
 package dev.themeinerlp.attollo
 
 import dev.themeinerlp.attollo.listener.AttolloListener
+import dev.themeinerlp.attollo.listener.UpdateCheckerListener
+import dev.themeinerlp.attollo.service.UpdateService
 import org.bukkit.Material
 import org.bukkit.plugin.java.JavaPlugin
 
 open class Attollo : JavaPlugin() {
 
-
     lateinit var elevatorBlock: Material
+    lateinit var updateService: UpdateService
+
     override fun onLoad() {
         saveDefaultConfig()
     }
 
     override fun onEnable() {
-        elevatorBlock = Material.matchMaterial(config.getString("elevatorBlock") ?: "DAYLIGHT_DETECTOR")
-            ?: Material.DAYLIGHT_DETECTOR
+        val rawValue = config.getString("elevatorBlock") ?: "DAYLIGHT_DETECTOR"
+        val material = Material.matchMaterial(rawValue)
+
+        if (material == null) {
+            logger.warning("Invalid elevatorBlock material in config.yml: '$rawValue'. Defaulting to DAYLIGHT_DETECTOR.")
+        }
+
+        elevatorBlock = material ?: Material.DAYLIGHT_DETECTOR
+        logger.info("Using elevatorBlock: $elevatorBlock")
         server.pluginManager.registerEvents(AttolloListener(this), this)
+        updateChecker()
     }
+
+    override fun onDisable() {
+        updateService.shutdown()
+    }
+
+    private fun updateChecker() {
+        updateService = UpdateService(this)
+        updateService.run()
+        updateService.notifyConsole(componentLogger)
+        server.pluginManager.registerEvents(UpdateCheckerListener(this), this)
+    }
+
 }
diff --git a/src/main/kotlin/dev/themeinerlp/attollo/constants.kt b/src/main/kotlin/dev/themeinerlp/attollo/constants.kt
@@ -1,4 +1,16 @@
 package dev.themeinerlp.attollo
 
+import java.net.URI
+import java.net.http.HttpRequest
+
+
+
 const val USE_PERMISSION = "attollo.use"
-const val BYTEBIN_BASE_URL = "https://paste.grim.ac/data"
+const val NOTIFY_UPDATE_PERMISSION = "attollo.update"
+const val BYTEBIN_BASE_URL = "https://paste.grim.ac/data"
+
+const val NOTIFY_PLAYER_UPDATE_MESSAGE = "<yellow><download_url>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!"
+const val NOTIFY_CONSOLE_UPDATE_MESSAGE = "<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>."
+
+val LATEST_RELEASE_VERSION_URI = URI.create("https://hangar.papermc.io/api/v1/projects/Attollo/latestrelease")
+val LATEST_RELEASE_VERSION_REQUEST = HttpRequest.newBuilder().GET().uri(LATEST_RELEASE_VERSION_URI).build()
diff --git a/src/main/kotlin/dev/themeinerlp/attollo/listener/AttolloListener.kt b/src/main/kotlin/dev/themeinerlp/attollo/listener/AttolloListener.kt
@@ -29,7 +29,7 @@ class AttolloListener(private val attollo: Attollo) : Listener {
     private fun handleElevator(player: Player, up: Boolean = false) {
         if (!player.hasPermission(USE_PERMISSION)) return
 
-        val location = player.location
+        val location = player.location.subtract(0.0, 1.0, 0.0)
         val block = location.block
 
         if (block.type != attollo.elevatorBlock) return
@@ -57,4 +57,4 @@ class AttolloListener(private val attollo: Attollo) : Listener {
        player.teleportAsync(modifiedLocation)
     }
 
-}
+}
diff --git a/src/main/kotlin/dev/themeinerlp/attollo/listener/UpdateCheckerListener.kt b/src/main/kotlin/dev/themeinerlp/attollo/listener/UpdateCheckerListener.kt
@@ -0,0 +1,19 @@
+package dev.themeinerlp.attollo.listener
+
+import dev.themeinerlp.attollo.Attollo
+import dev.themeinerlp.attollo.NOTIFY_UPDATE_PERMISSION
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.player.PlayerJoinEvent
+
+class UpdateCheckerListener(private val attollo: Attollo) : Listener {
+
+    @EventHandler
+    fun onJoin(event: PlayerJoinEvent) {
+        val player = event.player
+        if (player.isOp || player.hasPermission(NOTIFY_UPDATE_PERMISSION)) {
+            attollo.updateService.notifyPlayer(player)
+        }
+    }
+
+}
diff --git a/src/main/kotlin/dev/themeinerlp/attollo/service/UpdateService.kt b/src/main/kotlin/dev/themeinerlp/attollo/service/UpdateService.kt
@@ -0,0 +1,90 @@
+package dev.themeinerlp.attollo.service
+
+import com.github.zafarkhaja.semver.Version
+import dev.themeinerlp.attollo.*
+import net.kyori.adventure.text.Component
+import net.kyori.adventure.text.event.ClickEvent
+import net.kyori.adventure.text.logger.slf4j.ComponentLogger
+import net.kyori.adventure.text.minimessage.MiniMessage
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder
+import org.bukkit.Bukkit
+import org.bukkit.entity.Player
+import org.slf4j.LoggerFactory
+import java.io.IOException
+import java.net.http.HttpClient
+import java.net.http.HttpResponse
+
+class UpdateService(plugin: Attollo) : Runnable {
+    private val hangarClient = HttpClient.newBuilder().build()
+    private val LOGGER = LoggerFactory.getLogger(UpdateService::class.java)
+    private val localVersion = Version.parse(plugin.pluginMeta.version)
+    private var remoteVersion: Version? = null
+    private val scheduler = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, this, 0, 20 * 60 * 60 * 3)
+    private val DOWNLOAD_URL = "https://hangar.papermc.io/OneLiteFeather/Attollo/versions/%s"
+
+
+    override fun run() {
+        val remoteVersion: Version? = getNewerVersion()
+        if (remoteVersion != null) {
+            this.remoteVersion = remoteVersion
+            for (onlinePlayer in Bukkit.getOnlinePlayers()) {
+                if (onlinePlayer.isOp || onlinePlayer.hasPermission(NOTIFY_UPDATE_PERMISSION)) {
+                    notifyPlayer(localVersion, remoteVersion, onlinePlayer)
+                }
+            }
+        }
+    }
+
+    fun notifyConsole(logger: ComponentLogger) {
+        if (this.remoteVersion != null && remoteVersion?.isHigherThan(this.localVersion) == true) {
+            logger.warn(
+                MiniMessage.miniMessage().deserialize(
+                    NOTIFY_CONSOLE_UPDATE_MESSAGE,
+                    Placeholder.component("local_version", Component.text(localVersion.toString())),
+                    Placeholder.component("remote_version", Component.text(remoteVersion.toString())),
+                    Placeholder.component("download_url", Component.text(DOWNLOAD_URL.format(remoteVersion.toString())))
+                )
+            )
+        }
+    }
+
+    fun notifyPlayer(player: Player) {
+        if (this.remoteVersion != null && remoteVersion?.isHigherThan(this.localVersion) == true) {
+            notifyPlayer(this.localVersion, this.remoteVersion, player)
+        }
+    }
+
+    private fun notifyPlayer(localVersion: Version, remoteVersion: Version?, player: Player) {
+        player.sendMessage(
+            MiniMessage.miniMessage().deserialize(
+                NOTIFY_PLAYER_UPDATE_MESSAGE,
+                Placeholder.component("local_version", Component.text(localVersion.toString())),
+                Placeholder.component("remote_version", Component.text(remoteVersion.toString())),
+                Placeholder.styling("download_url", ClickEvent.openUrl(DOWNLOAD_URL.format(remoteVersion.toString())))
+            )
+        )
+    }
+
+    private fun getNewerVersion(): Version? {
+        try {
+            val httpResponse = hangarClient.send(
+                LATEST_RELEASE_VERSION_REQUEST,
+                HttpResponse.BodyHandlers.ofString()
+            )
+            val remoteVersion = Version.parse(httpResponse.body())
+            if (remoteVersion.isHigherThan(this.localVersion)) {
+                return remoteVersion
+            }
+        } catch (e: IOException) {
+            LOGGER.error("Something went wrong to check updates", e)
+        } catch (e: InterruptedException) {
+            LOGGER.error("Something went wrong to check updates", e)
+        }
+        return null
+    }
+
+    fun shutdown() {
+        hangarClient.shutdownNow()
+        scheduler.cancel()
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import net.minecrell.pluginyml.bukkit.BukkitPluginDescription.Permission.Default`
`3`	`3`	`import xyz.jpenilla.runpaper.task.RunServer`
`4`	`4`
`5`	`5`	`plugins {`
`6`		`- kotlin("jvm") version "2.0.0"`
	`6`	`+ kotlin("jvm") version "2.1.0"`
`7`	`7`	`alias(libs.plugins.publishdata)`
`8`	`8`	`alias(libs.plugins.shadow)`
`9`	`9`	`alias(libs.plugins.paper.run)`
`@@ -34,7 +34,7 @@ val supportedMinecraftVersions = listOf(`
`34`	`34`
`35`	`35`	`repositories {`
`36`	`36`	`mavenCentral()`
`37`		`- maven("https://papermc.io/repo/repository/maven-public/")`
	`37`	`+ maven("https://repo.papermc.io/repository/maven-public/")`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`dependencies {`
`@@ -65,6 +65,10 @@ paper {`
`65`	`65`	`description = "Allows the player to use the plugin"`
`66`	`66`	`default = Default.TRUE`
`67`	`67`	`}`
	`68`	`+ register("attollo.update") {`
	`69`	`+ description = "Allows the player to see update notifications"`
	`70`	`+ default = Default.OP`
	`71`	`+ }`
`68`	`72`	`}`
`69`	`73`	`}`
`70`	`74`