falling block entity physics

This commit is contained in:
Bixilon 2023-06-25 01:40:02 +02:00
parent a98b21b38b
commit ffaebece84
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 51 additions and 0 deletions

View File

@ -24,6 +24,7 @@ import de.bixilon.minosoft.data.registries.entities.EntityFactory
import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.data.registries.entities.EntityType
import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft
import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.identified.ResourceLocation
import de.bixilon.minosoft.physics.entities.item.FallingBlockPhysics
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
class FallingBlockEntity(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation) : Entity(connection, entityType, data, position, rotation) { class FallingBlockEntity(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation) : Entity(connection, entityType, data, position, rotation) {
@ -38,11 +39,16 @@ class FallingBlockEntity(connection: PlayConnection, entityType: EntityType, dat
override fun onAttack(attacker: Entity): Boolean = false override fun onAttack(attacker: Entity): Boolean = false
override fun createPhysics() = FallingBlockPhysics(this)
override fun setObjectData(data: Int) { override fun setObjectData(data: Int) {
blockState = connection.registries.blockState.getOrNull(data) blockState = connection.registries.blockState.getOrNull(data)
} }
override fun tick() {
if (blockState == null) return // TODO: discard
}
companion object : EntityFactory<FallingBlockEntity> { companion object : EntityFactory<FallingBlockEntity> {
override val identifier: ResourceLocation = minecraft("falling_block") override val identifier: ResourceLocation = minecraft("falling_block")
private val SPAWN_POSITION_DATA = EntityDataField("FALLING_BLOCK_SPAWN_POSITION") private val SPAWN_POSITION_DATA = EntityDataField("FALLING_BLOCK_SPAWN_POSITION")

View File

@ -0,0 +1,44 @@
/*
* Minosoft
* Copyright (C) 2020-2023 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 distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.physics.entities.item
import de.bixilon.kotlinglm.vec3.Vec3d
import de.bixilon.minosoft.data.entities.entities.item.FallingBlockEntity
import de.bixilon.minosoft.physics.PhysicsConstants
import de.bixilon.minosoft.physics.entities.EntityPhysics
class FallingBlockPhysics(entity: FallingBlockEntity) : EntityPhysics<FallingBlockEntity>(entity) {
// TODO: test
private fun move() {
if (entity.hasGravity) {
this.velocity = this.velocity + GRAVITY
}
this.move(this.velocity)
this.velocity = this.velocity * PhysicsConstants.AIR_RESISTANCE
}
override fun tick() {
move()
super.tick()
}
companion object {
val GRAVITY = Vec3d(0.0, -0.04, 0.0)
}
}

View File

@ -19,6 +19,7 @@ import de.bixilon.minosoft.physics.PhysicsConstants
import de.bixilon.minosoft.physics.entities.EntityPhysics import de.bixilon.minosoft.physics.entities.EntityPhysics
class PrimedTNTPhysics(entity: PrimedTNT) : EntityPhysics<PrimedTNT>(entity) { class PrimedTNTPhysics(entity: PrimedTNT) : EntityPhysics<PrimedTNT>(entity) {
// TODO: test
private fun move() { private fun move() {