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

fix some bugs in TimeWorker, more fixes

Browse Source
This commit is contained in:
Bixilon 2021-05-05 19:55:53 +02:00
parent 4edba60489
commit 770fe6551d
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
9 changed files with 58 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/bixilon/minosoft/data/entities/StatusEffectInstance.kt
View File

@ -18,4 +18,10 @@ data class StatusEffectInstance(
val statusEffect: StatusEffect,
val amplifier: Int,
val duration: Int,
)
) {
private val startMillis = System.currentTimeMillis()
val remainingMillis: Long
get() = System.currentTimeMillis() - startMillis
}

18
src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt
View File

@ -31,6 +31,7 @@ import de.bixilon.minosoft.gui.rendering.util.VecUtil.chunkPosition
import de.bixilon.minosoft.gui.rendering.util.VecUtil.inChunkPosition
import de.bixilon.minosoft.protocol.network.connection.PlayConnection
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
import de.bixilon.minosoft.util.KUtil.synchronizedMapOf
import glm_.vec3.Vec3
import java.lang.reflect.InvocationTargetException
import java.util.*
@ -42,8 +43,8 @@ abstract class Entity(
var position: Vec3,
var rotation: EntityRotation,
) {
val equipment: MutableMap<EquipmentSlots, ItemStack> = mutableMapOf()
val effectList: MutableSet<StatusEffectInstance> = mutableSetOf()
val equipment: MutableMap<EquipmentSlots, ItemStack> = synchronizedMapOf()
val activeStatusEffects: MutableMap<StatusEffect, StatusEffectInstance> = synchronizedMapOf()
@JvmField
protected val versionId: Int = connection.version.versionId
@ -69,12 +70,11 @@ abstract class Entity(
fun addEffect(effect: StatusEffectInstance) {
// effect already applied, maybe the duration or the amplifier changed?
effectList.removeIf { (statusEffect) -> statusEffect === effect.statusEffect }
effectList.add(effect)
activeStatusEffects[effect.statusEffect] = effect
}
fun removeEffect(effect: StatusEffect) {
effectList.removeIf { (statusEffect) -> statusEffect === effect }
activeStatusEffects.remove(effect)
}
fun attachTo(vehicleId: Int?) {
@ -278,7 +278,7 @@ abstract class Entity(
return delta
}
fun tick(deltaMillis: Long) {
private fun tickMovement(deltaMillis: Long) {
if (connection.world.getChunk(position.blockPosition.chunkPosition)?.isFullyLoaded != true) {
return // ignore update if chunk is not loaded yet
}
@ -301,6 +301,12 @@ abstract class Entity(
move(velocity * deltaTime)
}
fun tick(deltaMillis: Long) {
check(deltaMillis > 0L) { "Delta tick time is <= 0: $deltaMillis" }
tickMovement(deltaMillis)
}
private val aabb: AABB
get() = defaultAABB + position

10
src/main/java/de/bixilon/minosoft/data/entities/meta/EntityMetaData.kt
View File

@ -40,6 +40,10 @@ class EntityMetaData(
) {
val sets: MetaDataHashMap = MetaDataHashMap()
override fun toString(): String {
return sets.toString()
}
fun getData(type: EntityMetaDataDataTypes, buffer: PlayInByteBuffer): Any? {
return when (type) {
EntityMetaDataDataTypes.BYTE -> buffer.readByte()
@ -128,8 +132,8 @@ class EntityMetaData(
get(index)?.let {
try {
return it as K
} catch (e: ClassCastException) {
Log.log(LogMessageType.OTHER, level = LogLevels.WARN, message = e)
} catch (exception: ClassCastException) {
Log.log(LogMessageType.OTHER, level = LogLevels.WARN, message = exception)
}
}
return field.getDefaultValue()
@ -197,7 +201,7 @@ class EntityMetaData(
}
fun getChatComponent(field: EntityMetaDataFields): ChatComponent? {
return ChatComponent.of(get(field), connection.version.localeManager)
return get<Any?>(field)?.let { ChatComponent.of(it, connection.version.localeManager) }
}
fun getString(field: EntityMetaDataFields): String? {

9
src/main/java/de/bixilon/minosoft/data/inventory/ItemStack.kt
View File

@ -161,11 +161,6 @@ data class ItemStack(
return nbt
}
override fun toString(): String {
return fullDisplayName
}
val displayName: ChatComponent
get() {
customDisplayName?.let { return it }
@ -173,10 +168,6 @@ data class ItemStack(
return ChatComponent.of(item.toString())
}
// ToDo all properties
val fullDisplayName: String
get() = displayName.legacyText + ": " + super.toString()
fun shouldHideEnchantments(): Boolean {
return BitByte.isBitSet(hideFlags, HIDE_ENCHANTMENT_BIT)
}

3
src/main/java/de/bixilon/minosoft/data/world/WorldEntities.kt
View File

@ -15,6 +15,7 @@ package de.bixilon.minosoft.data.world
import de.bixilon.minosoft.data.entities.entities.Entity
import de.bixilon.minosoft.util.KUtil.synchronizedMapOf
import de.bixilon.minosoft.util.KUtil.toSynchronizedMap
import java.util.*
class WorldEntities : Iterable<Entity> {
@ -72,6 +73,6 @@ class WorldEntities : Iterable<Entity> {
}
override fun iterator(): Iterator<Entity> {
return idEntityMap.values.iterator()
return idEntityMap.toSynchronizedMap().values.iterator()
}
}

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

@ -117,10 +117,12 @@ class PlayConnection(
velocityHandlerTask = TimeWorkerTask(ProtocolDefinition.TICK_TIME / 5) {
val currentTime = System.currentTimeMillis()
val deltaTime = currentTime - velocityHandlerLastExecutionTime
for (entity in world.entities) {
entity.tick(deltaTime)
if (deltaTime > 0L) {
for (entity in world.entities) {
entity.tick(deltaTime)
}
renderer?.renderWindow?.inputHandler?.camera?.checkPosition()
}
renderer?.renderWindow?.inputHandler?.camera?.checkPosition()
velocityHandlerLastExecutionTime = currentTime
}
TimeWorker.addTask(velocityHandlerTask)

2
src/main/java/de/bixilon/minosoft/terminal/commands/commands/CommandEntities.java
View File

@ -55,7 +55,7 @@ public class CommandEntities extends Command {
tableData.add(new Object[]{"Location", entity.getPosition()});
tableData.add(new Object[]{"Rotation", entity.getRotation()});
tableData.add(new Object[]{"Equipment", entity.getEquipment()});
tableData.add(new Object[]{"Effects", entity.getEffectList()});
tableData.add(new Object[]{"Effects", entity.getActiveStatusEffects()});
tableData.add(new Object[]{"Attached to", entity.getAttachedEntity() == -1 ? "" : entity.getAttachedEntity()});
for (var entry : entity.getEntityMetaDataFormatted().entrySet()) {

29
src/main/java/de/bixilon/minosoft/util/time/TimeWorker.kt
View File

@ -1,20 +1,25 @@
package de.bixilon.minosoft.util.time
import de.bixilon.minosoft.Minosoft
import de.bixilon.minosoft.util.KUtil.synchronizedListOf
import de.bixilon.minosoft.util.KUtil.toSynchronizedList
import de.bixilon.minosoft.util.KUtil.synchronizedSetOf
import de.bixilon.minosoft.util.KUtil.toSynchronizedSet
object TimeWorker {
private val TASKS: MutableList<TimeWorkerTask> = synchronizedListOf()
private val TASKS: MutableSet<TimeWorkerTask> = synchronizedSetOf()
init {
Thread({
while (true) {
val currentTime = System.currentTimeMillis()
for (task in TASKS.toSynchronizedList()) {
if (currentTime - task.lastExecution >= task.interval) {
Minosoft.THREAD_POOL.execute(task.runnable)
task.lastExecution = currentTime
for (task in TASKS.toSynchronizedSet()) {
if (!task.getsExecuted && currentTime - task.lastExecution >= task.interval) {
Minosoft.THREAD_POOL.execute {
task.getsExecuted = true
task.runnable.run()
task.lastExecution = currentTime
task.getsExecuted = false
}
TASKS -= task
}
}
Thread.sleep(1)
@ -22,6 +27,16 @@ object TimeWorker {
}, "TimeWorkerThread").start()
}
fun runIn(millis: Int, runnable: Runnable) {
val task = TimeWorkerTask(
interval = millis,
runnable = runnable,
runOnce = true,
)
task.lastExecution = System.currentTimeMillis()
TASKS += task
}
fun addTask(task: TimeWorkerTask) {
TASKS += task
}

2
src/main/java/de/bixilon/minosoft/util/time/TimeWorkerTask.kt
View File

@ -2,7 +2,9 @@ package de.bixilon.minosoft.util.time
data class TimeWorkerTask(
val interval: Int,
val runOnce: Boolean = true,
val runnable: Runnable,
) {
var getsExecuted: Boolean = false
var lastExecution: Long = 0L
}