chore: code cleanup

Author: Boy0000

src/main/kotlin/com/mineinabyss/deeperworld/extensions/DeeperWorldExtensions.kt

@@ -2,15 +2,13 @@ package com.mineinabyss.deeperworld.extensions
 
 import org.bukkit.entity.Entity
 
-internal fun Entity.getRootVehicle(): Entity? {
+internal fun Entity.rootVehicle(): Entity? {
     var currentVehicle = vehicle ?: return null
-    while (currentVehicle.isInsideVehicle) {
-        currentVehicle = currentVehicle.vehicle!!
-    }
+    while (currentVehicle.isInsideVehicle) currentVehicle = currentVehicle.vehicle!!
 
     return currentVehicle
 }
 
-internal fun Entity.getPassengersRecursive(): List<Entity> {
-    return passengers.plus(passengers.flatMap { it.getPassengersRecursive() })
+internal fun Entity.passengersRecursive(): List<Entity> {
+    return passengers.plus(passengers.flatMap { it.passengersRecursive() })
 }

src/main/kotlin/com/mineinabyss/deeperworld/listeners/MovementListener.kt

@@ -1,7 +1,7 @@
 package com.mineinabyss.deeperworld.listeners
 
 import com.mineinabyss.deeperworld.Permissions
-import com.mineinabyss.deeperworld.extensions.getPassengersRecursive
+import com.mineinabyss.deeperworld.extensions.passengersRecursive
 import com.mineinabyss.deeperworld.movement.MovementHandler
 import com.mineinabyss.deeperworld.services.canMoveSections
 import io.papermc.paper.event.entity.EntityMoveEvent
@@ -24,15 +24,14 @@ object MovementListener : Listener {
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
     fun VehicleMoveEvent.move() {
-        val players = vehicle.getPassengersRecursive().filterIsInstance<Player>()
+        val players = vehicle.passengersRecursive().filterIsInstance<Player>()
 
         val teleportEntity = players.firstOrNull { it.hasPermission(Permissions.ADMIN_PERMISSION) && it.canMoveSections } ?: vehicle
         MovementHandler.handleMovement(teleportEntity, from, to)
     }
 
     @EventHandler
     fun EntityMoveEvent.entityMove() {
-        if (!hasExplicitlyChangedPosition()) return
-        MovementHandler.handleMovement(entity, from, to)
+        if (hasExplicitlyChangedPosition()) MovementHandler.handleMovement(entity, from, to)
     }
 }

src/main/kotlin/com/mineinabyss/deeperworld/movement/transition/ConfigSectionChecker.kt

@@ -24,16 +24,10 @@ object ConfigSectionChecker : SectionChecker {
             fromSection != toSection -> to
             else -> null
         } ?: return null
+        val kind = if (to.y < from.y) TransitionKind.DESCEND else TransitionKind.ASCEND
 
         return corrLoc.section?.let {
-            SectionTransition(
-                from,
-                corrLoc,
-                fromSection,
-                it,
-                if (to.y < from.y) TransitionKind.DESCEND else TransitionKind.ASCEND,
-                teleportUnnecessary = fromSection != toSection
-            )
+            SectionTransition(from, corrLoc, fromSection, it, kind, fromSection != toSection)
         }
     }
 }

src/main/kotlin/com/mineinabyss/deeperworld/player/FallingDamageManager.kt

@@ -1,15 +1,15 @@
 package com.mineinabyss.deeperworld.player
 
 import com.mineinabyss.deeperworld.deeperWorld
-import com.mineinabyss.deeperworld.extensions.getRootVehicle
+import com.mineinabyss.deeperworld.extensions.rootVehicle
 import org.bukkit.GameMode.ADVENTURE
 import org.bukkit.GameMode.SURVIVAL
 import org.bukkit.Particle
 import org.bukkit.entity.Player
 
 internal object FallingDamageManager {
     fun updateFallingDamage(player: Player) {
-        val actualFallDistance = player.getRootVehicle()?.fallDistance ?: player.fallDistance
+        val actualFallDistance = player.rootVehicle()?.fallDistance ?: player.fallDistance
 
         if (actualFallDistance > deeperWorld.config.fall.maxSafeDist
             && !player.isGliding

src/main/kotlin/com/mineinabyss/deeperworld/synchronization/ContainerSyncListener.kt

@@ -42,14 +42,14 @@ object ContainerSyncListener : Listener {
             updateProtection(block)
 
             //allow chest protection signs to be placed
-            if (player.inventory.itemInMainHand.type.name.contains("SIGN")
+            if ("SIGN" in player.inventory.itemInMainHand.type.name
                 || !BlockLockerAPIv2.isAllowed(player, block, true)
                 || !BlockLockerAPIv2.isAllowed(player, linkedBlock, true)
             ) return
         }
 
         if (container is Lidded) {
-            (linkedBlock.state as Lidded).open()
+            (linkedBlock.state as? Lidded)?.open()
             if (!section.isOnTopOf(linkedSection)) container.open()
         }
 

src/main/kotlin/com/mineinabyss/deeperworld/synchronization/Updaters.kt

@@ -38,7 +38,7 @@ internal inline fun Location.sync(updater: (original: Block, corresponding: Bloc
 internal fun signUpdater(lines: MutableList<Component>? = null) = { original: Block, corresponding: Block ->
     copyBlockData(original, corresponding)
     val sign = original.state
-    if (sign is Sign) for (side in Side.values()) {
+    if (sign is Sign) for (side in Side.entries) {
         val readLines = lines ?: sign.getSide(side).lines()
         val corrSign = corresponding.state
         if (corrSign is Sign && !corrSign.getSide(side).lines().containsAll(readLines)) {