Search all resource domains for skins and add task to zip the defaults.

.gitignore

@@ -8,3 +8,4 @@ run/
 *.launch
 /.apt_generated/
 .factorypath
+logs/

build.gradle

@@ -100,6 +100,11 @@ task srgJar(type: Jar) {
 	classifier "mc$minecraft.version-srg"
 	baseName "mod-${project.name.toLowerCase()}"
 }
+task skinZip(type: Zip) {
+	from fileTree('skins')
+	baseName 'Pony Skin Resources'
+	version 'v1'
+}
 
 reobf {
 	srgJar {

skins/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+	"pack": {
+		"pack_format": 2,
+		"description": "Custom Pony NPC Skins"
+	}
+}

src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinResourceManager.java

@@ -5,7 +5,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
@@ -23,7 +22,6 @@ import com.google.gson.JsonParseException;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-import com.voxelmodpack.hdskins.HDSkinManager;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.IResource;
@@ -42,34 +40,36 @@ public class SkinResourceManager implements IResourceManagerReloadListener {
 
     @Override
     public void onResourceManagerReload(IResourceManager resourceManager) {
-        try {
+        uuidSkins.clear();
-            uuidSkins.clear();
+        namedSkins.clear();
-            namedSkins.clear();
+        for (Future<ResourceLocation> loc : inProgress.values()) {
-            for (Future<ResourceLocation> loc : inProgress.values()) {
+            loc.cancel(true);
-                loc.cancel(true);
+        }
-            }
+        inProgress.clear();
-            inProgress.clear();
+        for (ResourceLocation res : converted.values()) {
-            for (ResourceLocation res : converted.values()) {
+            Minecraft.getMinecraft().getTextureManager().deleteTexture(res);
-                Minecraft.getMinecraft().getTextureManager().deleteTexture(res);
+        }
-            }
+        converted.clear();
-            converted.clear();
+        for (String domain : resourceManager.getResourceDomains()) {
-            for (IResource res : resourceManager.getAllResources(new ResourceLocation("hdskins", "textures/skins/skins.json"))) {
+            try {
-                try {
+                for (IResource res : resourceManager.getAllResources(new ResourceLocation(domain, "textures/skins/skins.json"))) {
-                    SkinData data = getSkinData(res.getInputStream());
+                    try {
-                    for (Skin s : data.skins) {
+                        SkinData data = getSkinData(res.getInputStream());
-                        if (s.uuid != null) {
+                        for (Skin s : data.skins) {
-                            uuidSkins.put(s.uuid, s);
+                            if (s.uuid != null) {
-                        }
+                                uuidSkins.put(s.uuid, s);
-                        if (s.name != null) {
+                            }
-                            namedSkins.put(s.name, s);
+                            if (s.name != null) {
+                                namedSkins.put(s.name, s);
+                            }
                         }
+                    } catch (JsonParseException je) {
+                        LiteLoaderLogger.warning(je, "Invalid skins.json in %s", res.getResourcePackName());
                     }
-                } catch (JsonParseException je) {
-                    LiteLoaderLogger.warning(je, "Invalid skins.json in %s", res.getResourcePackName());
                 }
+            } catch (IOException e) {
+                // ignore
             }
-        } catch (IOException e) {
-            // ignore
         }
 
     }

src/rsrcpk/resources/pack.mcmeta

@@ -1,6 +0,0 @@
-{
-	"pack": {
-		"pack_format": 2,
-		"description": "Custom Pony NCP Skins"
-	}
-}