bump kutil

This fixes an issue with timed out assets loading or pixlyzer data loading

build.gradle.kts

@@ -56,7 +56,7 @@ repositories {
 
 buildscript {
     dependencies {
-        classpath("de.bixilon", "kutil", "1.18.2")
+        classpath("de.bixilon", "kutil", "1.18.3")
     }
 }
 

gradle.properties

@@ -17,4 +17,4 @@ lwjgl.version=3.3.2-SNAPSHOT
 ikonli.version=12.3.1
 netty.version=4.1.85.Final
 jackson.version=2.14.1
-kutil.version=1.18.2
+kutil.version=1.18.3

src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt

@@ -13,13 +13,13 @@
 package de.bixilon.minosoft.data.entities.entities
 
 import de.bixilon.kotlinglm.vec3.Vec3d
+import de.bixilon.kutil.random.RandomUtil.nextLong
 import de.bixilon.minosoft.data.entities.EntityRotation
 import de.bixilon.minosoft.data.entities.data.EntityData
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.entities.EntityFactory
 import de.bixilon.minosoft.data.registries.entities.EntityType
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
-import de.bixilon.minosoft.util.KUtil.nextLong
 
 class LightningBolt(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d) : Entity(connection, entityType, data, position, EntityRotation(0.0f, 0.0f)) {
     val duration = random.nextLong(100, 250)
@@ -27,7 +27,7 @@ class LightningBolt(connection: PlayConnection, entityType: EntityType, data: En
     companion object : EntityFactory<LightningBolt> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("lightning_bolt")
 
-        override fun build(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation): LightningBolt? {
+        override fun build(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation): LightningBolt {
             return LightningBolt(connection, entityType, data, position)
         }
     }

src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt

@@ -215,7 +215,7 @@ class Registries {
             if (error2 != null) {
                 throw error2
             }
-            inner.waitForChange()
+            inner.waitForChange(100L)
         }
         error?.let { throw it }
 

src/main/java/de/bixilon/minosoft/data/world/World.kt

@@ -20,6 +20,7 @@ import de.bixilon.kutil.concurrent.pool.ThreadPool
 import de.bixilon.kutil.concurrent.worker.unconditional.UnconditionalTask
 import de.bixilon.kutil.concurrent.worker.unconditional.UnconditionalWorker
 import de.bixilon.kutil.observer.DataObserver.Companion.observed
+import de.bixilon.kutil.random.RandomUtil.nextInt
 import de.bixilon.minosoft.data.entities.block.BlockEntity
 import de.bixilon.minosoft.data.registries.biomes.Biome
 import de.bixilon.minosoft.data.registries.blocks.BlockState
@@ -53,7 +54,6 @@ import de.bixilon.minosoft.modding.event.events.blocks.BlockSetEvent
 import de.bixilon.minosoft.modding.event.events.blocks.chunk.ChunkDataChangeEvent
 import de.bixilon.minosoft.modding.event.events.blocks.chunk.ChunkUnloadEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
-import de.bixilon.minosoft.util.KUtil.nextInt
 import de.bixilon.minosoft.util.chunk.ChunkUtil.canBuildBiomeCache
 import de.bixilon.minosoft.util.chunk.ChunkUtil.getChunkNeighbourPositions
 import de.bixilon.minosoft.util.chunk.ChunkUtil.isInViewDistance

src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/fun/effects/tint/Tint.kt

@@ -13,12 +13,12 @@
 
 package de.bixilon.minosoft.gui.rendering.framebuffer.world.`fun`.effects.tint
 
+import de.bixilon.kutil.random.RandomUtil.nextInt
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.framebuffer.world.`fun`.FunEffect
 import de.bixilon.minosoft.gui.rendering.framebuffer.world.`fun`.FunEffectFactory
-import de.bixilon.minosoft.util.KUtil.nextInt
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
 import java.util.*
 

src/main/java/de/bixilon/minosoft/gui/rendering/stats/ExperimentalRenderStats.kt

@@ -17,8 +17,9 @@ import de.bixilon.kotlinglm.func.common.clamp
 import de.bixilon.kutil.avg.Average
 import de.bixilon.kutil.avg.LongAverage
 import de.bixilon.kutil.random.RandomUtil.nextFloat
+import de.bixilon.kutil.random.RandomUtil.nextInt
 import de.bixilon.kutil.time.TimeUtil
-import de.bixilon.minosoft.util.KUtil.nextInt
+import de.bixilon.kutil.time.TimeUtil.millis
 import java.util.*
 
 class ExperimentalRenderStats : AbstractRenderStats {
@@ -33,7 +34,7 @@ class ExperimentalRenderStats : AbstractRenderStats {
     private var lastSmoothFPSCalculationTime = 0L
     override var smoothAvgFPS: Double = 0.0
         get() {
-            val time = TimeUtil.millis
+            val time = millis()
             if (time - lastSmoothFPSCalculationTime > 100) {
                 field = avgFPS
                 lastSmoothFPSCalculationTime = time

src/main/java/de/bixilon/minosoft/util/KUtil.kt

@@ -325,14 +325,4 @@ object KUtil {
         val random = SecureRandom()
         return UUID(random.nextLong(), random.nextLong())
     }
-
-    @Deprecated("Kutil")
-    fun Random.nextInt(min: Int, max: Int): Int {
-        return nextInt((max - min) + 1) + min
-    }
-
-    @Deprecated("Kutil")
-    fun Random.nextLong(min: Long, max: Long): Long {
-        return nextLong() % (max - min) + min
-    }
 }