Use the entrypoint instead

src/main/java/com/minelittlepony/client/MineLittlePony.java

@@ -1,6 +1,5 @@
 package com.minelittlepony.client;
 
-import com.minelittlepony.client.hdskins.IndirectHDSkins;
 import com.minelittlepony.client.model.ModelType;
 import com.minelittlepony.client.pony.PonyManager;
 import com.minelittlepony.client.render.PonyRenderDispatcher;
@@ -88,10 +87,6 @@ public class MineLittlePony implements ClientModInitializer {
 
         config.load();
 
-        if (FabricLoader.getInstance().isModLoaded("hdskins")) {
-            IndirectHDSkins.initialize();
-        }
-
         ModelType.bootstrap();
     }
 

src/main/java/com/minelittlepony/client/hdskins/DummyPonyModel.java

@@ -2,8 +2,7 @@ package com.minelittlepony.client.hdskins;
 
 import com.minelittlepony.client.model.entity.race.EarthPonyModel;
 
-public class DummyPonyModel extends EarthPonyModel<DummyPony> {
+class DummyPonyModel extends EarthPonyModel<DummyPony> {
-
     public DummyPonyModel(boolean smallArms) {
         super(smallArms);
     }

src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java

@@ -19,7 +19,7 @@ import net.minecraft.util.Identifier;
 /**
  * Skin uploading GUI. Usually displayed over the main menu.
  */
-public class GuiSkinsMineLP extends GuiSkins {
+class GuiSkinsMineLP extends GuiSkins {
 
     private IPonyManager ponyManager = MineLittlePony.getInstance().getManager();
 

src/main/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java

@@ -1,22 +0,0 @@
-package com.minelittlepony.client.hdskins;
-
-import com.minelittlepony.client.SkinsProxy;
-import com.minelittlepony.hdskins.HDSkins;
-import com.minelittlepony.hdskins.profile.SkinType;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.util.Identifier;
-
-class HDSkinsProxy extends SkinsProxy {
-
-    @Override
-    public Identifier getSkinTexture(GameProfile profile) {
-
-        Identifier skin = HDSkins.getInstance().getProfileRepository().getTextures(profile).get(SkinType.SKIN);
-
-        if (skin != null) {
-            return skin;
-        }
-
-        return super.getSkinTexture(profile);
-    }
-}

src/main/java/com/minelittlepony/client/hdskins/IndirectHDSkins.java

@@ -1,13 +0,0 @@
-package com.minelittlepony.client.hdskins;
-
-import org.apache.logging.log4j.LogManager;
-
-public final class IndirectHDSkins {
-    public static void initialize() {
-        try {
-            new MineLPHDSkins();
-        } catch (Exception e) {
-            LogManager.getLogger().warn("Failed to initialize hooks for hdskins", e);
-        }
-    }
-}

src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java

@@ -4,9 +4,12 @@ import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.SkinsProxy;
 import com.minelittlepony.common.event.ClientReadyCallback;
 import com.minelittlepony.hdskins.SkinCacheClearCallback;
+import com.minelittlepony.hdskins.profile.SkinType;
 import com.minelittlepony.mson.api.Mson;
+import com.mojang.authlib.GameProfile;
 
-import net.minecraft.client.MinecraftClient;
+import net.fabricmc.api.ClientModInitializer;
+import net.minecraft.util.Identifier;
 
 import com.minelittlepony.client.pony.PonyManager;
 import com.minelittlepony.hdskins.HDSkins;
@@ -14,25 +17,34 @@ import com.minelittlepony.hdskins.HDSkins;
 /**
  * All the interactions with HD Skins.
  */
-class MineLPHDSkins {
+public class MineLPHDSkins extends SkinsProxy implements ClientModInitializer {
 
-    MineLPHDSkins() {
+    @Override
-        SkinsProxy.instance = new HDSkinsProxy();
+    public void onInitializeClient() {
-
+        SkinsProxy.instance = this;
-        ClientReadyCallback.EVENT.register(this::postInit);
-
-        // Preview on the select skin gui
-        Mson.getInstance().getEntityRendererRegistry().registerEntityRenderer(DummyPony.TYPE, DummyPonyRenderer::new);
-    }
-
-    private void postInit(MinecraftClient minecraft) {
-        HDSkins manager = HDSkins.getInstance();
 
+        ClientReadyCallback.EVENT.register(client -> {
             // Clear ponies when skins are cleared
             PonyManager ponyManager = (PonyManager) MineLittlePony.getInstance().getManager();
             SkinCacheClearCallback.EVENT.register(ponyManager::onSkinCacheCleared);
 
             // Ponify the skins GUI.
-        manager.getSkinServerList().setSkinsGui(GuiSkinsMineLP::new);
+            HDSkins.getInstance().getSkinServerList().setSkinsGui(GuiSkinsMineLP::new);
+        });
+
+        // Preview on the select skin gui
+        Mson.getInstance().getEntityRendererRegistry().registerEntityRenderer(DummyPony.TYPE, DummyPonyRenderer::new);
+    }
+
+    @Override
+    public Identifier getSkinTexture(GameProfile profile) {
+
+        Identifier skin = HDSkins.getInstance().getProfileRepository().getTextures(profile).get(SkinType.SKIN);
+
+        if (skin != null) {
+            return skin;
+        }
+
+        return super.getSkinTexture(profile);
     }
 }

src/main/resources/fabric.mod.json

@@ -19,6 +19,9 @@
     "client": [
       "com.minelittlepony.client.MineLittlePony"
     ],
+    "hdskins": [
+      "com.minelittlepony.client.hdskins.MineLPHDSkins"
+    ],
     "__disabled__modmenu": [
       "com.minelittlepony.client.modmenu.MineLPModMenuFactory"
     ]