From 7dcfed1e8cc74d7cc4be8bea1f5d9252e3b4bed9 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Sat, 10 Dec 2022 13:54:14 +0100 Subject: [PATCH] bump kutil This fixes an issue with timed out assets loading or pixlyzer data loading --- build.gradle.kts | 2 +- gradle.properties | 2 +- .../minosoft/data/entities/entities/LightningBolt.kt | 4 ++-- .../minosoft/data/registries/registries/Registries.kt | 2 +- src/main/java/de/bixilon/minosoft/data/world/World.kt | 2 +- .../framebuffer/world/fun/effects/tint/Tint.kt | 2 +- .../gui/rendering/stats/ExperimentalRenderStats.kt | 5 +++-- src/main/java/de/bixilon/minosoft/util/KUtil.kt | 10 ---------- 8 files changed, 10 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 28addc594..b7a7dd84e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,7 +56,7 @@ repositories { buildscript { dependencies { - classpath("de.bixilon", "kutil", "1.18.2") + classpath("de.bixilon", "kutil", "1.18.3") } } diff --git a/gradle.properties b/gradle.properties index aab345741..a92701f7a 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt index 07027063e..36c154265 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt +++ b/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 { 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) } } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt b/src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt index 20b0238e4..d75c5d33e 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt +++ b/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 } diff --git a/src/main/java/de/bixilon/minosoft/data/world/World.kt b/src/main/java/de/bixilon/minosoft/data/world/World.kt index 2c8a17428..be9713560 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/World.kt +++ b/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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/fun/effects/tint/Tint.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/fun/effects/tint/Tint.kt index 286c10247..86d239b3e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/fun/effects/tint/Tint.kt +++ b/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.* diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/stats/ExperimentalRenderStats.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/stats/ExperimentalRenderStats.kt index 6e3561704..c0ed7fbdb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/stats/ExperimentalRenderStats.kt +++ b/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 diff --git a/src/main/java/de/bixilon/minosoft/util/KUtil.kt b/src/main/java/de/bixilon/minosoft/util/KUtil.kt index c9cacaa22..426f4b0c9 100644 --- a/src/main/java/de/bixilon/minosoft/util/KUtil.kt +++ b/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 - } }