From 680586c953992935dcd568c4eea287e6f0553294 Mon Sep 17 00:00:00 2001 From: Gabber235 Date: Wed, 23 Oct 2024 18:07:19 +0200 Subject: [PATCH 1/2] Fix eye height for entities with scale data --- .../entity/entries/entity/custom/EntityTypeProperty.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/entity/custom/EntityTypeProperty.kt b/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/entity/custom/EntityTypeProperty.kt index 3102b819fc..fa439ed800 100644 --- a/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/entity/custom/EntityTypeProperty.kt +++ b/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/entity/custom/EntityTypeProperty.kt @@ -7,6 +7,8 @@ import com.typewritermc.engine.paper.entry.entity.EntityState import com.typewritermc.engine.paper.entry.entries.EntityProperty import com.typewritermc.entity.entries.data.minecraft.PoseProperty import com.typewritermc.entity.entries.data.minecraft.living.AgableProperty +import com.typewritermc.entity.entries.data.minecraft.living.ScaleData +import com.typewritermc.entity.entries.data.minecraft.living.ScaleProperty import com.typewritermc.entity.entries.data.minecraft.living.SizeProperty import com.typewritermc.entity.entries.data.minecraft.living.pufferfish.PuffStateProperty import com.typewritermc.entity.entries.data.minecraft.other.MarkerProperty @@ -67,7 +69,7 @@ private fun EntityType.matcher(properties: Map, EntityProperty>): Enti fun EntityType.state(properties: Map, EntityProperty>): EntityState { val matcher = matcher(properties) return EntityState( - eyeHeight = matcher.eyeHeight, + eyeHeight = matcher.eyeHeight * (properties.property(ScaleProperty::class)?.scale ?: 1.0), ) } From ed7af0e3def8a448519d8c6dfe0e3cbd039ae72c Mon Sep 17 00:00:00 2001 From: Gabber235 Date: Wed, 23 Oct 2024 18:07:36 +0200 Subject: [PATCH 2/2] Add colored and placeholder modifiers --- .../typewritermc/engine/paper/entry/entries/EntityEntry.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/entries/EntityEntry.kt b/engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/entries/EntityEntry.kt index d99e3adaf7..46ebba6a88 100644 --- a/engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/entries/EntityEntry.kt +++ b/engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/entries/EntityEntry.kt @@ -3,9 +3,7 @@ package com.typewritermc.engine.paper.entry.entries import com.typewritermc.core.entries.PriorityEntry import com.typewritermc.core.entries.Ref import com.typewritermc.core.entries.ref -import com.typewritermc.core.extension.annotations.Tags -import com.typewritermc.core.extension.annotations.Help -import com.typewritermc.core.extension.annotations.WithRotation +import com.typewritermc.core.extension.annotations.* import com.typewritermc.core.utils.point.Position import com.typewritermc.engine.paper.entry.* import com.typewritermc.engine.paper.entry.entity.* @@ -16,6 +14,8 @@ import kotlin.reflect.KClass @Tags("speaker") interface SpeakerEntry : PlaceholderEntry { + @Colored + @Placeholder @Help("The name of the entity that will be displayed in the chat (e.g. 'Steve' or 'Alex').") val displayName: String