From dcf04103c6b7c77ab9a4191042871c5ace2eac94 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Tue, 23 Feb 2021 21:31:00 +0100 Subject: [PATCH] fix abstract player entity data --- .../pixlyzer/generator/generators/EntityGenerator.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 09ac407..836a938 100644 --- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt +++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt @@ -10,6 +10,7 @@ import net.minecraft.resources.ResourceLocation import net.minecraft.world.entity.Entity import net.minecraft.world.entity.LivingEntity import net.minecraft.world.entity.ai.attributes.Attributes +import net.minecraft.world.entity.player.Player object EntityGenerator : Generator( "entities" @@ -128,6 +129,17 @@ object EntityGenerator : Generator( generateMetaDataForParents(entityClass, entityData, data) } + + // Fix player + data[ResourceLocation("player").toString()]?.asJsonObject?.let { + val playerClassName = Player::class.simpleName.toString() + val player = data[playerClassName].asJsonObject + for ((key, value) in player.entrySet()) { + it.add(key, value) + } + it.addProperty("class", playerClassName) + data.remove(playerClassName) + } } private fun generateMetaDataForParents(clazz: Class, entityData: JsonObject, data: JsonObject) {