Create/Update assets for version 1.21.5-pre3

_list.json

@@ -1 +1 @@
-{"directories":["assets","data","mappings"],"files":["23w05a.json","version.json"]}
+{"directories":["assets","data","mappings"],"files":["1.21.5-pre3.json","version.json"]}

assets/icons/_list.json

@@ -1 +1 @@
-{"directories":[],"files":["icon_16x16.png","icon_32x32.png","minecraft.icns"]}
+{"directories":["snapshot"],"files":["icon_128x128.png","icon_16x16.png","icon_256x256.png","icon_32x32.png","icon_48x48.png","minecraft.icns"]}

assets/icons/snapshot/_list.json

@@ -0,0 +1 @@
+{"directories":[],"files":["icon_128x128.png","icon_16x16.png","icon_256x256.png","icon_32x32.png","icon_48x48.png","minecraft.icns"]}

assets/minecraft/_list.json

@@ -1 +1 @@
-{"directories":["atlases","blockstates","font","icons","lang","models","particles","resourcepacks","shaders","sounds","texts","textures"],"files":["gpu_warnlist.json","regional_compliancies.json","sounds.json"]}
+{"directories":["atlases","blockstates","equipment","font","items","lang","models","particles","post_effect","resourcepacks","shaders","sounds","texts","textures"],"files":["gpu_warnlist.json","regional_compliancies.json","sounds.json"]}

assets/minecraft/atlases/_list.json

@@ -1 +1 @@
-{"directories":[],"files":["armor_trims.json","banner_patterns.json","beds.json","blocks.json","chests.json","mob_effects.json","paintings.json","particles.json","shield_patterns.json","shulker_boxes.json","signs.json"]}
+{"directories":[],"files":["armor_trims.json","banner_patterns.json","beds.json","blocks.json","chests.json","decorated_pot.json","gui.json","map_decorations.json","mob_effects.json","paintings.json","particles.json","shield_patterns.json","shulker_boxes.json","signs.json"]}

assets/minecraft/atlases/armor_trims.json

@@ -1,48 +1,63 @@
 {
-    "sources": [
+  "sources": [
-        {
+    {
-            "type": "paletted_permutations",
+      "type": "minecraft:paletted_permutations",
-            "textures": [
+      "palette_key": "minecraft:trims/color_palettes/trim_palette",
-                "trims/models/armor/coast",
+      "permutations": {
-                "trims/models/armor/coast_leggings",
+        "amethyst": "minecraft:trims/color_palettes/amethyst",
-                "trims/models/armor/sentry",
+        "copper": "minecraft:trims/color_palettes/copper",
-                "trims/models/armor/sentry_leggings",
+        "diamond": "minecraft:trims/color_palettes/diamond",
-                "trims/models/armor/dune",
+        "diamond_darker": "minecraft:trims/color_palettes/diamond_darker",
-                "trims/models/armor/dune_leggings",
+        "emerald": "minecraft:trims/color_palettes/emerald",
-                "trims/models/armor/wild",
+        "gold": "minecraft:trims/color_palettes/gold",
-                "trims/models/armor/wild_leggings",
+        "gold_darker": "minecraft:trims/color_palettes/gold_darker",
-                "trims/models/armor/ward",
+        "iron": "minecraft:trims/color_palettes/iron",
-                "trims/models/armor/ward_leggings",
+        "iron_darker": "minecraft:trims/color_palettes/iron_darker",
-                "trims/models/armor/eye",
+        "lapis": "minecraft:trims/color_palettes/lapis",
-                "trims/models/armor/eye_leggings",
+        "netherite": "minecraft:trims/color_palettes/netherite",
-                "trims/models/armor/vex",
+        "netherite_darker": "minecraft:trims/color_palettes/netherite_darker",
-                "trims/models/armor/vex_leggings",
+        "quartz": "minecraft:trims/color_palettes/quartz",
-                "trims/models/armor/tide",
+        "redstone": "minecraft:trims/color_palettes/redstone",
-                "trims/models/armor/tide_leggings",
+        "resin": "minecraft:trims/color_palettes/resin"
-                "trims/models/armor/snout",
+      },
-                "trims/models/armor/snout_leggings",
+      "textures": [
-                "trims/models/armor/rib",
+        "minecraft:trims/entity/humanoid/sentry",
-                "trims/models/armor/rib_leggings",
+        "minecraft:trims/entity/humanoid_leggings/sentry",
-                "trims/models/armor/spire",
+        "minecraft:trims/entity/humanoid/dune",
-                "trims/models/armor/spire_leggings"
+        "minecraft:trims/entity/humanoid_leggings/dune",
-            ],
+        "minecraft:trims/entity/humanoid/coast",
-            "palette_key": "trims/color_palettes/trim_palette",
+        "minecraft:trims/entity/humanoid_leggings/coast",
-            "permutations": {
+        "minecraft:trims/entity/humanoid/wild",
-                "quartz": "trims/color_palettes/quartz",
+        "minecraft:trims/entity/humanoid_leggings/wild",
-                "iron": "trims/color_palettes/iron",
+        "minecraft:trims/entity/humanoid/ward",
-                "gold": "trims/color_palettes/gold",
+        "minecraft:trims/entity/humanoid_leggings/ward",
-                "diamond": "trims/color_palettes/diamond",
+        "minecraft:trims/entity/humanoid/eye",
-                "netherite": "trims/color_palettes/netherite",
+        "minecraft:trims/entity/humanoid_leggings/eye",
-                "redstone": "trims/color_palettes/redstone",
+        "minecraft:trims/entity/humanoid/vex",
-                "copper": "trims/color_palettes/copper",
+        "minecraft:trims/entity/humanoid_leggings/vex",
-                "emerald": "trims/color_palettes/emerald",
+        "minecraft:trims/entity/humanoid/tide",
-                "lapis": "trims/color_palettes/lapis",
+        "minecraft:trims/entity/humanoid_leggings/tide",
-                "amethyst": "trims/color_palettes/amethyst",
+        "minecraft:trims/entity/humanoid/snout",
-                "iron_darker": "trims/color_palettes/iron_darker",
+        "minecraft:trims/entity/humanoid_leggings/snout",
-                "gold_darker": "trims/color_palettes/gold_darker",
+        "minecraft:trims/entity/humanoid/rib",
-                "diamond_darker": "trims/color_palettes/diamond_darker",
+        "minecraft:trims/entity/humanoid_leggings/rib",
-                "netherite_darker": "trims/color_palettes/netherite_darker"
+        "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": [
+  "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,53 +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/enchanting_table_book"
+      "resource": "minecraft:entity/decorated_pot/decorated_pot_side"
-        },
+    },
-        {
+    {
-            "type": "paletted_permutations",
+      "type": "minecraft:single",
-            "textures": [
+      "resource": "minecraft:entity/enchanting_table_book"
-                "trims/items/leggings_trim",
+    },
-                "trims/items/chestplate_trim",
+    {
-                "trims/items/helmet_trim",
+      "type": "minecraft:paletted_permutations",
-                "trims/items/boots_trim"
+      "palette_key": "minecraft:trims/color_palettes/trim_palette",
-            ],
+      "permutations": {
-            "palette_key": "trims/color_palettes/trim_palette",
+        "amethyst": "minecraft:trims/color_palettes/amethyst",
-            "permutations": {
+        "copper": "minecraft:trims/color_palettes/copper",
-                "quartz": "trims/color_palettes/quartz",
+        "diamond": "minecraft:trims/color_palettes/diamond",
-                "iron": "trims/color_palettes/iron",
+        "diamond_darker": "minecraft:trims/color_palettes/diamond_darker",
-                "gold": "trims/color_palettes/gold",
+        "emerald": "minecraft:trims/color_palettes/emerald",
-                "diamond": "trims/color_palettes/diamond",
+        "gold": "minecraft:trims/color_palettes/gold",
-                "netherite": "trims/color_palettes/netherite",
+        "gold_darker": "minecraft:trims/color_palettes/gold_darker",
-                "redstone": "trims/color_palettes/redstone",
+        "iron": "minecraft:trims/color_palettes/iron",
-                "copper": "trims/color_palettes/copper",
+        "iron_darker": "minecraft:trims/color_palettes/iron_darker",
-                "emerald": "trims/color_palettes/emerald",
+        "lapis": "minecraft:trims/color_palettes/lapis",
-                "lapis": "trims/color_palettes/lapis",
+        "netherite": "minecraft:trims/color_palettes/netherite",
-                "amethyst": "trims/color_palettes/amethyst",
+        "netherite_darker": "minecraft:trims/color_palettes/netherite_darker",
-                "iron_darker": "trims/color_palettes/iron_darker",
+        "quartz": "minecraft:trims/color_palettes/quartz",
-                "gold_darker": "trims/color_palettes/gold_darker",
+        "redstone": "minecraft:trims/color_palettes/redstone",
-                "diamond_darker": "trims/color_palettes/diamond_darker",
+        "resin": "minecraft:trims/color_palettes/resin"
-                "netherite_darker": "trims/color_palettes/netherite_darker"
+      },
-            }
+      "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": [
+  "sources": [
-        {
+    {
-            "type": "directory",
+      "type": "minecraft:directory",
-            "source": "entity/chest",
+      "prefix": "entity/chest/",
-            "prefix": "entity/chest/"
+      "source": "entity/chest"
-        }
+    }
-    ]
+  ]
 }

assets/minecraft/atlases/decorated_pot.json

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

assets/minecraft/atlases/gui.json

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

assets/minecraft/atlases/map_decorations.json

@@ -0,0 +1,9 @@
+{
+  "sources": [
+    {
+      "type": "minecraft:directory",
+      "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/bee_nest.json

@@ -1,23 +1,23 @@
 {
   "variants": {
     "facing=east,honey_level=0": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 90
     },
     "facing=east,honey_level=1": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 90
     },
     "facing=east,honey_level=2": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 90
     },
     "facing=east,honey_level=3": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 90
     },
     "facing=east,honey_level=4": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 90
     },
     "facing=east,honey_level=5": {
@@ -25,41 +25,41 @@
       "y": 90
     },
     "facing=north,honey_level=0": {
-      "model": "minecraft:block/bee_nest"
+      "model": "minecraft:block/bee_nest_empty"
     },
     "facing=north,honey_level=1": {
-      "model": "minecraft:block/bee_nest"
+      "model": "minecraft:block/bee_nest_empty"
     },
     "facing=north,honey_level=2": {
-      "model": "minecraft:block/bee_nest"
+      "model": "minecraft:block/bee_nest_empty"
     },
     "facing=north,honey_level=3": {
-      "model": "minecraft:block/bee_nest"
+      "model": "minecraft:block/bee_nest_empty"
     },
     "facing=north,honey_level=4": {
-      "model": "minecraft:block/bee_nest"
+      "model": "minecraft:block/bee_nest_empty"
     },
     "facing=north,honey_level=5": {
       "model": "minecraft:block/bee_nest_honey"
     },
     "facing=south,honey_level=0": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 180
     },
     "facing=south,honey_level=1": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 180
     },
     "facing=south,honey_level=2": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 180
     },
     "facing=south,honey_level=3": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 180
     },
     "facing=south,honey_level=4": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 180
     },
     "facing=south,honey_level=5": {
@@ -67,23 +67,23 @@
       "y": 180
     },
     "facing=west,honey_level=0": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 270
     },
     "facing=west,honey_level=1": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 270
     },
     "facing=west,honey_level=2": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 270
     },
     "facing=west,honey_level=3": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 270
     },
     "facing=west,honey_level=4": {
-      "model": "minecraft:block/bee_nest",
+      "model": "minecraft:block/bee_nest_empty",
       "y": 270
     },
     "facing=west,honey_level=5": {

assets/minecraft/blockstates/beehive.json

@@ -1,23 +1,23 @@
 {
   "variants": {
     "facing=east,honey_level=0": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 90
     },
     "facing=east,honey_level=1": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 90
     },
     "facing=east,honey_level=2": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 90
     },
     "facing=east,honey_level=3": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 90
     },
     "facing=east,honey_level=4": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 90
     },
     "facing=east,honey_level=5": {
@@ -25,41 +25,41 @@
       "y": 90
     },
     "facing=north,honey_level=0": {
-      "model": "minecraft:block/beehive"
+      "model": "minecraft:block/beehive_empty"
     },
     "facing=north,honey_level=1": {
-      "model": "minecraft:block/beehive"
+      "model": "minecraft:block/beehive_empty"
     },
     "facing=north,honey_level=2": {
-      "model": "minecraft:block/beehive"
+      "model": "minecraft:block/beehive_empty"
     },
     "facing=north,honey_level=3": {
-      "model": "minecraft:block/beehive"
+      "model": "minecraft:block/beehive_empty"
     },
     "facing=north,honey_level=4": {
-      "model": "minecraft:block/beehive"
+      "model": "minecraft:block/beehive_empty"
     },
     "facing=north,honey_level=5": {
       "model": "minecraft:block/beehive_honey"
     },
     "facing=south,honey_level=0": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 180
     },
     "facing=south,honey_level=1": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 180
     },
     "facing=south,honey_level=2": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 180
     },
     "facing=south,honey_level=3": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 180
     },
     "facing=south,honey_level=4": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 180
     },
     "facing=south,honey_level=5": {
@@ -67,23 +67,23 @@
       "y": 180
     },
     "facing=west,honey_level=0": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 270
     },
     "facing=west,honey_level=1": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 270
     },
     "facing=west,honey_level=2": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 270
     },
     "facing=west,honey_level=3": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 270
     },
     "facing=west,honey_level=4": {
-      "model": "minecraft:block/beehive",
+      "model": "minecraft:block/beehive_empty",
       "y": 270
     },
     "facing=west,honey_level=5": {

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/calibrated_sculk_sensor.json

@@ -0,0 +1,49 @@
+{
+  "variants": {
+    "facing=east,sculk_sensor_phase=active": {
+      "model": "minecraft:block/calibrated_sculk_sensor_active",
+      "y": 90
+    },
+    "facing=east,sculk_sensor_phase=cooldown": {
+      "model": "minecraft:block/calibrated_sculk_sensor_active",
+      "y": 90
+    },
+    "facing=east,sculk_sensor_phase=inactive": {
+      "model": "minecraft:block/calibrated_sculk_sensor_inactive",
+      "y": 90
+    },
+    "facing=north,sculk_sensor_phase=active": {
+      "model": "minecraft:block/calibrated_sculk_sensor_active"
+    },
+    "facing=north,sculk_sensor_phase=cooldown": {
+      "model": "minecraft:block/calibrated_sculk_sensor_active"
+    },
+    "facing=north,sculk_sensor_phase=inactive": {
+      "model": "minecraft:block/calibrated_sculk_sensor_inactive"
+    },
+    "facing=south,sculk_sensor_phase=active": {
+      "model": "minecraft:block/calibrated_sculk_sensor_active",
+      "y": 180
+    },
+    "facing=south,sculk_sensor_phase=cooldown": {
+      "model": "minecraft:block/calibrated_sculk_sensor_active",
+      "y": 180
+    },
+    "facing=south,sculk_sensor_phase=inactive": {
+      "model": "minecraft:block/calibrated_sculk_sensor_inactive",
+      "y": 180
+    },
+    "facing=west,sculk_sensor_phase=active": {
+      "model": "minecraft:block/calibrated_sculk_sensor_active",
+      "y": 270
+    },
+    "facing=west,sculk_sensor_phase=cooldown": {
+      "model": "minecraft:block/calibrated_sculk_sensor_active",
+      "y": 270
+    },
+    "facing=west,sculk_sensor_phase=inactive": {
+      "model": "minecraft:block/calibrated_sculk_sensor_inactive",
+      "y": 270
+    }
+  }
+}

assets/minecraft/blockstates/cherry_button.json

@@ -0,0 +1,118 @@
+{
+  "variants": {
+    "face=ceiling,facing=east,powered=false": {
+      "model": "minecraft:block/cherry_button",
+      "x": 180,
+      "y": 270
+    },
+    "face=ceiling,facing=east,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed",
+      "x": 180,
+      "y": 270
+    },
+    "face=ceiling,facing=north,powered=false": {
+      "model": "minecraft:block/cherry_button",
+      "x": 180,
+      "y": 180
+    },
+    "face=ceiling,facing=north,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed",
+      "x": 180,
+      "y": 180
+    },
+    "face=ceiling,facing=south,powered=false": {
+      "model": "minecraft:block/cherry_button",
+      "x": 180
+    },
+    "face=ceiling,facing=south,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed",
+      "x": 180
+    },
+    "face=ceiling,facing=west,powered=false": {
+      "model": "minecraft:block/cherry_button",
+      "x": 180,
+      "y": 90
+    },
+    "face=ceiling,facing=west,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed",
+      "x": 180,
+      "y": 90
+    },
+    "face=floor,facing=east,powered=false": {
+      "model": "minecraft:block/cherry_button",
+      "y": 90
+    },
+    "face=floor,facing=east,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed",
+      "y": 90
+    },
+    "face=floor,facing=north,powered=false": {
+      "model": "minecraft:block/cherry_button"
+    },
+    "face=floor,facing=north,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed"
+    },
+    "face=floor,facing=south,powered=false": {
+      "model": "minecraft:block/cherry_button",
+      "y": 180
+    },
+    "face=floor,facing=south,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed",
+      "y": 180
+    },
+    "face=floor,facing=west,powered=false": {
+      "model": "minecraft:block/cherry_button",
+      "y": 270
+    },
+    "face=floor,facing=west,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed",
+      "y": 270
+    },
+    "face=wall,facing=east,powered=false": {
+      "model": "minecraft:block/cherry_button",
+      "uvlock": true,
+      "x": 90,
+      "y": 90
+    },
+    "face=wall,facing=east,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed",
+      "uvlock": true,
+      "x": 90,
+      "y": 90
+    },
+    "face=wall,facing=north,powered=false": {
+      "model": "minecraft:block/cherry_button",
+      "uvlock": true,
+      "x": 90
+    },
+    "face=wall,facing=north,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed",
+      "uvlock": true,
+      "x": 90
+    },
+    "face=wall,facing=south,powered=false": {
+      "model": "minecraft:block/cherry_button",
+      "uvlock": true,
+      "x": 90,
+      "y": 180
+    },
+    "face=wall,facing=south,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed",
+      "uvlock": true,
+      "x": 90,
+      "y": 180
+    },
+    "face=wall,facing=west,powered=false": {
+      "model": "minecraft:block/cherry_button",
+      "uvlock": true,
+      "x": 90,
+      "y": 270
+    },
+    "face=wall,facing=west,powered=true": {
+      "model": "minecraft:block/cherry_button_pressed",
+      "uvlock": true,
+      "x": 90,
+      "y": 270
+    }
+  }
+}

assets/minecraft/blockstates/cherry_door.json

@@ -0,0 +1,124 @@
+{
+  "variants": {
+    "facing=east,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/cherry_door_bottom_left"
+    },
+    "facing=east,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/cherry_door_bottom_left_open",
+      "y": 90
+    },
+    "facing=east,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/cherry_door_bottom_right"
+    },
+    "facing=east,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/cherry_door_bottom_right_open",
+      "y": 270
+    },
+    "facing=east,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/cherry_door_top_left"
+    },
+    "facing=east,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/cherry_door_top_left_open",
+      "y": 90
+    },
+    "facing=east,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/cherry_door_top_right"
+    },
+    "facing=east,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/cherry_door_top_right_open",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/cherry_door_bottom_left",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/cherry_door_bottom_left_open"
+    },
+    "facing=north,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/cherry_door_bottom_right",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/cherry_door_bottom_right_open",
+      "y": 180
+    },
+    "facing=north,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/cherry_door_top_left",
+      "y": 270
+    },
+    "facing=north,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/cherry_door_top_left_open"
+    },
+    "facing=north,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/cherry_door_top_right",
+      "y": 270
+    },
+    "facing=north,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/cherry_door_top_right_open",
+      "y": 180
+    },
+    "facing=south,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/cherry_door_bottom_left",
+      "y": 90
+    },
+    "facing=south,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/cherry_door_bottom_left_open",
+      "y": 180
+    },
+    "facing=south,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/cherry_door_bottom_right",
+      "y": 90
+    },
+    "facing=south,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/cherry_door_bottom_right_open"
+    },
+    "facing=south,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/cherry_door_top_left",
+      "y": 90
+    },
+    "facing=south,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/cherry_door_top_left_open",
+      "y": 180
+    },
+    "facing=south,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/cherry_door_top_right",
+      "y": 90
+    },
+    "facing=south,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/cherry_door_top_right_open"
+    },
+    "facing=west,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/cherry_door_bottom_left",
+      "y": 180
+    },
+    "facing=west,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/cherry_door_bottom_left_open",
+      "y": 270
+    },
+    "facing=west,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/cherry_door_bottom_right",
+      "y": 180
+    },
+    "facing=west,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/cherry_door_bottom_right_open",
+      "y": 90
+    },
+    "facing=west,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/cherry_door_top_left",
+      "y": 180
+    },
+    "facing=west,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/cherry_door_top_left_open",
+      "y": 270
+    },
+    "facing=west,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/cherry_door_top_right",
+      "y": 180
+    },
+    "facing=west,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/cherry_door_top_right_open",
+      "y": 90
+    }
+  }
+}

assets/minecraft/blockstates/cherry_fence.json

@@ -0,0 +1,48 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "minecraft:block/cherry_fence_post"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cherry_fence_side",
+        "uvlock": true
+      },
+      "when": {
+        "north": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cherry_fence_side",
+        "uvlock": true,
+        "y": 90
+      },
+      "when": {
+        "east": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cherry_fence_side",
+        "uvlock": true,
+        "y": 180
+      },
+      "when": {
+        "south": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cherry_fence_side",
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "true"
+      }
+    }
+  ]
+}

assets/minecraft/blockstates/cherry_fence_gate.json

@@ -0,0 +1,80 @@
+{
+  "variants": {
+    "facing=east,in_wall=false,open=false": {
+      "model": "minecraft:block/cherry_fence_gate",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=false,open=true": {
+      "model": "minecraft:block/cherry_fence_gate_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=false": {
+      "model": "minecraft:block/cherry_fence_gate_wall",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=true": {
+      "model": "minecraft:block/cherry_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,in_wall=false,open=false": {
+      "model": "minecraft:block/cherry_fence_gate",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=false,open=true": {
+      "model": "minecraft:block/cherry_fence_gate_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=false": {
+      "model": "minecraft:block/cherry_fence_gate_wall",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=true": {
+      "model": "minecraft:block/cherry_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=south,in_wall=false,open=false": {
+      "model": "minecraft:block/cherry_fence_gate",
+      "uvlock": true
+    },
+    "facing=south,in_wall=false,open=true": {
+      "model": "minecraft:block/cherry_fence_gate_open",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=false": {
+      "model": "minecraft:block/cherry_fence_gate_wall",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=true": {
+      "model": "minecraft:block/cherry_fence_gate_wall_open",
+      "uvlock": true
+    },
+    "facing=west,in_wall=false,open=false": {
+      "model": "minecraft:block/cherry_fence_gate",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=false,open=true": {
+      "model": "minecraft:block/cherry_fence_gate_open",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=false": {
+      "model": "minecraft:block/cherry_fence_gate_wall",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=true": {
+      "model": "minecraft:block/cherry_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 90
+    }
+  }
+}

assets/minecraft/blockstates/cherry_hanging_sign.json

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

assets/minecraft/blockstates/cherry_leaves.json

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

assets/minecraft/blockstates/cherry_log.json

@@ -0,0 +1,13 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "minecraft:block/cherry_log_x"
+    },
+    "axis=y": {
+      "model": "minecraft:block/cherry_log_y"
+    },
+    "axis=z": {
+      "model": "minecraft:block/cherry_log_z"
+    }
+  }
+}

assets/minecraft/blockstates/cherry_planks.json

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

assets/minecraft/blockstates/cherry_pressure_plate.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "powered=false": {
+      "model": "minecraft:block/cherry_pressure_plate"
+    },
+    "powered=true": {
+      "model": "minecraft:block/cherry_pressure_plate_down"
+    }
+  }
+}

assets/minecraft/blockstates/cherry_sapling.json

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

assets/minecraft/blockstates/cherry_sign.json

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

assets/minecraft/blockstates/cherry_slab.json

@@ -0,0 +1,13 @@
+{
+  "variants": {
+    "type=bottom": {
+      "model": "minecraft:block/cherry_slab"
+    },
+    "type=double": {
+      "model": "minecraft:block/cherry_planks"
+    },
+    "type=top": {
+      "model": "minecraft:block/cherry_slab_top"
+    }
+  }
+}

assets/minecraft/blockstates/cherry_stairs.json

@@ -0,0 +1,209 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=inner_left": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,half=bottom,shape=inner_right": {
+      "model": "minecraft:block/cherry_stairs_inner"
+    },
+    "facing=east,half=bottom,shape=outer_left": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,half=bottom,shape=outer_right": {
+      "model": "minecraft:block/cherry_stairs_outer"
+    },
+    "facing=east,half=bottom,shape=straight": {
+      "model": "minecraft:block/cherry_stairs"
+    },
+    "facing=east,half=top,shape=inner_left": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=east,half=top,shape=inner_right": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=east,half=top,shape=outer_left": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=east,half=top,shape=outer_right": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=east,half=top,shape=straight": {
+      "model": "minecraft:block/cherry_stairs",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=bottom,shape=inner_left": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,half=bottom,shape=inner_right": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=bottom,shape=outer_left": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,half=bottom,shape=outer_right": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=bottom,shape=straight": {
+      "model": "minecraft:block/cherry_stairs",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=top,shape=inner_left": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=top,shape=inner_right": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=top,shape=outer_left": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=top,shape=outer_right": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=top,shape=straight": {
+      "model": "minecraft:block/cherry_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=south,half=bottom,shape=inner_left": {
+      "model": "minecraft:block/cherry_stairs_inner"
+    },
+    "facing=south,half=bottom,shape=inner_right": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=bottom,shape=outer_left": {
+      "model": "minecraft:block/cherry_stairs_outer"
+    },
+    "facing=south,half=bottom,shape=outer_right": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=bottom,shape=straight": {
+      "model": "minecraft:block/cherry_stairs",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=top,shape=inner_left": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=south,half=top,shape=inner_right": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=top,shape=outer_left": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=south,half=top,shape=outer_right": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=top,shape=straight": {
+      "model": "minecraft:block/cherry_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=inner_left": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=inner_right": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=bottom,shape=outer_left": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=outer_right": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=bottom,shape=straight": {
+      "model": "minecraft:block/cherry_stairs",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=top,shape=inner_left": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=west,half=top,shape=inner_right": {
+      "model": "minecraft:block/cherry_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=west,half=top,shape=outer_left": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=west,half=top,shape=outer_right": {
+      "model": "minecraft:block/cherry_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=west,half=top,shape=straight": {
+      "model": "minecraft:block/cherry_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    }
+  }
+}

assets/minecraft/blockstates/cherry_trapdoor.json

@@ -0,0 +1,68 @@
+{
+  "variants": {
+    "facing=east,half=bottom,open=false": {
+      "model": "minecraft:block/cherry_trapdoor_bottom",
+      "y": 90
+    },
+    "facing=east,half=bottom,open=true": {
+      "model": "minecraft:block/cherry_trapdoor_open",
+      "y": 90
+    },
+    "facing=east,half=top,open=false": {
+      "model": "minecraft:block/cherry_trapdoor_top",
+      "y": 90
+    },
+    "facing=east,half=top,open=true": {
+      "model": "minecraft:block/cherry_trapdoor_open",
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=bottom,open=false": {
+      "model": "minecraft:block/cherry_trapdoor_bottom"
+    },
+    "facing=north,half=bottom,open=true": {
+      "model": "minecraft:block/cherry_trapdoor_open"
+    },
+    "facing=north,half=top,open=false": {
+      "model": "minecraft:block/cherry_trapdoor_top"
+    },
+    "facing=north,half=top,open=true": {
+      "model": "minecraft:block/cherry_trapdoor_open",
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=bottom,open=false": {
+      "model": "minecraft:block/cherry_trapdoor_bottom",
+      "y": 180
+    },
+    "facing=south,half=bottom,open=true": {
+      "model": "minecraft:block/cherry_trapdoor_open",
+      "y": 180
+    },
+    "facing=south,half=top,open=false": {
+      "model": "minecraft:block/cherry_trapdoor_top",
+      "y": 180
+    },
+    "facing=south,half=top,open=true": {
+      "model": "minecraft:block/cherry_trapdoor_open",
+      "x": 180
+    },
+    "facing=west,half=bottom,open=false": {
+      "model": "minecraft:block/cherry_trapdoor_bottom",
+      "y": 270
+    },
+    "facing=west,half=bottom,open=true": {
+      "model": "minecraft:block/cherry_trapdoor_open",
+      "y": 270
+    },
+    "facing=west,half=top,open=false": {
+      "model": "minecraft:block/cherry_trapdoor_top",
+      "y": 270
+    },
+    "facing=west,half=top,open=true": {
+      "model": "minecraft:block/cherry_trapdoor_open",
+      "x": 180,
+      "y": 90
+    }
+  }
+}

assets/minecraft/blockstates/cherry_wall_hanging_sign.json

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

assets/minecraft/blockstates/cherry_wall_sign.json

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

assets/minecraft/blockstates/cherry_wood.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "minecraft:block/cherry_wood",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "minecraft:block/cherry_wood"
+    },
+    "axis=z": {
+      "model": "minecraft:block/cherry_wood",
+      "x": 90
+    }
+  }
+}

assets/minecraft/blockstates/chiseled_copper.json

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

assets/minecraft/blockstates/chiseled_resin_bricks.json

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

assets/minecraft/blockstates/chiseled_tuff.json

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

assets/minecraft/blockstates/chiseled_tuff_bricks.json

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

assets/minecraft/blockstates/closed_eyeblossom.json

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

assets/minecraft/blockstates/copper_bulb.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "lit=false,powered=false": {
+      "model": "minecraft:block/copper_bulb"
+    },
+    "lit=false,powered=true": {
+      "model": "minecraft:block/copper_bulb_powered"
+    },
+    "lit=true,powered=false": {
+      "model": "minecraft:block/copper_bulb_lit"
+    },
+    "lit=true,powered=true": {
+      "model": "minecraft:block/copper_bulb_lit_powered"
+    }
+  }
+}

assets/minecraft/blockstates/copper_door.json

@@ -0,0 +1,124 @@
+{
+  "variants": {
+    "facing=east,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/copper_door_bottom_left"
+    },
+    "facing=east,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/copper_door_bottom_left_open",
+      "y": 90
+    },
+    "facing=east,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/copper_door_bottom_right"
+    },
+    "facing=east,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/copper_door_bottom_right_open",
+      "y": 270
+    },
+    "facing=east,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/copper_door_top_left"
+    },
+    "facing=east,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/copper_door_top_left_open",
+      "y": 90
+    },
+    "facing=east,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/copper_door_top_right"
+    },
+    "facing=east,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/copper_door_top_right_open",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/copper_door_bottom_left",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/copper_door_bottom_left_open"
+    },
+    "facing=north,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/copper_door_bottom_right",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/copper_door_bottom_right_open",
+      "y": 180
+    },
+    "facing=north,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/copper_door_top_left",
+      "y": 270
+    },
+    "facing=north,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/copper_door_top_left_open"
+    },
+    "facing=north,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/copper_door_top_right",
+      "y": 270
+    },
+    "facing=north,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/copper_door_top_right_open",
+      "y": 180
+    },
+    "facing=south,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/copper_door_bottom_left",
+      "y": 90
+    },
+    "facing=south,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/copper_door_bottom_left_open",
+      "y": 180
+    },
+    "facing=south,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/copper_door_bottom_right",
+      "y": 90
+    },
+    "facing=south,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/copper_door_bottom_right_open"
+    },
+    "facing=south,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/copper_door_top_left",
+      "y": 90
+    },
+    "facing=south,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/copper_door_top_left_open",
+      "y": 180
+    },
+    "facing=south,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/copper_door_top_right",
+      "y": 90
+    },
+    "facing=south,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/copper_door_top_right_open"
+    },
+    "facing=west,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/copper_door_bottom_left",
+      "y": 180
+    },
+    "facing=west,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/copper_door_bottom_left_open",
+      "y": 270
+    },
+    "facing=west,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/copper_door_bottom_right",
+      "y": 180
+    },
+    "facing=west,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/copper_door_bottom_right_open",
+      "y": 90
+    },
+    "facing=west,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/copper_door_top_left",
+      "y": 180
+    },
+    "facing=west,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/copper_door_top_left_open",
+      "y": 270
+    },
+    "facing=west,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/copper_door_top_right",
+      "y": 180
+    },
+    "facing=west,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/copper_door_top_right_open",
+      "y": 90
+    }
+  }
+}

assets/minecraft/blockstates/copper_grate.json

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

assets/minecraft/blockstates/copper_trapdoor.json

@@ -0,0 +1,58 @@
+{
+  "variants": {
+    "facing=east,half=bottom,open=false": {
+      "model": "minecraft:block/copper_trapdoor_bottom"
+    },
+    "facing=east,half=bottom,open=true": {
+      "model": "minecraft:block/copper_trapdoor_open",
+      "y": 90
+    },
+    "facing=east,half=top,open=false": {
+      "model": "minecraft:block/copper_trapdoor_top"
+    },
+    "facing=east,half=top,open=true": {
+      "model": "minecraft:block/copper_trapdoor_open",
+      "y": 90
+    },
+    "facing=north,half=bottom,open=false": {
+      "model": "minecraft:block/copper_trapdoor_bottom"
+    },
+    "facing=north,half=bottom,open=true": {
+      "model": "minecraft:block/copper_trapdoor_open"
+    },
+    "facing=north,half=top,open=false": {
+      "model": "minecraft:block/copper_trapdoor_top"
+    },
+    "facing=north,half=top,open=true": {
+      "model": "minecraft:block/copper_trapdoor_open"
+    },
+    "facing=south,half=bottom,open=false": {
+      "model": "minecraft:block/copper_trapdoor_bottom"
+    },
+    "facing=south,half=bottom,open=true": {
+      "model": "minecraft:block/copper_trapdoor_open",
+      "y": 180
+    },
+    "facing=south,half=top,open=false": {
+      "model": "minecraft:block/copper_trapdoor_top"
+    },
+    "facing=south,half=top,open=true": {
+      "model": "minecraft:block/copper_trapdoor_open",
+      "y": 180
+    },
+    "facing=west,half=bottom,open=false": {
+      "model": "minecraft:block/copper_trapdoor_bottom"
+    },
+    "facing=west,half=bottom,open=true": {
+      "model": "minecraft:block/copper_trapdoor_open",
+      "y": 270
+    },
+    "facing=west,half=top,open=false": {
+      "model": "minecraft:block/copper_trapdoor_top"
+    },
+    "facing=west,half=top,open=true": {
+      "model": "minecraft:block/copper_trapdoor_open",
+      "y": 270
+    }
+  }
+}

assets/minecraft/blockstates/crafter.json

@@ -0,0 +1,216 @@
+{
+  "variants": {
+    "crafting=false,orientation=down_east,triggered=false": {
+      "model": "minecraft:block/crafter",
+      "x": 90,
+      "y": 90
+    },
+    "crafting=false,orientation=down_east,triggered=true": {
+      "model": "minecraft:block/crafter_triggered",
+      "x": 90,
+      "y": 90
+    },
+    "crafting=false,orientation=down_north,triggered=false": {
+      "model": "minecraft:block/crafter",
+      "x": 90
+    },
+    "crafting=false,orientation=down_north,triggered=true": {
+      "model": "minecraft:block/crafter_triggered",
+      "x": 90
+    },
+    "crafting=false,orientation=down_south,triggered=false": {
+      "model": "minecraft:block/crafter",
+      "x": 90,
+      "y": 180
+    },
+    "crafting=false,orientation=down_south,triggered=true": {
+      "model": "minecraft:block/crafter_triggered",
+      "x": 90,
+      "y": 180
+    },
+    "crafting=false,orientation=down_west,triggered=false": {
+      "model": "minecraft:block/crafter",
+      "x": 90,
+      "y": 270
+    },
+    "crafting=false,orientation=down_west,triggered=true": {
+      "model": "minecraft:block/crafter_triggered",
+      "x": 90,
+      "y": 270
+    },
+    "crafting=false,orientation=east_up,triggered=false": {
+      "model": "minecraft:block/crafter",
+      "y": 90
+    },
+    "crafting=false,orientation=east_up,triggered=true": {
+      "model": "minecraft:block/crafter_triggered",
+      "y": 90
+    },
+    "crafting=false,orientation=north_up,triggered=false": {
+      "model": "minecraft:block/crafter"
+    },
+    "crafting=false,orientation=north_up,triggered=true": {
+      "model": "minecraft:block/crafter_triggered"
+    },
+    "crafting=false,orientation=south_up,triggered=false": {
+      "model": "minecraft:block/crafter",
+      "y": 180
+    },
+    "crafting=false,orientation=south_up,triggered=true": {
+      "model": "minecraft:block/crafter_triggered",
+      "y": 180
+    },
+    "crafting=false,orientation=up_east,triggered=false": {
+      "model": "minecraft:block/crafter",
+      "x": 270,
+      "y": 270
+    },
+    "crafting=false,orientation=up_east,triggered=true": {
+      "model": "minecraft:block/crafter_triggered",
+      "x": 270,
+      "y": 270
+    },
+    "crafting=false,orientation=up_north,triggered=false": {
+      "model": "minecraft:block/crafter",
+      "x": 270,
+      "y": 180
+    },
+    "crafting=false,orientation=up_north,triggered=true": {
+      "model": "minecraft:block/crafter_triggered",
+      "x": 270,
+      "y": 180
+    },
+    "crafting=false,orientation=up_south,triggered=false": {
+      "model": "minecraft:block/crafter",
+      "x": 270
+    },
+    "crafting=false,orientation=up_south,triggered=true": {
+      "model": "minecraft:block/crafter_triggered",
+      "x": 270
+    },
+    "crafting=false,orientation=up_west,triggered=false": {
+      "model": "minecraft:block/crafter",
+      "x": 270,
+      "y": 90
+    },
+    "crafting=false,orientation=up_west,triggered=true": {
+      "model": "minecraft:block/crafter_triggered",
+      "x": 270,
+      "y": 90
+    },
+    "crafting=false,orientation=west_up,triggered=false": {
+      "model": "minecraft:block/crafter",
+      "y": 270
+    },
+    "crafting=false,orientation=west_up,triggered=true": {
+      "model": "minecraft:block/crafter_triggered",
+      "y": 270
+    },
+    "crafting=true,orientation=down_east,triggered=false": {
+      "model": "minecraft:block/crafter_crafting",
+      "x": 90,
+      "y": 90
+    },
+    "crafting=true,orientation=down_east,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered",
+      "x": 90,
+      "y": 90
+    },
+    "crafting=true,orientation=down_north,triggered=false": {
+      "model": "minecraft:block/crafter_crafting",
+      "x": 90
+    },
+    "crafting=true,orientation=down_north,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered",
+      "x": 90
+    },
+    "crafting=true,orientation=down_south,triggered=false": {
+      "model": "minecraft:block/crafter_crafting",
+      "x": 90,
+      "y": 180
+    },
+    "crafting=true,orientation=down_south,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered",
+      "x": 90,
+      "y": 180
+    },
+    "crafting=true,orientation=down_west,triggered=false": {
+      "model": "minecraft:block/crafter_crafting",
+      "x": 90,
+      "y": 270
+    },
+    "crafting=true,orientation=down_west,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered",
+      "x": 90,
+      "y": 270
+    },
+    "crafting=true,orientation=east_up,triggered=false": {
+      "model": "minecraft:block/crafter_crafting",
+      "y": 90
+    },
+    "crafting=true,orientation=east_up,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered",
+      "y": 90
+    },
+    "crafting=true,orientation=north_up,triggered=false": {
+      "model": "minecraft:block/crafter_crafting"
+    },
+    "crafting=true,orientation=north_up,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered"
+    },
+    "crafting=true,orientation=south_up,triggered=false": {
+      "model": "minecraft:block/crafter_crafting",
+      "y": 180
+    },
+    "crafting=true,orientation=south_up,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered",
+      "y": 180
+    },
+    "crafting=true,orientation=up_east,triggered=false": {
+      "model": "minecraft:block/crafter_crafting",
+      "x": 270,
+      "y": 270
+    },
+    "crafting=true,orientation=up_east,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered",
+      "x": 270,
+      "y": 270
+    },
+    "crafting=true,orientation=up_north,triggered=false": {
+      "model": "minecraft:block/crafter_crafting",
+      "x": 270,
+      "y": 180
+    },
+    "crafting=true,orientation=up_north,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered",
+      "x": 270,
+      "y": 180
+    },
+    "crafting=true,orientation=up_south,triggered=false": {
+      "model": "minecraft:block/crafter_crafting",
+      "x": 270
+    },
+    "crafting=true,orientation=up_south,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered",
+      "x": 270
+    },
+    "crafting=true,orientation=up_west,triggered=false": {
+      "model": "minecraft:block/crafter_crafting",
+      "x": 270,
+      "y": 90
+    },
+    "crafting=true,orientation=up_west,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered",
+      "x": 270,
+      "y": 90
+    },
+    "crafting=true,orientation=west_up,triggered=false": {
+      "model": "minecraft:block/crafter_crafting",
+      "y": 270
+    },
+    "crafting=true,orientation=west_up,triggered=true": {
+      "model": "minecraft:block/crafter_crafting_triggered",
+      "y": 270
+    }
+  }
+}

assets/minecraft/blockstates/creaking_heart.json

@@ -0,0 +1,40 @@
+{
+  "variants": {
+    "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
+    },
+    "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"
+    },
+    "axis=z,creaking_heart_state=awake": {
+      "model": "minecraft:block/creaking_heart_awake_horizontal",
+      "x": 90
+    },
+    "axis=z,creaking_heart_state=dormant": {
+      "model": "minecraft:block/creaking_heart_dormant_horizontal",
+      "x": 90
+    },
+    "axis=z,creaking_heart_state=uprooted": {
+      "model": "minecraft:block/creaking_heart_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/decorated_pot.json

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

assets/minecraft/blockstates/end_gateway.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "": {
-      "model": "minecraft:block/end_portal"
+      "model": "minecraft:block/end_gateway"
     }
   }
 }

assets/minecraft/blockstates/exposed_chiseled_copper.json

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

assets/minecraft/blockstates/exposed_copper_bulb.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "lit=false,powered=false": {
+      "model": "minecraft:block/exposed_copper_bulb"
+    },
+    "lit=false,powered=true": {
+      "model": "minecraft:block/exposed_copper_bulb_powered"
+    },
+    "lit=true,powered=false": {
+      "model": "minecraft:block/exposed_copper_bulb_lit"
+    },
+    "lit=true,powered=true": {
+      "model": "minecraft:block/exposed_copper_bulb_lit_powered"
+    }
+  }
+}

assets/minecraft/blockstates/exposed_copper_door.json

@@ -0,0 +1,124 @@
+{
+  "variants": {
+    "facing=east,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/exposed_copper_door_bottom_left"
+    },
+    "facing=east,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/exposed_copper_door_bottom_left_open",
+      "y": 90
+    },
+    "facing=east,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/exposed_copper_door_bottom_right"
+    },
+    "facing=east,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/exposed_copper_door_bottom_right_open",
+      "y": 270
+    },
+    "facing=east,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/exposed_copper_door_top_left"
+    },
+    "facing=east,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/exposed_copper_door_top_left_open",
+      "y": 90
+    },
+    "facing=east,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/exposed_copper_door_top_right"
+    },
+    "facing=east,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/exposed_copper_door_top_right_open",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/exposed_copper_door_bottom_left",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/exposed_copper_door_bottom_left_open"
+    },
+    "facing=north,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/exposed_copper_door_bottom_right",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/exposed_copper_door_bottom_right_open",
+      "y": 180
+    },
+    "facing=north,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/exposed_copper_door_top_left",
+      "y": 270
+    },
+    "facing=north,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/exposed_copper_door_top_left_open"
+    },
+    "facing=north,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/exposed_copper_door_top_right",
+      "y": 270
+    },
+    "facing=north,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/exposed_copper_door_top_right_open",
+      "y": 180
+    },
+    "facing=south,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/exposed_copper_door_bottom_left",
+      "y": 90
+    },
+    "facing=south,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/exposed_copper_door_bottom_left_open",
+      "y": 180
+    },
+    "facing=south,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/exposed_copper_door_bottom_right",
+      "y": 90
+    },
+    "facing=south,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/exposed_copper_door_bottom_right_open"
+    },
+    "facing=south,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/exposed_copper_door_top_left",
+      "y": 90
+    },
+    "facing=south,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/exposed_copper_door_top_left_open",
+      "y": 180
+    },
+    "facing=south,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/exposed_copper_door_top_right",
+      "y": 90
+    },
+    "facing=south,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/exposed_copper_door_top_right_open"
+    },
+    "facing=west,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/exposed_copper_door_bottom_left",
+      "y": 180
+    },
+    "facing=west,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/exposed_copper_door_bottom_left_open",
+      "y": 270
+    },
+    "facing=west,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/exposed_copper_door_bottom_right",
+      "y": 180
+    },
+    "facing=west,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/exposed_copper_door_bottom_right_open",
+      "y": 90
+    },
+    "facing=west,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/exposed_copper_door_top_left",
+      "y": 180
+    },
+    "facing=west,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/exposed_copper_door_top_left_open",
+      "y": 270
+    },
+    "facing=west,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/exposed_copper_door_top_right",
+      "y": 180
+    },
+    "facing=west,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/exposed_copper_door_top_right_open",
+      "y": 90
+    }
+  }
+}

assets/minecraft/blockstates/exposed_copper_grate.json

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

assets/minecraft/blockstates/exposed_copper_trapdoor.json

@@ -0,0 +1,58 @@
+{
+  "variants": {
+    "facing=east,half=bottom,open=false": {
+      "model": "minecraft:block/exposed_copper_trapdoor_bottom"
+    },
+    "facing=east,half=bottom,open=true": {
+      "model": "minecraft:block/exposed_copper_trapdoor_open",
+      "y": 90
+    },
+    "facing=east,half=top,open=false": {
+      "model": "minecraft:block/exposed_copper_trapdoor_top"
+    },
+    "facing=east,half=top,open=true": {
+      "model": "minecraft:block/exposed_copper_trapdoor_open",
+      "y": 90
+    },
+    "facing=north,half=bottom,open=false": {
+      "model": "minecraft:block/exposed_copper_trapdoor_bottom"
+    },
+    "facing=north,half=bottom,open=true": {
+      "model": "minecraft:block/exposed_copper_trapdoor_open"
+    },
+    "facing=north,half=top,open=false": {
+      "model": "minecraft:block/exposed_copper_trapdoor_top"
+    },
+    "facing=north,half=top,open=true": {
+      "model": "minecraft:block/exposed_copper_trapdoor_open"
+    },
+    "facing=south,half=bottom,open=false": {
+      "model": "minecraft:block/exposed_copper_trapdoor_bottom"
+    },
+    "facing=south,half=bottom,open=true": {
+      "model": "minecraft:block/exposed_copper_trapdoor_open",
+      "y": 180
+    },
+    "facing=south,half=top,open=false": {
+      "model": "minecraft:block/exposed_copper_trapdoor_top"
+    },
+    "facing=south,half=top,open=true": {
+      "model": "minecraft:block/exposed_copper_trapdoor_open",
+      "y": 180
+    },
+    "facing=west,half=bottom,open=false": {
+      "model": "minecraft:block/exposed_copper_trapdoor_bottom"
+    },
+    "facing=west,half=bottom,open=true": {
+      "model": "minecraft:block/exposed_copper_trapdoor_open",
+      "y": 270
+    },
+    "facing=west,half=top,open=false": {
+      "model": "minecraft:block/exposed_copper_trapdoor_top"
+    },
+    "facing=west,half=top,open=true": {
+      "model": "minecraft:block/exposed_copper_trapdoor_open",
+      "y": 270
+    }
+  }
+}

assets/minecraft/blockstates/firefly_bush.json

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

assets/minecraft/blockstates/grass.json

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

assets/minecraft/blockstates/heavy_core.json

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

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,160 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_1"
+      },
+      "when": {
+        "facing": "north",
+        "segment_amount": "1"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_1",
+        "y": 90
+      },
+      "when": {
+        "facing": "east",
+        "segment_amount": "1"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_1",
+        "y": 180
+      },
+      "when": {
+        "facing": "south",
+        "segment_amount": "1"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_1",
+        "y": 270
+      },
+      "when": {
+        "facing": "west",
+        "segment_amount": "1"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_2"
+      },
+      "when": {
+        "facing": "north",
+        "segment_amount": "2|3"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_2",
+        "y": 90
+      },
+      "when": {
+        "facing": "east",
+        "segment_amount": "2|3"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_2",
+        "y": 180
+      },
+      "when": {
+        "facing": "south",
+        "segment_amount": "2|3"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_2",
+        "y": 270
+      },
+      "when": {
+        "facing": "west",
+        "segment_amount": "2|3"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_3"
+      },
+      "when": {
+        "facing": "north",
+        "segment_amount": "3"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_3",
+        "y": 90
+      },
+      "when": {
+        "facing": "east",
+        "segment_amount": "3"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_3",
+        "y": 180
+      },
+      "when": {
+        "facing": "south",
+        "segment_amount": "3"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/leaf_litter_3",
+        "y": 270
+      },
+      "when": {
+        "facing": "west",
+        "segment_amount": "3"
+      }
+    },
+    {
+      "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/open_eyeblossom.json

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

assets/minecraft/blockstates/oxidized_chiseled_copper.json

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

assets/minecraft/blockstates/oxidized_copper_bulb.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "lit=false,powered=false": {
+      "model": "minecraft:block/oxidized_copper_bulb"
+    },
+    "lit=false,powered=true": {
+      "model": "minecraft:block/oxidized_copper_bulb_powered"
+    },
+    "lit=true,powered=false": {
+      "model": "minecraft:block/oxidized_copper_bulb_lit"
+    },
+    "lit=true,powered=true": {
+      "model": "minecraft:block/oxidized_copper_bulb_lit_powered"
+    }
+  }
+}

assets/minecraft/blockstates/oxidized_copper_door.json

@@ -0,0 +1,124 @@
+{
+  "variants": {
+    "facing=east,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_left"
+    },
+    "facing=east,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_left_open",
+      "y": 90
+    },
+    "facing=east,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_right"
+    },
+    "facing=east,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_right_open",
+      "y": 270
+    },
+    "facing=east,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_top_left"
+    },
+    "facing=east,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_top_left_open",
+      "y": 90
+    },
+    "facing=east,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_top_right"
+    },
+    "facing=east,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_top_right_open",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_left",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_left_open"
+    },
+    "facing=north,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_right",
+      "y": 270
+    },
+    "facing=north,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_right_open",
+      "y": 180
+    },
+    "facing=north,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_top_left",
+      "y": 270
+    },
+    "facing=north,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_top_left_open"
+    },
+    "facing=north,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_top_right",
+      "y": 270
+    },
+    "facing=north,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_top_right_open",
+      "y": 180
+    },
+    "facing=south,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_left",
+      "y": 90
+    },
+    "facing=south,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_left_open",
+      "y": 180
+    },
+    "facing=south,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_right",
+      "y": 90
+    },
+    "facing=south,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_right_open"
+    },
+    "facing=south,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_top_left",
+      "y": 90
+    },
+    "facing=south,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_top_left_open",
+      "y": 180
+    },
+    "facing=south,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_top_right",
+      "y": 90
+    },
+    "facing=south,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_top_right_open"
+    },
+    "facing=west,half=lower,hinge=left,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_left",
+      "y": 180
+    },
+    "facing=west,half=lower,hinge=left,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_left_open",
+      "y": 270
+    },
+    "facing=west,half=lower,hinge=right,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_right",
+      "y": 180
+    },
+    "facing=west,half=lower,hinge=right,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_bottom_right_open",
+      "y": 90
+    },
+    "facing=west,half=upper,hinge=left,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_top_left",
+      "y": 180
+    },
+    "facing=west,half=upper,hinge=left,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_top_left_open",
+      "y": 270
+    },
+    "facing=west,half=upper,hinge=right,open=false": {
+      "model": "minecraft:block/oxidized_copper_door_top_right",
+      "y": 180
+    },
+    "facing=west,half=upper,hinge=right,open=true": {
+      "model": "minecraft:block/oxidized_copper_door_top_right_open",
+      "y": 90
+    }
+  }
+}

assets/minecraft/blockstates/oxidized_copper_grate.json

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

assets/minecraft/blockstates/oxidized_copper_trapdoor.json

@@ -0,0 +1,58 @@
+{
+  "variants": {
+    "facing=east,half=bottom,open=false": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_bottom"
+    },
+    "facing=east,half=bottom,open=true": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_open",
+      "y": 90
+    },
+    "facing=east,half=top,open=false": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_top"
+    },
+    "facing=east,half=top,open=true": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_open",
+      "y": 90
+    },
+    "facing=north,half=bottom,open=false": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_bottom"
+    },
+    "facing=north,half=bottom,open=true": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_open"
+    },
+    "facing=north,half=top,open=false": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_top"
+    },
+    "facing=north,half=top,open=true": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_open"
+    },
+    "facing=south,half=bottom,open=false": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_bottom"
+    },
+    "facing=south,half=bottom,open=true": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_open",
+      "y": 180
+    },
+    "facing=south,half=top,open=false": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_top"
+    },
+    "facing=south,half=top,open=true": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_open",
+      "y": 180
+    },
+    "facing=west,half=bottom,open=false": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_bottom"
+    },
+    "facing=west,half=bottom,open=true": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_open",
+      "y": 270
+    },
+    "facing=west,half=top,open=false": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_top"
+    },
+    "facing=west,half=top,open=true": {
+      "model": "minecraft:block/oxidized_copper_trapdoor_open",
+      "y": 270
+    }
+  }
+}

assets/minecraft/blockstates/pale_hanging_moss.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "tip=false": {
+      "model": "minecraft:block/pale_hanging_moss"
+    },
+    "tip=true": {
+      "model": "minecraft:block/pale_hanging_moss_tip"
+    }
+  }
+}