From a1c588f1aa52fab21d56c239a89bb6ae8b52457b Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Mon, 27 Mar 2023 20:07:14 +0100
Subject: [PATCH] Some last minute sweaks to the hippo and gryphon models

---
 .../models/entity/races/steve/gryphon.json    | 89 +++++++++++++++++++
 .../models/entity/races/steve/hippogriff.json | 17 ++--
 2 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/assets/minelittlepony/models/entity/races/steve/gryphon.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/gryphon.json
index 70569b7f..ff05995b 100644
--- a/src/main/resources/assets/minelittlepony/models/entity/races/steve/gryphon.json
+++ b/src/main/resources/assets/minelittlepony/models/entity/races/steve/gryphon.json
@@ -1,9 +1,98 @@
 {
 	"parent": "minelittlepony:races/steve/hippogriff",
+	"locals": {
+    "claw_outset_z": [ "#arm_z", "-", 1 ]
+  },
 	"data": {
     "tail": {
       "implementation": "com.minelittlepony.client.model.part.LionTail",
       "data": "minelittlepony:components/lion_tail"
+    },
+    "left_arm": {
+      "pivot": ["#arm_rotation_x", "#arm_rotation_y", 0],
+      "texture": { "u": 32, "v": 49 },
+      "cubes": [
+        {
+          "from": [ "#arm_x", 4, "#front_leg_outset_z"],
+          "size": [ "#arm_width", "#elbow_point", "#arm_depth" ],
+          "dilate": [0, 0, -0.5]
+        }
+      ],
+      "children": {
+        "left_forearm": {
+          "type": "mson:import",
+          "data": "minelittlepony:components/cube",
+          "locals": {
+            "x": "#arm_x",
+            "y": 8,
+            "z": "#arm_z",
+            "u": 32,
+            "v": 48,
+            "side_v": 56,
+            "width": "#arm_width",
+            "height": "#fore_arm_length",
+            "depth": "#arm_depth"
+          }
+        },
+        "left_claw": {
+          "type": "mson:import",
+          "data": "minelittlepony:components/cube",
+          "locals": {
+            "x": "#arm_x",
+            "y": [2.99, "+", "#arm_length"],
+            "z": "#back_leg_outset_z",
+            "u": 32,
+            "v": 48,
+            "side_v": 63,
+            "width": "#arm_width",
+            "height": 1,
+            "depth": "#arm_depth"
+          }
+        }
+      }
+    },
+    "right_arm": {
+      "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0],
+      "texture": { "u": 40, "v": 17 },
+      "cubes": [
+        {
+          "from": [ "#arm_x_neg", 4, "#front_leg_outset_z"],
+          "size": [ "#arm_width", "#elbow_point", "#arm_depth" ],
+          "dilate": [0, 0, -0.5]
+        }
+      ],
+      "children": {
+        "right_forearm": {
+          "type": "mson:import",
+          "data": "minelittlepony:components/cube",
+          "locals": {
+            "x": "#arm_x_neg",
+            "y": 8,
+            "z": "#arm_z",
+            "u": 40,
+            "v": 16,
+            "side_v": 24,
+            "width": "#arm_width",
+            "height": "#fore_arm_length",
+            "depth": "#arm_depth"
+          }
+        },
+        "right_claw": {
+          "type": "mson:import",
+          "data": "minelittlepony:components/cube",
+          "locals": {
+            "x": "#arm_x_neg",
+            "y": [2.99, "+", "#arm_length"],
+            "z": "#back_leg_outset_z",
+            "u": 40,
+            "v": 16,
+            "side_v": 30,
+            "width": "#arm_width",
+            "height": 1,
+            "depth": "#arm_depth"
+          }
+        }
+      }
     }
 	}
 }
diff --git a/src/main/resources/assets/minelittlepony/models/entity/races/steve/hippogriff.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/hippogriff.json
index 43f94d4f..cbaa36dd 100644
--- a/src/main/resources/assets/minelittlepony/models/entity/races/steve/hippogriff.json
+++ b/src/main/resources/assets/minelittlepony/models/entity/races/steve/hippogriff.json
@@ -3,10 +3,13 @@
   "locals": {
     "tight_arm_width": [ "#arm_width", "-", 1 ],
     "knee_point": [ "#arm_length", "/", 2 ],
+    "fore_leg_length": [ "#arm_length", "-", "#knee_point" ],
+    "fore_leg_y": [ 4, "+", "#knee_point" ],
+    
     "elbow_point": [ "#arm_length", "/", 3 ],
     "fore_arm_length": [ "#arm_length", "-", "#elbow_point" ],
     "back_leg_outset_z": [ "#arm_z", "-", 0.5 ],
-    "front_leg_outset_z": [ "#arm_z", "+", 0.5 ],
+    "front_leg_outset_z": [ "#arm_z", "-", 0.5 ],
     
     "claws_z": [ "#arm_z", "-", 1 ]
   },
@@ -36,7 +39,7 @@
       "texture": { "u": 32, "v": 49 },
       "cubes": [
         {
-          "from": [ "#arm_x", 4, "#back_leg_outset_z"],
+          "from": [ "#arm_x", 4, "#front_leg_outset_z"],
           "size": [ "#arm_width", "#elbow_point", "#arm_depth" ],
           "dilate": [0, 0, -0.5]
         }
@@ -64,7 +67,7 @@
       "texture": { "u": 40, "v": 17 },
       "cubes": [
         {
-          "from": [ "#arm_x_neg", 4, "#back_leg_outset_z"],
+          "from": [ "#arm_x_neg", 4, "#front_leg_outset_z"],
           "size": [ "#arm_width", "#elbow_point", "#arm_depth" ],
           "dilate": [0, 0, -0.5]
         }
@@ -103,13 +106,13 @@
           "data": "minelittlepony:components/cube",
           "locals": {
             "x": "#arm_x",
-            "y": 10,
+            "y": "#fore_leg_y",
             "z": "#arm_z",
             "u": 16,
             "v": 48,
             "side_v": 58,
             "width": "#arm_width",
-            "height": "#knee_point",
+            "height": "#fore_leg_length",
             "depth": "#arm_depth"
           }
         }
@@ -131,13 +134,13 @@
           "data": "minelittlepony:components/cube",
           "locals": {
             "x": "#arm_x_neg",
-            "y": 10,
+            "y": "#fore_leg_y",
             "z": "#arm_z",
             "u": 0,
             "v": 16,
             "side_v": 26,
             "width": "#arm_width",
-            "height": "#knee_point",
+            "height": "#fore_leg_length",
             "depth": "#arm_depth"
           }
         }