From 1cdc9582e3bd0322987a6b0fe3b0147ec1c3b487 Mon Sep 17 00:00:00 2001
From: Matthew Messinger <mattmess1221@gmail.com>
Date: Wed, 3 Jul 2019 23:26:19 -0400
Subject: [PATCH] Convert skins without hdskins

---
 .../client/hdskins/MineLPHDSkins.java         |  4 ---
 .../client/LegacySkinConverter.java           | 25 +++++++++++--------
 .../minelittlepony/client/MineLPClient.java   |  4 +++
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/hdskins/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java b/src/hdskins/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java
index 3375908a..249d3421 100644
--- a/src/hdskins/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java
+++ b/src/hdskins/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java
@@ -9,8 +9,6 @@ import com.minelittlepony.client.hdskins.gui.RenderDummyPony;
 import net.fabricmc.fabric.api.client.render.EntityRendererRegistry;
 import net.minecraft.client.MinecraftClient;
 
-import com.minelittlepony.client.settings.ClientPonyConfig;
-import com.minelittlepony.client.LegacySkinConverter;
 import com.minelittlepony.client.pony.PonyManager;
 import com.minelittlepony.hdskins.HDSkins;
 import com.minelittlepony.hdskins.net.LegacySkinServer;
@@ -48,8 +46,6 @@ public class MineLPHDSkins {
     private void postInit(MinecraftClient minecraft) {
         HDSkins manager = HDSkins.getInstance();
 
-        // Convert legacy pony skins
-        manager.addSkinModifier(new LegacySkinConverter());
         // Clear ponies when skins are cleared
         PonyManager ponyManager = (PonyManager) MineLittlePony.getInstance().getManager();
         manager.addClearListener(ponyManager::onSkinCacheCleared);
diff --git a/src/main/java/com/minelittlepony/client/LegacySkinConverter.java b/src/main/java/com/minelittlepony/client/LegacySkinConverter.java
index 8776ec3d..d384284c 100644
--- a/src/main/java/com/minelittlepony/client/LegacySkinConverter.java
+++ b/src/main/java/com/minelittlepony/client/LegacySkinConverter.java
@@ -1,6 +1,9 @@
 package com.minelittlepony.client;
 
-import com.minelittlepony.common.util.TextureConverter;
+import com.minelittlepony.common.event.SkinFilterCallback;
+import net.minecraft.client.texture.NativeImage;
+
+import static com.minelittlepony.common.event.SkinFilterCallback.copy;
 
 /**
  * Called to convert the legacy 64x32 skins to the new 64x64 format.
@@ -9,16 +12,18 @@ import com.minelittlepony.common.util.TextureConverter;
  * do is copy the wing across.
  *
  */
-public class LegacySkinConverter implements TextureConverter {
+public class LegacySkinConverter implements SkinFilterCallback {
 
     @Override
-    public void convertTexture(Drawer drawer) {
-              // ( from ) ( offset )  (size) flipX flipY
-       drawer.copy(58, 16,  0, 16, 2,  2, true, false); // top
-       drawer.copy(60, 16,  0, 16, 2,  2, true, false); // bottom
-       drawer.copy(60, 18, -4, 16, 2, 14, true, false); // inside
-       drawer.copy(58, 18,  0, 16, 2, 14, true, false); // back
-       drawer.copy(56, 18,  4, 16, 2, 14, true, false); // outside
-       drawer.copy(62, 18,  0, 16, 2, 14, true, false); // front
+    public void processImage(NativeImage image, boolean legacy) {
+        if (legacy) {
+            // ( from ) ( offset )  (size) flipX flipY
+            copy(image, 58, 16, 0, 16, 2, 2, true, false); // top
+            copy(image, 60, 16, 0, 16, 2, 2, true, false); // bottom
+            copy(image, 60, 18, -4, 16, 2, 14, true, false); // inside
+            copy(image, 58, 18, 0, 16, 2, 14, true, false); // back
+            copy(image, 56, 18, 4, 16, 2, 14, true, false); // outside
+            copy(image, 62, 18, 0, 16, 2, 14, true, false); // front
+        }
     }
 }
diff --git a/src/main/java/com/minelittlepony/client/MineLPClient.java b/src/main/java/com/minelittlepony/client/MineLPClient.java
index 4c485313..ccb3e2c9 100644
--- a/src/main/java/com/minelittlepony/client/MineLPClient.java
+++ b/src/main/java/com/minelittlepony/client/MineLPClient.java
@@ -5,6 +5,7 @@ import com.minelittlepony.client.gui.GuiPonySettings;
 import com.minelittlepony.client.pony.PonyManager;
 import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer;
 import com.minelittlepony.client.settings.ClientPonyConfig;
+import com.minelittlepony.common.event.SkinFilterCallback;
 import com.minelittlepony.common.util.GamePaths;
 import com.minelittlepony.settings.JsonConfig;
 import com.minelittlepony.settings.PonyConfig;
@@ -52,6 +53,9 @@ public class MineLPClient extends MineLittlePony {
         KeyBindingRegistry.INSTANCE.register(keyBinding);
 
         ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(ponyManager);
+
+        // convert legacy pony skins
+        SkinFilterCallback.EVENT.register(new LegacySkinConverter());
     }
 
     protected ClientPonyConfig createConfig() {