From 61fd25f300df8d2f62d4db3aa65ed1f80cd6d5f2 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Mon, 5 Apr 2021 23:19:42 +0200
Subject: [PATCH] entities: move entity attributes to sub json object

---
 .../pixlyzer/generator/generators/EntityGenerator.kt       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
index 593213f..6814d45 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
@@ -57,6 +57,7 @@ object EntityGenerator : Generator(
             // ToDo: entityData.addProperty("category", entityType.getEntityCategory(entity).ordinal)
 
             if (entity is LivingEntity && entity2 is LivingEntity) {
+                val attributesData = JsonObject()
                 for ((resourceLocation, attribute) in ATTRIBUTE_MAP) {
                     val attributes = LIVING_ENTITY_GET_ATTRIBUTES_METHOD.invoke(entity) ?: continue
                     val instance = BASE_ATTRIBUTE_MAP_GET_INSTANCE_METHOD.invoke(attributes, attribute) as EntityAttributeInstance? ?: continue
@@ -68,7 +69,11 @@ object EntityGenerator : Generator(
                     if (value != value2) {
                         continue
                     }
-                    entityData.addProperty(resourceLocation, value)
+
+                    attributesData.addProperty(resourceLocation, value)
+                }
+                if (attributesData.size() > 0) {
+                    entityData.add("attributes", attributesData)
                 }
 
                 //       entity.getEatingSound(ItemStack.EMPTY)?.let {