diff --git a/src/main/java/de/bixilon/minosoft/data/entities/EntityRenderInfo.kt b/src/main/java/de/bixilon/minosoft/data/entities/EntityRenderInfo.kt index 852ba9672..08a1d8dda 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/EntityRenderInfo.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/EntityRenderInfo.kt @@ -45,7 +45,7 @@ class EntityRenderInfo(private val entity: Entity) : Drawable, Tickable { private fun interpolatePosition(delta: Float) { // TODO: Only interpolate if changed position = Vec3dUtil.interpolateLinear(delta.toDouble(), position0, position1) - eyePosition = position + Vec3d(0.0, entity.eyeHeight, 0.0) + eyePosition = position + Vec3d(0.0, entity.eyeHeight.toDouble(), 0.0) cameraAABB = entity.defaultAABB + position eyeBlockPosition = position1.blockPosition } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/plant/SweetBerryBushBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/plant/SweetBerryBushBlock.kt index 39b12ce26..1a7838c50 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/plant/SweetBerryBushBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/plant/SweetBerryBushBlock.kt @@ -30,10 +30,11 @@ open class SweetBerryBushBlock(resourceLocation: ResourceLocation, registries: R if (entity !is LivingEntity) { return } - physics.slowMovement(state, Vec3d(0.8f, 0.75, 0.8f)) + physics.slowMovement(state, SLOW) } companion object : PixLyzerBlockFactory { + val SLOW = Vec3d(0.8f, 0.75, 0.8f) override fun build(resourceLocation: ResourceLocation, registries: Registries, data: Map): SweetBerryBushBlock { return SweetBerryBushBlock(resourceLocation, registries, data) diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/snow/PowderSnowBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/snow/PowderSnowBlock.kt index 672360068..8575fa53e 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/snow/PowderSnowBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/snow/PowderSnowBlock.kt @@ -51,7 +51,7 @@ open class PowderSnowBlock(identifier: ResourceLocation = PowderSnowBlock.identi if (entity is LivingEntity && physics.positionInfo.block?.block !is PowderSnowBlock) { return } - physics.slowMovement(state, Vec3d(0.9f, 1.5, 0.9f)) + physics.slowMovement(state, SLOW) } override fun getCollisionShape(context: CollisionContext, blockPosition: Vec3i, state: BlockState, blockEntity: BlockEntity?): AbstractVoxelShape? { @@ -70,6 +70,7 @@ open class PowderSnowBlock(identifier: ResourceLocation = PowderSnowBlock.identi companion object : BlockFactory { override val identifier = minecraft("powder_snow") + private val SLOW = Vec3d(0.9f, 1.5, 0.9f) private val FALLING_SHAPE = VoxelShape(AABB(Vec3d(0.0, 0.0, 0.0), Vec3d(1.0, 0.9f, 1.0))) private val TAG = minecraft("powder_snow_walkable_mobs") diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pvp/CobwebBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pvp/CobwebBlock.kt index a280bada9..1072f8b52 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pvp/CobwebBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pvp/CobwebBlock.kt @@ -52,11 +52,12 @@ open class CobwebBlock(identifier: ResourceLocation = Companion.identifier, sett } override fun onEntityCollision(entity: Entity, physics: EntityPhysics<*>, position: Vec3i, state: BlockState) { - physics.slowMovement(state, Vec3d(0.25, 0.05f, 0.25)) + physics.slowMovement(state, SLOW) } companion object : BlockFactory { override val identifier = minecraft("cobweb") + val SLOW = Vec3d(0.25, 0.05f, 0.25) override fun build(registries: Registries, settings: BlockSettings) = CobwebBlock(settings = settings) } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt b/src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt index 394164641..197a93b38 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt @@ -103,7 +103,7 @@ abstract class Fluid(override val identifier: ResourceLocation) : RegistryItem() protected fun LivingEntityPhysics<*>.applyBouncing(y: Double) { val velocity = this.velocity if (!horizontalCollision || !doesNotCollide(Vec3d(velocity.x, velocity.y + 0.6f - position.y + y, velocity.z))) return - this.velocity = Vec3d(velocity.x, 0.3f, velocity.z) + this.velocity = Vec3d(velocity.x, 0.3, velocity.z) } protected fun LivingEntityPhysics<*>.applyFriction(horizontal: Double, vertical: Double = 0.8f.toDouble()) { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABB.kt b/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABB.kt index 1462ab831..167f821f2 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABB.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/shapes/aabb/AABB.kt @@ -168,9 +168,9 @@ class AABB { fun offset(axis: Axes, offset: Double): AABB { return when (axis) { - Axes.X -> this + Vec3d(-offset, 0, 0) - Axes.Y -> this + Vec3d(0, -offset, 0) - Axes.Z -> this + Vec3d(0, 0, -offset) + Axes.X -> this + Vec3d(-offset, 0.0, 0.0) + Axes.Y -> this + Vec3d(0.0, -offset, 0.0) + Axes.Z -> this + Vec3d(0.0, 0.0, -offset) } } @@ -237,7 +237,7 @@ class AABB { } fun hShrink(size: Float): AABB { - val vec = Vec3d(size, 0.0, size) + val vec = Vec3d(size, 0.0f, size) return AABB(min + vec, max - vec) } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt index 53f99f4b8..caf41bf01 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt @@ -111,7 +111,7 @@ object VecUtil { get() = this shr 4 val Vec3i.entityPosition: Vec3d - get() = Vec3d(x + 0.5f, y, z + 0.5f) // ToDo: Confirm + get() = Vec3d(x + 0.5, y + 0.0, z + 0.5) // ToDo: Confirm val Vec3i.centerf: Vec3 get() = Vec3(x + 0.5f, y + 0.5f, z + 0.5f) diff --git a/src/main/java/de/bixilon/minosoft/physics/entities/EntityPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/entities/EntityPhysics.kt index 8f6c0e9ee..aef73769d 100644 --- a/src/main/java/de/bixilon/minosoft/physics/entities/EntityPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/entities/EntityPhysics.kt @@ -14,6 +14,7 @@ package de.bixilon.minosoft.physics.entities import de.bixilon.kotlinglm.vec3.Vec3d +import de.bixilon.kotlinglm.vec3.Vec3i import de.bixilon.kutil.observer.DataObserver.Companion.observed import de.bixilon.kutil.primitive.DoubleUtil import de.bixilon.minosoft.data.direction.Directions @@ -33,7 +34,6 @@ import de.bixilon.minosoft.data.world.positions.BlockPosition import de.bixilon.minosoft.data.world.positions.ChunkPositionUtil.inChunkPosition import de.bixilon.minosoft.gui.rendering.util.VecUtil.plus import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY -import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.blockPosition import de.bixilon.minosoft.physics.EntityPositionInfo import de.bixilon.minosoft.physics.handlers.general.AbstractEntityPhysics import de.bixilon.minosoft.physics.handlers.movement.SneakAdjuster @@ -107,7 +107,7 @@ open class EntityPhysics(val entity: E) : BasicPhysicsEntity(), Abst fun getLandingPosition(): BlockPosition { val info = this.positionInfo - val position = Vec3d(info.inChunkPosition.x, position.y - 0.2, info.inChunkPosition.z).blockPosition + val position = Vec3i(info.inChunkPosition.x, (position.y - 0.2).toInt(), info.inChunkPosition.z) val state = positionInfo.chunk?.get(position) if (state == null) { val down = positionInfo.chunk?.get(position + Directions.DOWN) diff --git a/src/main/java/de/bixilon/minosoft/physics/entities/living/LivingEntityPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/entities/living/LivingEntityPhysics.kt index 99ee2b9b9..d0a091119 100644 --- a/src/main/java/de/bixilon/minosoft/physics/entities/living/LivingEntityPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/entities/living/LivingEntityPhysics.kt @@ -83,7 +83,7 @@ open class LivingEntityPhysics(entity: E) : EntityPhysics(e } fun swimUpwards(fluid: Identified) { - this.velocity = velocity + Vec3d(0.0, 0.04f, 0.0) + this.velocity = velocity + SWIM_UPWARDS } fun doesNotCollide(offset: Vec3d): Boolean { @@ -173,4 +173,8 @@ open class LivingEntityPhysics(entity: E) : EntityPhysics(e super.tickRiding() fallDistance = 0.0f } + + private companion object { + val SWIM_UPWARDS = Vec3d(0.0, 0.04f, 0.0) + } } diff --git a/src/main/java/de/bixilon/minosoft/physics/parts/CollisionMovementPhysics.kt b/src/main/java/de/bixilon/minosoft/physics/parts/CollisionMovementPhysics.kt index 490d14208..311c6aba5 100644 --- a/src/main/java/de/bixilon/minosoft/physics/parts/CollisionMovementPhysics.kt +++ b/src/main/java/de/bixilon/minosoft/physics/parts/CollisionMovementPhysics.kt @@ -134,7 +134,7 @@ object CollisionMovementPhysics { if (!grounded || !(collided.x || collided.z)) return collision - val stepHeight = stepHeight + val stepHeight = stepHeight.toDouble() var total = collide(Vec3d(movement.x, stepHeight, movement.z), aabb, collisions) val vertical = collide(Vec3d(0.0, stepHeight, 0.0), aabb.extend(Vec3d(movement.x, 0.0, movement.z)), collisions)