Create/Update assets for version 1.17

_list.json

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

assets/icons/_list.json

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

assets/icons/snapshot/_list.json

@@ -1 +0,0 @@
-{"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","equipment","font","items","lang","models","particles","post_effect","resourcepacks","shaders","sounds","texts","textures"],"files":["gpu_warnlist.json","regional_compliancies.json","sounds.json"]}
+{"directories":["blockstates","font","icons","lang","models","particles","resourcepacks","shaders","sounds","texts","textures"],"files":["gpu_warnlist.json","sounds.json"]}

assets/minecraft/atlases/_all.json

@@ -1 +0,0 @@
-{"armor_trims":{"sources":[{"type":"paletted_permutations","textures":["trims/entity/humanoid/coast","trims/entity/humanoid_leggings/coast","trims/entity/humanoid/sentry","trims/entity/humanoid_leggings/sentry","trims/entity/humanoid/dune","trims/entity/humanoid_leggings/dune","trims/entity/humanoid/wild","trims/entity/humanoid_leggings/wild","trims/entity/humanoid/ward","trims/entity/humanoid_leggings/ward","trims/entity/humanoid/eye","trims/entity/humanoid_leggings/eye","trims/entity/humanoid/vex","trims/entity/humanoid_leggings/vex","trims/entity/humanoid/tide","trims/entity/humanoid_leggings/tide","trims/entity/humanoid/snout","trims/entity/humanoid_leggings/snout","trims/entity/humanoid/rib","trims/entity/humanoid_leggings/rib","trims/entity/humanoid/spire","trims/entity/humanoid_leggings/spire","trims/entity/humanoid/wayfinder","trims/entity/humanoid_leggings/wayfinder","trims/entity/humanoid/shaper","trims/entity/humanoid_leggings/shaper","trims/entity/humanoid/silence","trims/entity/humanoid_leggings/silence","trims/entity/humanoid/raiser","trims/entity/humanoid_leggings/raiser","trims/entity/humanoid/host","trims/entity/humanoid_leggings/host","trims/entity/humanoid/flow","trims/entity/humanoid_leggings/flow","trims/entity/humanoid/bolt","trims/entity/humanoid_leggings/bolt"],"palette_key":"trims/color_palettes/trim_palette","permutations":{"quartz":"trims/color_palettes/quartz","iron":"trims/color_palettes/iron","gold":"trims/color_palettes/gold","diamond":"trims/color_palettes/diamond","netherite":"trims/color_palettes/netherite","redstone":"trims/color_palettes/redstone","copper":"trims/color_palettes/copper","emerald":"trims/color_palettes/emerald","lapis":"trims/color_palettes/lapis","amethyst":"trims/color_palettes/amethyst","iron_darker":"trims/color_palettes/iron_darker","gold_darker":"trims/color_palettes/gold_darker","diamond_darker":"trims/color_palettes/diamond_darker","netherite_darker":"trims/color_palettes/netherite_darker","resin":"trims/color_palettes/resin"}}]},"banner_patterns":{"sources":[{"type":"single","resource":"entity/banner_base"},{"type":"directory","source":"entity/banner","prefix":"entity/banner/"}]},"beds":{"sources":[{"type":"directory","source":"entity/bed","prefix":"entity/bed/"}]},"blocks":{"sources":[{"type":"directory","source":"block","prefix":"block/"},{"type":"directory","source":"item","prefix":"item/"},{"type":"directory","source":"entity/conduit","prefix":"entity/conduit/"},{"type":"single","resource":"entity/bell/bell_body"},{"type":"single","resource":"entity/decorated_pot/decorated_pot_side"},{"type":"single","resource":"entity/enchanting_table_book"},{"type":"paletted_permutations","textures":["trims/items/leggings_trim","trims/items/chestplate_trim","trims/items/helmet_trim","trims/items/boots_trim"],"palette_key":"trims/color_palettes/trim_palette","permutations":{"quartz":"trims/color_palettes/quartz","iron":"trims/color_palettes/iron","gold":"trims/color_palettes/gold","diamond":"trims/color_palettes/diamond","netherite":"trims/color_palettes/netherite","redstone":"trims/color_palettes/redstone","copper":"trims/color_palettes/copper","emerald":"trims/color_palettes/emerald","lapis":"trims/color_palettes/lapis","amethyst":"trims/color_palettes/amethyst","iron_darker":"trims/color_palettes/iron_darker","gold_darker":"trims/color_palettes/gold_darker","diamond_darker":"trims/color_palettes/diamond_darker","netherite_darker":"trims/color_palettes/netherite_darker","resin":"trims/color_palettes/resin"}}]},"chests":{"sources":[{"type":"directory","source":"entity/chest","prefix":"entity/chest/"}]},"decorated_pot":{"sources":[{"type":"directory","source":"entity/decorated_pot","prefix":"entity/decorated_pot/"}]},"gui":{"sources":[{"type":"directory","source":"gui/sprites","prefix":""}]},"map_decorations":{"sources":[{"type":"directory","source":"map/decorations","prefix":""}]},"mob_effects":{"sources":[{"type":"directory","source":"mob_effect","prefix":""}]},"paintings":{"sources":[{"type":"directory","source":"painting","prefix":""}]},"particles":{"sources":[{"type":"directory","source":"particle","prefix":""}]},"shield_patterns":{"sources":[{"type":"single","resource":"entity/shield_base"},{"type":"single","resource":"entity/shield_base_nopattern"},{"type":"directory","source":"entity/shield","prefix":"entity/shield/"}]},"shulker_boxes":{"sources":[{"type":"directory","source":"entity/shulker","prefix":"entity/shulker/"}]},"signs":{"sources":[{"type":"directory","source":"entity/signs","prefix":"entity/signs/"}]}}

assets/minecraft/atlases/_list.json

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

assets/minecraft/atlases/banner_patterns.json

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

assets/minecraft/atlases/beds.json

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

assets/minecraft/atlases/blocks.json

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

assets/minecraft/atlases/chests.json

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

assets/minecraft/atlases/decorated_pot.json

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

assets/minecraft/atlases/gui.json

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

assets/minecraft/atlases/map_decorations.json

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

assets/minecraft/atlases/mob_effects.json

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

assets/minecraft/atlases/paintings.json

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

assets/minecraft/atlases/particles.json

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

assets/minecraft/atlases/shield_patterns.json

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

assets/minecraft/atlases/shulker_boxes.json

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

assets/minecraft/atlases/signs.json

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

assets/minecraft/blockstates/acacia_button.json

@@ -2,23 +2,23 @@
   "variants": {
     "face=ceiling,facing=east,powered=false": {
       "model": "minecraft:block/acacia_button",
-      "x": 180,
-      "y": 270
+      "y": 270,
+      "x": 180
     },
     "face=ceiling,facing=east,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "x": 180,
-      "y": 270
+      "y": 270,
+      "x": 180
     },
     "face=ceiling,facing=north,powered=false": {
       "model": "minecraft:block/acacia_button",
-      "x": 180,
-      "y": 180
+      "y": 180,
+      "x": 180
     },
     "face=ceiling,facing=north,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "x": 180,
-      "y": 180
+      "y": 180,
+      "x": 180
     },
     "face=ceiling,facing=south,powered=false": {
       "model": "minecraft:block/acacia_button",
@@ -30,13 +30,13 @@
     },
     "face=ceiling,facing=west,powered=false": {
       "model": "minecraft:block/acacia_button",
-      "x": 180,
-      "y": 90
+      "y": 90,
+      "x": 180
     },
     "face=ceiling,facing=west,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "x": 180,
-      "y": 90
+      "y": 90,
+      "x": 180
     },
     "face=floor,facing=east,powered=false": {
       "model": "minecraft:block/acacia_button",
@@ -70,49 +70,49 @@
     },
     "face=wall,facing=east,powered=false": {
       "model": "minecraft:block/acacia_button",
-      "uvlock": true,
+      "y": 90,
       "x": 90,
-      "y": 90
+      "uvlock": true
     },
     "face=wall,facing=east,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "uvlock": true,
+      "y": 90,
       "x": 90,
-      "y": 90
+      "uvlock": true
     },
     "face=wall,facing=north,powered=false": {
       "model": "minecraft:block/acacia_button",
-      "uvlock": true,
-      "x": 90
+      "x": 90,
+      "uvlock": true
     },
     "face=wall,facing=north,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "uvlock": true,
-      "x": 90
+      "x": 90,
+      "uvlock": true
     },
     "face=wall,facing=south,powered=false": {
       "model": "minecraft:block/acacia_button",
-      "uvlock": true,
+      "y": 180,
       "x": 90,
-      "y": 180
+      "uvlock": true
     },
     "face=wall,facing=south,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "uvlock": true,
+      "y": 180,
       "x": 90,
-      "y": 180
+      "uvlock": true
     },
     "face=wall,facing=west,powered=false": {
       "model": "minecraft:block/acacia_button",
-      "uvlock": true,
+      "y": 270,
       "x": 90,
-      "y": 270
+      "uvlock": true
     },
     "face=wall,facing=west,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "uvlock": true,
+      "y": 270,
       "x": 90,
-      "y": 270
+      "uvlock": true
     }
   }
 }

assets/minecraft/blockstates/acacia_door.json

@@ -1,123 +1,123 @@
 {
   "variants": {
     "facing=east,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_left"
+      "model": "minecraft:block/acacia_door_bottom"
     },
     "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_left_open",
+      "model": "minecraft:block/acacia_door_bottom_hinge",
       "y": 90
     },
     "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_right"
+      "model": "minecraft:block/acacia_door_bottom_hinge"
     },
     "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_right_open",
+      "model": "minecraft:block/acacia_door_bottom",
       "y": 270
     },
     "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_top_left"
+      "model": "minecraft:block/acacia_door_top"
     },
     "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_top_left_open",
+      "model": "minecraft:block/acacia_door_top_hinge",
       "y": 90
     },
     "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_top_right"
+      "model": "minecraft:block/acacia_door_top_hinge"
     },
     "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_top_right_open",
+      "model": "minecraft:block/acacia_door_top",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_left",
+      "model": "minecraft:block/acacia_door_bottom",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_left_open"
+      "model": "minecraft:block/acacia_door_bottom_hinge"
     },
     "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_right",
+      "model": "minecraft:block/acacia_door_bottom_hinge",
       "y": 270
     },
     "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_right_open",
+      "model": "minecraft:block/acacia_door_bottom",
       "y": 180
     },
     "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_top_left",
+      "model": "minecraft:block/acacia_door_top",
       "y": 270
     },
     "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_top_left_open"
+      "model": "minecraft:block/acacia_door_top_hinge"
     },
     "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_top_right",
+      "model": "minecraft:block/acacia_door_top_hinge",
       "y": 270
     },
     "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_top_right_open",
+      "model": "minecraft:block/acacia_door_top",
       "y": 180
     },
     "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_left",
+      "model": "minecraft:block/acacia_door_bottom",
       "y": 90
     },
     "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_left_open",
+      "model": "minecraft:block/acacia_door_bottom_hinge",
       "y": 180
     },
     "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_right",
+      "model": "minecraft:block/acacia_door_bottom_hinge",
       "y": 90
     },
     "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_right_open"
+      "model": "minecraft:block/acacia_door_bottom"
     },
     "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_top_left",
+      "model": "minecraft:block/acacia_door_top",
       "y": 90
     },
     "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_top_left_open",
+      "model": "minecraft:block/acacia_door_top_hinge",
       "y": 180
     },
     "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_top_right",
+      "model": "minecraft:block/acacia_door_top_hinge",
       "y": 90
     },
     "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_top_right_open"
+      "model": "minecraft:block/acacia_door_top"
     },
     "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_left",
+      "model": "minecraft:block/acacia_door_bottom",
       "y": 180
     },
     "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_left_open",
+      "model": "minecraft:block/acacia_door_bottom_hinge",
       "y": 270
     },
     "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_right",
+      "model": "minecraft:block/acacia_door_bottom_hinge",
       "y": 180
     },
     "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_right_open",
+      "model": "minecraft:block/acacia_door_bottom",
       "y": 90
     },
     "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_top_left",
+      "model": "minecraft:block/acacia_door_top",
       "y": 180
     },
     "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_top_left_open",
+      "model": "minecraft:block/acacia_door_top_hinge",
       "y": 270
     },
     "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_top_right",
+      "model": "minecraft:block/acacia_door_top_hinge",
       "y": 180
     },
     "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_top_right_open",
+      "model": "minecraft:block/acacia_door_top",
       "y": 90
     }
   }

assets/minecraft/blockstates/acacia_fence.json

@@ -6,42 +6,42 @@
       }
     },
     {
+      "when": {
+        "north": "true"
+      },
       "apply": {
         "model": "minecraft:block/acacia_fence_side",
         "uvlock": true
-      },
-      "when": {
-        "north": "true"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/acacia_fence_side",
-        "uvlock": true,
-        "y": 90
-      },
       "when": {
         "east": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/acacia_fence_side",
+        "y": 90,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/acacia_fence_side",
-        "uvlock": true,
-        "y": 180
-      },
       "when": {
         "south": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/acacia_fence_side",
+        "y": 180,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/acacia_fence_side",
-        "uvlock": true,
-        "y": 270
-      },
       "when": {
         "west": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/acacia_fence_side",
+        "y": 270,
+        "uvlock": true
       }
     }
   ]

assets/minecraft/blockstates/acacia_fence_gate.json

@@ -1,80 +1,80 @@
 {
   "variants": {
     "facing=east,in_wall=false,open=false": {
-      "model": "minecraft:block/acacia_fence_gate",
       "uvlock": true,
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/acacia_fence_gate"
     },
     "facing=east,in_wall=false,open=true": {
-      "model": "minecraft:block/acacia_fence_gate_open",
       "uvlock": true,
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/acacia_fence_gate_open"
     },
     "facing=east,in_wall=true,open=false": {
-      "model": "minecraft:block/acacia_fence_gate_wall",
       "uvlock": true,
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/acacia_fence_gate_wall"
     },
     "facing=east,in_wall=true,open=true": {
-      "model": "minecraft:block/acacia_fence_gate_wall_open",
       "uvlock": true,
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/acacia_fence_gate_wall_open"
     },
     "facing=north,in_wall=false,open=false": {
-      "model": "minecraft:block/acacia_fence_gate",
       "uvlock": true,
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/acacia_fence_gate"
     },
     "facing=north,in_wall=false,open=true": {
-      "model": "minecraft:block/acacia_fence_gate_open",
       "uvlock": true,
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/acacia_fence_gate_open"
     },
     "facing=north,in_wall=true,open=false": {
-      "model": "minecraft:block/acacia_fence_gate_wall",
       "uvlock": true,
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/acacia_fence_gate_wall"
     },
     "facing=north,in_wall=true,open=true": {
-      "model": "minecraft:block/acacia_fence_gate_wall_open",
       "uvlock": true,
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/acacia_fence_gate_wall_open"
     },
     "facing=south,in_wall=false,open=false": {
-      "model": "minecraft:block/acacia_fence_gate",
-      "uvlock": true
+      "uvlock": true,
+      "model": "minecraft:block/acacia_fence_gate"
     },
     "facing=south,in_wall=false,open=true": {
-      "model": "minecraft:block/acacia_fence_gate_open",
-      "uvlock": true
+      "uvlock": true,
+      "model": "minecraft:block/acacia_fence_gate_open"
     },
     "facing=south,in_wall=true,open=false": {
-      "model": "minecraft:block/acacia_fence_gate_wall",
-      "uvlock": true
+      "uvlock": true,
+      "model": "minecraft:block/acacia_fence_gate_wall"
     },
     "facing=south,in_wall=true,open=true": {
-      "model": "minecraft:block/acacia_fence_gate_wall_open",
-      "uvlock": true
+      "uvlock": true,
+      "model": "minecraft:block/acacia_fence_gate_wall_open"
     },
     "facing=west,in_wall=false,open=false": {
-      "model": "minecraft:block/acacia_fence_gate",
       "uvlock": true,
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/acacia_fence_gate"
     },
     "facing=west,in_wall=false,open=true": {
-      "model": "minecraft:block/acacia_fence_gate_open",
       "uvlock": true,
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/acacia_fence_gate_open"
     },
     "facing=west,in_wall=true,open=false": {
-      "model": "minecraft:block/acacia_fence_gate_wall",
       "uvlock": true,
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/acacia_fence_gate_wall"
     },
     "facing=west,in_wall=true,open=true": {
-      "model": "minecraft:block/acacia_fence_gate_wall_open",
       "uvlock": true,
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/acacia_fence_gate_wall_open"
     }
   }
 }

assets/minecraft/blockstates/acacia_hanging_sign.json

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

assets/minecraft/blockstates/acacia_stairs.json

@@ -2,16 +2,16 @@
   "variants": {
     "facing=east,half=bottom,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=east,half=bottom,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner"
     },
     "facing=east,half=bottom,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=east,half=bottom,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer"
@@ -21,189 +21,189 @@
     },
     "facing=east,half=top,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=east,half=top,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=east,half=top,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=east,half=top,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=east,half=top,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=top,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=top,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner"
     },
     "facing=south,half=bottom,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer"
     },
     "facing=south,half=bottom,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=south,half=top,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=south,half=top,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=west,half=top,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=west,half=top,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     }
   }
 }

assets/minecraft/blockstates/acacia_wall_hanging_sign.json

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

assets/minecraft/blockstates/andesite_stairs.json

@@ -2,16 +2,16 @@
   "variants": {
     "facing=east,half=bottom,shape=inner_left": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=east,half=bottom,shape=inner_right": {
       "model": "minecraft:block/andesite_stairs_inner"
     },
     "facing=east,half=bottom,shape=outer_left": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=east,half=bottom,shape=outer_right": {
       "model": "minecraft:block/andesite_stairs_outer"
@@ -21,189 +21,189 @@
     },
     "facing=east,half=top,shape=inner_left": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=east,half=top,shape=inner_right": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=east,half=top,shape=outer_left": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=east,half=top,shape=outer_right": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=east,half=top,shape=straight": {
       "model": "minecraft:block/andesite_stairs",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=inner_left": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=inner_right": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=outer_left": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=outer_right": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=straight": {
       "model": "minecraft:block/andesite_stairs",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=inner_left": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=inner_right": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=top,shape=outer_left": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=outer_right": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=top,shape=straight": {
       "model": "minecraft:block/andesite_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=inner_left": {
       "model": "minecraft:block/andesite_stairs_inner"
     },
     "facing=south,half=bottom,shape=inner_right": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=outer_left": {
       "model": "minecraft:block/andesite_stairs_outer"
     },
     "facing=south,half=bottom,shape=outer_right": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=straight": {
       "model": "minecraft:block/andesite_stairs",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=inner_left": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=inner_right": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=south,half=top,shape=outer_left": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=outer_right": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=south,half=top,shape=straight": {
       "model": "minecraft:block/andesite_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=inner_left": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=inner_right": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=outer_left": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=outer_right": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=straight": {
       "model": "minecraft:block/andesite_stairs",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=inner_left": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=inner_right": {
       "model": "minecraft:block/andesite_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=west,half=top,shape=outer_left": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=outer_right": {
       "model": "minecraft:block/andesite_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=west,half=top,shape=straight": {
       "model": "minecraft:block/andesite_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     }
   }
 }

assets/minecraft/blockstates/andesite_wall.json

@@ -1,89 +1,89 @@
 {
   "multipart": [
     {
-      "apply": {
-        "model": "minecraft:block/andesite_wall_post"
-      },
       "when": {
         "up": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/andesite_wall_post"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/andesite_wall_side",
-        "uvlock": true
-      },
       "when": {
         "north": "low"
+      },
+      "apply": {
+        "model": "minecraft:block/andesite_wall_side",
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/andesite_wall_side",
-        "uvlock": true,
-        "y": 90
-      },
       "when": {
         "east": "low"
+      },
+      "apply": {
+        "model": "minecraft:block/andesite_wall_side",
+        "y": 90,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/andesite_wall_side",
-        "uvlock": true,
-        "y": 180
-      },
       "when": {
         "south": "low"
-      }
-    },
-    {
+      },
       "apply": {
         "model": "minecraft:block/andesite_wall_side",
-        "uvlock": true,
-        "y": 270
-      },
-      "when": {
-        "west": "low"
+        "y": 180,
+        "uvlock": true
       }
     },
     {
+      "when": {
+        "west": "low"
+      },
+      "apply": {
+        "model": "minecraft:block/andesite_wall_side",
+        "y": 270,
+        "uvlock": true
+      }
+    },
+    {
+      "when": {
+        "north": "tall"
+      },
       "apply": {
         "model": "minecraft:block/andesite_wall_side_tall",
         "uvlock": true
-      },
-      "when": {
-        "north": "tall"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/andesite_wall_side_tall",
-        "uvlock": true,
-        "y": 90
-      },
       "when": {
         "east": "tall"
+      },
+      "apply": {
+        "model": "minecraft:block/andesite_wall_side_tall",
+        "y": 90,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/andesite_wall_side_tall",
-        "uvlock": true,
-        "y": 180
-      },
       "when": {
         "south": "tall"
+      },
+      "apply": {
+        "model": "minecraft:block/andesite_wall_side_tall",
+        "y": 180,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/andesite_wall_side_tall",
-        "uvlock": true,
-        "y": 270
-      },
       "when": {
         "west": "tall"
+      },
+      "apply": {
+        "model": "minecraft:block/andesite_wall_side_tall",
+        "y": 270,
+        "uvlock": true
       }
     }
   ]

assets/minecraft/blockstates/bamboo.json

@@ -1,6 +1,9 @@
 {
   "multipart": [
     {
+      "when": {
+        "age": "0"
+      },
       "apply": [
         {
           "model": "minecraft:block/bamboo1_age0"
@@ -14,12 +17,12 @@
         {
           "model": "minecraft:block/bamboo4_age0"
         }
-      ],
-      "when": {
-        "age": "0"
-      }
+      ]
     },
     {
+      "when": {
+        "age": "1"
+      },
       "apply": [
         {
           "model": "minecraft:block/bamboo1_age1"
@@ -33,25 +36,22 @@
         {
           "model": "minecraft:block/bamboo4_age1"
         }
-      ],
-      "when": {
-        "age": "1"
-      }
+      ]
     },
     {
-      "apply": {
-        "model": "minecraft:block/bamboo_small_leaves"
-      },
       "when": {
         "leaves": "small"
+      },
+      "apply": {
+        "model": "minecraft:block/bamboo_small_leaves"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/bamboo_large_leaves"
-      },
       "when": {
         "leaves": "large"
+      },
+      "apply": {
+        "model": "minecraft:block/bamboo_large_leaves"
       }
     }
   ]

assets/minecraft/blockstates/bamboo_block.json

@@ -1,13 +0,0 @@
-{
-  "variants": {
-    "axis=x": {
-      "model": "minecraft:block/bamboo_block_x"
-    },
-    "axis=y": {
-      "model": "minecraft:block/bamboo_block_y"
-    },
-    "axis=z": {
-      "model": "minecraft:block/bamboo_block_z"
-    }
-  }
-}

assets/minecraft/blockstates/bamboo_button.json

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

assets/minecraft/blockstates/bamboo_door.json

@@ -1,124 +0,0 @@
-{
-  "variants": {
-    "facing=east,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/bamboo_door_bottom_left"
-    },
-    "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/bamboo_door_bottom_left_open",
-      "y": 90
-    },
-    "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/bamboo_door_bottom_right"
-    },
-    "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/bamboo_door_bottom_right_open",
-      "y": 270
-    },
-    "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/bamboo_door_top_left"
-    },
-    "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/bamboo_door_top_left_open",
-      "y": 90
-    },
-    "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/bamboo_door_top_right"
-    },
-    "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/bamboo_door_top_right_open",
-      "y": 270
-    },
-    "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/bamboo_door_bottom_left",
-      "y": 270
-    },
-    "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/bamboo_door_bottom_left_open"
-    },
-    "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/bamboo_door_bottom_right",
-      "y": 270
-    },
-    "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/bamboo_door_bottom_right_open",
-      "y": 180
-    },
-    "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/bamboo_door_top_left",
-      "y": 270
-    },
-    "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/bamboo_door_top_left_open"
-    },
-    "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/bamboo_door_top_right",
-      "y": 270
-    },
-    "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/bamboo_door_top_right_open",
-      "y": 180
-    },
-    "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/bamboo_door_bottom_left",
-      "y": 90
-    },
-    "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/bamboo_door_bottom_left_open",
-      "y": 180
-    },
-    "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/bamboo_door_bottom_right",
-      "y": 90
-    },
-    "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/bamboo_door_bottom_right_open"
-    },
-    "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/bamboo_door_top_left",
-      "y": 90
-    },
-    "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/bamboo_door_top_left_open",
-      "y": 180
-    },
-    "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/bamboo_door_top_right",
-      "y": 90
-    },
-    "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/bamboo_door_top_right_open"
-    },
-    "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/bamboo_door_bottom_left",
-      "y": 180
-    },
-    "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/bamboo_door_bottom_left_open",
-      "y": 270
-    },
-    "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/bamboo_door_bottom_right",
-      "y": 180
-    },
-    "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/bamboo_door_bottom_right_open",
-      "y": 90
-    },
-    "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/bamboo_door_top_left",
-      "y": 180
-    },
-    "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/bamboo_door_top_left_open",
-      "y": 270
-    },
-    "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/bamboo_door_top_right",
-      "y": 180
-    },
-    "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/bamboo_door_top_right_open",
-      "y": 90
-    }
-  }
-}

assets/minecraft/blockstates/bamboo_fence.json

@@ -1,45 +0,0 @@
-{
-  "multipart": [
-    {
-      "apply": {
-        "model": "minecraft:block/bamboo_fence_post"
-      }
-    },
-    {
-      "apply": {
-        "model": "minecraft:block/bamboo_fence_side_north",
-        "uvlock": false
-      },
-      "when": {
-        "north": "true"
-      }
-    },
-    {
-      "apply": {
-        "model": "minecraft:block/bamboo_fence_side_east",
-        "uvlock": false
-      },
-      "when": {
-        "east": "true"
-      }
-    },
-    {
-      "apply": {
-        "model": "minecraft:block/bamboo_fence_side_south",
-        "uvlock": false
-      },
-      "when": {
-        "south": "true"
-      }
-    },
-    {
-      "apply": {
-        "model": "minecraft:block/bamboo_fence_side_west",
-        "uvlock": false
-      },
-      "when": {
-        "west": "true"
-      }
-    }
-  ]
-}

assets/minecraft/blockstates/bamboo_fence_gate.json

@@ -1,80 +0,0 @@
-{
-  "variants": {
-    "facing=east,in_wall=false,open=false": {
-      "model": "minecraft:block/bamboo_fence_gate",
-      "uvlock": false,
-      "y": 270
-    },
-    "facing=east,in_wall=false,open=true": {
-      "model": "minecraft:block/bamboo_fence_gate_open",
-      "uvlock": false,
-      "y": 270
-    },
-    "facing=east,in_wall=true,open=false": {
-      "model": "minecraft:block/bamboo_fence_gate_wall",
-      "uvlock": false,
-      "y": 270
-    },
-    "facing=east,in_wall=true,open=true": {
-      "model": "minecraft:block/bamboo_fence_gate_wall_open",
-      "uvlock": false,
-      "y": 270
-    },
-    "facing=north,in_wall=false,open=false": {
-      "model": "minecraft:block/bamboo_fence_gate",
-      "uvlock": false,
-      "y": 180
-    },
-    "facing=north,in_wall=false,open=true": {
-      "model": "minecraft:block/bamboo_fence_gate_open",
-      "uvlock": false,
-      "y": 180
-    },
-    "facing=north,in_wall=true,open=false": {
-      "model": "minecraft:block/bamboo_fence_gate_wall",
-      "uvlock": false,
-      "y": 180
-    },
-    "facing=north,in_wall=true,open=true": {
-      "model": "minecraft:block/bamboo_fence_gate_wall_open",
-      "uvlock": false,
-      "y": 180
-    },
-    "facing=south,in_wall=false,open=false": {
-      "model": "minecraft:block/bamboo_fence_gate",
-      "uvlock": false
-    },
-    "facing=south,in_wall=false,open=true": {
-      "model": "minecraft:block/bamboo_fence_gate_open",
-      "uvlock": false
-    },
-    "facing=south,in_wall=true,open=false": {
-      "model": "minecraft:block/bamboo_fence_gate_wall",
-      "uvlock": false
-    },
-    "facing=south,in_wall=true,open=true": {
-      "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_hanging_sign.json

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

assets/minecraft/blockstates/bamboo_mosaic.json

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

assets/minecraft/blockstates/bamboo_mosaic_slab.json

@@ -1,13 +0,0 @@
-{
-  "variants": {
-    "type=bottom": {
-      "model": "minecraft:block/bamboo_mosaic_slab"
-    },
-    "type=double": {
-      "model": "minecraft:block/bamboo_mosaic"
-    },
-    "type=top": {
-      "model": "minecraft:block/bamboo_mosaic_slab_top"
-    }
-  }
-}

assets/minecraft/blockstates/bamboo_mosaic_stairs.json

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

assets/minecraft/blockstates/bamboo_planks.json

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

assets/minecraft/blockstates/bamboo_pressure_plate.json

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

assets/minecraft/blockstates/bamboo_sign.json

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

assets/minecraft/blockstates/bamboo_slab.json

@@ -1,13 +0,0 @@
-{
-  "variants": {
-    "type=bottom": {
-      "model": "minecraft:block/bamboo_slab"
-    },
-    "type=double": {
-      "model": "minecraft:block/bamboo_planks"
-    },
-    "type=top": {
-      "model": "minecraft:block/bamboo_slab_top"
-    }
-  }
-}

assets/minecraft/blockstates/bamboo_stairs.json

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

assets/minecraft/blockstates/bamboo_trapdoor.json

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

assets/minecraft/blockstates/bamboo_wall_hanging_sign.json

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

assets/minecraft/blockstates/bamboo_wall_sign.json

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

assets/minecraft/blockstates/barrel.json

@@ -1,40 +1,40 @@
 {
   "variants": {
     "facing=down,open=false": {
-      "model": "minecraft:block/barrel",
-      "x": 180
+      "x": 180,
+      "model": "minecraft:block/barrel"
     },
     "facing=down,open=true": {
-      "model": "minecraft:block/barrel_open",
-      "x": 180
+      "x": 180,
+      "model": "minecraft:block/barrel_open"
     },
     "facing=east,open=false": {
-      "model": "minecraft:block/barrel",
       "x": 90,
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/barrel"
     },
     "facing=east,open=true": {
-      "model": "minecraft:block/barrel_open",
       "x": 90,
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/barrel_open"
     },
     "facing=north,open=false": {
-      "model": "minecraft:block/barrel",
-      "x": 90
+      "x": 90,
+      "model": "minecraft:block/barrel"
     },
     "facing=north,open=true": {
-      "model": "minecraft:block/barrel_open",
-      "x": 90
+      "x": 90,
+      "model": "minecraft:block/barrel_open"
     },
     "facing=south,open=false": {
-      "model": "minecraft:block/barrel",
       "x": 90,
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/barrel"
     },
     "facing=south,open=true": {
-      "model": "minecraft:block/barrel_open",
       "x": 90,
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/barrel_open"
     },
     "facing=up,open=false": {
       "model": "minecraft:block/barrel"
@@ -43,14 +43,14 @@
       "model": "minecraft:block/barrel_open"
     },
     "facing=west,open=false": {
-      "model": "minecraft:block/barrel",
       "x": 90,
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/barrel"
     },
     "facing=west,open=true": {
-      "model": "minecraft:block/barrel_open",
       "x": 90,
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/barrel_open"
     }
   }
 }

assets/minecraft/blockstates/bee_nest.json

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

assets/minecraft/blockstates/beehive.json

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

assets/minecraft/blockstates/big_dripleaf.json

@@ -1,20 +1,20 @@
 {
   "variants": {
     "facing=east,tilt=full": {
-      "model": "minecraft:block/big_dripleaf_full_tilt",
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/big_dripleaf_full_tilt"
     },
     "facing=east,tilt=none": {
-      "model": "minecraft:block/big_dripleaf",
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/big_dripleaf"
     },
     "facing=east,tilt=partial": {
-      "model": "minecraft:block/big_dripleaf_partial_tilt",
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/big_dripleaf_partial_tilt"
     },
     "facing=east,tilt=unstable": {
-      "model": "minecraft:block/big_dripleaf",
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/big_dripleaf"
     },
     "facing=north,tilt=full": {
       "model": "minecraft:block/big_dripleaf_full_tilt"
@@ -29,36 +29,36 @@
       "model": "minecraft:block/big_dripleaf"
     },
     "facing=south,tilt=full": {
-      "model": "minecraft:block/big_dripleaf_full_tilt",
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/big_dripleaf_full_tilt"
     },
     "facing=south,tilt=none": {
-      "model": "minecraft:block/big_dripleaf",
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/big_dripleaf"
     },
     "facing=south,tilt=partial": {
-      "model": "minecraft:block/big_dripleaf_partial_tilt",
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/big_dripleaf_partial_tilt"
     },
     "facing=south,tilt=unstable": {
-      "model": "minecraft:block/big_dripleaf",
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/big_dripleaf"
     },
     "facing=west,tilt=full": {
-      "model": "minecraft:block/big_dripleaf_full_tilt",
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/big_dripleaf_full_tilt"
     },
     "facing=west,tilt=none": {
-      "model": "minecraft:block/big_dripleaf",
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/big_dripleaf"
     },
     "facing=west,tilt=partial": {
-      "model": "minecraft:block/big_dripleaf_partial_tilt",
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/big_dripleaf_partial_tilt"
     },
     "facing=west,tilt=unstable": {
-      "model": "minecraft:block/big_dripleaf",
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/big_dripleaf"
     }
   }
 }

assets/minecraft/blockstates/birch_button.json

@@ -2,23 +2,23 @@
   "variants": {
     "face=ceiling,facing=east,powered=false": {
       "model": "minecraft:block/birch_button",
-      "x": 180,
-      "y": 270
+      "y": 270,
+      "x": 180
     },
     "face=ceiling,facing=east,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "x": 180,
-      "y": 270
+      "y": 270,
+      "x": 180
     },
     "face=ceiling,facing=north,powered=false": {
       "model": "minecraft:block/birch_button",
-      "x": 180,
-      "y": 180
+      "y": 180,
+      "x": 180
     },
     "face=ceiling,facing=north,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "x": 180,
-      "y": 180
+      "y": 180,
+      "x": 180
     },
     "face=ceiling,facing=south,powered=false": {
       "model": "minecraft:block/birch_button",
@@ -30,13 +30,13 @@
     },
     "face=ceiling,facing=west,powered=false": {
       "model": "minecraft:block/birch_button",
-      "x": 180,
-      "y": 90
+      "y": 90,
+      "x": 180
     },
     "face=ceiling,facing=west,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "x": 180,
-      "y": 90
+      "y": 90,
+      "x": 180
     },
     "face=floor,facing=east,powered=false": {
       "model": "minecraft:block/birch_button",
@@ -70,49 +70,49 @@
     },
     "face=wall,facing=east,powered=false": {
       "model": "minecraft:block/birch_button",
-      "uvlock": true,
+      "y": 90,
       "x": 90,
-      "y": 90
+      "uvlock": true
     },
     "face=wall,facing=east,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "uvlock": true,
+      "y": 90,
       "x": 90,
-      "y": 90
+      "uvlock": true
     },
     "face=wall,facing=north,powered=false": {
       "model": "minecraft:block/birch_button",
-      "uvlock": true,
-      "x": 90
+      "x": 90,
+      "uvlock": true
     },
     "face=wall,facing=north,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "uvlock": true,
-      "x": 90
+      "x": 90,
+      "uvlock": true
     },
     "face=wall,facing=south,powered=false": {
       "model": "minecraft:block/birch_button",
-      "uvlock": true,
+      "y": 180,
       "x": 90,
-      "y": 180
+      "uvlock": true
     },
     "face=wall,facing=south,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "uvlock": true,
+      "y": 180,
       "x": 90,
-      "y": 180
+      "uvlock": true
     },
     "face=wall,facing=west,powered=false": {
       "model": "minecraft:block/birch_button",
-      "uvlock": true,
+      "y": 270,
       "x": 90,
-      "y": 270
+      "uvlock": true
     },
     "face=wall,facing=west,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "uvlock": true,
+      "y": 270,
       "x": 90,
-      "y": 270
+      "uvlock": true
     }
   }
 }

assets/minecraft/blockstates/birch_door.json

@@ -1,123 +1,123 @@
 {
   "variants": {
     "facing=east,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_bottom_left"
+      "model": "minecraft:block/birch_door_bottom"
     },
     "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_bottom_left_open",
+      "model": "minecraft:block/birch_door_bottom_hinge",
       "y": 90
     },
     "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_bottom_right"
+      "model": "minecraft:block/birch_door_bottom_hinge"
     },
     "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_bottom_right_open",
+      "model": "minecraft:block/birch_door_bottom",
       "y": 270
     },
     "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_top_left"
+      "model": "minecraft:block/birch_door_top"
     },
     "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_top_left_open",
+      "model": "minecraft:block/birch_door_top_hinge",
       "y": 90
     },
     "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_top_right"
+      "model": "minecraft:block/birch_door_top_hinge"
     },
     "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_top_right_open",
+      "model": "minecraft:block/birch_door_top",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_bottom_left",
+      "model": "minecraft:block/birch_door_bottom",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_bottom_left_open"
+      "model": "minecraft:block/birch_door_bottom_hinge"
     },
     "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_bottom_right",
+      "model": "minecraft:block/birch_door_bottom_hinge",
       "y": 270
     },
     "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_bottom_right_open",
+      "model": "minecraft:block/birch_door_bottom",
       "y": 180
     },
     "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_top_left",
+      "model": "minecraft:block/birch_door_top",
       "y": 270
     },
     "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_top_left_open"
+      "model": "minecraft:block/birch_door_top_hinge"
     },
     "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_top_right",
+      "model": "minecraft:block/birch_door_top_hinge",
       "y": 270
     },
     "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_top_right_open",
+      "model": "minecraft:block/birch_door_top",
       "y": 180
     },
     "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_bottom_left",
+      "model": "minecraft:block/birch_door_bottom",
       "y": 90
     },
     "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_bottom_left_open",
+      "model": "minecraft:block/birch_door_bottom_hinge",
       "y": 180
     },
     "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_bottom_right",
+      "model": "minecraft:block/birch_door_bottom_hinge",
       "y": 90
     },
     "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_bottom_right_open"
+      "model": "minecraft:block/birch_door_bottom"
     },
     "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_top_left",
+      "model": "minecraft:block/birch_door_top",
       "y": 90
     },
     "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_top_left_open",
+      "model": "minecraft:block/birch_door_top_hinge",
       "y": 180
     },
     "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_top_right",
+      "model": "minecraft:block/birch_door_top_hinge",
       "y": 90
     },
     "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_top_right_open"
+      "model": "minecraft:block/birch_door_top"
     },
     "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_bottom_left",
+      "model": "minecraft:block/birch_door_bottom",
       "y": 180
     },
     "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_bottom_left_open",
+      "model": "minecraft:block/birch_door_bottom_hinge",
       "y": 270
     },
     "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_bottom_right",
+      "model": "minecraft:block/birch_door_bottom_hinge",
       "y": 180
     },
     "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_bottom_right_open",
+      "model": "minecraft:block/birch_door_bottom",
       "y": 90
     },
     "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_top_left",
+      "model": "minecraft:block/birch_door_top",
       "y": 180
     },
     "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_top_left_open",
+      "model": "minecraft:block/birch_door_top_hinge",
       "y": 270
     },
     "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_top_right",
+      "model": "minecraft:block/birch_door_top_hinge",
       "y": 180
     },
     "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_top_right_open",
+      "model": "minecraft:block/birch_door_top",
       "y": 90
     }
   }

assets/minecraft/blockstates/birch_fence.json

@@ -6,42 +6,42 @@
       }
     },
     {
+      "when": {
+        "north": "true"
+      },
       "apply": {
         "model": "minecraft:block/birch_fence_side",
         "uvlock": true
-      },
-      "when": {
-        "north": "true"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/birch_fence_side",
-        "uvlock": true,
-        "y": 90
-      },
       "when": {
         "east": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/birch_fence_side",
+        "y": 90,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/birch_fence_side",
-        "uvlock": true,
-        "y": 180
-      },
       "when": {
         "south": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/birch_fence_side",
+        "y": 180,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/birch_fence_side",
-        "uvlock": true,
-        "y": 270
-      },
       "when": {
         "west": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/birch_fence_side",
+        "y": 270,
+        "uvlock": true
       }
     }
   ]

assets/minecraft/blockstates/birch_fence_gate.json

@@ -1,80 +1,80 @@
 {
   "variants": {
     "facing=east,in_wall=false,open=false": {
-      "model": "minecraft:block/birch_fence_gate",
       "uvlock": true,
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/birch_fence_gate"
     },
     "facing=east,in_wall=false,open=true": {
-      "model": "minecraft:block/birch_fence_gate_open",
       "uvlock": true,
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/birch_fence_gate_open"
     },
     "facing=east,in_wall=true,open=false": {
-      "model": "minecraft:block/birch_fence_gate_wall",
       "uvlock": true,
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/birch_fence_gate_wall"
     },
     "facing=east,in_wall=true,open=true": {
-      "model": "minecraft:block/birch_fence_gate_wall_open",
       "uvlock": true,
-      "y": 270
+      "y": 270,
+      "model": "minecraft:block/birch_fence_gate_wall_open"
     },
     "facing=north,in_wall=false,open=false": {
-      "model": "minecraft:block/birch_fence_gate",
       "uvlock": true,
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/birch_fence_gate"
     },
     "facing=north,in_wall=false,open=true": {
-      "model": "minecraft:block/birch_fence_gate_open",
       "uvlock": true,
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/birch_fence_gate_open"
     },
     "facing=north,in_wall=true,open=false": {
-      "model": "minecraft:block/birch_fence_gate_wall",
       "uvlock": true,
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/birch_fence_gate_wall"
     },
     "facing=north,in_wall=true,open=true": {
-      "model": "minecraft:block/birch_fence_gate_wall_open",
       "uvlock": true,
-      "y": 180
+      "y": 180,
+      "model": "minecraft:block/birch_fence_gate_wall_open"
     },
     "facing=south,in_wall=false,open=false": {
-      "model": "minecraft:block/birch_fence_gate",
-      "uvlock": true
+      "uvlock": true,
+      "model": "minecraft:block/birch_fence_gate"
     },
     "facing=south,in_wall=false,open=true": {
-      "model": "minecraft:block/birch_fence_gate_open",
-      "uvlock": true
+      "uvlock": true,
+      "model": "minecraft:block/birch_fence_gate_open"
     },
     "facing=south,in_wall=true,open=false": {
-      "model": "minecraft:block/birch_fence_gate_wall",
-      "uvlock": true
+      "uvlock": true,
+      "model": "minecraft:block/birch_fence_gate_wall"
     },
     "facing=south,in_wall=true,open=true": {
-      "model": "minecraft:block/birch_fence_gate_wall_open",
-      "uvlock": true
+      "uvlock": true,
+      "model": "minecraft:block/birch_fence_gate_wall_open"
     },
     "facing=west,in_wall=false,open=false": {
-      "model": "minecraft:block/birch_fence_gate",
       "uvlock": true,
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/birch_fence_gate"
     },
     "facing=west,in_wall=false,open=true": {
-      "model": "minecraft:block/birch_fence_gate_open",
       "uvlock": true,
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/birch_fence_gate_open"
     },
     "facing=west,in_wall=true,open=false": {
-      "model": "minecraft:block/birch_fence_gate_wall",
       "uvlock": true,
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/birch_fence_gate_wall"
     },
     "facing=west,in_wall=true,open=true": {
-      "model": "minecraft:block/birch_fence_gate_wall_open",
       "uvlock": true,
-      "y": 90
+      "y": 90,
+      "model": "minecraft:block/birch_fence_gate_wall_open"
     }
   }
 }

assets/minecraft/blockstates/birch_hanging_sign.json

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

assets/minecraft/blockstates/birch_stairs.json

@@ -2,16 +2,16 @@
   "variants": {
     "facing=east,half=bottom,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=east,half=bottom,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner"
     },
     "facing=east,half=bottom,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=east,half=bottom,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer"
@@ -21,189 +21,189 @@
     },
     "facing=east,half=top,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=east,half=top,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=east,half=top,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=east,half=top,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=east,half=top,shape=straight": {
       "model": "minecraft:block/birch_stairs",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=straight": {
       "model": "minecraft:block/birch_stairs",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=top,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=top,shape=straight": {
       "model": "minecraft:block/birch_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner"
     },
     "facing=south,half=bottom,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer"
     },
     "facing=south,half=bottom,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=straight": {
       "model": "minecraft:block/birch_stairs",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=south,half=top,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=south,half=top,shape=straight": {
       "model": "minecraft:block/birch_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=straight": {
       "model": "minecraft:block/birch_stairs",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=west,half=top,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=west,half=top,shape=straight": {
       "model": "minecraft:block/birch_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     }
   }
 }

assets/minecraft/blockstates/birch_wall_hanging_sign.json

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

assets/minecraft/blockstates/black_stained_glass_pane.json

@@ -6,71 +6,71 @@
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/black_stained_glass_pane_side"
-      },
       "when": {
         "north": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/black_stained_glass_pane_side"
       }
     },
     {
+      "when": {
+        "east": "true"
+      },
       "apply": {
         "model": "minecraft:block/black_stained_glass_pane_side",
         "y": 90
-      },
-      "when": {
-        "east": "true"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/black_stained_glass_pane_side_alt"
-      },
       "when": {
         "south": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/black_stained_glass_pane_side_alt"
       }
     },
     {
+      "when": {
+        "west": "true"
+      },
       "apply": {
         "model": "minecraft:block/black_stained_glass_pane_side_alt",
         "y": 90
-      },
-      "when": {
-        "west": "true"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/black_stained_glass_pane_noside"
-      },
       "when": {
         "north": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/black_stained_glass_pane_noside"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/black_stained_glass_pane_noside_alt"
-      },
       "when": {
         "east": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/black_stained_glass_pane_noside_alt"
       }
     },
     {
+      "when": {
+        "south": "false"
+      },
       "apply": {
         "model": "minecraft:block/black_stained_glass_pane_noside_alt",
         "y": 90
-      },
-      "when": {
-        "south": "false"
       }
     },
     {
+      "when": {
+        "west": "false"
+      },
       "apply": {
         "model": "minecraft:block/black_stained_glass_pane_noside",
         "y": 270
-      },
-      "when": {
-        "west": "false"
       }
     }
   ]

assets/minecraft/blockstates/blackstone_stairs.json

@@ -2,16 +2,16 @@
   "variants": {
     "facing=east,half=bottom,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=east,half=bottom,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner"
     },
     "facing=east,half=bottom,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=east,half=bottom,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer"
@@ -21,189 +21,189 @@
     },
     "facing=east,half=top,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=east,half=top,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=east,half=top,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=east,half=top,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=east,half=top,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=top,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=top,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner"
     },
     "facing=south,half=bottom,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer"
     },
     "facing=south,half=bottom,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=south,half=top,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=south,half=top,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=west,half=top,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=west,half=top,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     }
   }
 }

assets/minecraft/blockstates/blackstone_wall.json

@@ -1,89 +1,89 @@
 {
   "multipart": [
     {
-      "apply": {
-        "model": "minecraft:block/blackstone_wall_post"
-      },
       "when": {
         "up": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/blackstone_wall_post"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/blackstone_wall_side",
-        "uvlock": true
-      },
       "when": {
         "north": "low"
+      },
+      "apply": {
+        "model": "minecraft:block/blackstone_wall_side",
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/blackstone_wall_side",
-        "uvlock": true,
-        "y": 90
-      },
       "when": {
         "east": "low"
+      },
+      "apply": {
+        "model": "minecraft:block/blackstone_wall_side",
+        "y": 90,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/blackstone_wall_side",
-        "uvlock": true,
-        "y": 180
-      },
       "when": {
         "south": "low"
-      }
-    },
-    {
+      },
       "apply": {
         "model": "minecraft:block/blackstone_wall_side",
-        "uvlock": true,
-        "y": 270
-      },
-      "when": {
-        "west": "low"
+        "y": 180,
+        "uvlock": true
       }
     },
     {
+      "when": {
+        "west": "low"
+      },
+      "apply": {
+        "model": "minecraft:block/blackstone_wall_side",
+        "y": 270,
+        "uvlock": true
+      }
+    },
+    {
+      "when": {
+        "north": "tall"
+      },
       "apply": {
         "model": "minecraft:block/blackstone_wall_side_tall",
         "uvlock": true
-      },
-      "when": {
-        "north": "tall"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/blackstone_wall_side_tall",
-        "uvlock": true,
-        "y": 90
-      },
       "when": {
         "east": "tall"
+      },
+      "apply": {
+        "model": "minecraft:block/blackstone_wall_side_tall",
+        "y": 90,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/blackstone_wall_side_tall",
-        "uvlock": true,
-        "y": 180
-      },
       "when": {
         "south": "tall"
+      },
+      "apply": {
+        "model": "minecraft:block/blackstone_wall_side_tall",
+        "y": 180,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/blackstone_wall_side_tall",
-        "uvlock": true,
-        "y": 270
-      },
       "when": {
         "west": "tall"
+      },
+      "apply": {
+        "model": "minecraft:block/blackstone_wall_side_tall",
+        "y": 270,
+        "uvlock": true
       }
     }
   ]

assets/minecraft/blockstates/blue_stained_glass_pane.json

@@ -6,71 +6,71 @@
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/blue_stained_glass_pane_side"
-      },
       "when": {
         "north": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/blue_stained_glass_pane_side"
       }
     },
     {
+      "when": {
+        "east": "true"
+      },
       "apply": {
         "model": "minecraft:block/blue_stained_glass_pane_side",
         "y": 90
-      },
-      "when": {
-        "east": "true"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/blue_stained_glass_pane_side_alt"
-      },
       "when": {
         "south": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/blue_stained_glass_pane_side_alt"
       }
     },
     {
+      "when": {
+        "west": "true"
+      },
       "apply": {
         "model": "minecraft:block/blue_stained_glass_pane_side_alt",
         "y": 90
-      },
-      "when": {
-        "west": "true"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/blue_stained_glass_pane_noside"
-      },
       "when": {
         "north": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/blue_stained_glass_pane_noside"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/blue_stained_glass_pane_noside_alt"
-      },
       "when": {
         "east": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/blue_stained_glass_pane_noside_alt"
       }
     },
     {
+      "when": {
+        "south": "false"
+      },
       "apply": {
         "model": "minecraft:block/blue_stained_glass_pane_noside_alt",
         "y": 90
-      },
-      "when": {
-        "south": "false"
       }
     },
     {
+      "when": {
+        "west": "false"
+      },
       "apply": {
         "model": "minecraft:block/blue_stained_glass_pane_noside",
         "y": 270
-      },
-      "when": {
-        "west": "false"
       }
     }
   ]

assets/minecraft/blockstates/brewing_stand.json

@@ -6,51 +6,51 @@
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brewing_stand_bottle0"
-      },
       "when": {
         "has_bottle_0": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/brewing_stand_bottle0"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brewing_stand_bottle1"
-      },
       "when": {
         "has_bottle_1": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/brewing_stand_bottle1"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brewing_stand_bottle2"
-      },
       "when": {
         "has_bottle_2": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/brewing_stand_bottle2"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brewing_stand_empty0"
-      },
       "when": {
         "has_bottle_0": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/brewing_stand_empty0"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brewing_stand_empty1"
-      },
       "when": {
         "has_bottle_1": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/brewing_stand_empty1"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brewing_stand_empty2"
-      },
       "when": {
         "has_bottle_2": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/brewing_stand_empty2"
       }
     }
   ]

assets/minecraft/blockstates/brick_stairs.json

@@ -2,16 +2,16 @@
   "variants": {
     "facing=east,half=bottom,shape=inner_left": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=east,half=bottom,shape=inner_right": {
       "model": "minecraft:block/brick_stairs_inner"
     },
     "facing=east,half=bottom,shape=outer_left": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=east,half=bottom,shape=outer_right": {
       "model": "minecraft:block/brick_stairs_outer"
@@ -21,189 +21,189 @@
     },
     "facing=east,half=top,shape=inner_left": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=east,half=top,shape=inner_right": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=east,half=top,shape=outer_left": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=east,half=top,shape=outer_right": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=east,half=top,shape=straight": {
       "model": "minecraft:block/brick_stairs",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=inner_left": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=inner_right": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=outer_left": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=outer_right": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=bottom,shape=straight": {
       "model": "minecraft:block/brick_stairs",
-      "uvlock": true,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=inner_left": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=inner_right": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=top,shape=outer_left": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=north,half=top,shape=outer_right": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
-      "x": 180
+      "x": 180,
+      "uvlock": true
     },
     "facing=north,half=top,shape=straight": {
       "model": "minecraft:block/brick_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=inner_left": {
       "model": "minecraft:block/brick_stairs_inner"
     },
     "facing=south,half=bottom,shape=inner_right": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=outer_left": {
       "model": "minecraft:block/brick_stairs_outer"
     },
     "facing=south,half=bottom,shape=outer_right": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=bottom,shape=straight": {
       "model": "minecraft:block/brick_stairs",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=inner_left": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=inner_right": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=south,half=top,shape=outer_left": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=south,half=top,shape=outer_right": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=south,half=top,shape=straight": {
       "model": "minecraft:block/brick_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=inner_left": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=inner_right": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=outer_left": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
-      "y": 90
+      "y": 90,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=outer_right": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=bottom,shape=straight": {
       "model": "minecraft:block/brick_stairs",
-      "uvlock": true,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=inner_left": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=inner_right": {
       "model": "minecraft:block/brick_stairs_inner",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=west,half=top,shape=outer_left": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     },
     "facing=west,half=top,shape=outer_right": {
       "model": "minecraft:block/brick_stairs_outer",
-      "uvlock": true,
       "x": 180,
-      "y": 270
+      "y": 270,
+      "uvlock": true
     },
     "facing=west,half=top,shape=straight": {
       "model": "minecraft:block/brick_stairs",
-      "uvlock": true,
       "x": 180,
-      "y": 180
+      "y": 180,
+      "uvlock": true
     }
   }
 }

assets/minecraft/blockstates/brick_wall.json

@@ -1,89 +1,89 @@
 {
   "multipart": [
     {
-      "apply": {
-        "model": "minecraft:block/brick_wall_post"
-      },
       "when": {
         "up": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/brick_wall_post"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brick_wall_side",
-        "uvlock": true
-      },
       "when": {
         "north": "low"
+      },
+      "apply": {
+        "model": "minecraft:block/brick_wall_side",
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brick_wall_side",
-        "uvlock": true,
-        "y": 90
-      },
       "when": {
         "east": "low"
+      },
+      "apply": {
+        "model": "minecraft:block/brick_wall_side",
+        "y": 90,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brick_wall_side",
-        "uvlock": true,
-        "y": 180
-      },
       "when": {
         "south": "low"
-      }
-    },
-    {
+      },
       "apply": {
         "model": "minecraft:block/brick_wall_side",
-        "uvlock": true,
-        "y": 270
-      },
-      "when": {
-        "west": "low"
+        "y": 180,
+        "uvlock": true
       }
     },
     {
+      "when": {
+        "west": "low"
+      },
+      "apply": {
+        "model": "minecraft:block/brick_wall_side",
+        "y": 270,
+        "uvlock": true
+      }
+    },
+    {
+      "when": {
+        "north": "tall"
+      },
       "apply": {
         "model": "minecraft:block/brick_wall_side_tall",
         "uvlock": true
-      },
-      "when": {
-        "north": "tall"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brick_wall_side_tall",
-        "uvlock": true,
-        "y": 90
-      },
       "when": {
         "east": "tall"
+      },
+      "apply": {
+        "model": "minecraft:block/brick_wall_side_tall",
+        "y": 90,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brick_wall_side_tall",
-        "uvlock": true,
-        "y": 180
-      },
       "when": {
         "south": "tall"
+      },
+      "apply": {
+        "model": "minecraft:block/brick_wall_side_tall",
+        "y": 180,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brick_wall_side_tall",
-        "uvlock": true,
-        "y": 270
-      },
       "when": {
         "west": "tall"
+      },
+      "apply": {
+        "model": "minecraft:block/brick_wall_side_tall",
+        "y": 270,
+        "uvlock": true
       }
     }
   ]

assets/minecraft/blockstates/brown_mushroom_block.json

@@ -1,119 +1,119 @@
 {
   "multipart": [
     {
-      "apply": {
-        "model": "minecraft:block/brown_mushroom_block"
-      },
       "when": {
         "north": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/brown_mushroom_block"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brown_mushroom_block",
-        "uvlock": true,
-        "y": 90
-      },
       "when": {
         "east": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/brown_mushroom_block",
+        "y": 90,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brown_mushroom_block",
-        "uvlock": true,
-        "y": 180
-      },
       "when": {
         "south": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/brown_mushroom_block",
+        "y": 180,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brown_mushroom_block",
-        "uvlock": true,
-        "y": 270
-      },
       "when": {
         "west": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/brown_mushroom_block",
+        "y": 270,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brown_mushroom_block",
-        "uvlock": true,
-        "x": 270
-      },
       "when": {
         "up": "true"
-      }
-    },
-    {
+      },
       "apply": {
         "model": "minecraft:block/brown_mushroom_block",
-        "uvlock": true,
-        "x": 90
-      },
+        "x": 270,
+        "uvlock": true
+      }
+    },
+    {
       "when": {
         "down": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/brown_mushroom_block",
+        "x": 90,
+        "uvlock": true
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/mushroom_block_inside"
-      },
       "when": {
         "north": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
-        "y": 90
-      },
       "when": {
         "east": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside",
+        "y": 90,
+        "uvlock": false
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
-        "y": 180
-      },
       "when": {
         "south": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside",
+        "y": 180,
+        "uvlock": false
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
-        "y": 270
-      },
       "when": {
         "west": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside",
+        "y": 270,
+        "uvlock": false
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
-        "x": 270
-      },
       "when": {
         "up": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside",
+        "x": 270,
+        "uvlock": false
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/mushroom_block_inside",
-        "uvlock": false,
-        "x": 90
-      },
       "when": {
         "down": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside",
+        "x": 90,
+        "uvlock": false
       }
     }
   ]

assets/minecraft/blockstates/brown_stained_glass_pane.json

@@ -6,71 +6,71 @@
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brown_stained_glass_pane_side"
-      },
       "when": {
         "north": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/brown_stained_glass_pane_side"
       }
     },
     {
+      "when": {
+        "east": "true"
+      },
       "apply": {
         "model": "minecraft:block/brown_stained_glass_pane_side",
         "y": 90
-      },
-      "when": {
-        "east": "true"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brown_stained_glass_pane_side_alt"
-      },
       "when": {
         "south": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/brown_stained_glass_pane_side_alt"
       }
     },
     {
+      "when": {
+        "west": "true"
+      },
       "apply": {
         "model": "minecraft:block/brown_stained_glass_pane_side_alt",
         "y": 90
-      },
-      "when": {
-        "west": "true"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brown_stained_glass_pane_noside"
-      },
       "when": {
         "north": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/brown_stained_glass_pane_noside"
       }
     },
     {
-      "apply": {
-        "model": "minecraft:block/brown_stained_glass_pane_noside_alt"
-      },
       "when": {
         "east": "false"
+      },
+      "apply": {
+        "model": "minecraft:block/brown_stained_glass_pane_noside_alt"
       }
     },
     {
+      "when": {
+        "south": "false"
+      },
       "apply": {
         "model": "minecraft:block/brown_stained_glass_pane_noside_alt",
         "y": 90
-      },
-      "when": {
-        "south": "false"
       }
     },
     {
+      "when": {
+        "west": "false"
+      },
       "apply": {
         "model": "minecraft:block/brown_stained_glass_pane_noside",
         "y": 270
-      },
-      "when": {
-        "west": "false"
       }
     }
   ]

assets/minecraft/blockstates/calibrated_sculk_sensor.json

@@ -1,49 +0,0 @@
-{
-  "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

@@ -1,118 +0,0 @@
-{
-  "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

@@ -1,124 +0,0 @@
-{
-  "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

@@ -1,48 +0,0 @@
-{
-  "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

@@ -1,80 +0,0 @@
-{
-  "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

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

assets/minecraft/blockstates/cherry_leaves.json

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

assets/minecraft/blockstates/cherry_log.json

@@ -1,13 +0,0 @@
-{
-  "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

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

assets/minecraft/blockstates/cherry_pressure_plate.json

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

assets/minecraft/blockstates/cherry_sapling.json

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

assets/minecraft/blockstates/cherry_sign.json

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

assets/minecraft/blockstates/cherry_slab.json

@@ -1,13 +0,0 @@
-{
-  "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

@@ -1,209 +0,0 @@
-{
-  "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

@@ -1,69 +0,0 @@
-{
-  "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,
-      "y": 0
-    },
-    "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
-    }
-  }
-}