Add lama renderer to choose lama-model based on variant and chest

Author: TBlueF

core/src/main/java/de/bluecolored/bluemap/core/map/hires/entity/EntityRendererType.java

@@ -40,9 +40,12 @@ public interface EntityRendererType extends Keyed, EntityRendererFactory {
     EntityRendererType DEFAULT = new Impl(Key.bluemap("default"), ResourceModelRenderer::new);
     EntityRendererType MISSING = new Impl(Key.bluemap("missing"), MissingModelRenderer::new);
 
+    EntityRendererType LLAMA = new Impl(Key.minecraft("llama"), LlamaRenderer::new);
+
     Registry<EntityRendererType> REGISTRY = new Registry<>(
             DEFAULT,
-            MISSING
+            MISSING,
+            LLAMA
     );
 
     /**

core/src/main/java/de/bluecolored/bluemap/core/map/hires/entity/LlamaRenderer.java

@@ -0,0 +1,61 @@
+package de.bluecolored.bluemap.core.map.hires.entity;
+
+import de.bluecolored.bluemap.core.map.TextureGallery;
+import de.bluecolored.bluemap.core.map.hires.RenderSettings;
+import de.bluecolored.bluemap.core.map.hires.TileModelView;
+import de.bluecolored.bluemap.core.resources.ResourcePath;
+import de.bluecolored.bluemap.core.resources.pack.resourcepack.ResourcePack;
+import de.bluecolored.bluemap.core.resources.pack.resourcepack.entitystate.Part;
+import de.bluecolored.bluemap.core.resources.pack.resourcepack.model.Model;
+import de.bluecolored.bluemap.core.util.Key;
+import de.bluecolored.bluemap.core.world.Entity;
+import de.bluecolored.bluemap.core.world.block.BlockNeighborhood;
+import de.bluecolored.bluemap.core.world.mca.entity.Llama;
+
+public class LlamaRenderer extends ResourceModelRenderer {
+
+    private final ResourcePath<Model>
+            LAMA_CREAMY = new ResourcePath<>(Key.MINECRAFT_NAMESPACE, "entity/llama/llama_creamy"),
+            LAMA_WHITE = new ResourcePath<>(Key.MINECRAFT_NAMESPACE, "entity/llama/llama_white"),
+            LAMA_BROWN = new ResourcePath<>(Key.MINECRAFT_NAMESPACE, "entity/llama/llama_brown"),
+            LAMA_GRAY = new ResourcePath<>(Key.MINECRAFT_NAMESPACE, "entity/llama/llama_gray"),
+            LAMA_CHEST_CREAMY = new ResourcePath<>(Key.MINECRAFT_NAMESPACE, "entity/llama/llama_chest_creamy"),
+            LAMA_CHEST_WHITE = new ResourcePath<>(Key.MINECRAFT_NAMESPACE, "entity/llama/llama_chest_white"),
+            LAMA_CHEST_BROWN = new ResourcePath<>(Key.MINECRAFT_NAMESPACE, "entity/llama/llama_chest_brown"),
+            LAMA_CHEST_GRAY = new ResourcePath<>(Key.MINECRAFT_NAMESPACE, "entity/llama/llama_chest_gray");
+
+    public LlamaRenderer(ResourcePack resourcePack, TextureGallery textureGallery, RenderSettings renderSettings) {
+        super(resourcePack, textureGallery, renderSettings);
+    }
+
+    @Override
+    public void render(Entity entity, BlockNeighborhood block, Part part, TileModelView tileModel) {
+        if (!(entity instanceof Llama llama)) return;
+
+        // choose correct model
+        ResourcePath<Model> model;
+        if (llama.isWithChest()) {
+            model = switch (llama.getVariant()) {
+                case CREAMY -> LAMA_CHEST_CREAMY;
+                case WHITE -> LAMA_CHEST_WHITE;
+                case BROWN -> LAMA_CHEST_BROWN;
+                case GRAY -> LAMA_CHEST_GRAY;
+            };
+        } else {
+            model = switch (llama.getVariant()) {
+                case CREAMY -> LAMA_CREAMY;
+                case WHITE -> LAMA_WHITE;
+                case BROWN -> LAMA_BROWN;
+                case GRAY -> LAMA_GRAY;
+            };
+        }
+
+        // render chosen model
+        super.render(entity, block, model.getResource(resourcePack::getModel), TintColorProvider.NO_TINT, tileModel);
+
+        // apply part transform
+        if (part.isTransformed())
+            tileModel.transform(part.getTransformMatrix());
+    }
+
+}

core/src/main/java/de/bluecolored/bluemap/core/world/mca/entity/EntityType.java

@@ -33,7 +33,11 @@
 
 public interface EntityType extends Keyed {
 
-    Registry<EntityType> REGISTRY = new Registry<>();
+    EntityType LLAMA = new Impl(Key.minecraft("llama"), Llama.class);
+
+    Registry<EntityType> REGISTRY = new Registry<>(
+            LLAMA
+    );
 
     Class<? extends Entity> getEntityClass();
 

core/src/main/java/de/bluecolored/bluemap/core/world/mca/entity/Llama.java

@@ -0,0 +1,24 @@
+package de.bluecolored.bluemap.core.world.mca.entity;
+
+import de.bluecolored.bluenbt.NBTName;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@EqualsAndHashCode(callSuper = true)
+@ToString
+@SuppressWarnings("FieldMayBeFinal")
+public class Llama extends MCAEntity {
+
+    @NBTName("ChestedHorse") boolean withChest;
+    @NBTName("Variant") Variant variant;
+
+    public enum Variant {
+        CREAMY,
+        WHITE,
+        BROWN,
+        GRAY
+    }
+
+}

core/src/main/resourceExtensions/assets/minecraft/entitystates/llama.json

@@ -1,5 +1,5 @@
 {
   "parts": [
-    { "model": "minecraft:entity/llama/llama_brown" }
+    { "renderer": "minecraft:llama" }
   ]
 }