Sssecrets

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(24, 48, 20, 52,  4, 16,  8, 20); // top
-        drawImage(28, 48, 24, 52, 8, 16, 12, 20); // bottom
+        drawImage(28, 48, 24, 52,  8, 16, 12, 20); // bottom
-        drawImage(20, 52, 16, 64, 8, 20, 12, 32); // inside
+        drawImage(20, 52, 16, 64,  8, 20, 12, 32); // inside
-        drawImage(24, 52, 20, 64, 4, 20, 8, 32); // front
+        drawImage(24, 52, 20, 64,  4, 20,  8, 32); // front
-        drawImage(28, 52, 24, 64, 0, 20, 4, 32); // outside
+        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

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) {
+        if (!special) {
-            trinket.render(scale);
+            if (profession == 2) {
-        } else if (profession > 2) {
+                trinket.render(scale);
-            apron.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);

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;
     }

src/main/java/com/minelittlepony/render/ponies/RenderPonyVillager.java

@@ -18,6 +18,8 @@ public class RenderPonyVillager extends RenderPonyMob<EntityVillager> {
             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<EntityVillager> {
 
     @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];
     }
 }