Add player animation system!

- Hooks into ModelRenderer by wrapping it in an extended version that allows modification of angles after the model has set them
- Is compatible with pretty much everything, yay (even modded armour!)
- Adds property overrides to ItemWand so that gets animated too
- Adds a system for generating override models from a template at runtime so I don't have to duplicate all the wand models
- Tweaks particles and ray spells so they line up with the end of the newly-animated wand
- Fixes a long-standing bug where wand usage actions would stop immediately for all non-continuous spells

src/main/resources/assets/ebwizardry/models/item/advanced_earth_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_advanced_earth"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/advanced_fire_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_advanced_fire"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/advanced_healing_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_advanced_healing"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/advanced_ice_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_advanced_ice"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/advanced_lightning_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_advanced_lightning"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/advanced_necromancy_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_advanced_necromancy"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/advanced_sorcery_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_advanced_sorcery"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/advanced_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_advanced"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/apprentice_earth_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_apprentice_earth"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/apprentice_fire_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_apprentice_fire"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/apprentice_healing_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_apprentice_healing"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/apprentice_ice_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_apprentice_ice"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/apprentice_lightning_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_apprentice_lightning"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/apprentice_necromancy_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_apprentice_necromancy"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/apprentice_sorcery_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_apprentice_sorcery"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/apprentice_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_apprentice"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/festive_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_festive"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/magic_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_novice"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/master_earth_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_master_earth"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/master_fire_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_master_fire"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/master_healing_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_master_healing"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/master_ice_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_master_ice"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/master_lightning_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_master_lightning"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/master_necromancy_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_master_necromancy"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/master_sorcery_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_master_sorcery"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/master_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_master"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/novice_earth_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_novice_earth"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/novice_fire_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_novice_fire"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/novice_healing_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_novice_healing"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/novice_ice_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_novice_ice"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/novice_lightning_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_novice_lightning"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/novice_necromancy_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_novice_necromancy"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/novice_sorcery_wand.json

@@ -2,5 +2,13 @@
     "parent": "item/handheld",
     "textures": {
         "layer0": "ebwizardry:items/wand_novice_sorcery"
-    }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "this_gets_ignored": 1
+            },
+            "model": "ebwizardry:item/override_generators/wand"
+        }
+    ]
 }

src/main/resources/assets/ebwizardry/models/item/override_generators/wand.json

@@ -0,0 +1,11 @@
+{
+    "parent": "item/handheld",
+    "overrides": [
+        {
+            "predicate": {
+                "pointing": 1
+            },
+            "model": "ebwizardry:item/wand_point"
+        }
+    ]
+}

src/main/resources/assets/ebwizardry/models/item/wand_point.json

@@ -0,0 +1,25 @@
+{
+    "parent": "item/handheld",
+    "display": {
+        "thirdperson_righthand": {
+            "rotation": [0, -90, 105],
+            "translation": [0, 0, -3.25],
+            "scale": [0.85, 0.85, 0.85]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [0, 90, -105],
+            "translation": [0, 0, -3.25],
+            "scale": [0.85, 0.85, 0.85]
+        },
+        "firstperson_righthand": {
+            "rotation": [0, -90, 105],
+            "translation": [1.13, 3.2, 0.5],
+            "scale": [0.68, 0.68, 0.68]
+        },
+        "firstperson_lefthand": {
+            "rotation": [0, 90, -105],
+            "translation": [1.13, 3.2, 0.5],
+            "scale": [0.68, 0.68, 0.68]
+        }
+    }
+}