AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 19:35:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

bump kutil

Browse Source
This commit is contained in:
Bixilon 2023-01-28 19:27:17 +01:00
parent 1b4769b58a
commit 8974a31371
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -59,7 +59,7 @@ repositories {
buildscript { buildscript {
dependencies { dependencies {
classpath("de.bixilon", "kutil", "1.19.1") classpath("de.bixilon", "kutil", "1.20")
} }
} }

2
gradle.properties
View File

@ -17,4 +17,4 @@ lwjgl.version=3.3.2-SNAPSHOT
ikonli.version=12.3.1 ikonli.version=12.3.1
netty.version=4.1.87.Final netty.version=4.1.87.Final
jackson.version=2.14.1 jackson.version=2.14.1
kutil.version=1.19.1 kutil.version=1.20

2
src/main/java/de/bixilon/minosoft/Minosoft.kt
View File

@ -86,7 +86,7 @@ object Minosoft {
} }
MinosoftPropertiesLoader.load() 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) taskWorker += WorkerTask(identifier = BootTasks.CLI, priority = ThreadPool.HIGH, executor = CLI::startThread)

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

@ -150,7 +150,7 @@ class Registries : Parentable<Registries> {
item.flattened = isFlattened item.flattened = isFlattened
var error: Throwable? = null 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() val stopwatch = Stopwatch()
// enums // enums
worker += WorkerTask(this::shape) { this.shape.load(pixlyzerData["shapes"]?.toJsonObject()) } worker += WorkerTask(this::shape) { this.shape.load(pixlyzerData["shapes"]?.toJsonObject()) }

2
src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt
View File

@ -181,7 +181,7 @@ class PlayConnection(
state = PlayConnectionStates.LOADING_ASSETS state = PlayConnectionStates.LOADING_ASSETS
var error: Throwable? = null 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 += { taskWorker += {
events.fire(RegistriesLoadEvent(this, registries, RegistriesLoadEvent.States.PRE)) events.fire(RegistriesLoadEvent(this, registries, RegistriesLoadEvent.States.PRE))
registries.parent = version.load(profiles.resources, latch) registries.parent = version.load(profiles.resources, latch)