Merge pull request #1 from NotAlexNoyle/main

Use Ktfmt (Kotlin-style) using Spotless

build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     kotlin("jvm") version "2.1.21"
     id("io.papermc.paperweight.userdev") version "2.0.0-beta.17"
     id("com.gradleup.shadow") version "8.3.6"
+    id("com.diffplug.spotless") version "7.0.4"
     eclipse
 }
 
@@ -52,6 +53,7 @@ tasks.assemble {
 }
 
 tasks.build {
+    dependsOn(tasks.spotlessApply)
     dependsOn(tasks.shadowJar)
 }
 
@@ -93,3 +95,10 @@ java {
     }
 }
 
+spotless {
+    kotlin {
+        ktfmt().kotlinlangStyle().configure {
+            it.setMaxWidth(120)
+        }
+    }
+}

src/main/kotlin/nl/skbotnl/rewindfixog/Events.kt

@@ -25,4 +25,4 @@ class Events : Listener {
             player.velocity = player.location.direction.multiply(0.26)
         }
     }
-}
+}

src/main/kotlin/nl/skbotnl/rewindfixog/Helper.kt

@@ -4,6 +4,7 @@ import java.util.*
 
 object Helper {
     private var boatTimeout: MutableMap<UUID, Long> = HashMap()
+
     fun getBoatTimeout(uuid: UUID): Long {
         val cooldown: Long
         if (!boatTimeout.containsKey(uuid)) {

src/main/kotlin/nl/skbotnl/rewindfixog/MoveBoatRunnable.kt

@@ -9,4 +9,4 @@ class MoveBoatRunnable(private val boat: Boat, private val vec: Vector) : Runnab
     override fun run() {
         boat.move(MoverType.PLAYER, Vec3(vec.x, vec.y, vec.z))
     }
-}
+}

src/main/kotlin/nl/skbotnl/rewindfixog/MoveHorseRunnable.kt

@@ -9,4 +9,4 @@ class MoveHorseRunnable(private val horse: AbstractHorse, private val vec: Vecto
     override fun run() {
         horse.move(MoverType.PLAYER, Vec3(vec.x, vec.y, vec.z))
     }
-}
+}

src/main/kotlin/nl/skbotnl/rewindfixog/RewindFixOG.kt

@@ -29,80 +29,82 @@ class RewindFixOG : JavaPlugin() {
         plugin = this
         viaApi = Via.getAPI()
         object : BukkitRunnable() {
-            override fun run() {
-                for (player in Bukkit.getOnlinePlayers()) {
-                    if (player.vehicle == null) {
-                        return
-                    }
-                    if (viaApi.getPlayerVersion(player.uniqueId) > 107) {
-                        return
-                    }
-                    if (player.vehicle is CraftAbstractHorse && player.vehicle !is CraftLlama) {
-                        val abstractHorse = player.vehicle as CraftAbstractHorse
-                        if (abstractHorse.inventory.saddle == null) {
+                override fun run() {
+                    for (player in Bukkit.getOnlinePlayers()) {
+                        if (player.vehicle == null) {
                             return
                         }
-                        val downVec = Vector(0, -1, 0)
-                        val nmsHorse = abstractHorse.handle
-                        Bukkit.getScheduler().runTask(plugin, MoveHorseRunnable(nmsHorse, downVec))
-                    }
-                    if (player.vehicle is CraftBoat) {
-                        if ((player.vehicle as CraftBoat).isInWater) {
+                        if (viaApi.getPlayerVersion(player.uniqueId) > 107) {
                             return
                         }
-                        val craftBoat = player.vehicle as CraftBoat
-                        val downVec = Vector(0.0, -0.5, 0.0)
-                        val nmsBoat = craftBoat.handle
-                        Bukkit.getScheduler().runTask(plugin, MoveBoatRunnable(nmsBoat, downVec))
+                        if (player.vehicle is CraftAbstractHorse && player.vehicle !is CraftLlama) {
+                            val abstractHorse = player.vehicle as CraftAbstractHorse
+                            if (abstractHorse.inventory.saddle == null) {
+                                return
+                            }
+                            val downVec = Vector(0, -1, 0)
+                            val nmsHorse = abstractHorse.handle
+                            Bukkit.getScheduler().runTask(plugin, MoveHorseRunnable(nmsHorse, downVec))
+                        }
+                        if (player.vehicle is CraftBoat) {
+                            if ((player.vehicle as CraftBoat).isInWater) {
+                                return
+                            }
+                            val craftBoat = player.vehicle as CraftBoat
+                            val downVec = Vector(0.0, -0.5, 0.0)
+                            val nmsBoat = craftBoat.handle
+                            Bukkit.getScheduler().runTask(plugin, MoveBoatRunnable(nmsBoat, downVec))
+                        }
                     }
                 }
             }
-        }.runTaskTimer(this, 0L, 1L)
-        protocolManager.addPacketListener(object :
-            PacketAdapter(this, ListenerPriority.NORMAL, PacketType.Play.Client.STEER_VEHICLE) {
-            override fun onPacketReceiving(event: PacketEvent) {
-                val player = event.player
-                val api = Via.getAPI()
-                if (api.getPlayerVersion(player.uniqueId) > 107) {
-                    return
-                }
-                val packet = event.packet
-                val sideways = packet.float.read(0)
-                val forward = packet.float.read(1)
-                if (forward == 0f && sideways == 0f) {
-                    return
-                }
-                if (event.player.vehicle == null) {
-                    return
-                }
-                if (player.vehicle is CraftLlama) {
-                    return
-                }
-                if (event.player.vehicle is CraftBoat) {
-                    val craftBoat = event.player.vehicle as CraftBoat
-                    val nmsBoat: Boat = craftBoat.handle
-                    if (Helper.getBoatTimeout(player.uniqueId) != 0L) {
+            .runTaskTimer(this, 0L, 1L)
+        protocolManager.addPacketListener(
+            object : PacketAdapter(this, ListenerPriority.NORMAL, PacketType.Play.Client.STEER_VEHICLE) {
+                override fun onPacketReceiving(event: PacketEvent) {
+                    val player = event.player
+                    val api = Via.getAPI()
+                    if (api.getPlayerVersion(player.uniqueId) > 107) {
                         return
                     }
-                    val loc = player.location
-                    val vec = loc.direction
-                    vec.setY(0)
-                    Bukkit.getScheduler().runTask(plugin, MoveBoatRunnable(nmsBoat, vec))
-                } else if (event.player.vehicle is CraftAbstractHorse) {
-                    val craftHorse = event.player.vehicle as CraftAbstractHorse
-                    if (craftHorse.inventory.saddle == null) {
+                    val packet = event.packet
+                    val sideways = packet.float.read(0)
+                    val forward = packet.float.read(1)
+                    if (forward == 0f && sideways == 0f) {
                         return
                     }
-                    val speed = craftHorse.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)?.value ?: return
-                    val nmsHorse: AbstractHorse = craftHorse.handle
-                    val loc = player.location
-                    val vec = loc.direction
-                    vec.setY(0)
-                    vec.multiply(3 * speed)
-                    Bukkit.getScheduler().runTask(plugin, MoveHorseRunnable(nmsHorse, vec))
+                    if (event.player.vehicle == null) {
+                        return
+                    }
+                    if (player.vehicle is CraftLlama) {
+                        return
+                    }
+                    if (event.player.vehicle is CraftBoat) {
+                        val craftBoat = event.player.vehicle as CraftBoat
+                        val nmsBoat: Boat = craftBoat.handle
+                        if (Helper.getBoatTimeout(player.uniqueId) != 0L) {
+                            return
+                        }
+                        val loc = player.location
+                        val vec = loc.direction
+                        vec.setY(0)
+                        Bukkit.getScheduler().runTask(plugin, MoveBoatRunnable(nmsBoat, vec))
+                    } else if (event.player.vehicle is CraftAbstractHorse) {
+                        val craftHorse = event.player.vehicle as CraftAbstractHorse
+                        if (craftHorse.inventory.saddle == null) {
+                            return
+                        }
+                        val speed = craftHorse.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)?.value ?: return
+                        val nmsHorse: AbstractHorse = craftHorse.handle
+                        val loc = player.location
+                        val vec = loc.direction
+                        vec.setY(0)
+                        vec.multiply(3 * speed)
+                        Bukkit.getScheduler().runTask(plugin, MoveHorseRunnable(nmsHorse, vec))
+                    }
                 }
             }
-        })
+        )
         this.server.pluginManager.registerEvents(Events(), this)
     }
 }