From a89fe7c957b6ce9a149fa0a2246b358b7a0f39af Mon Sep 17 00:00:00 2001 From: Pedro Date: Thu, 22 Feb 2024 14:22:40 -0300 Subject: [PATCH] Added "Easter egg" head --- .../java/net/pedroricardo/HeadedRewrittenClient.java | 1 + .../content/models/EntityCopyHeadEntityModel.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/client/java/net/pedroricardo/HeadedRewrittenClient.java b/src/client/java/net/pedroricardo/HeadedRewrittenClient.java index ae13b73..0b0a5c4 100644 --- a/src/client/java/net/pedroricardo/HeadedRewrittenClient.java +++ b/src/client/java/net/pedroricardo/HeadedRewrittenClient.java @@ -192,6 +192,7 @@ public void onInitializeClient() { TextureToHeadMap.addHead(() -> "http://textures.minecraft.net/texture/" + HeadedRewritten.CONFIG.headURLs.STRAY(), (modelLoader) -> new StraySkullEntityModel(modelLoader.getModelPart(HeadedEntityModelLayers.STRAY_SKULL)), RenderLayer.getEntityCutoutNoCull(new Identifier("textures/entity/skeleton/stray.png")), "Stray", SoundEvents.ENTITY_STRAY_AMBIENT.getId().toString(), (modelLoader) -> new SimpleModelHeadFeatureRenderer(new StraySkullEntityModel(modelLoader.getModelPart(HeadedEntityModelLayers.STRAY_SKULL_OUTER_LAYER)), RenderLayer.getEntityCutoutNoCullZOffset(new Identifier("textures/entity/skeleton/stray_overlay.png")))); TextureToHeadMap.addHead(() -> "http://textures.minecraft.net/texture/" + HeadedRewritten.CONFIG.headURLs.STRIDER(), (modelLoader) -> new StriderHeadEntityModel(modelLoader.getModelPart(HeadedEntityModelLayers.STRIDER_HEAD)), RenderLayer.getEntityCutoutNoCull(new Identifier("textures/entity/strider/strider.png")), "Strider", SoundEvents.ENTITY_STRIDER_AMBIENT.getId().toString()); TextureToHeadMap.addHead(() -> "http://textures.minecraft.net/texture/" + HeadedRewritten.CONFIG.headURLs.TADPOLE(), (modelLoader) -> new TadpoleHeadEntityModel(modelLoader.getModelPart(HeadedEntityModelLayers.TADPOLE_HEAD)), RenderLayer.getEntityCutoutNoCull(new Identifier("textures/entity/tadpole/tadpole.png")), "Tadpole", SoundEvents.ENTITY_TADPOLE_FLOP.getId().toString()); + TextureToHeadMap.addHeadNotInGroup(() -> "http://textures.minecraft.net/texture/ed1403271bbbbd46f371c85734fa9fa96c091a942801e413c60eba90f9d468c0", (modelLoader) -> new EntityCopyHeadEntityModel(modelLoader.getModelPart(EntityModelLayers.ZOMBIE_HEAD), new Vector3f(16.0f, 16.0f, 16.0f), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f), RenderLayer.getEntityCutoutNoCull(new Identifier("textures/entity/zombie/zombie.png")), "Giant", SoundEvents.ENTITY_ZOMBIE_AMBIENT.getId().toString()); TextureToHeadMap.addHead(() -> "http://textures.minecraft.net/texture/" + HeadedRewritten.CONFIG.headURLs.CREAMY_TRADER_LLAMA(), (modelLoader) -> new LlamaHeadEntityModel(modelLoader.getModelPart(HeadedEntityModelLayers.LLAMA_HEAD)), RenderLayer.getEntityCutoutNoCull(new Identifier("textures/entity/llama/creamy.png")), "Creamy Trader Llama", SoundEvents.ENTITY_LLAMA_AMBIENT.getId().toString(), (modelLoader) -> new SimpleModelHeadFeatureRenderer(new LlamaHeadEntityModel(modelLoader.getModelPart(HeadedEntityModelLayers.LLAMA_HEAD_DECOR)), RenderLayer.getEntityCutoutNoCull(new Identifier("textures/entity/llama/decor/trader_llama.png")))); TextureToHeadMap.addHead(() -> "http://textures.minecraft.net/texture/" + HeadedRewritten.CONFIG.headURLs.WHITE_TRADER_LLAMA(), (modelLoader) -> new LlamaHeadEntityModel(modelLoader.getModelPart(HeadedEntityModelLayers.LLAMA_HEAD)), RenderLayer.getEntityCutoutNoCull(new Identifier("textures/entity/llama/white.png")), "White Trader Llama", SoundEvents.ENTITY_LLAMA_AMBIENT.getId().toString(), (modelLoader) -> new SimpleModelHeadFeatureRenderer(new LlamaHeadEntityModel(modelLoader.getModelPart(HeadedEntityModelLayers.LLAMA_HEAD_DECOR)), RenderLayer.getEntityCutoutNoCull(new Identifier("textures/entity/llama/decor/trader_llama.png")))); TextureToHeadMap.addHead(() -> "http://textures.minecraft.net/texture/" + HeadedRewritten.CONFIG.headURLs.BROWN_TRADER_LLAMA(), (modelLoader) -> new LlamaHeadEntityModel(modelLoader.getModelPart(HeadedEntityModelLayers.LLAMA_HEAD)), RenderLayer.getEntityCutoutNoCull(new Identifier("textures/entity/llama/brown.png")), "Brown Trader Llama", SoundEvents.ENTITY_LLAMA_AMBIENT.getId().toString(), (modelLoader) -> new SimpleModelHeadFeatureRenderer(new LlamaHeadEntityModel(modelLoader.getModelPart(HeadedEntityModelLayers.LLAMA_HEAD_DECOR)), RenderLayer.getEntityCutoutNoCull(new Identifier("textures/entity/llama/decor/trader_llama.png")))); diff --git a/src/client/java/net/pedroricardo/content/models/EntityCopyHeadEntityModel.java b/src/client/java/net/pedroricardo/content/models/EntityCopyHeadEntityModel.java index a90046a..7b4f6c9 100644 --- a/src/client/java/net/pedroricardo/content/models/EntityCopyHeadEntityModel.java +++ b/src/client/java/net/pedroricardo/content/models/EntityCopyHeadEntityModel.java @@ -15,13 +15,17 @@ public class EntityCopyHeadEntityModel extends SkullBlockEntityModel implements private final Vector3f size; private final float yaw; private final float pitch; + private final float scale; public EntityCopyHeadEntityModel(ModelPart root, float offsetY, Vector3f size) { this(root, size, 0, offsetY, 0, 0, 0); } - public EntityCopyHeadEntityModel(ModelPart root, Vector3f size, float offsetX, float offsetY, float offsetZ, float yaw, float pitch) { + this(root, size, offsetX, offsetY, offsetZ, yaw, pitch, 1.0f); + } + + public EntityCopyHeadEntityModel(ModelPart root, Vector3f size, float offsetX, float offsetY, float offsetZ, float yaw, float pitch, float scale) { this.root = root; this.offsetX = offsetX; this.offsetY = offsetY; @@ -29,6 +33,7 @@ public EntityCopyHeadEntityModel(ModelPart root, Vector3f size, float offsetX, f this.size = size; this.yaw = yaw; this.pitch = pitch; + this.scale = scale; } @Override @@ -47,6 +52,7 @@ public Vector3f getHeadSizeInPixels() { @Override public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) { + matrices.scale(this.scale, this.scale, this.scale); this.root.render(matrices, vertices, light, overlay, red, green, blue, alpha); } }