Implement EntityTag id in spawn eggs (#17)

Queerbric · Jul 30, 2021 · 44bc6c2 · 44bc6c2
1 parent 6bbeba2
commit 44bc6c2
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/main/java/io/github/queerbric/inspecio/tooltip/SpawnEntityTooltipComponent.java b/src/main/java/io/github/queerbric/inspecio/tooltip/SpawnEntityTooltipComponent.java
@@ -30,9 +30,9 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtElement;
 
 import java.util.Optional;
-import java.util.UUID;
 
 public class SpawnEntityTooltipComponent extends EntityTooltipComponent {
 	private final Entity entity;
@@ -59,6 +59,19 @@ public static Optional<TooltipData> of(EntityType<?> entityType, NbtCompound ite
 				villagerData.putString("type", "minecraft:plains");
 				itemEntityNbt.put("VillagerData", villagerData);
 			}
+			if (itemEntityNbt.contains("id", NbtElement.STRING_TYPE)) {
+				var id = itemEntityNbt.getString("id");
+				id = id.replaceAll("[^a-z0-9/._-]", "");
+				itemEntityNbt.putString("id", id);
+				Optional<EntityType<?>> entityTypeOptional = EntityType.fromNbt(itemEntityNbt);
+				if (entityTypeOptional.isPresent()) {
+					var entity2 = entityTypeOptional.get().create(client.world);
+					if (entity2 != null) {
+						entity = entity2;
+						adjustEntity(entity, itemNbt, entitiesConfig);
+					}
+				}
+			}
 			var entityTag = entity.writeNbt(new NbtCompound());
 			var uuid = entity.getUuid();
 			entityTag.copyFrom(itemEntityNbt);