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

22w19a: map entity data

Browse Source
This commit is contained in:
Bixilon 2022-06-15 21:10:06 +02:00
parent 396027fecf
commit 5854bcc4d3
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Painting.kt
View File

@ -43,7 +43,7 @@ class Painting(
companion object : EntityFactory<Painting> {
override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("painting")
private val MOTIVE_DATA = EntityDataField("MOTIVE")
private val MOTIVE_DATA = EntityDataField("MOTIF", "MOTIVE")
override fun build(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation): Painting {
return Painting(connection, entityType, data, position.toVec3i(), Directions.NORTH, null)

13
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Allay.kt
View File

@ -15,7 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster
import de.bixilon.kotlinglm.vec3.Vec3d
import de.bixilon.minosoft.data.entities.EntityRotation
import de.bixilon.minosoft.data.entities.data.EntityData
import de.bixilon.minosoft.data.entities.data.EntityDataField
import de.bixilon.minosoft.data.entities.entities.PathfinderMob
import de.bixilon.minosoft.data.entities.entities.SynchronizedEntityData
import de.bixilon.minosoft.data.registries.entities.EntityFactory
import de.bixilon.minosoft.data.registries.entities.EntityType
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
@ -23,8 +25,19 @@ import de.bixilon.minosoft.util.KUtil.toResourceLocation
class Allay(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation) : PathfinderMob(connection, entityType, data, position, rotation) {
@get:SynchronizedEntityData
val isDancing: Boolean
get() = data.getBoolean(IS_DANCING_DATA, false)
@get:SynchronizedEntityData
val canDuplicate: Boolean
get() = data.getBoolean(CAN_DUPLICATE_DATA, true)
companion object : EntityFactory<Allay> {
override val RESOURCE_LOCATION = "minecraft:allay".toResourceLocation()
private val IS_DANCING_DATA = EntityDataField("IS_DANCING")
private val CAN_DUPLICATE_DATA = EntityDataField("CAN_DUPLICATE")
override fun build(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation): Allay {
return Allay(connection, entityType, data, position, rotation)