From 26765d586e187ebd088cdb2f7451768a637968c8 Mon Sep 17 00:00:00 2001 From: Trumeet Date: Fri, 29 Jul 2022 12:17:56 -0700 Subject: feat(mod/libacron): provide entity type to clients API:ADD --- mod/src/main/java/moe/ymc/acron/s2c/Entity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mod/src/main/java/moe/ymc/acron/s2c/Entity.java') diff --git a/mod/src/main/java/moe/ymc/acron/s2c/Entity.java b/mod/src/main/java/moe/ymc/acron/s2c/Entity.java index 3e0add1..b10c041 100644 --- a/mod/src/main/java/moe/ymc/acron/s2c/Entity.java +++ b/mod/src/main/java/moe/ymc/acron/s2c/Entity.java @@ -4,6 +4,7 @@ import com.google.gson.annotations.SerializedName; import com.mojang.authlib.GameProfile; import moe.ymc.acron.common.Vec3d; import moe.ymc.acron.common.WorldKey; +import net.minecraft.entity.EntityType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -11,16 +12,18 @@ import java.util.UUID; public record Entity(@SerializedName("name") @NotNull String name, @SerializedName("uuid") @NotNull UUID uuid, + @SerializedName("type") @NotNull String type, @SerializedName("pos") @Nullable Vec3d pos, @SerializedName("world") @Nullable WorldKey world) { public Entity(@NotNull net.minecraft.entity.Entity entity) { this(entity.getName().getString(), entity.getUuid(), + EntityType.getId(entity.getType()).toString(), new Vec3d(entity.getPos()), WorldKey.create(entity.world.getRegistryKey().getValue())); } public Entity(@NotNull GameProfile profile) { - this(profile.getName(), profile.getId(), null, null); + this(profile.getName(), profile.getId(), "minecraft:player", null, null); } } -- cgit v1.2.3