Create/Update assets for version 23w04a

.github\FUNDING.yml

@@ -1,3 +0,0 @@
-github: InventivetalentDev
-patreon: inventivetalent
-custom: ["https://www.paypal.me/inventivetalent", "https://donation.inventivetalent.org"]

README.md

@@ -1,5 +0,0 @@
-# minecraft-assets
-
-This repository contains assets extracted from the Minecraft .jar files and additional downloaded resources (sounds).  
-
-Please use the **branch selector** to switch versions.

_list.json

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

assets/_list.json

@@ -0,0 +1 @@
+{"directories":["icons","minecraft","realms"],"files":[".mcassetsroot","pack.mcmeta"]}

assets/icons/_list.json

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

assets/minecraft/_list.json

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

assets/minecraft/atlases/_all.json

@@ -0,0 +1 @@
+{"armor_trims":{"sources":[{"type":"paletted_permutations","textures":["trims/models/armor/coast","trims/models/armor/coast_leggings","trims/models/armor/sentry","trims/models/armor/sentry_leggings","trims/models/armor/dune","trims/models/armor/dune_leggings","trims/models/armor/wild","trims/models/armor/wild_leggings","trims/models/armor/ward","trims/models/armor/ward_leggings","trims/models/armor/eye","trims/models/armor/eye_leggings","trims/models/armor/vex","trims/models/armor/vex_leggings","trims/models/armor/tide","trims/models/armor/tide_leggings","trims/models/armor/snout","trims/models/armor/snout_leggings","trims/models/armor/rib","trims/models/armor/rib_leggings","trims/models/armor/spire","trims/models/armor/spire_leggings"],"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"}}]},"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/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"}}]},"chests":{"sources":[{"type":"directory","source":"entity/chest","prefix":"entity/chest/"}]},"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

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

assets/minecraft/atlases/armor_trims.json

@@ -0,0 +1,44 @@
+{
+    "sources": [
+        {
+            "type": "paletted_permutations",
+            "textures": [
+                "trims/models/armor/coast",
+                "trims/models/armor/coast_leggings",
+                "trims/models/armor/sentry",
+                "trims/models/armor/sentry_leggings",
+                "trims/models/armor/dune",
+                "trims/models/armor/dune_leggings",
+                "trims/models/armor/wild",
+                "trims/models/armor/wild_leggings",
+                "trims/models/armor/ward",
+                "trims/models/armor/ward_leggings",
+                "trims/models/armor/eye",
+                "trims/models/armor/eye_leggings",
+                "trims/models/armor/vex",
+                "trims/models/armor/vex_leggings",
+                "trims/models/armor/tide",
+                "trims/models/armor/tide_leggings",
+                "trims/models/armor/snout",
+                "trims/models/armor/snout_leggings",
+                "trims/models/armor/rib",
+                "trims/models/armor/rib_leggings",
+                "trims/models/armor/spire",
+                "trims/models/armor/spire_leggings"
+            ],
+            "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"
+            }
+        }
+    ]
+}

assets/minecraft/atlases/banner_patterns.json

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

assets/minecraft/atlases/beds.json

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

assets/minecraft/atlases/blocks.json

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

assets/minecraft/atlases/chests.json

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

assets/minecraft/atlases/mob_effects.json

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

assets/minecraft/atlases/paintings.json

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

assets/minecraft/atlases/particles.json

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

assets/minecraft/atlases/shield_patterns.json

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

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

assets/minecraft/atlases/signs.json

@@ -0,0 +1,9 @@
+{
+    "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",
-      "y": 270,
-      "x": 180
+      "x": 180,
+      "y": 270
     },
     "face=ceiling,facing=east,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "y": 270,
-      "x": 180
+      "x": 180,
+      "y": 270
     },
     "face=ceiling,facing=north,powered=false": {
       "model": "minecraft:block/acacia_button",
-      "y": 180,
-      "x": 180
+      "x": 180,
+      "y": 180
     },
     "face=ceiling,facing=north,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "y": 180,
-      "x": 180
+      "x": 180,
+      "y": 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",
-      "y": 90,
-      "x": 180
+      "x": 180,
+      "y": 90
     },
     "face=ceiling,facing=west,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "y": 90,
-      "x": 180
+      "x": 180,
+      "y": 90
     },
     "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",
-      "y": 90,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 90
     },
     "face=wall,facing=east,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "y": 90,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 90
     },
     "face=wall,facing=north,powered=false": {
       "model": "minecraft:block/acacia_button",
-      "x": 90,
-      "uvlock": true
+      "uvlock": true,
+      "x": 90
     },
     "face=wall,facing=north,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "x": 90,
-      "uvlock": true
+      "uvlock": true,
+      "x": 90
     },
     "face=wall,facing=south,powered=false": {
       "model": "minecraft:block/acacia_button",
-      "y": 180,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 180
     },
     "face=wall,facing=south,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "y": 180,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 180
     },
     "face=wall,facing=west,powered=false": {
       "model": "minecraft:block/acacia_button",
-      "y": 270,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 270
     },
     "face=wall,facing=west,powered=true": {
       "model": "minecraft:block/acacia_button_pressed",
-      "y": 270,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 270
     }
   }
 }

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"
+      "model": "minecraft:block/acacia_door_bottom_left"
     },
     "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_hinge",
+      "model": "minecraft:block/acacia_door_bottom_left_open",
       "y": 90
     },
     "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_hinge"
+      "model": "minecraft:block/acacia_door_bottom_right"
     },
     "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_bottom",
+      "model": "minecraft:block/acacia_door_bottom_right_open",
       "y": 270
     },
     "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_top"
+      "model": "minecraft:block/acacia_door_top_left"
     },
     "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_top_hinge",
+      "model": "minecraft:block/acacia_door_top_left_open",
       "y": 90
     },
     "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_top_hinge"
+      "model": "minecraft:block/acacia_door_top_right"
     },
     "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_top",
+      "model": "minecraft:block/acacia_door_top_right_open",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_bottom",
+      "model": "minecraft:block/acacia_door_bottom_left",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_hinge"
+      "model": "minecraft:block/acacia_door_bottom_left_open"
     },
     "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_hinge",
+      "model": "minecraft:block/acacia_door_bottom_right",
       "y": 270
     },
     "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_bottom",
+      "model": "minecraft:block/acacia_door_bottom_right_open",
       "y": 180
     },
     "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_top",
+      "model": "minecraft:block/acacia_door_top_left",
       "y": 270
     },
     "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_top_hinge"
+      "model": "minecraft:block/acacia_door_top_left_open"
     },
     "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_top_hinge",
+      "model": "minecraft:block/acacia_door_top_right",
       "y": 270
     },
     "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_top",
+      "model": "minecraft:block/acacia_door_top_right_open",
       "y": 180
     },
     "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_bottom",
+      "model": "minecraft:block/acacia_door_bottom_left",
       "y": 90
     },
     "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_hinge",
+      "model": "minecraft:block/acacia_door_bottom_left_open",
       "y": 180
     },
     "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_hinge",
+      "model": "minecraft:block/acacia_door_bottom_right",
       "y": 90
     },
     "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_bottom"
+      "model": "minecraft:block/acacia_door_bottom_right_open"
     },
     "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_top",
+      "model": "minecraft:block/acacia_door_top_left",
       "y": 90
     },
     "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_top_hinge",
+      "model": "minecraft:block/acacia_door_top_left_open",
       "y": 180
     },
     "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_top_hinge",
+      "model": "minecraft:block/acacia_door_top_right",
       "y": 90
     },
     "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_top"
+      "model": "minecraft:block/acacia_door_top_right_open"
     },
     "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_bottom",
+      "model": "minecraft:block/acacia_door_bottom_left",
       "y": 180
     },
     "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_hinge",
+      "model": "minecraft:block/acacia_door_bottom_left_open",
       "y": 270
     },
     "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_hinge",
+      "model": "minecraft:block/acacia_door_bottom_right",
       "y": 180
     },
     "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_bottom",
+      "model": "minecraft:block/acacia_door_bottom_right_open",
       "y": 90
     },
     "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_top",
+      "model": "minecraft:block/acacia_door_top_left",
       "y": 180
     },
     "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_top_hinge",
+      "model": "minecraft:block/acacia_door_top_left_open",
       "y": 270
     },
     "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_top_hinge",
+      "model": "minecraft:block/acacia_door_top_right",
       "y": 180
     },
     "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_top",
+      "model": "minecraft:block/acacia_door_top_right_open",
       "y": 90
     }
   }

assets/minecraft/blockstates/acacia_fence.json

@@ -6,42 +6,42 @@
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/acacia_fence_side",
+        "uvlock": true
+      },
       "when": {
         "north": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/acacia_fence_side",
-        "uvlock": 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
       }
     },
     {
-      "when": {
-        "west": "true"
-      },
       "apply": {
         "model": "minecraft:block/acacia_fence_side",
-        "y": 270,
-        "uvlock": true
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "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,
-      "model": "minecraft:block/acacia_fence_gate"
+      "y": 270
     },
     "facing=east,in_wall=false,open=true": {
+      "model": "minecraft:block/acacia_fence_gate_open",
       "uvlock": true,
-      "y": 270,
-      "model": "minecraft:block/acacia_fence_gate_open"
+      "y": 270
     },
     "facing=east,in_wall=true,open=false": {
+      "model": "minecraft:block/acacia_fence_gate_wall",
       "uvlock": true,
-      "y": 270,
-      "model": "minecraft:block/acacia_fence_gate_wall"
+      "y": 270
     },
     "facing=east,in_wall=true,open=true": {
+      "model": "minecraft:block/acacia_fence_gate_wall_open",
       "uvlock": true,
-      "y": 270,
-      "model": "minecraft:block/acacia_fence_gate_wall_open"
+      "y": 270
     },
     "facing=north,in_wall=false,open=false": {
+      "model": "minecraft:block/acacia_fence_gate",
       "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/acacia_fence_gate"
+      "y": 180
     },
     "facing=north,in_wall=false,open=true": {
+      "model": "minecraft:block/acacia_fence_gate_open",
       "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/acacia_fence_gate_open"
+      "y": 180
     },
     "facing=north,in_wall=true,open=false": {
+      "model": "minecraft:block/acacia_fence_gate_wall",
       "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/acacia_fence_gate_wall"
+      "y": 180
     },
     "facing=north,in_wall=true,open=true": {
+      "model": "minecraft:block/acacia_fence_gate_wall_open",
       "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/acacia_fence_gate_wall_open"
+      "y": 180
     },
     "facing=south,in_wall=false,open=false": {
-      "uvlock": true,
-      "model": "minecraft:block/acacia_fence_gate"
+      "model": "minecraft:block/acacia_fence_gate",
+      "uvlock": true
     },
     "facing=south,in_wall=false,open=true": {
-      "uvlock": true,
-      "model": "minecraft:block/acacia_fence_gate_open"
+      "model": "minecraft:block/acacia_fence_gate_open",
+      "uvlock": true
     },
     "facing=south,in_wall=true,open=false": {
-      "uvlock": true,
-      "model": "minecraft:block/acacia_fence_gate_wall"
+      "model": "minecraft:block/acacia_fence_gate_wall",
+      "uvlock": true
     },
     "facing=south,in_wall=true,open=true": {
-      "uvlock": true,
-      "model": "minecraft:block/acacia_fence_gate_wall_open"
+      "model": "minecraft:block/acacia_fence_gate_wall_open",
+      "uvlock": true
     },
     "facing=west,in_wall=false,open=false": {
+      "model": "minecraft:block/acacia_fence_gate",
       "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/acacia_fence_gate"
+      "y": 90
     },
     "facing=west,in_wall=false,open=true": {
+      "model": "minecraft:block/acacia_fence_gate_open",
       "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/acacia_fence_gate_open"
+      "y": 90
     },
     "facing=west,in_wall=true,open=false": {
+      "model": "minecraft:block/acacia_fence_gate_wall",
       "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/acacia_fence_gate_wall"
+      "y": 90
     },
     "facing=west,in_wall=true,open=true": {
+      "model": "minecraft:block/acacia_fence_gate_wall_open",
       "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/acacia_fence_gate_wall_open"
+      "y": 90
     }
   }
 }

assets/minecraft/blockstates/acacia_hanging_sign.json

@@ -0,0 +1,7 @@
+{
+  "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",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "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",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "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",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=east,half=top,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=east,half=top,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=east,half=top,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=east,half=top,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=north,half=bottom,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=north,half=bottom,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "facing=north,half=bottom,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=north,half=bottom,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "facing=north,half=bottom,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "facing=north,half=top,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=north,half=top,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=north,half=top,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=north,half=top,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=north,half=top,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "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",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "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",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=south,half=bottom,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=south,half=top,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=south,half=top,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=south,half=top,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=south,half=top,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=south,half=top,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=west,half=bottom,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=west,half=bottom,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=west,half=bottom,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=west,half=bottom,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=west,half=bottom,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=west,half=top,shape=inner_left": {
       "model": "minecraft:block/acacia_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=west,half=top,shape=inner_right": {
       "model": "minecraft:block/acacia_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=west,half=top,shape=outer_left": {
       "model": "minecraft:block/acacia_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=west,half=top,shape=outer_right": {
       "model": "minecraft:block/acacia_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=west,half=top,shape=straight": {
       "model": "minecraft:block/acacia_stairs",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     }
   }
 }

assets/minecraft/blockstates/acacia_wall_hanging_sign.json

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

assets/minecraft/blockstates/amethyst_block.json

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

assets/minecraft/blockstates/amethyst_cluster.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "minecraft:block/amethyst_cluster",
+      "x": 180
+    },
+    "facing=east": {
+      "model": "minecraft:block/amethyst_cluster",
+      "x": 90,
+      "y": 90
+    },
+    "facing=north": {
+      "model": "minecraft:block/amethyst_cluster",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "minecraft:block/amethyst_cluster",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up": {
+      "model": "minecraft:block/amethyst_cluster"
+    },
+    "facing=west": {
+      "model": "minecraft:block/amethyst_cluster",
+      "x": 90,
+      "y": 270
+    }
+  }
+}

assets/minecraft/blockstates/andesite_stairs.json

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

assets/minecraft/blockstates/andesite_wall.json

@@ -1,89 +1,89 @@
 {
   "multipart": [
     {
-      "when": {
-        "up": "true"
-      },
       "apply": {
         "model": "minecraft:block/andesite_wall_post"
+      },
+      "when": {
+        "up": "true"
       }
     },
     {
+      "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",
-        "y": 180,
-        "uvlock": true
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/andesite_wall_side",
+        "uvlock": true,
+        "y": 270
+      },
       "when": {
         "west": "low"
-      },
-      "apply": {
-        "model": "minecraft:block/andesite_wall_side",
-        "y": 270,
-        "uvlock": true
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/andesite_wall_side_tall",
+        "uvlock": true
+      },
       "when": {
         "north": "tall"
-      },
-      "apply": {
-        "model": "minecraft:block/andesite_wall_side_tall",
-        "uvlock": true
       }
     },
     {
+      "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
       }
     },
     {
-      "when": {
-        "west": "tall"
-      },
       "apply": {
         "model": "minecraft:block/andesite_wall_side_tall",
-        "y": 270,
-        "uvlock": true
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "tall"
       }
     }
   ]

assets/minecraft/blockstates/azalea.json

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

assets/minecraft/blockstates/azalea_leaves.json

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

assets/minecraft/blockstates/bamboo.json

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

assets/minecraft/blockstates/bamboo_block.json

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

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

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

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

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

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

assets/minecraft/blockstates/bamboo_mosaic.json

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

assets/minecraft/blockstates/bamboo_mosaic_slab.json

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

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

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

assets/minecraft/blockstates/bamboo_pressure_plate.json

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

assets/minecraft/blockstates/bamboo_sign.json

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

assets/minecraft/blockstates/bamboo_slab.json

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

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

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

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

assets/minecraft/blockstates/bamboo_wall_sign.json

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

assets/minecraft/blockstates/barrel.json

@@ -1,40 +1,40 @@
 {
   "variants": {
     "facing=down,open=false": {
-      "x": 180,
-      "model": "minecraft:block/barrel"
+      "model": "minecraft:block/barrel",
+      "x": 180
     },
     "facing=down,open=true": {
-      "x": 180,
-      "model": "minecraft:block/barrel_open"
+      "model": "minecraft:block/barrel_open",
+      "x": 180
     },
     "facing=east,open=false": {
+      "model": "minecraft:block/barrel",
       "x": 90,
-      "y": 90,
-      "model": "minecraft:block/barrel"
+      "y": 90
     },
     "facing=east,open=true": {
+      "model": "minecraft:block/barrel_open",
       "x": 90,
-      "y": 90,
-      "model": "minecraft:block/barrel_open"
+      "y": 90
     },
     "facing=north,open=false": {
-      "x": 90,
-      "model": "minecraft:block/barrel"
+      "model": "minecraft:block/barrel",
+      "x": 90
     },
     "facing=north,open=true": {
-      "x": 90,
-      "model": "minecraft:block/barrel_open"
+      "model": "minecraft:block/barrel_open",
+      "x": 90
     },
     "facing=south,open=false": {
+      "model": "minecraft:block/barrel",
       "x": 90,
-      "y": 180,
-      "model": "minecraft:block/barrel"
+      "y": 180
     },
     "facing=south,open=true": {
+      "model": "minecraft:block/barrel_open",
       "x": 90,
-      "y": 180,
-      "model": "minecraft:block/barrel_open"
+      "y": 180
     },
     "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,
-      "model": "minecraft:block/barrel"
+      "y": 270
     },
     "facing=west,open=true": {
+      "model": "minecraft:block/barrel_open",
       "x": 90,
-      "y": 270,
-      "model": "minecraft:block/barrel_open"
+      "y": 270
     }
   }
 }

assets/minecraft/blockstates/bee_nest.json

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

assets/minecraft/blockstates/beehive.json

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

assets/minecraft/blockstates/big_dripleaf.json

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

assets/minecraft/blockstates/big_dripleaf_stem.json

@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "minecraft:block/big_dripleaf_stem",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "minecraft:block/big_dripleaf_stem"
+    },
+    "facing=south": {
+      "model": "minecraft:block/big_dripleaf_stem",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "minecraft:block/big_dripleaf_stem",
+      "y": 270
+    }
+  }
+}

assets/minecraft/blockstates/birch_button.json

@@ -2,23 +2,23 @@
   "variants": {
     "face=ceiling,facing=east,powered=false": {
       "model": "minecraft:block/birch_button",
-      "y": 270,
-      "x": 180
+      "x": 180,
+      "y": 270
     },
     "face=ceiling,facing=east,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "y": 270,
-      "x": 180
+      "x": 180,
+      "y": 270
     },
     "face=ceiling,facing=north,powered=false": {
       "model": "minecraft:block/birch_button",
-      "y": 180,
-      "x": 180
+      "x": 180,
+      "y": 180
     },
     "face=ceiling,facing=north,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "y": 180,
-      "x": 180
+      "x": 180,
+      "y": 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",
-      "y": 90,
-      "x": 180
+      "x": 180,
+      "y": 90
     },
     "face=ceiling,facing=west,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "y": 90,
-      "x": 180
+      "x": 180,
+      "y": 90
     },
     "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",
-      "y": 90,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 90
     },
     "face=wall,facing=east,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "y": 90,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 90
     },
     "face=wall,facing=north,powered=false": {
       "model": "minecraft:block/birch_button",
-      "x": 90,
-      "uvlock": true
+      "uvlock": true,
+      "x": 90
     },
     "face=wall,facing=north,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "x": 90,
-      "uvlock": true
+      "uvlock": true,
+      "x": 90
     },
     "face=wall,facing=south,powered=false": {
       "model": "minecraft:block/birch_button",
-      "y": 180,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 180
     },
     "face=wall,facing=south,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "y": 180,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 180
     },
     "face=wall,facing=west,powered=false": {
       "model": "minecraft:block/birch_button",
-      "y": 270,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 270
     },
     "face=wall,facing=west,powered=true": {
       "model": "minecraft:block/birch_button_pressed",
-      "y": 270,
+      "uvlock": true,
       "x": 90,
-      "uvlock": true
+      "y": 270
     }
   }
 }

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"
+      "model": "minecraft:block/birch_door_bottom_left"
     },
     "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_bottom_hinge",
+      "model": "minecraft:block/birch_door_bottom_left_open",
       "y": 90
     },
     "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_bottom_hinge"
+      "model": "minecraft:block/birch_door_bottom_right"
     },
     "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_bottom",
+      "model": "minecraft:block/birch_door_bottom_right_open",
       "y": 270
     },
     "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_top"
+      "model": "minecraft:block/birch_door_top_left"
     },
     "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_top_hinge",
+      "model": "minecraft:block/birch_door_top_left_open",
       "y": 90
     },
     "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_top_hinge"
+      "model": "minecraft:block/birch_door_top_right"
     },
     "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_top",
+      "model": "minecraft:block/birch_door_top_right_open",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_bottom",
+      "model": "minecraft:block/birch_door_bottom_left",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_bottom_hinge"
+      "model": "minecraft:block/birch_door_bottom_left_open"
     },
     "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_bottom_hinge",
+      "model": "minecraft:block/birch_door_bottom_right",
       "y": 270
     },
     "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_bottom",
+      "model": "minecraft:block/birch_door_bottom_right_open",
       "y": 180
     },
     "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_top",
+      "model": "minecraft:block/birch_door_top_left",
       "y": 270
     },
     "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_top_hinge"
+      "model": "minecraft:block/birch_door_top_left_open"
     },
     "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_top_hinge",
+      "model": "minecraft:block/birch_door_top_right",
       "y": 270
     },
     "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_top",
+      "model": "minecraft:block/birch_door_top_right_open",
       "y": 180
     },
     "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_bottom",
+      "model": "minecraft:block/birch_door_bottom_left",
       "y": 90
     },
     "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_bottom_hinge",
+      "model": "minecraft:block/birch_door_bottom_left_open",
       "y": 180
     },
     "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_bottom_hinge",
+      "model": "minecraft:block/birch_door_bottom_right",
       "y": 90
     },
     "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_bottom"
+      "model": "minecraft:block/birch_door_bottom_right_open"
     },
     "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_top",
+      "model": "minecraft:block/birch_door_top_left",
       "y": 90
     },
     "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_top_hinge",
+      "model": "minecraft:block/birch_door_top_left_open",
       "y": 180
     },
     "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_top_hinge",
+      "model": "minecraft:block/birch_door_top_right",
       "y": 90
     },
     "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_top"
+      "model": "minecraft:block/birch_door_top_right_open"
     },
     "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_bottom",
+      "model": "minecraft:block/birch_door_bottom_left",
       "y": 180
     },
     "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_bottom_hinge",
+      "model": "minecraft:block/birch_door_bottom_left_open",
       "y": 270
     },
     "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_bottom_hinge",
+      "model": "minecraft:block/birch_door_bottom_right",
       "y": 180
     },
     "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_bottom",
+      "model": "minecraft:block/birch_door_bottom_right_open",
       "y": 90
     },
     "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_top",
+      "model": "minecraft:block/birch_door_top_left",
       "y": 180
     },
     "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_top_hinge",
+      "model": "minecraft:block/birch_door_top_left_open",
       "y": 270
     },
     "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_top_hinge",
+      "model": "minecraft:block/birch_door_top_right",
       "y": 180
     },
     "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_top",
+      "model": "minecraft:block/birch_door_top_right_open",
       "y": 90
     }
   }

assets/minecraft/blockstates/birch_fence.json

@@ -6,42 +6,42 @@
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/birch_fence_side",
+        "uvlock": true
+      },
       "when": {
         "north": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/birch_fence_side",
-        "uvlock": 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
       }
     },
     {
-      "when": {
-        "west": "true"
-      },
       "apply": {
         "model": "minecraft:block/birch_fence_side",
-        "y": 270,
-        "uvlock": true
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "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,
-      "model": "minecraft:block/birch_fence_gate"
+      "y": 270
     },
     "facing=east,in_wall=false,open=true": {
+      "model": "minecraft:block/birch_fence_gate_open",
       "uvlock": true,
-      "y": 270,
-      "model": "minecraft:block/birch_fence_gate_open"
+      "y": 270
     },
     "facing=east,in_wall=true,open=false": {
+      "model": "minecraft:block/birch_fence_gate_wall",
       "uvlock": true,
-      "y": 270,
-      "model": "minecraft:block/birch_fence_gate_wall"
+      "y": 270
     },
     "facing=east,in_wall=true,open=true": {
+      "model": "minecraft:block/birch_fence_gate_wall_open",
       "uvlock": true,
-      "y": 270,
-      "model": "minecraft:block/birch_fence_gate_wall_open"
+      "y": 270
     },
     "facing=north,in_wall=false,open=false": {
+      "model": "minecraft:block/birch_fence_gate",
       "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/birch_fence_gate"
+      "y": 180
     },
     "facing=north,in_wall=false,open=true": {
+      "model": "minecraft:block/birch_fence_gate_open",
       "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/birch_fence_gate_open"
+      "y": 180
     },
     "facing=north,in_wall=true,open=false": {
+      "model": "minecraft:block/birch_fence_gate_wall",
       "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/birch_fence_gate_wall"
+      "y": 180
     },
     "facing=north,in_wall=true,open=true": {
+      "model": "minecraft:block/birch_fence_gate_wall_open",
       "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/birch_fence_gate_wall_open"
+      "y": 180
     },
     "facing=south,in_wall=false,open=false": {
-      "uvlock": true,
-      "model": "minecraft:block/birch_fence_gate"
+      "model": "minecraft:block/birch_fence_gate",
+      "uvlock": true
     },
     "facing=south,in_wall=false,open=true": {
-      "uvlock": true,
-      "model": "minecraft:block/birch_fence_gate_open"
+      "model": "minecraft:block/birch_fence_gate_open",
+      "uvlock": true
     },
     "facing=south,in_wall=true,open=false": {
-      "uvlock": true,
-      "model": "minecraft:block/birch_fence_gate_wall"
+      "model": "minecraft:block/birch_fence_gate_wall",
+      "uvlock": true
     },
     "facing=south,in_wall=true,open=true": {
-      "uvlock": true,
-      "model": "minecraft:block/birch_fence_gate_wall_open"
+      "model": "minecraft:block/birch_fence_gate_wall_open",
+      "uvlock": true
     },
     "facing=west,in_wall=false,open=false": {
+      "model": "minecraft:block/birch_fence_gate",
       "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/birch_fence_gate"
+      "y": 90
     },
     "facing=west,in_wall=false,open=true": {
+      "model": "minecraft:block/birch_fence_gate_open",
       "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/birch_fence_gate_open"
+      "y": 90
     },
     "facing=west,in_wall=true,open=false": {
+      "model": "minecraft:block/birch_fence_gate_wall",
       "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/birch_fence_gate_wall"
+      "y": 90
     },
     "facing=west,in_wall=true,open=true": {
+      "model": "minecraft:block/birch_fence_gate_wall_open",
       "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/birch_fence_gate_wall_open"
+      "y": 90
     }
   }
 }

assets/minecraft/blockstates/birch_hanging_sign.json

@@ -0,0 +1,7 @@
+{
+  "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",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "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",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "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",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=east,half=top,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=east,half=top,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=east,half=top,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=east,half=top,shape=straight": {
       "model": "minecraft:block/birch_stairs",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=north,half=bottom,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=north,half=bottom,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "facing=north,half=bottom,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=north,half=bottom,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "facing=north,half=bottom,shape=straight": {
       "model": "minecraft:block/birch_stairs",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "facing=north,half=top,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=north,half=top,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=north,half=top,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=north,half=top,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=north,half=top,shape=straight": {
       "model": "minecraft:block/birch_stairs",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "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",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "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",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=south,half=bottom,shape=straight": {
       "model": "minecraft:block/birch_stairs",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=south,half=top,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=south,half=top,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=south,half=top,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=south,half=top,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=south,half=top,shape=straight": {
       "model": "minecraft:block/birch_stairs",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=west,half=bottom,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=west,half=bottom,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=west,half=bottom,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=west,half=bottom,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=west,half=bottom,shape=straight": {
       "model": "minecraft:block/birch_stairs",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=west,half=top,shape=inner_left": {
       "model": "minecraft:block/birch_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=west,half=top,shape=inner_right": {
       "model": "minecraft:block/birch_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=west,half=top,shape=outer_left": {
       "model": "minecraft:block/birch_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=west,half=top,shape=outer_right": {
       "model": "minecraft:block/birch_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=west,half=top,shape=straight": {
       "model": "minecraft:block/birch_stairs",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     }
   }
 }

assets/minecraft/blockstates/birch_wall_hanging_sign.json

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

assets/minecraft/blockstates/black_candle.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "candles=1,lit=false": {
+      "model": "minecraft:block/black_candle_one_candle"
+    },
+    "candles=1,lit=true": {
+      "model": "minecraft:block/black_candle_one_candle_lit"
+    },
+    "candles=2,lit=false": {
+      "model": "minecraft:block/black_candle_two_candles"
+    },
+    "candles=2,lit=true": {
+      "model": "minecraft:block/black_candle_two_candles_lit"
+    },
+    "candles=3,lit=false": {
+      "model": "minecraft:block/black_candle_three_candles"
+    },
+    "candles=3,lit=true": {
+      "model": "minecraft:block/black_candle_three_candles_lit"
+    },
+    "candles=4,lit=false": {
+      "model": "minecraft:block/black_candle_four_candles"
+    },
+    "candles=4,lit=true": {
+      "model": "minecraft:block/black_candle_four_candles_lit"
+    }
+  }
+}

assets/minecraft/blockstates/black_candle_cake.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "lit=false": {
+      "model": "minecraft:block/black_candle_cake"
+    },
+    "lit=true": {
+      "model": "minecraft:block/black_candle_cake_lit"
+    }
+  }
+}

assets/minecraft/blockstates/black_stained_glass_pane.json

@@ -6,71 +6,71 @@
       }
     },
     {
-      "when": {
-        "north": "true"
-      },
       "apply": {
         "model": "minecraft:block/black_stained_glass_pane_side"
+      },
+      "when": {
+        "north": "true"
       }
     },
     {
-      "when": {
-        "east": "true"
-      },
       "apply": {
         "model": "minecraft:block/black_stained_glass_pane_side",
         "y": 90
+      },
+      "when": {
+        "east": "true"
       }
     },
     {
-      "when": {
-        "south": "true"
-      },
       "apply": {
         "model": "minecraft:block/black_stained_glass_pane_side_alt"
+      },
+      "when": {
+        "south": "true"
       }
     },
     {
-      "when": {
-        "west": "true"
-      },
       "apply": {
         "model": "minecraft:block/black_stained_glass_pane_side_alt",
         "y": 90
+      },
+      "when": {
+        "west": "true"
       }
     },
     {
-      "when": {
-        "north": "false"
-      },
       "apply": {
         "model": "minecraft:block/black_stained_glass_pane_noside"
+      },
+      "when": {
+        "north": "false"
       }
     },
     {
-      "when": {
-        "east": "false"
-      },
       "apply": {
         "model": "minecraft:block/black_stained_glass_pane_noside_alt"
+      },
+      "when": {
+        "east": "false"
       }
     },
     {
-      "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",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "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",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "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",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=east,half=top,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=east,half=top,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=east,half=top,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=east,half=top,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=north,half=bottom,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=north,half=bottom,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "facing=north,half=bottom,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=north,half=bottom,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "facing=north,half=bottom,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
-      "y": 270,
-      "uvlock": true
+      "uvlock": true,
+      "y": 270
     },
     "facing=north,half=top,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=north,half=top,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=north,half=top,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=north,half=top,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "x": 180,
-      "uvlock": true
+      "uvlock": true,
+      "x": 180
     },
     "facing=north,half=top,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "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",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "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",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=south,half=bottom,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=south,half=top,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=south,half=top,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=south,half=top,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=south,half=top,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=south,half=top,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
+      "uvlock": true,
       "x": 180,
-      "y": 90,
-      "uvlock": true
+      "y": 90
     },
     "facing=west,half=bottom,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=west,half=bottom,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=west,half=bottom,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "y": 90,
-      "uvlock": true
+      "uvlock": true,
+      "y": 90
     },
     "facing=west,half=bottom,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=west,half=bottom,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
-      "y": 180,
-      "uvlock": true
+      "uvlock": true,
+      "y": 180
     },
     "facing=west,half=top,shape=inner_left": {
       "model": "minecraft:block/blackstone_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=west,half=top,shape=inner_right": {
       "model": "minecraft:block/blackstone_stairs_inner",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=west,half=top,shape=outer_left": {
       "model": "minecraft:block/blackstone_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     },
     "facing=west,half=top,shape=outer_right": {
       "model": "minecraft:block/blackstone_stairs_outer",
+      "uvlock": true,
       "x": 180,
-      "y": 270,
-      "uvlock": true
+      "y": 270
     },
     "facing=west,half=top,shape=straight": {
       "model": "minecraft:block/blackstone_stairs",
+      "uvlock": true,
       "x": 180,
-      "y": 180,
-      "uvlock": true
+      "y": 180
     }
   }
 }

assets/minecraft/blockstates/blackstone_wall.json

@@ -1,89 +1,89 @@
 {
   "multipart": [
     {
-      "when": {
-        "up": "true"
-      },
       "apply": {
         "model": "minecraft:block/blackstone_wall_post"
+      },
+      "when": {
+        "up": "true"
       }
     },
     {
+      "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",
-        "y": 180,
-        "uvlock": true
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/blackstone_wall_side",
+        "uvlock": true,
+        "y": 270
+      },
       "when": {
         "west": "low"
-      },
-      "apply": {
-        "model": "minecraft:block/blackstone_wall_side",
-        "y": 270,
-        "uvlock": true
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/blackstone_wall_side_tall",
+        "uvlock": true
+      },
       "when": {
         "north": "tall"
-      },
-      "apply": {
-        "model": "minecraft:block/blackstone_wall_side_tall",
-        "uvlock": true
       }
     },
     {
+      "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
       }
     },
     {
-      "when": {
-        "west": "tall"
-      },
       "apply": {
         "model": "minecraft:block/blackstone_wall_side_tall",
-        "y": 270,
-        "uvlock": true
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "tall"
       }
     }
   ]

assets/minecraft/blockstates/blue_candle.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "candles=1,lit=false": {
+      "model": "minecraft:block/blue_candle_one_candle"
+    },
+    "candles=1,lit=true": {
+      "model": "minecraft:block/blue_candle_one_candle_lit"
+    },
+    "candles=2,lit=false": {
+      "model": "minecraft:block/blue_candle_two_candles"
+    },
+    "candles=2,lit=true": {
+      "model": "minecraft:block/blue_candle_two_candles_lit"
+    },
+    "candles=3,lit=false": {
+      "model": "minecraft:block/blue_candle_three_candles"
+    },
+    "candles=3,lit=true": {
+      "model": "minecraft:block/blue_candle_three_candles_lit"
+    },
+    "candles=4,lit=false": {
+      "model": "minecraft:block/blue_candle_four_candles"
+    },
+    "candles=4,lit=true": {
+      "model": "minecraft:block/blue_candle_four_candles_lit"
+    }
+  }
+}

assets/minecraft/blockstates/blue_candle_cake.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "lit=false": {
+      "model": "minecraft:block/blue_candle_cake"
+    },
+    "lit=true": {
+      "model": "minecraft:block/blue_candle_cake_lit"
+    }
+  }
+}

assets/minecraft/blockstates/blue_stained_glass_pane.json

@@ -6,71 +6,71 @@
       }
     },
     {
-      "when": {
-        "north": "true"
-      },
       "apply": {
         "model": "minecraft:block/blue_stained_glass_pane_side"
+      },
+      "when": {
+        "north": "true"
       }
     },
     {
-      "when": {
-        "east": "true"
-      },
       "apply": {
         "model": "minecraft:block/blue_stained_glass_pane_side",
         "y": 90
+      },
+      "when": {
+        "east": "true"
       }
     },
     {
-      "when": {
-        "south": "true"
-      },
       "apply": {
         "model": "minecraft:block/blue_stained_glass_pane_side_alt"
+      },
+      "when": {
+        "south": "true"
       }
     },
     {
-      "when": {
-        "west": "true"
-      },
       "apply": {
         "model": "minecraft:block/blue_stained_glass_pane_side_alt",
         "y": 90
+      },
+      "when": {
+        "west": "true"
       }
     },
     {
-      "when": {
-        "north": "false"
-      },
       "apply": {
         "model": "minecraft:block/blue_stained_glass_pane_noside"
+      },
+      "when": {
+        "north": "false"
       }
     },
     {
-      "when": {
-        "east": "false"
-      },
       "apply": {
         "model": "minecraft:block/blue_stained_glass_pane_noside_alt"
+      },
+      "when": {
+        "east": "false"
       }
     },
     {
-      "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 @@
       }
     },
     {
-      "when": {
-        "has_bottle_0": "true"
-      },
       "apply": {
         "model": "minecraft:block/brewing_stand_bottle0"
+      },
+      "when": {
+        "has_bottle_0": "true"
       }
     },
     {
-      "when": {
-        "has_bottle_1": "true"
-      },
       "apply": {
         "model": "minecraft:block/brewing_stand_bottle1"
+      },
+      "when": {
+        "has_bottle_1": "true"
       }
     },
     {
-      "when": {
-        "has_bottle_2": "true"
-      },
       "apply": {
         "model": "minecraft:block/brewing_stand_bottle2"
+      },
+      "when": {
+        "has_bottle_2": "true"
       }
     },
     {
-      "when": {
-        "has_bottle_0": "false"
-      },
       "apply": {
         "model": "minecraft:block/brewing_stand_empty0"
+      },
+      "when": {
+        "has_bottle_0": "false"
       }
     },
     {
-      "when": {
-        "has_bottle_1": "false"
-      },
       "apply": {
         "model": "minecraft:block/brewing_stand_empty1"
+      },
+      "when": {
+        "has_bottle_1": "false"
       }
     },
     {
-      "when": {
-        "has_bottle_2": "false"
-      },
       "apply": {
         "model": "minecraft:block/brewing_stand_empty2"
+      },
+      "when": {
+        "has_bottle_2": "false"
       }
     }
   ]

assets/minecraft/blockstates/brick_stairs.json

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

assets/minecraft/blockstates/brick_wall.json

@@ -1,89 +1,89 @@
 {
   "multipart": [
     {
-      "when": {
-        "up": "true"
-      },
       "apply": {
         "model": "minecraft:block/brick_wall_post"
+      },
+      "when": {
+        "up": "true"
       }
     },
     {
+      "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",
-        "y": 180,
-        "uvlock": true
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/brick_wall_side",
+        "uvlock": true,
+        "y": 270
+      },
       "when": {
         "west": "low"
-      },
-      "apply": {
-        "model": "minecraft:block/brick_wall_side",
-        "y": 270,
-        "uvlock": true
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/brick_wall_side_tall",
+        "uvlock": true
+      },
       "when": {
         "north": "tall"
-      },
-      "apply": {
-        "model": "minecraft:block/brick_wall_side_tall",
-        "uvlock": true
       }
     },
     {
+      "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
       }
     },
     {
-      "when": {
-        "west": "tall"
-      },
       "apply": {
         "model": "minecraft:block/brick_wall_side_tall",
-        "y": 270,
-        "uvlock": true
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "tall"
       }
     }
   ]

assets/minecraft/blockstates/brown_candle.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "candles=1,lit=false": {
+      "model": "minecraft:block/brown_candle_one_candle"
+    },
+    "candles=1,lit=true": {
+      "model": "minecraft:block/brown_candle_one_candle_lit"
+    },
+    "candles=2,lit=false": {
+      "model": "minecraft:block/brown_candle_two_candles"
+    },
+    "candles=2,lit=true": {
+      "model": "minecraft:block/brown_candle_two_candles_lit"
+    },
+    "candles=3,lit=false": {
+      "model": "minecraft:block/brown_candle_three_candles"
+    },
+    "candles=3,lit=true": {
+      "model": "minecraft:block/brown_candle_three_candles_lit"
+    },
+    "candles=4,lit=false": {
+      "model": "minecraft:block/brown_candle_four_candles"
+    },
+    "candles=4,lit=true": {
+      "model": "minecraft:block/brown_candle_four_candles_lit"
+    }
+  }
+}

assets/minecraft/blockstates/brown_candle_cake.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "lit=false": {
+      "model": "minecraft:block/brown_candle_cake"
+    },
+    "lit=true": {
+      "model": "minecraft:block/brown_candle_cake_lit"
+    }
+  }
+}

assets/minecraft/blockstates/brown_mushroom_block.json

@@ -1,119 +1,119 @@
 {
   "multipart": [
     {
-      "when": {
-        "north": "true"
-      },
       "apply": {
         "model": "minecraft:block/brown_mushroom_block"
+      },
+      "when": {
+        "north": "true"
       }
     },
     {
+      "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",
-        "x": 270,
-        "uvlock": true
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/brown_mushroom_block",
+        "uvlock": true,
+        "x": 90
+      },
       "when": {
         "down": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/brown_mushroom_block",
-        "x": 90,
-        "uvlock": true
       }
     },
     {
-      "when": {
-        "north": "false"
-      },
       "apply": {
         "model": "minecraft:block/mushroom_block_inside"
+      },
+      "when": {
+        "north": "false"
       }
     },
     {
+      "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
       }
     },
     {
-      "when": {
-        "down": "false"
-      },
       "apply": {
         "model": "minecraft:block/mushroom_block_inside",
-        "x": 90,
-        "uvlock": false
+        "uvlock": false,
+        "x": 90
+      },
+      "when": {
+        "down": "false"
       }
     }
   ]

assets/minecraft/blockstates/brown_stained_glass_pane.json

@@ -6,71 +6,71 @@
       }
     },
     {
-      "when": {
-        "north": "true"
-      },
       "apply": {
         "model": "minecraft:block/brown_stained_glass_pane_side"
+      },
+      "when": {
+        "north": "true"
       }
     },
     {
-      "when": {
-        "east": "true"
-      },
       "apply": {
         "model": "minecraft:block/brown_stained_glass_pane_side",
         "y": 90
+      },
+      "when": {
+        "east": "true"
       }
     },
     {
-      "when": {
-        "south": "true"
-      },
       "apply": {
         "model": "minecraft:block/brown_stained_glass_pane_side_alt"
+      },
+      "when": {
+        "south": "true"
       }
     },
     {
-      "when": {
-        "west": "true"
-      },
       "apply": {
         "model": "minecraft:block/brown_stained_glass_pane_side_alt",
         "y": 90
+      },
+      "when": {
+        "west": "true"
       }
     },
     {
-      "when": {
-        "north": "false"
-      },
       "apply": {
         "model": "minecraft:block/brown_stained_glass_pane_noside"
+      },
+      "when": {
+        "north": "false"
       }
     },
     {
-      "when": {
-        "east": "false"
-      },
       "apply": {
         "model": "minecraft:block/brown_stained_glass_pane_noside_alt"
+      },
+      "when": {
+        "east": "false"
       }
     },
     {
-      "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/budding_amethyst.json

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

assets/minecraft/blockstates/calcite.json

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

assets/minecraft/blockstates/candle.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "candles=1,lit=false": {
+      "model": "minecraft:block/candle_one_candle"
+    },
+    "candles=1,lit=true": {
+      "model": "minecraft:block/candle_one_candle_lit"
+    },
+    "candles=2,lit=false": {
+      "model": "minecraft:block/candle_two_candles"
+    },
+    "candles=2,lit=true": {
+      "model": "minecraft:block/candle_two_candles_lit"
+    },
+    "candles=3,lit=false": {
+      "model": "minecraft:block/candle_three_candles"
+    },
+    "candles=3,lit=true": {
+      "model": "minecraft:block/candle_three_candles_lit"
+    },
+    "candles=4,lit=false": {
+      "model": "minecraft:block/candle_four_candles"
+    },
+    "candles=4,lit=true": {
+      "model": "minecraft:block/candle_four_candles_lit"
+    }
+  }
+}

assets/minecraft/blockstates/candle_cake.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "lit=false": {
+      "model": "minecraft:block/candle_cake"
+    },
+    "lit=true": {
+      "model": "minecraft:block/candle_cake_lit"
+    }
+  }
+}

assets/minecraft/blockstates/cauldron.json

@@ -1,16 +1,7 @@
 {
   "variants": {
-    "level=0": {
+    "": {
       "model": "minecraft:block/cauldron"
-    },
-    "level=1": {
-      "model": "minecraft:block/cauldron_level1"
-    },
-    "level=2": {
-      "model": "minecraft:block/cauldron_level2"
-    },
-    "level=3": {
-      "model": "minecraft:block/cauldron_level3"
     }
   }
 }

assets/minecraft/blockstates/cave_vines.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "berries=false": {
+      "model": "minecraft:block/cave_vines"
+    },
+    "berries=true": {
+      "model": "minecraft:block/cave_vines_lit"
+    }
+  }
+}

assets/minecraft/blockstates/cave_vines_plant.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "berries=false": {
+      "model": "minecraft:block/cave_vines_plant"
+    },
+    "berries=true": {
+      "model": "minecraft:block/cave_vines_plant_lit"
+    }
+  }
+}

assets/minecraft/blockstates/chain.json

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

assets/minecraft/blockstates/chiseled_bookshelf.json

@@ -0,0 +1,812 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf",
+        "uvlock": true,
+        "y": 90
+      },
+      "when": {
+        "facing": "east"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_right",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_2_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_right",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_2_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_mid",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_4_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_mid",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_4_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_left",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_0_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_left",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_0_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_right",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_5_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_right",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_5_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_left",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_3_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_left",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_3_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_mid",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_1_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_mid",
+        "y": 90
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "east"
+          },
+          {
+            "slot_1_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf",
+        "uvlock": true,
+        "y": 0
+      },
+      "when": {
+        "facing": "north"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_right",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_2_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_right",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_2_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_mid",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_4_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_mid",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_4_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_left",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_0_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_left",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_0_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_right",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_5_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_right",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_5_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_left",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_3_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_left",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_3_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_mid",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_1_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_mid",
+        "y": 0
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "north"
+          },
+          {
+            "slot_1_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf",
+        "uvlock": true,
+        "y": 180
+      },
+      "when": {
+        "facing": "south"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_right",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_2_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_right",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_2_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_mid",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_4_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_mid",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_4_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_left",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_0_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_left",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_0_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_right",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_5_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_right",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_5_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_left",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_3_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_left",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_3_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_mid",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_1_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_mid",
+        "y": 180
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "south"
+          },
+          {
+            "slot_1_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf",
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "facing": "west"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_right",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_2_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_right",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_2_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_mid",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_4_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_mid",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_4_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_left",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_0_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_left",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_0_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_right",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_5_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_right",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_5_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_bottom_left",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_3_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_bottom_left",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_3_occupied": "false"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_occupied_slot_top_mid",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_1_occupied": "true"
+          }
+        ]
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/chiseled_bookshelf_empty_slot_top_mid",
+        "y": 270
+      },
+      "when": {
+        "AND": [
+          {
+            "facing": "west"
+          },
+          {
+            "slot_1_occupied": "false"
+          }
+        ]
+      }
+    }
+  ]
+}

assets/minecraft/blockstates/chiseled_deepslate.json

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

assets/minecraft/blockstates/chorus_plant.json

@@ -1,67 +1,64 @@
 {
   "multipart": [
     {
-      "when": {
-        "north": "true"
-      },
       "apply": {
         "model": "minecraft:block/chorus_plant_side"
+      },
+      "when": {
+        "north": "true"
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/chorus_plant_side",
+        "uvlock": true,
+        "y": 90
+      },
       "when": {
         "east": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/chorus_plant_side",
-        "y": 90,
-        "uvlock": true
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/chorus_plant_side",
+        "uvlock": true,
+        "y": 180
+      },
       "when": {
         "south": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/chorus_plant_side",
-        "y": 180,
-        "uvlock": true
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/chorus_plant_side",
+        "uvlock": true,
+        "y": 270
+      },
       "when": {
         "west": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/chorus_plant_side",
-        "y": 270,
-        "uvlock": true
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/chorus_plant_side",
+        "uvlock": true,
+        "x": 270
+      },
       "when": {
         "up": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/chorus_plant_side",
-        "x": 270,
-        "uvlock": true
       }
     },
     {
+      "apply": {
+        "model": "minecraft:block/chorus_plant_side",
+        "uvlock": true,
+        "x": 90
+      },
       "when": {
         "down": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/chorus_plant_side",
-        "x": 90,
-        "uvlock": true
       }
     },
     {
-      "when": {
-        "north": "false"
-      },
       "apply": [
         {
           "model": "minecraft:block/chorus_plant_noside",
@@ -76,147 +73,150 @@
         {
           "model": "minecraft:block/chorus_plant_noside3"
         }
-      ]
+      ],
+      "when": {
+        "north": "false"
+      }
     },
     {
+      "apply": [
+        {
+          "model": "minecraft:block/chorus_plant_noside1",
+          "uvlock": true,
+          "y": 90
+        },
+        {
+          "model": "minecraft:block/chorus_plant_noside2",
+          "uvlock": true,
+          "y": 90
+        },
+        {
+          "model": "minecraft:block/chorus_plant_noside3",
+          "uvlock": true,
+          "y": 90
+        },
+        {
+          "model": "minecraft:block/chorus_plant_noside",
+          "uvlock": true,
+          "weight": 2,
+          "y": 90
+        }
+      ],
       "when": {
         "east": "false"
-      },
+      }
+    },
+    {
       "apply": [
-        {
-          "model": "minecraft:block/chorus_plant_noside1",
-          "y": 90,
-          "uvlock": true
-        },
         {
           "model": "minecraft:block/chorus_plant_noside2",
-          "y": 90,
-          "uvlock": true
+          "uvlock": true,
+          "y": 180
         },
         {
           "model": "minecraft:block/chorus_plant_noside3",
-          "y": 90,
-          "uvlock": true
+          "uvlock": true,
+          "y": 180
         },
         {
           "model": "minecraft:block/chorus_plant_noside",
+          "uvlock": true,
           "weight": 2,
-          "y": 90,
-          "uvlock": true
+          "y": 180
+        },
+        {
+          "model": "minecraft:block/chorus_plant_noside1",
+          "uvlock": true,
+          "y": 180
         }
-      ]
-    },
-    {
+      ],
       "when": {
         "south": "false"
-      },
+      }
+    },
+    {
       "apply": [
-        {
-          "model": "minecraft:block/chorus_plant_noside2",
-          "y": 180,
-          "uvlock": true
-        },
         {
           "model": "minecraft:block/chorus_plant_noside3",
-          "y": 180,
-          "uvlock": true
+          "uvlock": true,
+          "y": 270
         },
         {
           "model": "minecraft:block/chorus_plant_noside",
+          "uvlock": true,
           "weight": 2,
-          "y": 180,
-          "uvlock": true
+          "y": 270
         },
         {
           "model": "minecraft:block/chorus_plant_noside1",
-          "y": 180,
-          "uvlock": true
+          "uvlock": true,
+          "y": 270
+        },
+        {
+          "model": "minecraft:block/chorus_plant_noside2",
+          "uvlock": true,
+          "y": 270
         }
-      ]
-    },
-    {
+      ],
       "when": {
         "west": "false"
-      },
+      }
+    },
+    {
       "apply": [
         {
-          "model": "minecraft:block/chorus_plant_noside3",
-          "y": 270,
-          "uvlock": true
+          "model": "minecraft:block/chorus_plant_noside",
+          "uvlock": true,
+          "weight": 2,
+          "x": 270
         },
         {
-          "model": "minecraft:block/chorus_plant_noside",
-          "weight": 2,
-          "y": 270,
-          "uvlock": true
+          "model": "minecraft:block/chorus_plant_noside3",
+          "uvlock": true,
+          "x": 270
         },
         {
           "model": "minecraft:block/chorus_plant_noside1",
-          "y": 270,
-          "uvlock": true
+          "uvlock": true,
+          "x": 270
         },
         {
           "model": "minecraft:block/chorus_plant_noside2",
-          "y": 270,
-          "uvlock": true
+          "uvlock": true,
+          "x": 270
         }
-      ]
-    },
-    {
+      ],
       "when": {
         "up": "false"
-      },
-      "apply": [
-        {
-          "model": "minecraft:block/chorus_plant_noside",
-          "weight": 2,
-          "x": 270,
-          "uvlock": true
-        },
-        {
-          "model": "minecraft:block/chorus_plant_noside3",
-          "x": 270,
-          "uvlock": true
-        },
-        {
-          "model": "minecraft:block/chorus_plant_noside1",
-          "x": 270,
-          "uvlock": true
-        },
-        {
-          "model": "minecraft:block/chorus_plant_noside2",
-          "x": 270,
-          "uvlock": true
-        }
-      ]
+      }
     },
     {
-      "when": {
-        "down": "false"
-      },
       "apply": [
         {
           "model": "minecraft:block/chorus_plant_noside3",
-          "x": 90,
-          "uvlock": true
+          "uvlock": true,
+          "x": 90
         },
         {
           "model": "minecraft:block/chorus_plant_noside2",
-          "x": 90,
-          "uvlock": true
+          "uvlock": true,
+          "x": 90
         },
         {
           "model": "minecraft:block/chorus_plant_noside1",
-          "x": 90,
-          "uvlock": true
+          "uvlock": true,
+          "x": 90
         },
         {
           "model": "minecraft:block/chorus_plant_noside",
+          "uvlock": true,
           "weight": 2,
-          "x": 90,
-          "uvlock": true
+          "x": 90
         }
-      ]
+      ],
+      "when": {
+        "down": "false"
+      }
     }
   ]
 }

assets/minecraft/blockstates/cobbled_deepslate.json

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

assets/minecraft/blockstates/cobbled_deepslate_slab.json

@@ -0,0 +1,13 @@
+{
+  "variants": {
+    "type=bottom": {
+      "model": "minecraft:block/cobbled_deepslate_slab"
+    },
+    "type=double": {
+      "model": "minecraft:block/cobbled_deepslate"
+    },
+    "type=top": {
+      "model": "minecraft:block/cobbled_deepslate_slab_top"
+    }
+  }
+}

assets/minecraft/blockstates/cobbled_deepslate_stairs.json

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

assets/minecraft/blockstates/cobbled_deepslate_wall.json

@@ -0,0 +1,90 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "minecraft:block/cobbled_deepslate_wall_post"
+      },
+      "when": {
+        "up": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cobbled_deepslate_wall_side",
+        "uvlock": true
+      },
+      "when": {
+        "north": "low"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cobbled_deepslate_wall_side",
+        "uvlock": true,
+        "y": 90
+      },
+      "when": {
+        "east": "low"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cobbled_deepslate_wall_side",
+        "uvlock": true,
+        "y": 180
+      },
+      "when": {
+        "south": "low"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cobbled_deepslate_wall_side",
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "low"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cobbled_deepslate_wall_side_tall",
+        "uvlock": true
+      },
+      "when": {
+        "north": "tall"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cobbled_deepslate_wall_side_tall",
+        "uvlock": true,
+        "y": 90
+      },
+      "when": {
+        "east": "tall"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cobbled_deepslate_wall_side_tall",
+        "uvlock": true,
+        "y": 180
+      },
+      "when": {
+        "south": "tall"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/cobbled_deepslate_wall_side_tall",
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "tall"
+      }
+    }
+  ]
+}

assets/minecraft/blockstates/cobblestone_stairs.json

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