Create/Update assets for version 25w09a

_list.json

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

assets/minecraft/atlases/armor_trims.json

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

assets/minecraft/atlases/banner_patterns.json

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

assets/minecraft/atlases/beds.json

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

assets/minecraft/atlases/blocks.json

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

assets/minecraft/atlases/chests.json

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

assets/minecraft/atlases/decorated_pot.json

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

assets/minecraft/atlases/gui.json

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

assets/minecraft/atlases/map_decorations.json

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

assets/minecraft/atlases/mob_effects.json

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

assets/minecraft/atlases/paintings.json

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

assets/minecraft/atlases/particles.json

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

assets/minecraft/atlases/shield_patterns.json

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

assets/minecraft/atlases/shulker_boxes.json

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

assets/minecraft/atlases/signs.json

@@ -1,9 +1,9 @@
 {
-    "sources": [
+  "sources": [
-        {
+    {
-            "type": "directory",
+      "type": "minecraft:directory",
-            "source": "entity/signs",
+      "prefix": "entity/signs/",
-            "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,
+      "x": 180
-      "y": 0
     },
     "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",
+        "model": "minecraft:block/bamboo_fence_side_north"
-        "uvlock": false
       },
       "when": {
         "north": "true"
@@ -16,8 +15,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/bamboo_fence_side_east",
+        "model": "minecraft:block/bamboo_fence_side_east"
-        "uvlock": false
       },
       "when": {
         "east": "true"
@@ -25,8 +23,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/bamboo_fence_side_south",
+        "model": "minecraft:block/bamboo_fence_side_south"
-        "uvlock": false
       },
       "when": {
         "south": "true"
@@ -34,8 +31,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/bamboo_fence_side_west",
+        "model": "minecraft:block/bamboo_fence_side_west"
-        "uvlock": false
       },
       "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",
+      "model": "minecraft:block/bamboo_fence_gate"
-      "uvlock": false
     },
     "facing=south,in_wall=false,open=true": {
-      "model": "minecraft:block/bamboo_fence_gate_open",
+      "model": "minecraft:block/bamboo_fence_gate_open"
-      "uvlock": false
     },
     "facing=south,in_wall=true,open=false": {
-      "model": "minecraft:block/bamboo_fence_gate_wall",
+      "model": "minecraft:block/bamboo_fence_gate_wall"
-      "uvlock": false
     },
     "facing=south,in_wall=true,open=true": {
-      "model": "minecraft:block/bamboo_fence_gate_wall_open",
+      "model": "minecraft:block/bamboo_fence_gate_wall_open"
-      "uvlock": false
     },
     "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,
+      "x": 180
-      "y": 0
     },
     "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,
+      "x": 180
-      "y": 0
     },
     "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,
+      "x": 180
-      "y": 0
     },
     "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,
+        "uvlock": true
-        "y": 0
       },
       "when": {
         "facing": "north"
@@ -12,8 +11,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_left",
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_left"
-        "y": 0
       },
       "when": {
         "AND": [
@@ -28,8 +26,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_left",
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_left"
-        "y": 0
       },
       "when": {
         "AND": [
@@ -44,8 +41,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_mid",
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_mid"
-        "y": 0
       },
       "when": {
         "AND": [
@@ -60,8 +56,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_mid",
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_mid"
-        "y": 0
       },
       "when": {
         "AND": [
@@ -76,8 +71,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_right",
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_right"
-        "y": 0
       },
       "when": {
         "AND": [
@@ -92,8 +86,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_right",
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_right"
-        "y": 0
       },
       "when": {
         "AND": [
@@ -108,8 +101,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_left",
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_left"
-        "y": 0
       },
       "when": {
         "AND": [
@@ -124,8 +116,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_left",
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_left"
-        "y": 0
       },
       "when": {
         "AND": [
@@ -140,8 +131,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_mid",
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_mid"
-        "y": 0
       },
       "when": {
         "AND": [
@@ -156,8 +146,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_mid",
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_mid"
-        "y": 0
       },
       "when": {
         "AND": [
@@ -172,8 +161,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_right",
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_right"
-        "y": 0
       },
       "when": {
         "AND": [
@@ -188,8 +176,7 @@
     },
     {
       "apply": {
-        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_right",
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_right"
-        "y": 0
       },
       "when": {
         "AND": [

assets/minecraft/blockstates/creaking_heart.json

@@ -1,27 +1,39 @@
 {
   "variants": {
-    "active=false,axis=x": {
+    "axis=x,creaking_heart_state=awake": {
+      "model": "minecraft:block/creaking_heart_awake_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=x,creaking_heart_state=dormant": {
+      "model": "minecraft:block/creaking_heart_dormant_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=x,creaking_heart_state=uprooted": {
       "model": "minecraft:block/creaking_heart_horizontal",
       "x": 90,
       "y": 90
     },
-    "active=false,axis=y": {
+    "axis=y,creaking_heart_state=awake": {
+      "model": "minecraft:block/creaking_heart_awake"
+    },
+    "axis=y,creaking_heart_state=dormant": {
+      "model": "minecraft:block/creaking_heart_dormant"
+    },
+    "axis=y,creaking_heart_state=uprooted": {
       "model": "minecraft:block/creaking_heart"
     },
-    "active=false,axis=z": {
+    "axis=z,creaking_heart_state=awake": {
-      "model": "minecraft:block/creaking_heart_horizontal",
+      "model": "minecraft:block/creaking_heart_awake_horizontal",
       "x": 90
     },
-    "active=true,axis=x": {
+    "axis=z,creaking_heart_state=dormant": {
-      "model": "minecraft:block/creaking_heart_active_horizontal",
+      "model": "minecraft:block/creaking_heart_dormant_horizontal",
-      "x": 90,
+      "x": 90
-      "y": 90
     },
-    "active=true,axis=y": {
+    "axis=z,creaking_heart_state=uprooted": {
-      "model": "minecraft:block/creaking_heart_active"
+      "model": "minecraft:block/creaking_heart_horizontal",
-    },
-    "active=true,axis=z": {
-      "model": "minecraft:block/creaking_heart_active_horizontal",
       "x": 90
     }
   }

assets/minecraft/blockstates/crimson_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/crimson_trapdoor_open",
-      "x": 180,
+      "x": 180
-      "y": 0
     },
     "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,
+      "x": 180
-      "y": 0
     },
     "facing=west,half=bottom,open=false": {
       "model": "minecraft:block/jungle_trapdoor_bottom",

assets/minecraft/blockstates/leaf_litter.json

@@ -0,0 +1,156 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_1"
+      },
+      "when": {
+        "facing": "north"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_1",
+        "y": 90
+      },
+      "when": {
+        "facing": "east"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_1",
+        "y": 180
+      },
+      "when": {
+        "facing": "south"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_1",
+        "y": 270
+      },
+      "when": {
+        "facing": "west"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_2"
+      },
+      "when": {
+        "facing": "north",
+        "segment_amount": "2|3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_2",
+        "y": 90
+      },
+      "when": {
+        "facing": "east",
+        "segment_amount": "2|3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_2",
+        "y": 180
+      },
+      "when": {
+        "facing": "south",
+        "segment_amount": "2|3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_2",
+        "y": 270
+      },
+      "when": {
+        "facing": "west",
+        "segment_amount": "2|3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_3"
+      },
+      "when": {
+        "facing": "north",
+        "segment_amount": "3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_3",
+        "y": 90
+      },
+      "when": {
+        "facing": "east",
+        "segment_amount": "3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_3",
+        "y": 180
+      },
+      "when": {
+        "facing": "south",
+        "segment_amount": "3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_3",
+        "y": 270
+      },
+      "when": {
+        "facing": "west",
+        "segment_amount": "3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_4"
+      },
+      "when": {
+        "facing": "north",
+        "segment_amount": "4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_4",
+        "y": 90
+      },
+      "when": {
+        "facing": "east",
+        "segment_amount": "4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_4",
+        "y": 180
+      },
+      "when": {
+        "facing": "south",
+        "segment_amount": "4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_4",
+        "y": 270
+      },
+      "when": {
+        "facing": "west",
+        "segment_amount": "4"
+      }
+    }
+  ]
+}

assets/minecraft/blockstates/mangrove_trapdoor.json

@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "minecraft:block/mangrove_trapdoor_open",
-      "x": 180,
+      "x": 180
-      "y": 0
     },
     "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,
+      "x": 180
-      "y": 0
     },
     "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",
+        "facing": "north"
-        "flower_amount": "1|2|3|4"
       }
     },
     {
@@ -15,8 +14,7 @@
         "y": 90
       },
       "when": {
-        "facing": "east",
+        "facing": "east"
-        "flower_amount": "1|2|3|4"
       }
     },
     {
@@ -25,8 +23,7 @@
         "y": 180
       },
       "when": {
-        "facing": "south",
+        "facing": "south"
-        "flower_amount": "1|2|3|4"
       }
     },
     {
@@ -35,8 +32,7 @@
         "y": 270
       },
       "when": {
-        "facing": "west",
+        "facing": "west"
-        "flower_amount": "1|2|3|4"
       }
     },
     {

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,
+      "x": 180
-      "y": 0
     },
     "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

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

assets/minecraft/blockstates/test_instance_block.json

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

assets/minecraft/blockstates/warped_trapdoor.json

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

assets/minecraft/blockstates/wildflowers.json

@@ -0,0 +1,156 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_1"
+      },
+      "when": {
+        "facing": "north"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_1",
+        "y": 90
+      },
+      "when": {
+        "facing": "east"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_1",
+        "y": 180
+      },
+      "when": {
+        "facing": "south"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_1",
+        "y": 270
+      },
+      "when": {
+        "facing": "west"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_2"
+      },
+      "when": {
+        "facing": "north",
+        "flower_amount": "2|3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_2",
+        "y": 90
+      },
+      "when": {
+        "facing": "east",
+        "flower_amount": "2|3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_2",
+        "y": 180
+      },
+      "when": {
+        "facing": "south",
+        "flower_amount": "2|3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_2",
+        "y": 270
+      },
+      "when": {
+        "facing": "west",
+        "flower_amount": "2|3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_3"
+      },
+      "when": {
+        "facing": "north",
+        "flower_amount": "3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_3",
+        "y": 90
+      },
+      "when": {
+        "facing": "east",
+        "flower_amount": "3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_3",
+        "y": 180
+      },
+      "when": {
+        "facing": "south",
+        "flower_amount": "3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_3",
+        "y": 270
+      },
+      "when": {
+        "facing": "west",
+        "flower_amount": "3|4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_4"
+      },
+      "when": {
+        "facing": "north",
+        "flower_amount": "4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_4",
+        "y": 90
+      },
+      "when": {
+        "facing": "east",
+        "flower_amount": "4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_4",
+        "y": 180
+      },
+      "when": {
+        "facing": "south",
+        "flower_amount": "4"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/wildflowers_4",
+        "y": 270
+      },
+      "when": {
+        "facing": "west",
+        "flower_amount": "4"
+      }
+    }
+  ]
+}

assets/minecraft/equipment/_all.json

@@ -1 +1 @@
-{"armadillo_scute":{"layers":{"wolf_body":[{"texture":"minecraft:armadillo_scute"},{"dyeable":{},"texture":"minecraft:armadillo_scute_overlay"}]}},"black_carpet":{"layers":{"llama_body":[{"texture":"minecraft:black"}]}},"blue_carpet":{"layers":{"llama_body":[{"texture":"minecraft:blue"}]}},"brown_carpet":{"layers":{"llama_body":[{"texture":"minecraft:brown"}]}},"chainmail":{"layers":{"humanoid":[{"texture":"minecraft:chainmail"}],"humanoid_leggings":[{"texture":"minecraft:chainmail"}]}},"cyan_carpet":{"layers":{"llama_body":[{"texture":"minecraft:cyan"}]}},"diamond":{"layers":{"horse_body":[{"texture":"minecraft:diamond"}],"humanoid":[{"texture":"minecraft:diamond"}],"humanoid_leggings":[{"texture":"minecraft:diamond"}]}},"elytra":{"layers":{"wings":[{"texture":"minecraft:elytra","use_player_texture":true}]}},"gold":{"layers":{"horse_body":[{"texture":"minecraft:gold"}],"humanoid":[{"texture":"minecraft:gold"}],"humanoid_leggings":[{"texture":"minecraft:gold"}]}},"gray_carpet":{"layers":{"llama_body":[{"texture":"minecraft:gray"}]}},"green_carpet":{"layers":{"llama_body":[{"texture":"minecraft:green"}]}},"iron":{"layers":{"horse_body":[{"texture":"minecraft:iron"}],"humanoid":[{"texture":"minecraft:iron"}],"humanoid_leggings":[{"texture":"minecraft:iron"}]}},"leather":{"layers":{"horse_body":[{"dyeable":{"color_when_undyed":-6265536},"texture":"minecraft:leather"}],"humanoid":[{"dyeable":{"color_when_undyed":-6265536},"texture":"minecraft:leather"},{"texture":"minecraft:leather_overlay"}],"humanoid_leggings":[{"dyeable":{"color_when_undyed":-6265536},"texture":"minecraft:leather"},{"texture":"minecraft:leather_overlay"}]}},"light_blue_carpet":{"layers":{"llama_body":[{"texture":"minecraft:light_blue"}]}},"light_gray_carpet":{"layers":{"llama_body":[{"texture":"minecraft:light_gray"}]}},"lime_carpet":{"layers":{"llama_body":[{"texture":"minecraft:lime"}]}},"magenta_carpet":{"layers":{"llama_body":[{"texture":"minecraft:magenta"}]}},"netherite":{"layers":{"humanoid":[{"texture":"minecraft:netherite"}],"humanoid_leggings":[{"texture":"minecraft:netherite"}]}},"orange_carpet":{"layers":{"llama_body":[{"texture":"minecraft:orange"}]}},"pink_carpet":{"layers":{"llama_body":[{"texture":"minecraft:pink"}]}},"purple_carpet":{"layers":{"llama_body":[{"texture":"minecraft:purple"}]}},"red_carpet":{"layers":{"llama_body":[{"texture":"minecraft:red"}]}},"trader_llama":{"layers":{"llama_body":[{"texture":"minecraft:trader_llama"}]}},"turtle_scute":{"layers":{"humanoid":[{"texture":"minecraft:turtle_scute"}]}},"white_carpet":{"layers":{"llama_body":[{"texture":"minecraft:white"}]}},"yellow_carpet":{"layers":{"llama_body":[{"texture":"minecraft:yellow"}]}}}
+{"armadillo_scute":{"layers":{"wolf_body":[{"texture":"minecraft:armadillo_scute"},{"dyeable":{},"texture":"minecraft:armadillo_scute_overlay"}]}},"black_carpet":{"layers":{"llama_body":[{"texture":"minecraft:black"}]}},"blue_carpet":{"layers":{"llama_body":[{"texture":"minecraft:blue"}]}},"brown_carpet":{"layers":{"llama_body":[{"texture":"minecraft:brown"}]}},"chainmail":{"layers":{"humanoid":[{"texture":"minecraft:chainmail"}],"humanoid_leggings":[{"texture":"minecraft:chainmail"}]}},"cyan_carpet":{"layers":{"llama_body":[{"texture":"minecraft:cyan"}]}},"diamond":{"layers":{"horse_body":[{"texture":"minecraft:diamond"}],"humanoid":[{"texture":"minecraft:diamond"}],"humanoid_leggings":[{"texture":"minecraft:diamond"}]}},"elytra":{"layers":{"wings":[{"texture":"minecraft:elytra","use_player_texture":true}]}},"gold":{"layers":{"horse_body":[{"texture":"minecraft:gold"}],"humanoid":[{"texture":"minecraft:gold"}],"humanoid_leggings":[{"texture":"minecraft:gold"}]}},"gray_carpet":{"layers":{"llama_body":[{"texture":"minecraft:gray"}]}},"green_carpet":{"layers":{"llama_body":[{"texture":"minecraft:green"}]}},"iron":{"layers":{"horse_body":[{"texture":"minecraft:iron"}],"humanoid":[{"texture":"minecraft:iron"}],"humanoid_leggings":[{"texture":"minecraft:iron"}]}},"leather":{"layers":{"horse_body":[{"dyeable":{"color_when_undyed":-6265536},"texture":"minecraft:leather"}],"humanoid":[{"dyeable":{"color_when_undyed":-6265536},"texture":"minecraft:leather"},{"texture":"minecraft:leather_overlay"}],"humanoid_leggings":[{"dyeable":{"color_when_undyed":-6265536},"texture":"minecraft:leather"},{"texture":"minecraft:leather_overlay"}]}},"light_blue_carpet":{"layers":{"llama_body":[{"texture":"minecraft:light_blue"}]}},"light_gray_carpet":{"layers":{"llama_body":[{"texture":"minecraft:light_gray"}]}},"lime_carpet":{"layers":{"llama_body":[{"texture":"minecraft:lime"}]}},"magenta_carpet":{"layers":{"llama_body":[{"texture":"minecraft:magenta"}]}},"netherite":{"layers":{"humanoid":[{"texture":"minecraft:netherite"}],"humanoid_leggings":[{"texture":"minecraft:netherite"}]}},"orange_carpet":{"layers":{"llama_body":[{"texture":"minecraft:orange"}]}},"pink_carpet":{"layers":{"llama_body":[{"texture":"minecraft:pink"}]}},"purple_carpet":{"layers":{"llama_body":[{"texture":"minecraft:purple"}]}},"red_carpet":{"layers":{"llama_body":[{"texture":"minecraft:red"}]}},"saddle":{"layers":{"camel_saddle":[{"texture":"minecraft:saddle"}],"donkey_saddle":[{"texture":"minecraft:saddle"}],"horse_saddle":[{"texture":"minecraft:saddle"}],"mule_saddle":[{"texture":"minecraft:saddle"}],"pig_saddle":[{"texture":"minecraft:saddle"}],"skeleton_horse_saddle":[{"texture":"minecraft:saddle"}],"strider_saddle":[{"texture":"minecraft:saddle"}],"zombie_horse_saddle":[{"texture":"minecraft:saddle"}]}},"trader_llama":{"layers":{"llama_body":[{"texture":"minecraft:trader_llama"}]}},"turtle_scute":{"layers":{"humanoid":[{"texture":"minecraft:turtle_scute"}]}},"white_carpet":{"layers":{"llama_body":[{"texture":"minecraft:white"}]}},"yellow_carpet":{"layers":{"llama_body":[{"texture":"minecraft:yellow"}]}}}

assets/minecraft/equipment/_list.json

@@ -1 +1 @@
-{"directories":[],"files":["armadillo_scute.json","black_carpet.json","blue_carpet.json","brown_carpet.json","chainmail.json","cyan_carpet.json","diamond.json","elytra.json","gold.json","gray_carpet.json","green_carpet.json","iron.json","leather.json","light_blue_carpet.json","light_gray_carpet.json","lime_carpet.json","magenta_carpet.json","netherite.json","orange_carpet.json","pink_carpet.json","purple_carpet.json","red_carpet.json","trader_llama.json","turtle_scute.json","white_carpet.json","yellow_carpet.json"]}
+{"directories":[],"files":["armadillo_scute.json","black_carpet.json","blue_carpet.json","brown_carpet.json","chainmail.json","cyan_carpet.json","diamond.json","elytra.json","gold.json","gray_carpet.json","green_carpet.json","iron.json","leather.json","light_blue_carpet.json","light_gray_carpet.json","lime_carpet.json","magenta_carpet.json","netherite.json","orange_carpet.json","pink_carpet.json","purple_carpet.json","red_carpet.json","saddle.json","trader_llama.json","turtle_scute.json","white_carpet.json","yellow_carpet.json"]}

assets/minecraft/equipment/saddle.json

@@ -0,0 +1,44 @@
+{
+  "layers": {
+    "camel_saddle": [
+      {
+        "texture": "minecraft:saddle"
+      }
+    ],
+    "donkey_saddle": [
+      {
+        "texture": "minecraft:saddle"
+      }
+    ],
+    "horse_saddle": [
+      {
+        "texture": "minecraft:saddle"
+      }
+    ],
+    "mule_saddle": [
+      {
+        "texture": "minecraft:saddle"
+      }
+    ],
+    "pig_saddle": [
+      {
+        "texture": "minecraft:saddle"
+      }
+    ],
+    "skeleton_horse_saddle": [
+      {
+        "texture": "minecraft:saddle"
+      }
+    ],
+    "strider_saddle": [
+      {
+        "texture": "minecraft:saddle"
+      }
+    ],
+    "zombie_horse_saddle": [
+      {
+        "texture": "minecraft:saddle"
+      }
+    ]
+  }
+}

assets/minecraft/items/allay_spawn_egg.json

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

assets/minecraft/items/armadillo_spawn_egg.json

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

assets/minecraft/items/axolotl_spawn_egg.json

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

assets/minecraft/items/bat_spawn_egg.json

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

assets/minecraft/items/bee_spawn_egg.json

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

assets/minecraft/items/blaze_spawn_egg.json

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

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",
+    "model": "minecraft:item/bogged_spawn_egg"
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -7693198
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -13546213
-      }
-    ]
   }
 }

assets/minecraft/items/breeze_spawn_egg.json

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

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",
+    "model": "minecraft:item/camel_spawn_egg"
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -212119
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -3435721
-      }
-    ]
   }
 }

assets/minecraft/items/cat_spawn_egg.json

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

assets/minecraft/items/cave_spider_spawn_egg.json

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

assets/minecraft/items/chest.json

@@ -1,7 +1,24 @@
 {
   "model": {
-    "type": "minecraft:condition",
+    "type": "minecraft:select",
-    "on_false": {
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:special",
+          "base": "minecraft:item/chest",
+          "model": {
+            "type": "minecraft:chest",
+            "texture": "minecraft:christmas"
+          }
+        },
+        "when": [
+          "12-24",
+          "12-25",
+          "12-26"
+        ]
+      }
+    ],
+    "fallback": {
       "type": "minecraft:special",
       "base": "minecraft:item/chest",
       "model": {
@@ -9,14 +26,7 @@
         "texture": "minecraft:normal"
       }
     },
-    "on_true": {
+    "pattern": "MM-dd",
-      "type": "minecraft:special",
+    "property": "minecraft:local_time"
-      "base": "minecraft:item/chest",
-      "model": {
-        "type": "minecraft:chest",
-        "texture": "minecraft:christmas"
-      }
-    },
-    "property": "minecraft:xmas"
   }
 }

assets/minecraft/items/chicken_spawn_egg.json

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

assets/minecraft/items/cod_spawn_egg.json

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

assets/minecraft/items/compass.json

@@ -3,243 +3,491 @@
     "type": "minecraft:condition",
     "component": "minecraft:lodestone_tracker",
     "on_false": {
-      "type": "minecraft:range_dispatch",
+      "type": "minecraft:select",
-      "entries": [
+      "cases": [
         {
           "model": {
-            "type": "minecraft:model",
+            "type": "minecraft:range_dispatch",
-            "model": "minecraft:item/compass_16"
+            "entries": [
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_16"
+                },
+                "threshold": 0.0
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_17"
+                },
+                "threshold": 0.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_18"
+                },
+                "threshold": 1.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_19"
+                },
+                "threshold": 2.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_20"
+                },
+                "threshold": 3.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_21"
+                },
+                "threshold": 4.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_22"
+                },
+                "threshold": 5.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_23"
+                },
+                "threshold": 6.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_24"
+                },
+                "threshold": 7.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_25"
+                },
+                "threshold": 8.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_26"
+                },
+                "threshold": 9.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_27"
+                },
+                "threshold": 10.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_28"
+                },
+                "threshold": 11.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_29"
+                },
+                "threshold": 12.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_30"
+                },
+                "threshold": 13.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_31"
+                },
+                "threshold": 14.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_00"
+                },
+                "threshold": 15.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_01"
+                },
+                "threshold": 16.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_02"
+                },
+                "threshold": 17.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_03"
+                },
+                "threshold": 18.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_04"
+                },
+                "threshold": 19.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_05"
+                },
+                "threshold": 20.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_06"
+                },
+                "threshold": 21.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_07"
+                },
+                "threshold": 22.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_08"
+                },
+                "threshold": 23.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_09"
+                },
+                "threshold": 24.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_10"
+                },
+                "threshold": 25.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_11"
+                },
+                "threshold": 26.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_12"
+                },
+                "threshold": 27.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_13"
+                },
+                "threshold": 28.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_14"
+                },
+                "threshold": 29.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_15"
+                },
+                "threshold": 30.5
+              },
+              {
+                "model": {
+                  "type": "minecraft:model",
+                  "model": "minecraft:item/compass_16"
+                },
+                "threshold": 31.5
+              }
+            ],
+            "property": "minecraft:compass",
+            "scale": 32.0,
+            "target": "spawn"
           },
-          "threshold": 0.0
+          "when": "minecraft:overworld"
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_17"
-          },
-          "threshold": 0.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_18"
-          },
-          "threshold": 1.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_19"
-          },
-          "threshold": 2.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_20"
-          },
-          "threshold": 3.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_21"
-          },
-          "threshold": 4.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_22"
-          },
-          "threshold": 5.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_23"
-          },
-          "threshold": 6.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_24"
-          },
-          "threshold": 7.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_25"
-          },
-          "threshold": 8.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_26"
-          },
-          "threshold": 9.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_27"
-          },
-          "threshold": 10.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_28"
-          },
-          "threshold": 11.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_29"
-          },
-          "threshold": 12.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_30"
-          },
-          "threshold": 13.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_31"
-          },
-          "threshold": 14.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_00"
-          },
-          "threshold": 15.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_01"
-          },
-          "threshold": 16.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_02"
-          },
-          "threshold": 17.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_03"
-          },
-          "threshold": 18.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_04"
-          },
-          "threshold": 19.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_05"
-          },
-          "threshold": 20.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_06"
-          },
-          "threshold": 21.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_07"
-          },
-          "threshold": 22.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_08"
-          },
-          "threshold": 23.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_09"
-          },
-          "threshold": 24.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_10"
-          },
-          "threshold": 25.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_11"
-          },
-          "threshold": 26.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_12"
-          },
-          "threshold": 27.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_13"
-          },
-          "threshold": 28.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_14"
-          },
-          "threshold": 29.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_15"
-          },
-          "threshold": 30.5
-        },
-        {
-          "model": {
-            "type": "minecraft:model",
-            "model": "minecraft:item/compass_16"
-          },
-          "threshold": 31.5
         }
       ],
-      "property": "minecraft:compass",
+      "fallback": {
-      "scale": 32.0,
+        "type": "minecraft:range_dispatch",
-      "target": "spawn"
+        "entries": [
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_16"
+            },
+            "threshold": 0.0
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_17"
+            },
+            "threshold": 0.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_18"
+            },
+            "threshold": 1.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_19"
+            },
+            "threshold": 2.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_20"
+            },
+            "threshold": 3.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_21"
+            },
+            "threshold": 4.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_22"
+            },
+            "threshold": 5.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_23"
+            },
+            "threshold": 6.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_24"
+            },
+            "threshold": 7.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_25"
+            },
+            "threshold": 8.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_26"
+            },
+            "threshold": 9.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_27"
+            },
+            "threshold": 10.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_28"
+            },
+            "threshold": 11.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_29"
+            },
+            "threshold": 12.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_30"
+            },
+            "threshold": 13.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_31"
+            },
+            "threshold": 14.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_00"
+            },
+            "threshold": 15.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_01"
+            },
+            "threshold": 16.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_02"
+            },
+            "threshold": 17.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_03"
+            },
+            "threshold": 18.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_04"
+            },
+            "threshold": 19.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_05"
+            },
+            "threshold": 20.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_06"
+            },
+            "threshold": 21.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_07"
+            },
+            "threshold": 22.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_08"
+            },
+            "threshold": 23.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_09"
+            },
+            "threshold": 24.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_10"
+            },
+            "threshold": 25.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_11"
+            },
+            "threshold": 26.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_12"
+            },
+            "threshold": 27.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_13"
+            },
+            "threshold": 28.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_14"
+            },
+            "threshold": 29.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_15"
+            },
+            "threshold": 30.5
+          },
+          {
+            "model": {
+              "type": "minecraft:model",
+              "model": "minecraft:item/compass_16"
+            },
+            "threshold": 31.5
+          }
+        ],
+        "property": "minecraft:compass",
+        "scale": 32.0,
+        "target": "none"
+      },
+      "property": "minecraft:context_dimension"
     },
     "on_true": {
       "type": "minecraft:range_dispatch",

assets/minecraft/items/cow_spawn_egg.json

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

assets/minecraft/items/creaking_spawn_egg.json

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

assets/minecraft/items/creeper_spawn_egg.json

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

assets/minecraft/items/crossbow.json

@@ -1,54 +1,54 @@
 {
   "model": {
-    "type": "minecraft:condition",
+    "type": "minecraft:select",
-    "on_false": {
+    "cases": [
-      "type": "minecraft:select",
+      {
-      "cases": [
+        "model": {
-        {
+          "type": "minecraft:model",
-          "model": {
+          "model": "minecraft:item/crossbow_arrow"
-            "type": "minecraft:model",
-            "model": "minecraft:item/crossbow_arrow"
-          },
-          "when": "arrow"
         },
-        {
+        "when": "arrow"
-          "model": {
+      },
-            "type": "minecraft:model",
+      {
-            "model": "minecraft:item/crossbow_firework"
+        "model": {
-          },
+          "type": "minecraft:model",
-          "when": "rocket"
+          "model": "minecraft:item/crossbow_firework"
-        }
+        },
-      ],
+        "when": "rocket"
-      "fallback": {
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:condition",
+      "on_false": {
         "type": "minecraft:model",
         "model": "minecraft:item/crossbow"
       },
-      "property": "minecraft:charge_type"
+      "on_true": {
-    },
+        "type": "minecraft:range_dispatch",
-    "on_true": {
+        "entries": [
-      "type": "minecraft:range_dispatch",
+          {
-      "entries": [
+            "model": {
-        {
+              "type": "minecraft:model",
-          "model": {
+              "model": "minecraft:item/crossbow_pulling_1"
-            "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"
         },
-        {
+        "property": "minecraft:crossbow/pull"
-          "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: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",
+    "model": "minecraft:item/dolphin_spawn_egg"
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -14533811
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -394759
-      }
-    ]
   }
 }

assets/minecraft/items/donkey_spawn_egg.json

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

assets/minecraft/items/drowned_spawn_egg.json

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

assets/minecraft/items/elder_guardian_spawn_egg.json

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

assets/minecraft/items/ender_dragon_spawn_egg.json

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

assets/minecraft/items/enderman_spawn_egg.json

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

assets/minecraft/items/endermite_spawn_egg.json

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

assets/minecraft/items/evoker_spawn_egg.json

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

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",
+    "model": "minecraft:item/fox_spawn_egg"
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -2771297
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -3380960
-      }
-    ]
   }
 }

assets/minecraft/items/frog_spawn_egg.json

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

assets/minecraft/items/ghast_spawn_egg.json

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

assets/minecraft/items/glow_squid_spawn_egg.json

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

assets/minecraft/items/goat_spawn_egg.json

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

assets/minecraft/items/guardian_spawn_egg.json

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

assets/minecraft/items/hoglin_spawn_egg.json

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

assets/minecraft/items/horse_spawn_egg.json

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

assets/minecraft/items/husk_spawn_egg.json

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

assets/minecraft/items/iron_golem_spawn_egg.json

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

assets/minecraft/items/leaf_litter.json

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