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

KeyHandler: Don't queue first tick twice

Browse Source 
The RepeatedTask instantly executed in kutil 1.27 (additionally with the onTick call).
This commit is contained in:
Moritz Zwerger 2025-06-05 19:35:06 +02:00
parent 5bab0bf394
commit c51e0cdaee
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/bixilon/minosoft/input/interaction/KeyHandler.kt
View File

@ -1,6 +1,6 @@
/* /*
* Minosoft * Minosoft
* Copyright (C) 2020-2023 Moritz Zwerger * Copyright (C) 2020-2025 Moritz Zwerger
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* *
@ -17,8 +17,10 @@ import de.bixilon.kutil.concurrent.pool.ThreadPool
import de.bixilon.kutil.concurrent.schedule.RepeatedTask import de.bixilon.kutil.concurrent.schedule.RepeatedTask
import de.bixilon.kutil.concurrent.schedule.TaskScheduler import de.bixilon.kutil.concurrent.schedule.TaskScheduler
import de.bixilon.kutil.exception.Broken import de.bixilon.kutil.exception.Broken
import de.bixilon.kutil.reflection.ReflectionUtil.forceSet
import de.bixilon.minosoft.protocol.network.session.play.tick.TickUtil import de.bixilon.minosoft.protocol.network.session.play.tick.TickUtil
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
import de.bixilon.minosoft.util.KUtil.skip
import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.milliseconds
abstract class KeyHandler { abstract class KeyHandler {
@ -28,6 +30,7 @@ abstract class KeyHandler {
private fun queueTick() { private fun queueTick() {
val task = RepeatedTask(TickUtil.INTERVAL, priority = ThreadPool.HIGH) { onTick() } val task = RepeatedTask(TickUtil.INTERVAL, priority = ThreadPool.HIGH) { onTick() }
task.skip(1)
this.task = task this.task = task
TaskScheduler += task TaskScheduler += task
} }

8
src/main/java/de/bixilon/minosoft/util/KUtil.kt
View File

@ -30,12 +30,14 @@ import de.bixilon.kutil.collections.CollectionUtil.synchronizedSetOf
import de.bixilon.kutil.collections.CollectionUtil.toSynchronizedSet import de.bixilon.kutil.collections.CollectionUtil.toSynchronizedSet
import de.bixilon.kutil.concurrent.pool.DefaultThreadPool import de.bixilon.kutil.concurrent.pool.DefaultThreadPool
import de.bixilon.kutil.concurrent.pool.runnable.ForcePooledRunnable import de.bixilon.kutil.concurrent.pool.runnable.ForcePooledRunnable
import de.bixilon.kutil.concurrent.schedule.RepeatedTask
import de.bixilon.kutil.concurrent.schedule.TaskScheduler import de.bixilon.kutil.concurrent.schedule.TaskScheduler
import de.bixilon.kutil.primitive.DoubleUtil import de.bixilon.kutil.primitive.DoubleUtil
import de.bixilon.kutil.primitive.DoubleUtil.matches import de.bixilon.kutil.primitive.DoubleUtil.matches
import de.bixilon.kutil.primitive.IntUtil.isIntSafe import de.bixilon.kutil.primitive.IntUtil.isIntSafe
import de.bixilon.kutil.reflection.ReflectionUtil.field import de.bixilon.kutil.reflection.ReflectionUtil.field
import de.bixilon.kutil.reflection.ReflectionUtil.forceInit import de.bixilon.kutil.reflection.ReflectionUtil.forceInit
import de.bixilon.kutil.reflection.ReflectionUtil.forceSet
import de.bixilon.kutil.reflection.ReflectionUtil.getUnsafeField import de.bixilon.kutil.reflection.ReflectionUtil.getUnsafeField
import de.bixilon.kutil.reflection.ReflectionUtil.realName import de.bixilon.kutil.reflection.ReflectionUtil.realName
import de.bixilon.kutil.shutdown.ShutdownManager import de.bixilon.kutil.shutdown.ShutdownManager
@ -78,7 +80,6 @@ import java.util.*
import javax.net.ssl.SSLContext import javax.net.ssl.SSLContext
import kotlin.time.Duration import kotlin.time.Duration
import kotlin.time.Duration.Companion.nanoseconds import kotlin.time.Duration.Companion.nanoseconds
import kotlin.time.Duration.Companion.seconds
import kotlin.time.ExperimentalTime import kotlin.time.ExperimentalTime
@ -361,4 +362,9 @@ object KUtil {
@OptIn(ExperimentalTime::class) @OptIn(ExperimentalTime::class)
@Deprecated("kutil 1.27.2") @Deprecated("kutil 1.27.2")
fun SimpleDateFormat.format1(instant: kotlin.time.Instant) = format(instant.toEpochMilliseconds()) fun SimpleDateFormat.format1(instant: kotlin.time.Instant) = format(instant.toEpochMilliseconds())
@Deprecated("Kutil 1.27.2")
fun RepeatedTask.skip(count: Int = 1) {
this::next.forceSet(now() + this.interval * count)
}
} }