From 8f6f21b67b7b441b6b84a19170835bdf67fd91a7 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Thu, 28 Nov 2019 14:56:38 +0200
Subject: [PATCH] Register the gear

---
 .../minelittlepony/client/model/ModelType.java    | 15 +++++++++++++++
 .../models/{components => gear}/antlers.json      |  0
 .../models/{components => gear}/muffin.json       |  0
 .../models/{components => gear}/saddlebags.json   |  0
 .../models/{components => gear}/stetson.json      |  0
 5 files changed, 15 insertions(+)
 rename src/main/resources/assets/minelittlepony/models/{components => gear}/antlers.json (100%)
 rename src/main/resources/assets/minelittlepony/models/{components => gear}/muffin.json (100%)
 rename src/main/resources/assets/minelittlepony/models/{components => gear}/saddlebags.json (100%)
 rename src/main/resources/assets/minelittlepony/models/{components => gear}/stetson.json (100%)

diff --git a/src/main/java/com/minelittlepony/client/model/ModelType.java b/src/main/java/com/minelittlepony/client/model/ModelType.java
index 5480eea1..30677c4a 100644
--- a/src/main/java/com/minelittlepony/client/model/ModelType.java
+++ b/src/main/java/com/minelittlepony/client/model/ModelType.java
@@ -22,6 +22,11 @@ import com.minelittlepony.client.model.entity.race.ModelEarthPony;
 import com.minelittlepony.client.model.entity.race.ModelPegasus;
 import com.minelittlepony.client.model.entity.race.ModelUnicorn;
 import com.minelittlepony.client.model.entity.race.ModelZebra;
+import com.minelittlepony.client.model.gear.ChristmasHat;
+import com.minelittlepony.client.model.gear.Muffin;
+import com.minelittlepony.client.model.gear.SaddleBags;
+import com.minelittlepony.client.model.gear.Stetson;
+import com.minelittlepony.client.model.gear.WitchHat;
 import com.minelittlepony.client.render.entity.RenderPonyPlayer;
 import com.minelittlepony.client.render.entity.RenderSeaponyPlayer;
 import com.minelittlepony.mson.api.ModelKey;
@@ -56,6 +61,12 @@ public final class ModelType {
     public static final ModelKey<ModelPonyArmour<?>> ARMOUR_INNER = register("armour_inner", ModelPonyArmour::new);
     public static final ModelKey<ModelPonyArmour<?>> ARMOUR_OUTER = register("armour_outer", ModelPonyArmour::new);
 
+    public static final ModelKey<Stetson> STETSON = registerGear("stetson", Stetson::new);
+    public static final ModelKey<SaddleBags> SADDLEBAGS = registerGear("saddlebags", SaddleBags::new);
+    public static final ModelKey<Muffin> MUFFIN = registerGear("muffin", Muffin::new);
+    public static final ModelKey<WitchHat> WITCH_HAT = registerGear("witch_hat", WitchHat::new);
+    public static final ModelKey<ChristmasHat> ANTLERS = registerGear("antlers", ChristmasHat::new);
+
     public static final PlayerModelKey<?, ModelAlicorn<?>> ALICORN = registerPlayer("alicorn", Race.ALICORN, ModelAlicorn::new);
     public static final PlayerModelKey<?, ModelUnicorn<?>> UNICORN = registerPlayer("unicorn", Race.UNICORN, ModelUnicorn::new);
     public static final PlayerModelKey<?, ModelUnicorn<?>> KIRIN = registerPlayer("kirin", Race.KIRIN, ModelUnicorn::new);
@@ -80,6 +91,10 @@ public final class ModelType {
         });
     }
 
+    static <T extends Model & MsonModel> ModelKey<T> registerGear(String name, Supplier<T> constructor) {
+        return register("gear/" + name, constructor);
+    }
+
     static <T extends Model & MsonModel> ModelKey<T> register(String name, Supplier<T> constructor) {
         return Mson.getInstance().registerModel(new Identifier("minelittlepony", name), constructor);
     }
diff --git a/src/main/resources/assets/minelittlepony/models/components/antlers.json b/src/main/resources/assets/minelittlepony/models/gear/antlers.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/antlers.json
rename to src/main/resources/assets/minelittlepony/models/gear/antlers.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/muffin.json b/src/main/resources/assets/minelittlepony/models/gear/muffin.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/muffin.json
rename to src/main/resources/assets/minelittlepony/models/gear/muffin.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/saddlebags.json b/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/saddlebags.json
rename to src/main/resources/assets/minelittlepony/models/gear/saddlebags.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/stetson.json b/src/main/resources/assets/minelittlepony/models/gear/stetson.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/stetson.json
rename to src/main/resources/assets/minelittlepony/models/gear/stetson.json