Reformat utils

Author: Avanatiker

common/src/main/kotlin/com/lambda/util/FolderRegister.kt

@@ -19,12 +19,17 @@ package com.lambda.util
 
 import com.lambda.Lambda.mc
 import com.lambda.core.Loadable
+import com.lambda.util.FolderRegister.config
+import com.lambda.util.FolderRegister.lambda
+import com.lambda.util.FolderRegister.minecraft
+import com.lambda.util.FolderRegister.packetLogs
+import com.lambda.util.FolderRegister.replay
 import com.lambda.util.StringUtils.sanitizeForFilename
 import java.io.File
 import java.net.InetSocketAddress
 import java.nio.file.Path
-import kotlin.io.path.*
-import kotlin.math.min
+import kotlin.io.path.createDirectories
+import kotlin.io.path.notExists
 
 /**
  * The [FolderRegister] object is responsible for managing the directory structure of the application.

common/src/main/kotlin/com/lambda/util/Mouse.kt

@@ -18,7 +18,6 @@
 package com.lambda.util
 
 import org.lwjgl.glfw.GLFW
-import kotlin.jvm.Throws
 
 class Mouse {
     enum class Button(val key: Int) {

common/src/main/kotlin/com/lambda/util/VarIntIterator.kt

@@ -17,12 +17,10 @@
 
 package com.lambda.util
 
-import java.util.NoSuchElementException
-
 class VarIntIterator(
     private val bytes: ByteArray,
     private val bitsPerEntry: Int = 7,
-    private val maxGroups: Int = 5
+    private val maxGroups: Int = 5,
 ) : Iterator<Int> {
     private var index: Int = 0
 

common/src/main/kotlin/com/lambda/util/extension/World.kt

@@ -83,7 +83,7 @@ fun StructureTemplate.readSpongeOrException(
 fun StructureTemplate.readSchematicOrException(
     lookup: RegistryEntryLookup<Block>,
     nbt: NbtCompound,
-): Throwable? = when (nbt.getString("Materials")) {
+): Throwable = when (nbt.getString("Materials")) {
     "Alpha" -> IllegalStateException("Not implemented, you can help us by contributing to the project")
     "Classic" -> IllegalStateException("Method not implemented, you can help us by contributing to the Minecraft Wiki (https://minecraft.wiki/w/Data_values_(Classic))")
     "Pocket" -> IllegalStateException("Pocket Edition schematics are not supported")
@@ -121,24 +121,24 @@ private fun StructureTemplate.readSpongeV1OrException(
     palette.keys
         .sortedBy { palette.getInt(it) }
         .forEach { key ->
-        val resource = key.substringBefore('[')
-        val blockState = NbtCompound()
-
-        // Why ?
-        // I know it's supposed to be SNBT, but it cannot be parsed back
-        key.substringAfter('[')
-            .substringBefore(']')
-            .takeIf { it != resource }
-            ?.split(',')
-            ?.associate { it.substringBefore('=') to it.substringAfter('=') }
-            ?.forEach { (key, value) -> blockState.putString(key, value) }
-
-        // Populate the list using the correct indices
-        newPalette.add(NbtCompound().apply {
-            putString("Name", resource)
-            put("Properties", blockState)
-        })
-    }
+            val resource = key.substringBefore('[')
+            val blockState = NbtCompound()
+
+            // Why ?
+            // I know it's supposed to be SNBT, but it cannot be parsed back
+            key.substringAfter('[')
+                .substringBefore(']')
+                .takeIf { it != resource }
+                ?.split(',')
+                ?.associate { it.substringBefore('=') to it.substringAfter('=') }
+                ?.forEach { (key, value) -> blockState.putString(key, value) }
+
+            // Populate the list using the correct indices
+            newPalette.add(NbtCompound().apply {
+                putString("Name", resource)
+                put("Properties", blockState)
+            })
+        }
 
     val newBlocks = NbtList()
     var blockIndex = 0
@@ -181,6 +181,6 @@ private fun StructureTemplate.readSpongeV3OrException(
 fun StructureTemplate.readLitematicaOrException(
     lookup: RegistryEntryLookup<Block>,
     nbt: NbtCompound,
-): Throwable? {
+): Throwable {
     return IllegalStateException("Litematica parsing is not implemented")
 }

common/src/main/kotlin/com/lambda/util/math/VecUtils.kt

@@ -19,11 +19,7 @@ package com.lambda.util.math
 
 import com.lambda.util.math.MathUtils.sq
 import net.minecraft.entity.Entity
-import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Direction
-import net.minecraft.util.math.EightWayDirection
-import net.minecraft.util.math.Vec3d
-import net.minecraft.util.math.Vec3i
+import net.minecraft.util.math.*
 import kotlin.math.pow
 import kotlin.math.roundToInt
 import kotlin.math.sqrt
@@ -44,11 +40,15 @@ object VecUtils {
     fun EightWayDirection.rotateClockwise(steps: Int) =
         EightWayDirection.entries[(ordinal + steps) % 8]
 
-    fun Vec3d.approximate(other: Vec3d, precision: Double = 2.0E-4): Boolean = (subtract(other) distSq Vec3d.ZERO) > precision.pow(2)
+    fun Vec3d.approximate(other: Vec3d, precision: Double = 2.0E-4): Boolean =
+        (subtract(other) distSq Vec3d.ZERO) > precision.pow(2)
+
     infix fun Vec3d.dist(other: Vec3d): Double = sqrt(this distSq other)
     infix fun Vec3d.dist(other: Vec3i): Double = sqrt(this distSq other)
     infix fun Vec3d.distSq(other: Vec3d): Double = this.squaredDistanceTo(other)
-    infix fun Vec3d.distSq(other: Vec3i): Double = this.squaredDistanceTo(other.x.toDouble(), other.y.toDouble(), other.z.toDouble())
+    infix fun Vec3d.distSq(other: Vec3i): Double =
+        this.squaredDistanceTo(other.x.toDouble(), other.y.toDouble(), other.z.toDouble())
+
     infix operator fun Vec3d.plus(other: Vec3d): Vec3d = this.add(other)
     infix operator fun Vec3d.minus(other: Vec3d): Vec3d = this.subtract(other)
     infix operator fun Vec3d.times(other: Vec3d): Vec3d = this.multiply(other)

common/src/main/kotlin/com/lambda/util/player/MovementUtils.kt

@@ -43,7 +43,7 @@ object MovementUtils {
 
     fun SafeContext.newMovementInput(
         assumeBaritoneUsage: Boolean = true,
-        slowDownCheck: Boolean = true
+        slowDownCheck: Boolean = true,
     ): Input = if (assumeBaritoneUsage && player.input.handledByBaritone) {
         player.input
     } else {
@@ -61,7 +61,7 @@ object MovementUtils {
         forward: Double,
         strafe: Double,
         jump: Boolean = false,
-        sneak: Boolean = false
+        sneak: Boolean = false,
     ) = Input().apply {
         movementForward = forward.toFloat()
         movementSideways = strafe.toFloat()
@@ -109,26 +109,26 @@ object MovementUtils {
 
     private fun inputMoveOffset(
         moveForward: Double,
-        moveStrafe: Double
+        moveStrafe: Double,
     ) = atan2(-moveStrafe, moveForward)
 
     fun SafeContext.calcMoveYaw(
         yawIn: Float = player.moveYaw,
         moveForward: Double = player.input.roundedForward,
-        moveStrafe: Double = player.input.roundedStrafing
+        moveStrafe: Double = player.input.roundedStrafing,
     ) = yawIn + inputMoveOffset(moveForward, moveStrafe).toDegree()
 
     fun SafeContext.calcMoveRad(
         yawIn: Float = player.moveYaw,
         moveForward: Double = player.input.roundedForward,
-        moveStrafe: Double = player.input.roundedStrafing
+        moveStrafe: Double = player.input.roundedStrafing,
     ) = yawIn.toRadian() + inputMoveOffset(moveForward, moveStrafe)
 
     fun SafeContext.movementVector(radDir: Double = calcMoveRad(), y: Double = 0.0) =
         Vec3d(-sin(radDir), y, cos(radDir))
 
     var Entity.motion
-        get() = velocity;
+        get() = velocity
         set(value) {
             velocity = value
         }

common/src/main/kotlin/com/lambda/util/player/prediction/PredictionTick.kt

@@ -40,7 +40,7 @@ data class PredictionTick(
     val eyePos: Vec3d,
     val onGround: Boolean,
     val isJumping: Boolean,
-    val predictionEntity: PredictionEntity
+    val predictionEntity: PredictionEntity,
 ) {
     fun next() = skipTicks(1)
 

common/src/main/kotlin/com/lambda/util/world/BlockDsl.kt

@@ -56,7 +56,7 @@ class BlockDsl(
     pos: BlockPos,
     private val range: Vec3i,
     private val step: Vec3i,
-    private val predicate: (BlockPos, BlockState) -> Boolean
+    private val predicate: (BlockPos, BlockState) -> Boolean,
 ) {
     private val fastVector = pos.toFastVec()
     private val receiver: MutableMap<FastVector, BlockState> = mutableMapOf()
@@ -87,7 +87,7 @@ fun SafeContext.blockSearch(
     range: Vec3i,
     step: Vec3i = Vec3i(1, 1, 1),
     pos: BlockPos = player.blockPos,
-    predicate: (BlockPos, BlockState) -> Boolean = { _, _ -> true }
+    predicate: (BlockPos, BlockState) -> Boolean = { _, _ -> true },
 ): Map<BlockPos, BlockState> =
     BlockDsl(this, pos, range, step, predicate).build()
 
@@ -104,6 +104,6 @@ fun SafeContext.blockSearch(
     range: Int,
     step: Int = 1,
     pos: BlockPos = player.blockPos,
-    predicate: (BlockPos, BlockState) -> Boolean = { _, _ -> true }
+    predicate: (BlockPos, BlockState) -> Boolean = { _, _ -> true },
 ): Map<BlockPos, BlockState> =
     blockSearch(Vec3i(range, range, range), Vec3i(step, step, step), pos, predicate)

common/src/main/kotlin/com/lambda/util/world/EntityDsl.kt

@@ -59,7 +59,7 @@ class EntityDsl<T : Entity>(
     private val kClass: KClass<out T>,
     pos: BlockPos,
     private val range: Double,
-    private val predicate: (T) -> Boolean
+    private val predicate: (T) -> Boolean,
 ) {
     private val fastVector = pos.toFastVec()
     private val receiver: MutableList<T> = mutableListOf()
@@ -97,7 +97,7 @@ class EntityDsl<T : Entity>(
 inline fun <reified T : Entity> SafeContext.entitySearch(
     range: Double,
     pos: BlockPos = player.blockPos,
-    noinline predicate: (T) -> Boolean = { true }
+    noinline predicate: (T) -> Boolean = { true },
 ): List<T> = EntityDsl(this, T::class, pos, range, predicate).build()
 
 /**
@@ -112,5 +112,5 @@ inline fun <reified T : Entity> SafeContext.entitySearch(
 inline fun <reified T : Entity> SafeContext.fastEntitySearch(
     range: Double,
     pos: BlockPos = player.blockPos,
-    noinline predicate: (T) -> Boolean = { true }
+    noinline predicate: (T) -> Boolean = { true },
 ): List<T> = EntityDsl(this, T::class, pos, range, predicate).buildFast()

common/src/main/kotlin/com/lambda/util/world/FluidDsl.kt

@@ -63,7 +63,7 @@ class FluidDsl<T : Fluid>(
     pos: BlockPos,
     private val range: Vec3i,
     private val step: Vec3i,
-    private val predicate: (BlockPos, FluidState) -> Boolean
+    private val predicate: (BlockPos, FluidState) -> Boolean,
 ) {
     private val fastVector = pos.toFastVec()
     private val receiver: MutableMap<FastVector, T> = mutableMapOf()
@@ -95,7 +95,7 @@ inline fun <reified T : Fluid> SafeContext.fluidSearch(
     range: Vec3i,
     step: Vec3i,
     pos: BlockPos = player.blockPos,
-    noinline predicate: (BlockPos, FluidState) -> Boolean
+    noinline predicate: (BlockPos, FluidState) -> Boolean,
 ): Map<BlockPos, T> = FluidDsl(this, T::class, pos, range, step, predicate).build()
 
 /**
@@ -111,5 +111,5 @@ inline fun <reified T : Fluid> SafeContext.fluidSearch(
     range: Int,
     step: Int,
     pos: BlockPos = player.blockPos,
-    noinline predicate: (BlockPos, FluidState) -> Boolean
+    noinline predicate: (BlockPos, FluidState) -> Boolean,
 ): Map<BlockPos, T> = fluidSearch(Vec3i(range, range, range), Vec3i(step, step, step), pos, predicate)