From f4395e286a8142e895225788c38453ab99fef96f Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 20 Aug 2018 19:58:34 +0200 Subject: [PATCH] Sssecrets --- .../hdskins/ImageBufferDownloadHD.java | 10 +++++----- .../model/ponies/ModelVillagerPony.java | 15 ++++++++++----- .../model/ponies/ModelWitchPony.java | 3 +++ .../render/ponies/RenderPonyVillager.java | 8 ++++++++ .../textures/entity/villager/silly_pony.png | Bin 0 -> 3562 bytes .../textures/entity/villager/tiny_silly_pony.png | Bin 0 -> 521 bytes 6 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/minelittlepony/textures/entity/villager/silly_pony.png create mode 100644 src/main/resources/assets/minelittlepony/textures/entity/villager/tiny_silly_pony.png diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java b/src/hdskins/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java index 468e54e8..147e0763 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java @@ -46,11 +46,11 @@ public class ImageBufferDownloadHD implements ISkinAvailableCallback { // copy layers // leg - drawImage(24, 48, 20, 52, 4, 16, 8, 20); // top - drawImage(28, 48, 24, 52, 8, 16, 12, 20); // bottom - drawImage(20, 52, 16, 64, 8, 20, 12, 32); // inside - drawImage(24, 52, 20, 64, 4, 20, 8, 32); // front - drawImage(28, 52, 24, 64, 0, 20, 4, 32); // outside + drawImage(24, 48, 20, 52, 4, 16, 8, 20); // top + drawImage(28, 48, 24, 52, 8, 16, 12, 20); // bottom + drawImage(20, 52, 16, 64, 8, 20, 12, 32); // inside + drawImage(24, 52, 20, 64, 4, 20, 8, 32); // front + drawImage(28, 52, 24, 64, 0, 20, 4, 32); // outside drawImage(32, 52, 28, 64, 12, 20, 16, 32); // back // arm drawImage(40, 48, 36, 52, 44, 16, 48, 20); // top diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java b/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java index 6d34fdf6..62a8f126 100644 --- a/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java +++ b/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java @@ -16,6 +16,8 @@ public class ModelVillagerPony extends ModelAlicorn { private int profession; + private boolean special; + public ModelVillagerPony() { super(false); } @@ -30,23 +32,26 @@ public class ModelVillagerPony extends ModelAlicorn { @Override public void setLivingAnimations(EntityLivingBase entity, float limbSwing, float limbSwingAmount, float partialTickTime) { profession = getProfession(entity); + special = "Derpy".equals(entity.getCustomNameTag()); } @Override protected void renderBody(Entity entity, float move, float swing, float ticks, float headYaw, float headPitch, float scale) { super.renderBody(entity, move, swing, ticks, headYaw, headPitch, scale); - if (profession == 2) { - trinket.render(scale); - } else if (profession > 2) { - apron.render(scale); + if (!special) { + if (profession == 2) { + trinket.render(scale); + } else if (profession > 2) { + apron.render(scale); + } } } @Override public boolean isWearing(PonyWearable wearable) { if (wearable == PonyWearable.SADDLE_BAGS) { - return profession > -1 && profession < 2; + return !special && profession > -1 && profession < 2; } return super.isWearing(wearable); diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java b/src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java index 5b5267ef..10dfea23 100644 --- a/src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java +++ b/src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java @@ -30,6 +30,9 @@ public class ModelWitchPony extends ModelZebra { super.updateLivingState(entity, pony); EntityWitch witch = ((EntityWitch) entity); + if ("Filly".equals(entity.getCustomNameTag())) { + isChild = true; + } leftArmPose = ArmPose.EMPTY; rightArmPose = witch.getHeldItemMainhand().isEmpty() ? ArmPose.EMPTY : ArmPose.ITEM; } diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyVillager.java b/src/main/java/com/minelittlepony/render/ponies/RenderPonyVillager.java index 04ac32bd..99d1d816 100644 --- a/src/main/java/com/minelittlepony/render/ponies/RenderPonyVillager.java +++ b/src/main/java/com/minelittlepony/render/ponies/RenderPonyVillager.java @@ -18,6 +18,8 @@ public class RenderPonyVillager extends RenderPonyMob { new ResourceLocation("minelittlepony", "textures/entity/villager/butcher_pony.png"), new ResourceLocation("minelittlepony", "textures/entity/villager/villager_pony.png") }; + private static final ResourceLocation EGG = new ResourceLocation("minelittlepony", "textures/entity/villager/silly_pony.png"); + private static final ResourceLocation EGG_2 = new ResourceLocation("minelittlepony", "textures/entity/villager/tiny_silly_pony.png"); public RenderPonyVillager(RenderManager manager) { super(manager, PMAPI.villager); @@ -31,6 +33,12 @@ public class RenderPonyVillager extends RenderPonyMob { @Override protected ResourceLocation getTexture(EntityVillager entity) { + if ("Derpy".equals(entity.getCustomNameTag())) { + if (entity.isChild()) { + return EGG_2; + } + return EGG; + } return PROFESSIONS[entity.getProfession() % PROFESSIONS.length]; } } diff --git a/src/main/resources/assets/minelittlepony/textures/entity/villager/silly_pony.png b/src/main/resources/assets/minelittlepony/textures/entity/villager/silly_pony.png new file mode 100644 index 0000000000000000000000000000000000000000..5abe87f685f2fd03fff8703737745931d3af91a2 GIT binary patch literal 3562 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