From ab982a41258679cabf97f65d762da1c025c70a84 Mon Sep 17 00:00:00 2001
From: Matthew Messinger <mattmess1221@gmail.com>
Date: Thu, 27 Oct 2016 19:42:35 -0400
Subject: [PATCH] Fix zombie_villager textures

---
 build.gradle                                        |   2 +-
 build.number                                        |   4 ++--
 .../voxelmodpack/hdskins/resource/ImageLoader.java  |   2 ++
 .../zombie_butcher_pony.png}                        | Bin
 .../zombie_farmer_pony.png}                         | Bin
 .../zombie_librarian_pony.png}                      | Bin
 .../zombie_priest_pony.png}                         | Bin
 .../zombie_smith_pony.png}                          | Bin
 .../zombie_villager_pony.png                        | Bin
 9 files changed, 5 insertions(+), 3 deletions(-)
 rename src/main/resources/assets/minelittlepony/textures/entity/{zombie/butcher_pony.png => zombie_villager/zombie_butcher_pony.png} (100%)
 rename src/main/resources/assets/minelittlepony/textures/entity/{zombie/farmer_pony.png => zombie_villager/zombie_farmer_pony.png} (100%)
 rename src/main/resources/assets/minelittlepony/textures/entity/{zombie/librarian_pony.png => zombie_villager/zombie_librarian_pony.png} (100%)
 rename src/main/resources/assets/minelittlepony/textures/entity/{zombie/priest_pony.png => zombie_villager/zombie_priest_pony.png} (100%)
 rename src/main/resources/assets/minelittlepony/textures/entity/{zombie/smith_pony.png => zombie_villager/zombie_smith_pony.png} (100%)
 rename src/main/resources/assets/minelittlepony/textures/entity/{zombie => zombie_villager}/zombie_villager_pony.png (100%)

diff --git a/build.gradle b/build.gradle
index 16d73a0f..29e41f1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'mnm.gradle.ap-ide'
 
 group = 'com.brohoof.minelp'
-version = '1.10.2.3'
+version = '1.10.2.4'
 description = 'Mine Little Pony'
 
 minecraft {
diff --git a/build.number b/build.number
index d8905dbd..8c830b94 100644
--- a/build.number
+++ b/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Sat Oct 08 22:49:55 EDT 2016
-build.number=252
+#Thu Oct 27 19:41:55 EDT 2016
+build.number=253
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resource/ImageLoader.java b/src/hdskins/java/com/voxelmodpack/hdskins/resource/ImageLoader.java
index 9874c6f4..dcaf8fef 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/resource/ImageLoader.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resource/ImageLoader.java
@@ -30,6 +30,8 @@ public class ImageLoader implements Callable<ResourceLocation> {
     public ResourceLocation call() throws Exception {
         BufferedImage image = getImage(original);
         final BufferedImage updated = new ImageBufferDownloadHD().parseUserSkin(image);
+        if (updated == null)
+            return null;
         return this.mc.addScheduledTask(new Callable<ResourceLocation>() {
 
             @Override
diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie/butcher_pony.png b/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_butcher_pony.png
similarity index 100%
rename from src/main/resources/assets/minelittlepony/textures/entity/zombie/butcher_pony.png
rename to src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_butcher_pony.png
diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie/farmer_pony.png b/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_farmer_pony.png
similarity index 100%
rename from src/main/resources/assets/minelittlepony/textures/entity/zombie/farmer_pony.png
rename to src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_farmer_pony.png
diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie/librarian_pony.png b/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_librarian_pony.png
similarity index 100%
rename from src/main/resources/assets/minelittlepony/textures/entity/zombie/librarian_pony.png
rename to src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_librarian_pony.png
diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie/priest_pony.png b/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_priest_pony.png
similarity index 100%
rename from src/main/resources/assets/minelittlepony/textures/entity/zombie/priest_pony.png
rename to src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_priest_pony.png
diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie/smith_pony.png b/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_smith_pony.png
similarity index 100%
rename from src/main/resources/assets/minelittlepony/textures/entity/zombie/smith_pony.png
rename to src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_smith_pony.png
diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie/zombie_villager_pony.png b/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_villager_pony.png
similarity index 100%
rename from src/main/resources/assets/minelittlepony/textures/entity/zombie/zombie_villager_pony.png
rename to src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_villager_pony.png