From 8974a313713b8c59ae6de1445d8adbda5da4f4fd Mon Sep 17 00:00:00 2001 From: Bixilon Date: Sat, 28 Jan 2023 19:27:17 +0100 Subject: [PATCH] bump kutil --- build.gradle.kts | 2 +- gradle.properties | 2 +- src/main/java/de/bixilon/minosoft/Minosoft.kt | 2 +- .../bixilon/minosoft/data/registries/registries/Registries.kt | 2 +- .../minosoft/protocol/network/connection/play/PlayConnection.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6401db9a8..638097565 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,7 +59,7 @@ repositories { buildscript { dependencies { - classpath("de.bixilon", "kutil", "1.19.1") + classpath("de.bixilon", "kutil", "1.20") } } diff --git a/gradle.properties b/gradle.properties index 6c14c782c..0bd79d3c3 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.87.Final jackson.version=2.14.1 -kutil.version=1.19.1 +kutil.version=1.20 diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.kt b/src/main/java/de/bixilon/minosoft/Minosoft.kt index 21b96dc31..069817e38 100644 --- a/src/main/java/de/bixilon/minosoft/Minosoft.kt +++ b/src/main/java/de/bixilon/minosoft/Minosoft.kt @@ -86,7 +86,7 @@ object Minosoft { } MinosoftPropertiesLoader.load() - val taskWorker = TaskWorker(criticalErrorHandler = { _, exception -> exception.crash() }) + val taskWorker = TaskWorker(errorHandler = { _, error -> error.crash() }) taskWorker += WorkerTask(identifier = BootTasks.CLI, priority = ThreadPool.HIGH, executor = CLI::startThread) 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 7a8b56300..745133a11 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 @@ -150,7 +150,7 @@ class Registries : Parentable { item.flattened = isFlattened var error: Throwable? = null - val worker = TaskWorker(errorHandler = { _, it -> if (error == null) error = it }, criticalErrorHandler = { _, it -> if (error == null) error = it }) + val worker = TaskWorker(errorHandler = { _, it -> if (error == null) error = it }) val stopwatch = Stopwatch() // enums worker += WorkerTask(this::shape) { this.shape.load(pixlyzerData["shapes"]?.toJsonObject()) } diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt index a2b339215..1736470a4 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt @@ -181,7 +181,7 @@ class PlayConnection( state = PlayConnectionStates.LOADING_ASSETS var error: Throwable? = null - val taskWorker = TaskWorker(errorHandler = { _, exception -> if (error == null) error = exception }, criticalErrorHandler = { _, exception -> if (error == null) error = exception }) + val taskWorker = TaskWorker(errorHandler = { _, exception -> if (error == null) error = exception }) taskWorker += { events.fire(RegistriesLoadEvent(this, registries, RegistriesLoadEvent.States.PRE)) registries.parent = version.load(profiles.resources, latch)