Create/Update assets for version 25w10a

_list.json

@@ -1 +1 @@
-{"directories":["assets","data","mappings"],"files":["25w03a.json","version.json"]}
+{"directories":["assets","data","mappings"],"files":["25w10a.json","version.json"]}

assets/minecraft/atlases/armor_trims.json

@@ -1,63 +1,63 @@
 {
-    "sources": [
-        {
-            "type": "paletted_permutations",
-            "textures": [
-                "trims/entity/humanoid/coast",
-                "trims/entity/humanoid_leggings/coast",
-                "trims/entity/humanoid/sentry",
-                "trims/entity/humanoid_leggings/sentry",
-                "trims/entity/humanoid/dune",
-                "trims/entity/humanoid_leggings/dune",
-                "trims/entity/humanoid/wild",
-                "trims/entity/humanoid_leggings/wild",
-                "trims/entity/humanoid/ward",
-                "trims/entity/humanoid_leggings/ward",
-                "trims/entity/humanoid/eye",
-                "trims/entity/humanoid_leggings/eye",
-                "trims/entity/humanoid/vex",
-                "trims/entity/humanoid_leggings/vex",
-                "trims/entity/humanoid/tide",
-                "trims/entity/humanoid_leggings/tide",
-                "trims/entity/humanoid/snout",
-                "trims/entity/humanoid_leggings/snout",
-                "trims/entity/humanoid/rib",
-                "trims/entity/humanoid_leggings/rib",
-                "trims/entity/humanoid/spire",
-                "trims/entity/humanoid_leggings/spire",
-                "trims/entity/humanoid/wayfinder",
-                "trims/entity/humanoid_leggings/wayfinder",
-                "trims/entity/humanoid/shaper",
-                "trims/entity/humanoid_leggings/shaper",
-                "trims/entity/humanoid/silence",
-                "trims/entity/humanoid_leggings/silence",
-                "trims/entity/humanoid/raiser",
-                "trims/entity/humanoid_leggings/raiser",
-                "trims/entity/humanoid/host",
-                "trims/entity/humanoid_leggings/host",
-                "trims/entity/humanoid/flow",
-                "trims/entity/humanoid_leggings/flow",
-                "trims/entity/humanoid/bolt",
-                "trims/entity/humanoid_leggings/bolt"
-            ],
-            "palette_key": "trims/color_palettes/trim_palette",
-            "permutations": {
-                "quartz": "trims/color_palettes/quartz",
-                "iron": "trims/color_palettes/iron",
-                "gold": "trims/color_palettes/gold",
-                "diamond": "trims/color_palettes/diamond",
-                "netherite": "trims/color_palettes/netherite",
-                "redstone": "trims/color_palettes/redstone",
-                "copper": "trims/color_palettes/copper",
-                "emerald": "trims/color_palettes/emerald",
-                "lapis": "trims/color_palettes/lapis",
-                "amethyst": "trims/color_palettes/amethyst",
-                "iron_darker": "trims/color_palettes/iron_darker",
-                "gold_darker": "trims/color_palettes/gold_darker",
-                "diamond_darker": "trims/color_palettes/diamond_darker",
-                "netherite_darker": "trims/color_palettes/netherite_darker",
-                "resin": "trims/color_palettes/resin"
-            }
-        }
-    ]
-}
+  "sources": [
+    {
+      "type": "minecraft:paletted_permutations",
+      "palette_key": "minecraft:trims/color_palettes/trim_palette",
+      "permutations": {
+        "amethyst": "minecraft:trims/color_palettes/amethyst",
+        "copper": "minecraft:trims/color_palettes/copper",
+        "diamond": "minecraft:trims/color_palettes/diamond",
+        "diamond_darker": "minecraft:trims/color_palettes/diamond_darker",
+        "emerald": "minecraft:trims/color_palettes/emerald",
+        "gold": "minecraft:trims/color_palettes/gold",
+        "gold_darker": "minecraft:trims/color_palettes/gold_darker",
+        "iron": "minecraft:trims/color_palettes/iron",
+        "iron_darker": "minecraft:trims/color_palettes/iron_darker",
+        "lapis": "minecraft:trims/color_palettes/lapis",
+        "netherite": "minecraft:trims/color_palettes/netherite",
+        "netherite_darker": "minecraft:trims/color_palettes/netherite_darker",
+        "quartz": "minecraft:trims/color_palettes/quartz",
+        "redstone": "minecraft:trims/color_palettes/redstone",
+        "resin": "minecraft:trims/color_palettes/resin"
+      },
+      "textures": [
+        "minecraft:trims/entity/humanoid/sentry",
+        "minecraft:trims/entity/humanoid_leggings/sentry",
+        "minecraft:trims/entity/humanoid/dune",
+        "minecraft:trims/entity/humanoid_leggings/dune",
+        "minecraft:trims/entity/humanoid/coast",
+        "minecraft:trims/entity/humanoid_leggings/coast",
+        "minecraft:trims/entity/humanoid/wild",
+        "minecraft:trims/entity/humanoid_leggings/wild",
+        "minecraft:trims/entity/humanoid/ward",
+        "minecraft:trims/entity/humanoid_leggings/ward",
+        "minecraft:trims/entity/humanoid/eye",
+        "minecraft:trims/entity/humanoid_leggings/eye",
+        "minecraft:trims/entity/humanoid/vex",
+        "minecraft:trims/entity/humanoid_leggings/vex",
+        "minecraft:trims/entity/humanoid/tide",
+        "minecraft:trims/entity/humanoid_leggings/tide",
+        "minecraft:trims/entity/humanoid/snout",
+        "minecraft:trims/entity/humanoid_leggings/snout",
+        "minecraft:trims/entity/humanoid/rib",
+        "minecraft:trims/entity/humanoid_leggings/rib",
+        "minecraft:trims/entity/humanoid/spire",
+        "minecraft:trims/entity/humanoid_leggings/spire",
+        "minecraft:trims/entity/humanoid/wayfinder",
+        "minecraft:trims/entity/humanoid_leggings/wayfinder",
+        "minecraft:trims/entity/humanoid/shaper",
+        "minecraft:trims/entity/humanoid_leggings/shaper",
+        "minecraft:trims/entity/humanoid/silence",
+        "minecraft:trims/entity/humanoid_leggings/silence",
+        "minecraft:trims/entity/humanoid/raiser",
+        "minecraft:trims/entity/humanoid_leggings/raiser",
+        "minecraft:trims/entity/humanoid/host",
+        "minecraft:trims/entity/humanoid_leggings/host",
+        "minecraft:trims/entity/humanoid/flow",
+        "minecraft:trims/entity/humanoid_leggings/flow",
+        "minecraft:trims/entity/humanoid/bolt",
+        "minecraft:trims/entity/humanoid_leggings/bolt"
+      ]
+    }
+  ]
+}

assets/minecraft/atlases/banner_patterns.json

@@ -1,13 +1,13 @@
 {
-    "sources": [
-        {
-            "type": "single",
-            "resource": "entity/banner_base"
-        },
-        {
-            "type": "directory",
-            "source": "entity/banner",
-            "prefix": "entity/banner/"
-        }
-    ]
+  "sources": [
+    {
+      "type": "minecraft:single",
+      "resource": "minecraft:entity/banner_base"
+    },
+    {
+      "type": "minecraft:directory",
+      "prefix": "entity/banner/",
+      "source": "entity/banner"
+    }
+  ]
 }

assets/minecraft/atlases/beds.json

@@ -1,9 +1,9 @@
 {
-    "sources": [
-        {
-            "type": "directory",
-            "source": "entity/bed",
-            "prefix": "entity/bed/"
-        }
-    ]
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "prefix": "entity/bed/",
+      "source": "entity/bed"
+    }
+  ]
 }

assets/minecraft/atlases/blocks.json

@@ -1,58 +1,58 @@
 {
-    "sources": [
-        {
-            "type": "directory",
-            "source": "block",
-            "prefix": "block/"
-        },
-        {
-            "type": "directory",
-            "source": "item",
-            "prefix": "item/"
-        },
-        {
-            "type": "directory",
-            "source": "entity/conduit",
-            "prefix": "entity/conduit/"
-        },
-        {
-            "type": "single",
-            "resource": "entity/bell/bell_body"
-        },
-        {
-            "type": "single",
-            "resource": "entity/decorated_pot/decorated_pot_side"
-        },
-        {
-            "type": "single",
-            "resource": "entity/enchanting_table_book"
-        },
-        {
-            "type": "paletted_permutations",
-            "textures": [
-                "trims/items/leggings_trim",
-                "trims/items/chestplate_trim",
-                "trims/items/helmet_trim",
-                "trims/items/boots_trim"
-            ],
-            "palette_key": "trims/color_palettes/trim_palette",
-            "permutations": {
-                "quartz": "trims/color_palettes/quartz",
-                "iron": "trims/color_palettes/iron",
-                "gold": "trims/color_palettes/gold",
-                "diamond": "trims/color_palettes/diamond",
-                "netherite": "trims/color_palettes/netherite",
-                "redstone": "trims/color_palettes/redstone",
-                "copper": "trims/color_palettes/copper",
-                "emerald": "trims/color_palettes/emerald",
-                "lapis": "trims/color_palettes/lapis",
-                "amethyst": "trims/color_palettes/amethyst",
-                "iron_darker": "trims/color_palettes/iron_darker",
-                "gold_darker": "trims/color_palettes/gold_darker",
-                "diamond_darker": "trims/color_palettes/diamond_darker",
-                "netherite_darker": "trims/color_palettes/netherite_darker",
-                "resin": "trims/color_palettes/resin"
-            }
-        }
-    ]
-}
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "prefix": "block/",
+      "source": "block"
+    },
+    {
+      "type": "minecraft:directory",
+      "prefix": "item/",
+      "source": "item"
+    },
+    {
+      "type": "minecraft:directory",
+      "prefix": "entity/conduit/",
+      "source": "entity/conduit"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "minecraft:entity/bell/bell_body"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "minecraft:entity/decorated_pot/decorated_pot_side"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "minecraft:entity/enchanting_table_book"
+    },
+    {
+      "type": "minecraft:paletted_permutations",
+      "palette_key": "minecraft:trims/color_palettes/trim_palette",
+      "permutations": {
+        "amethyst": "minecraft:trims/color_palettes/amethyst",
+        "copper": "minecraft:trims/color_palettes/copper",
+        "diamond": "minecraft:trims/color_palettes/diamond",
+        "diamond_darker": "minecraft:trims/color_palettes/diamond_darker",
+        "emerald": "minecraft:trims/color_palettes/emerald",
+        "gold": "minecraft:trims/color_palettes/gold",
+        "gold_darker": "minecraft:trims/color_palettes/gold_darker",
+        "iron": "minecraft:trims/color_palettes/iron",
+        "iron_darker": "minecraft:trims/color_palettes/iron_darker",
+        "lapis": "minecraft:trims/color_palettes/lapis",
+        "netherite": "minecraft:trims/color_palettes/netherite",
+        "netherite_darker": "minecraft:trims/color_palettes/netherite_darker",
+        "quartz": "minecraft:trims/color_palettes/quartz",
+        "redstone": "minecraft:trims/color_palettes/redstone",
+        "resin": "minecraft:trims/color_palettes/resin"
+      },
+      "textures": [
+        "minecraft:trims/items/helmet_trim",
+        "minecraft:trims/items/chestplate_trim",
+        "minecraft:trims/items/leggings_trim",
+        "minecraft:trims/items/boots_trim"
+      ]
+    }
+  ]
+}

assets/minecraft/atlases/chests.json

@@ -1,9 +1,9 @@
 {
-    "sources": [
-        {
-            "type": "directory",
-            "source": "entity/chest",
-            "prefix": "entity/chest/"
-        }
-    ]
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "prefix": "entity/chest/",
+      "source": "entity/chest"
+    }
+  ]
 }

assets/minecraft/atlases/decorated_pot.json

@@ -1,9 +1,9 @@
 {
   "sources": [
     {
-      "type": "directory",
-      "source": "entity/decorated_pot",
-      "prefix": "entity/decorated_pot/"
+      "type": "minecraft:directory",
+      "prefix": "entity/decorated_pot/",
+      "source": "entity/decorated_pot"
     }
   ]
-}
+}

assets/minecraft/atlases/gui.json

@@ -1,9 +1,9 @@
 {
-    "sources": [
-        {
-            "type": "directory",
-            "source": "gui/sprites",
-            "prefix": ""
-        }
-    ]
-}
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "prefix": "",
+      "source": "gui/sprites"
+    }
+  ]
+}

assets/minecraft/atlases/map_decorations.json

@@ -1,9 +1,9 @@
 {
-    "sources": [
-        {
-            "type": "directory",
-            "source": "map/decorations",
-            "prefix": ""
-        }
-    ]
-}
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "prefix": "",
+      "source": "map/decorations"
+    }
+  ]
+}

assets/minecraft/atlases/mob_effects.json

@@ -1,9 +1,9 @@
 {
-    "sources": [
-        {
-            "type": "directory",
-            "source": "mob_effect",
-            "prefix": ""
-        }
-    ]
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "prefix": "",
+      "source": "mob_effect"
+    }
+  ]
 }

assets/minecraft/atlases/paintings.json

@@ -1,9 +1,9 @@
 {
-    "sources": [
-        {
-            "type": "directory",
-            "source": "painting",
-            "prefix": ""
-        }
-    ]
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "prefix": "",
+      "source": "painting"
+    }
+  ]
 }

assets/minecraft/atlases/particles.json

@@ -1,9 +1,9 @@
 {
-    "sources": [
-        {
-            "type": "directory",
-            "source": "particle",
-            "prefix": ""
-        }
-    ]
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "prefix": "",
+      "source": "particle"
+    }
+  ]
 }

assets/minecraft/atlases/shield_patterns.json

@@ -1,17 +1,17 @@
 {
-    "sources": [
-        {
-            "type": "single",
-            "resource": "entity/shield_base"
-        },
-        {
-            "type": "single",
-            "resource": "entity/shield_base_nopattern"
-        },
-        {
-            "type": "directory",
-            "source": "entity/shield",
-            "prefix": "entity/shield/"
-        }
-    ]
+  "sources": [
+    {
+      "type": "minecraft:single",
+      "resource": "minecraft:entity/shield_base"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "minecraft:entity/shield_base_nopattern"
+    },
+    {
+      "type": "minecraft:directory",
+      "prefix": "entity/shield/",
+      "source": "entity/shield"
+    }
+  ]
 }

assets/minecraft/atlases/shulker_boxes.json

@@ -1,9 +1,9 @@
 {
-    "sources": [
-        {
-            "type": "directory",
-            "source": "entity/shulker",
-            "prefix": "entity/shulker/"
-        }
-    ]
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "prefix": "entity/shulker/",
+      "source": "entity/shulker"
+    }
+  ]
 }

assets/minecraft/atlases/signs.json

@@ -1,9 +1,9 @@
 {
-    "sources": [
-        {
-            "type": "directory",
-            "source": "entity/signs",
-            "prefix": "entity/signs/"
-        }
-    ]
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "prefix": "entity/signs/",
+      "source": "entity/signs"
+    }
+  ]
 }

assets/minecraft/blockstates/acacia_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/acacia_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "minecraft:block/acacia_trapdoor_bottom",

assets/minecraft/blockstates/bamboo_fence.json

@@ -7,8 +7,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/bamboo_fence_side_north",
-        "uvlock": false
+        "model": "minecraft:block/bamboo_fence_side_north"
       },
       "when": {
         "north": "true"
@@ -16,8 +15,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/bamboo_fence_side_east",
-        "uvlock": false
+        "model": "minecraft:block/bamboo_fence_side_east"
       },
       "when": {
         "east": "true"
@@ -25,8 +23,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/bamboo_fence_side_south",
-        "uvlock": false
+        "model": "minecraft:block/bamboo_fence_side_south"
       },
       "when": {
         "south": "true"
@@ -34,8 +31,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/bamboo_fence_side_west",
-        "uvlock": false
+        "model": "minecraft:block/bamboo_fence_side_west"
       },
       "when": {
         "west": "true"

assets/minecraft/blockstates/bamboo_fence_gate.json

@@ -2,78 +2,62 @@
   "variants": {
     "facing=east,in_wall=false,open=false": {
       "model": "minecraft:block/bamboo_fence_gate",
-      "uvlock": false,
       "y": 270
     },
     "facing=east,in_wall=false,open=true": {
       "model": "minecraft:block/bamboo_fence_gate_open",
-      "uvlock": false,
       "y": 270
     },
     "facing=east,in_wall=true,open=false": {
       "model": "minecraft:block/bamboo_fence_gate_wall",
-      "uvlock": false,
       "y": 270
     },
     "facing=east,in_wall=true,open=true": {
       "model": "minecraft:block/bamboo_fence_gate_wall_open",
-      "uvlock": false,
       "y": 270
     },
     "facing=north,in_wall=false,open=false": {
       "model": "minecraft:block/bamboo_fence_gate",
-      "uvlock": false,
       "y": 180
     },
     "facing=north,in_wall=false,open=true": {
       "model": "minecraft:block/bamboo_fence_gate_open",
-      "uvlock": false,
       "y": 180
     },
     "facing=north,in_wall=true,open=false": {
       "model": "minecraft:block/bamboo_fence_gate_wall",
-      "uvlock": false,
       "y": 180
     },
     "facing=north,in_wall=true,open=true": {
       "model": "minecraft:block/bamboo_fence_gate_wall_open",
-      "uvlock": false,
       "y": 180
     },
     "facing=south,in_wall=false,open=false": {
-      "model": "minecraft:block/bamboo_fence_gate",
-      "uvlock": false
+      "model": "minecraft:block/bamboo_fence_gate"
     },
     "facing=south,in_wall=false,open=true": {
-      "model": "minecraft:block/bamboo_fence_gate_open",
-      "uvlock": false
+      "model": "minecraft:block/bamboo_fence_gate_open"
     },
     "facing=south,in_wall=true,open=false": {
-      "model": "minecraft:block/bamboo_fence_gate_wall",
-      "uvlock": false
+      "model": "minecraft:block/bamboo_fence_gate_wall"
     },
     "facing=south,in_wall=true,open=true": {
-      "model": "minecraft:block/bamboo_fence_gate_wall_open",
-      "uvlock": false
+      "model": "minecraft:block/bamboo_fence_gate_wall_open"
     },
     "facing=west,in_wall=false,open=false": {
       "model": "minecraft:block/bamboo_fence_gate",
-      "uvlock": false,
       "y": 90
     },
     "facing=west,in_wall=false,open=true": {
       "model": "minecraft:block/bamboo_fence_gate_open",
-      "uvlock": false,
       "y": 90
     },
     "facing=west,in_wall=true,open=false": {
       "model": "minecraft:block/bamboo_fence_gate_wall",
-      "uvlock": false,
       "y": 90
     },
     "facing=west,in_wall=true,open=true": {
       "model": "minecraft:block/bamboo_fence_gate_wall_open",
-      "uvlock": false,
       "y": 90
     }
   }

assets/minecraft/blockstates/bamboo_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/bamboo_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "minecraft:block/bamboo_trapdoor_bottom",

assets/minecraft/blockstates/birch_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/birch_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "minecraft:block/birch_trapdoor_bottom",

assets/minecraft/blockstates/brown_mushroom_block.json

@@ -69,7 +69,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "y": 90
       },
       "when": {
@@ -79,7 +78,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "y": 180
       },
       "when": {
@@ -89,7 +87,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "y": 270
       },
       "when": {
@@ -99,7 +96,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "x": 270
       },
       "when": {
@@ -109,7 +105,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "x": 90
       },
       "when": {

assets/minecraft/blockstates/bush.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/bush"
+    }
+  }
+}

assets/minecraft/blockstates/cactus_flower.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/cactus_flower"
+    }
+  }
+}

assets/minecraft/blockstates/cherry_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/cherry_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "minecraft:block/cherry_trapdoor_bottom",

assets/minecraft/blockstates/chiseled_bookshelf.json

@@ -3,8 +3,7 @@
     {
       "apply": {
         "model": "minecraft:block/chiseled_bookshelf",
-        "uvlock": true,
-        "y": 0
+        "uvlock": true
       },
       "when": {
         "facing": "north"
@@ -12,8 +11,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_left",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_left"
       },
       "when": {
         "AND": [
@@ -28,8 +26,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_left",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_left"
       },
       "when": {
         "AND": [
@@ -44,8 +41,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_mid",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_mid"
       },
       "when": {
         "AND": [
@@ -60,8 +56,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_mid",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_mid"
       },
       "when": {
         "AND": [
@@ -76,8 +71,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_right",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_right"
       },
       "when": {
         "AND": [
@@ -92,8 +86,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_right",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_right"
       },
       "when": {
         "AND": [
@@ -108,8 +101,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_left",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_left"
       },
       "when": {
         "AND": [
@@ -124,8 +116,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_left",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_left"
       },
       "when": {
         "AND": [
@@ -140,8 +131,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_mid",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_mid"
       },
       "when": {
         "AND": [
@@ -156,8 +146,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_mid",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_mid"
       },
       "when": {
         "AND": [
@@ -172,8 +161,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_right",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_right"
       },
       "when": {
         "AND": [
@@ -188,8 +176,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_right",
-        "y": 0
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_right"
       },
       "when": {
         "AND": [

assets/minecraft/blockstates/crimson_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/crimson_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "minecraft:block/crimson_trapdoor_bottom",

assets/minecraft/blockstates/firefly_bush.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/firefly_bush"
+    }
+  }
+}

assets/minecraft/blockstates/jungle_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/jungle_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "minecraft:block/jungle_trapdoor_bottom",

assets/minecraft/blockstates/leaf_litter.json

@@ -5,8 +5,7 @@
         "model": "minecraft:block/leaf_litter_1"
       },
       "when": {
-        "facing": "north",
-        "segment_amount": "1|2|3|4"
+        "facing": "north"
       }
     },
     {
@@ -15,8 +14,7 @@
         "y": 90
       },
       "when": {
-        "facing": "east",
-        "segment_amount": "1|2|3|4"
+        "facing": "east"
       }
     },
     {
@@ -25,8 +23,7 @@
         "y": 180
       },
       "when": {
-        "facing": "south",
-        "segment_amount": "1|2|3|4"
+        "facing": "south"
       }
     },
     {
@@ -35,8 +32,7 @@
         "y": 270
       },
       "when": {
-        "facing": "west",
-        "segment_amount": "1|2|3|4"
+        "facing": "west"
       }
     },
     {

assets/minecraft/blockstates/mangrove_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/mangrove_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "minecraft:block/mangrove_trapdoor_bottom",

assets/minecraft/blockstates/mushroom_stem.json

@@ -69,7 +69,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "y": 90
       },
       "when": {
@@ -79,7 +78,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "y": 180
       },
       "when": {
@@ -89,7 +87,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "y": 270
       },
       "when": {
@@ -99,7 +96,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "x": 270
       },
       "when": {
@@ -109,7 +105,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "x": 90
       },
       "when": {

assets/minecraft/blockstates/pale_oak_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/pale_oak_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "minecraft:block/pale_oak_trapdoor_bottom",

assets/minecraft/blockstates/pink_petals.json

@@ -5,8 +5,7 @@
         "model": "minecraft:block/pink_petals_1"
       },
       "when": {
-        "facing": "north",
-        "flower_amount": "1|2|3|4"
+        "facing": "north"
       }
     },
     {
@@ -15,8 +14,7 @@
         "y": 90
       },
       "when": {
-        "facing": "east",
-        "flower_amount": "1|2|3|4"
+        "facing": "east"
       }
     },
     {
@@ -25,8 +23,7 @@
         "y": 180
       },
       "when": {
-        "facing": "south",
-        "flower_amount": "1|2|3|4"
+        "facing": "south"
       }
     },
     {
@@ -35,8 +32,7 @@
         "y": 270
       },
       "when": {
-        "facing": "west",
-        "flower_amount": "1|2|3|4"
+        "facing": "west"
       }
     },
     {

assets/minecraft/blockstates/red_mushroom_block.json

@@ -69,7 +69,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "y": 90
       },
       "when": {
@@ -79,7 +78,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "y": 180
       },
       "when": {
@@ -89,7 +87,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "y": 270
       },
       "when": {
@@ -99,7 +96,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "x": 270
       },
       "when": {
@@ -109,7 +105,6 @@
     {
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
         "x": 90
       },
       "when": {

assets/minecraft/blockstates/short_dry_grass.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/short_dry_grass"
+    }
+  }
+}

assets/minecraft/blockstates/spruce_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/spruce_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "minecraft:block/spruce_trapdoor_bottom",

assets/minecraft/blockstates/tall_dry_grass.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/tall_dry_grass"
+    }
+  }
+}

assets/minecraft/blockstates/test_block.json

@@ -1,15 +1,15 @@
 {
   "variants": {
-    "test_block_mode=accept": {
+    "mode=accept": {
       "model": "minecraft:block/test_block_accept"
     },
-    "test_block_mode=fail": {
+    "mode=fail": {
       "model": "minecraft:block/test_block_fail"
     },
-    "test_block_mode=log": {
+    "mode=log": {
       "model": "minecraft:block/test_block_log"
     },
-    "test_block_mode=start": {
+    "mode=start": {
       "model": "minecraft:block/test_block_start"
     }
   }

assets/minecraft/blockstates/warped_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/warped_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "minecraft:block/warped_trapdoor_bottom",

assets/minecraft/blockstates/wildflowers.json

@@ -5,8 +5,7 @@
         "model": "minecraft:block/wildflowers_1"
       },
       "when": {
-        "facing": "north",
-        "flower_amount": "1|2|3|4"
+        "facing": "north"
       }
     },
     {
@@ -15,8 +14,7 @@
         "y": 90
       },
       "when": {
-        "facing": "east",
-        "flower_amount": "1|2|3|4"
+        "facing": "east"
       }
     },
     {
@@ -25,8 +23,7 @@
         "y": 180
       },
       "when": {
-        "facing": "south",
-        "flower_amount": "1|2|3|4"
+        "facing": "south"
       }
     },
     {
@@ -35,8 +32,7 @@
         "y": 270
       },
       "when": {
-        "facing": "west",
-        "flower_amount": "1|2|3|4"
+        "facing": "west"
       }
     },
     {

assets/minecraft/items/allay_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -16721153
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -16732673
-      }
-    ]
+    "model": "minecraft:item/allay_spawn_egg"
   }
 }

assets/minecraft/items/armadillo_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -5410451
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -8239032
-      }
-    ]
+    "model": "minecraft:item/armadillo_spawn_egg"
   }
 }

assets/minecraft/items/axolotl_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -278045
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -5886604
-      }
-    ]
+    "model": "minecraft:item/axolotl_spawn_egg"
   }
 }

assets/minecraft/items/bat_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -11780560
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -15790321
-      }
-    ]
+    "model": "minecraft:item/bat_spawn_egg"
   }
 }

assets/minecraft/items/bee_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -1195197
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -12377061
-      }
-    ]
+    "model": "minecraft:item/bee_spawn_egg"
   }
 }

assets/minecraft/items/blaze_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -609791
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -1922
-      }
-    ]
+    "model": "minecraft:item/blaze_spawn_egg"
   }
 }

assets/minecraft/items/blue_egg.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/blue_egg"
+  }
+}

assets/minecraft/items/bogged_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -7693198
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -13546213
-      }
-    ]
+    "model": "minecraft:item/bogged_spawn_egg"
   }
 }

assets/minecraft/items/breeze_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -5270305
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -7248161
-      }
-    ]
+    "model": "minecraft:item/breeze_spawn_egg"
   }
 }

assets/minecraft/items/brown_egg.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/brown_egg"
+  }
+}

assets/minecraft/items/bush.json

@@ -0,0 +1,13 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/bush",
+    "tints": [
+      {
+        "type": "minecraft:grass",
+        "downfall": 1.0,
+        "temperature": 0.5
+      }
+    ]
+  }
+}

assets/minecraft/items/cactus_flower.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/cactus_flower"
+  }
+}

assets/minecraft/items/camel_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -212119
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -3435721
-      }
-    ]
+    "model": "minecraft:item/camel_spawn_egg"
   }
 }

assets/minecraft/items/cat_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -1062770
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -6983082
-      }
-    ]
+    "model": "minecraft:item/cat_spawn_egg"
   }
 }

assets/minecraft/items/cave_spider_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -15973810
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -5763570
-      }
-    ]
+    "model": "minecraft:item/cave_spider_spawn_egg"
   }
 }

assets/minecraft/items/chicken_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -6184543
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -65536
-      }
-    ]
+    "model": "minecraft:item/chicken_spawn_egg"
   }
 }

assets/minecraft/items/cod_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -4085910
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -1719157
-      }
-    ]
+    "model": "minecraft:item/cod_spawn_egg"
   }
 }

assets/minecraft/items/cow_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -12306906
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -6184543
-      }
-    ]
+    "model": "minecraft:item/cow_spawn_egg"
   }
 }

assets/minecraft/items/creaking_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -10526881
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -231406
-      }
-    ]
+    "model": "minecraft:item/creaking_spawn_egg"
   }
 }

assets/minecraft/items/creeper_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -15882485
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -16777216
-      }
-    ]
+    "model": "minecraft:item/creeper_spawn_egg"
   }
 }

assets/minecraft/items/crossbow.json

@@ -1,54 +1,54 @@
 {
   "model": {
-    "type": "minecraft:condition",
-    "on_false": {
-      "type": "minecraft:select",
-      "cases": [
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/crossbow_arrow"
-          },
-          "when": "arrow"
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "minecraft:item/crossbow_arrow"
         },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/crossbow_firework"
-          },
-          "when": "rocket"
-        }
-      ],
-      "fallback": {
+        "when": "arrow"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "minecraft:item/crossbow_firework"
+        },
+        "when": "rocket"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:condition",
+      "on_false": {
         "type": "minecraft:model",
         "model": "minecraft:item/crossbow"
       },
-      "property": "minecraft:charge_type"
-    },
-    "on_true": {
-      "type": "minecraft:range_dispatch",
-      "entries": [
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/crossbow_pulling_1"
+      "on_true": {
+        "type": "minecraft:range_dispatch",
+        "entries": [
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/crossbow_pulling_1"
+            },
+            "threshold": 0.58
           },
-          "threshold": 0.58
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/crossbow_pulling_2"
+            },
+            "threshold": 1.0
+          }
+        ],
+        "fallback": {
+          "type": "minecraft:model",
+          "model": "minecraft:item/crossbow_pulling_0"
         },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/crossbow_pulling_2"
-          },
-          "threshold": 1.0
-        }
-      ],
-      "fallback": {
-        "type": "minecraft:model",
-        "model": "minecraft:item/crossbow_pulling_0"
+        "property": "minecraft:crossbow/pull"
       },
-      "property": "minecraft:crossbow/pull"
+      "property": "minecraft:using_item"
     },
-    "property": "minecraft:using_item"
+    "property": "minecraft:charge_type"
   }
 }

assets/minecraft/items/dolphin_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -14533811
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -394759
-      }
-    ]
+    "model": "minecraft:item/dolphin_spawn_egg"
   }
 }

assets/minecraft/items/donkey_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -11320007
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -7965338
-      }
-    ]
+    "model": "minecraft:item/donkey_spawn_egg"
   }
 }

assets/minecraft/items/drowned_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -7343657
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -8807323
-      }
-    ]
+    "model": "minecraft:item/drowned_spawn_egg"
   }
 }

assets/minecraft/items/elder_guardian_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -3224390
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -9144685
-      }
-    ]
+    "model": "minecraft:item/elder_guardian_spawn_egg"
   }
 }

assets/minecraft/items/ender_dragon_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -14935012
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -2065926
-      }
-    ]
+    "model": "minecraft:item/ender_dragon_spawn_egg"
   }
 }

assets/minecraft/items/enderman_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -15329770
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -16777216
-      }
-    ]
+    "model": "minecraft:item/enderman_spawn_egg"
   }
 }

assets/minecraft/items/endermite_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -15329770
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -9539986
-      }
-    ]
+    "model": "minecraft:item/endermite_spawn_egg"
   }
 }

assets/minecraft/items/evoker_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -6972517
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -14803942
-      }
-    ]
+    "model": "minecraft:item/evoker_spawn_egg"
   }
 }

assets/minecraft/items/firefly_bush.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/firefly_bush"
+  }
+}

assets/minecraft/items/fox_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -2771297
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -3380960
-      }
-    ]
+    "model": "minecraft:item/fox_spawn_egg"
   }
 }

assets/minecraft/items/frog_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -3115964
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -14468
-      }
-    ]
+    "model": "minecraft:item/frog_spawn_egg"
   }
 }

assets/minecraft/items/ghast_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -394759
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -4408132
-      }
-    ]
+    "model": "minecraft:item/ghast_spawn_egg"
   }
 }

assets/minecraft/items/glow_squid_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -16165290
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -7999044
-      }
-    ]
+    "model": "minecraft:item/glow_squid_spawn_egg"
   }
 }

assets/minecraft/items/goat_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -5925764
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -11187906
-      }
-    ]
+    "model": "minecraft:item/goat_spawn_egg"
   }
 }

assets/minecraft/items/guardian_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -10845582
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -950992
-      }
-    ]
+    "model": "minecraft:item/guardian_spawn_egg"
   }
 }

assets/minecraft/items/hoglin_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -3772843
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -10525596
-      }
-    ]
+    "model": "minecraft:item/hoglin_spawn_egg"
   }
 }

assets/minecraft/items/horse_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -4153731
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -1121024
-      }
-    ]
+    "model": "minecraft:item/horse_spawn_egg"
   }
 }

assets/minecraft/items/husk_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -8818591
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -1651564
-      }
-    ]
+    "model": "minecraft:item/husk_spawn_egg"
   }
 }

assets/minecraft/items/iron_golem_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -2372158
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -9133262
-      }
-    ]
+    "model": "minecraft:item/iron_golem_spawn_egg"
   }
 }

assets/minecraft/items/llama_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -4153731
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -6725824
-      }
-    ]
+    "model": "minecraft:item/llama_spawn_egg"
   }
 }

assets/minecraft/items/magma_cube_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -13369344
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -197632
-      }
-    ]
+    "model": "minecraft:item/magma_cube_spawn_egg"
   }
 }

assets/minecraft/items/mooshroom_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -6287600
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -4737097
-      }
-    ]
+    "model": "minecraft:item/mooshroom_spawn_egg"
   }
 }

assets/minecraft/items/mule_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -15007232
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -11455715
-      }
-    ]
+    "model": "minecraft:item/mule_spawn_egg"
   }
 }

assets/minecraft/items/ocelot_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -1057155
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -11123660
-      }
-    ]
+    "model": "minecraft:item/ocelot_spawn_egg"
   }
 }

assets/minecraft/items/panda_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -1579033
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -15000798
-      }
-    ]
+    "model": "minecraft:item/panda_spawn_egg"
   }
 }

assets/minecraft/items/parrot_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -15882485
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -65536
-      }
-    ]
+    "model": "minecraft:item/parrot_spawn_egg"
   }
 }

assets/minecraft/items/phantom_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -12365430
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -7799040
-      }
-    ]
+    "model": "minecraft:item/phantom_spawn_egg"
   }
 }

assets/minecraft/items/pig_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -1006174
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -2399393
-      }
-    ]
+    "model": "minecraft:item/pig_spawn_egg"
   }
 }

assets/minecraft/items/piglin_brute_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -10933744
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -396380
-      }
-    ]
+    "model": "minecraft:item/piglin_brute_spawn_egg"
   }
 }

assets/minecraft/items/piglin_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -6725824
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -396380
-      }
-    ]
+    "model": "minecraft:item/piglin_spawn_egg"
   }
 }

assets/minecraft/items/pillager_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -11325642
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -6972517
-      }
-    ]
+    "model": "minecraft:item/pillager_spawn_egg"
   }
 }