Add ability to use handheld parent tag for rendering of cyphers/trinkets/artifacts (#936)

Author: object-Object

Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_5.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_ancient_cypher"
   }

Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_5_filled.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_ancient_cypher",
     "layer1": "hexcasting:item/cad/5_ancient_cypher_overlay"

Common/src/generated/resources/assets/hexcasting/models/item/artifact_5.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_artifact"
   }

Common/src/generated/resources/assets/hexcasting/models/item/artifact_5_filled.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_artifact",
     "layer1": "hexcasting:item/cad/5_artifact_overlay"

Common/src/generated/resources/assets/hexcasting/models/item/cypher_5.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_cypher"
   }

Common/src/generated/resources/assets/hexcasting/models/item/cypher_5_filled.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_cypher",
     "layer1": "hexcasting:item/cad/5_cypher_overlay"

Common/src/generated/resources/assets/hexcasting/models/item/trinket_5.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_trinket"
   }

Common/src/generated/resources/assets/hexcasting/models/item/trinket_5_filled.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_trinket",
     "layer1": "hexcasting:item/cad/5_trinket_overlay"

Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java

@@ -26,6 +26,7 @@
 import net.minecraftforge.common.data.ExistingFileHelper;
 import net.minecraftforge.registries.ForgeRegistries;
 
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.BiFunction;
 
@@ -36,6 +37,8 @@ public HexItemModels(PackOutput output, ExistingFileHelper existingFileHelper) {
 
     private static final String[] PHIAL_SIZES = {"small", "medium", "large", "larger", "largest"};
 
+    private static final Integer[] PACKAGED_SPELL_HANDHELD_VARIANTS = {5};
+
     private static String getPath(Item item) {
         return Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(item)).getPath();
     }
@@ -276,11 +279,14 @@ private void buildPackagedSpell(Item item, String stub, int numVariants) {
         var name = getPath(item);
         var builder = getBuilder(name);
         for (int i = 0; i < numVariants; i++) {
-            var plain = i == 0 ? singleTexture(name, new ResourceLocation("item/generated"),
+
+            var parent_tag = Arrays.asList(PACKAGED_SPELL_HANDHELD_VARIANTS).contains(i) ? "item/handheld_rod" : "item/generated";
+
+            var plain = i == 0 ? singleTexture(name, new ResourceLocation(parent_tag),
                     "layer0", modLoc("item/cad/" + i + "_" + stub))
-                    : withExistingParent(name + "_" + i, new ResourceLocation("item/generated"))
+                    : withExistingParent(name + "_" + i, new ResourceLocation(parent_tag))
                     .texture("layer0", modLoc("item/cad/" + i + "_" + stub));
-            var filled = withExistingParent(name + "_" + i + "_filled", new ResourceLocation("item/generated"))
+            var filled = withExistingParent(name + "_" + i + "_filled", new ResourceLocation(parent_tag))
                 .texture("layer0", modLoc("item/cad/" + i + "_" + stub))
                 .texture("layer1", modLoc("item/cad/" + i + "_" + stub + "_overlay"));
             builder.override().predicate(ItemFocus.VARIANT_PRED, i).predicate(ItemPackagedHex.HAS_PATTERNS_PRED, -0.01f)