Create/Update assets for version 1.13

assets/minecraft/blockstates/acacia_button.json

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

assets/minecraft/blockstates/acacia_door.json

@@ -1,36 +1,36 @@
-{
-    "variants": {
-        "facing=east,half=lower,hinge=left,open=false":  { "model": "acacia_door_bottom" },
-        "facing=south,half=lower,hinge=left,open=false": { "model": "acacia_door_bottom", "y": 90 },
-        "facing=west,half=lower,hinge=left,open=false":  { "model": "acacia_door_bottom", "y": 180 },
-        "facing=north,half=lower,hinge=left,open=false": { "model": "acacia_door_bottom", "y": 270 },
-        "facing=east,half=lower,hinge=right,open=false":  { "model": "acacia_door_bottom_rh" },
-        "facing=south,half=lower,hinge=right,open=false": { "model": "acacia_door_bottom_rh", "y": 90 },
-        "facing=west,half=lower,hinge=right,open=false":  { "model": "acacia_door_bottom_rh", "y": 180 },
-        "facing=north,half=lower,hinge=right,open=false": { "model": "acacia_door_bottom_rh", "y": 270 },
-        "facing=east,half=lower,hinge=left,open=true":  { "model": "acacia_door_bottom_rh", "y": 90 },
-        "facing=south,half=lower,hinge=left,open=true": { "model": "acacia_door_bottom_rh", "y": 180 },
-        "facing=west,half=lower,hinge=left,open=true":  { "model": "acacia_door_bottom_rh", "y": 270 },
-        "facing=north,half=lower,hinge=left,open=true": { "model": "acacia_door_bottom_rh" },
-        "facing=east,half=lower,hinge=right,open=true":  { "model": "acacia_door_bottom", "y": 270 },
-        "facing=south,half=lower,hinge=right,open=true": { "model": "acacia_door_bottom" },
-        "facing=west,half=lower,hinge=right,open=true":  { "model": "acacia_door_bottom", "y": 90 },
-        "facing=north,half=lower,hinge=right,open=true": { "model": "acacia_door_bottom", "y": 180 },
-        "facing=east,half=upper,hinge=left,open=false":  { "model": "acacia_door_top" },
-        "facing=south,half=upper,hinge=left,open=false": { "model": "acacia_door_top", "y": 90 },
-        "facing=west,half=upper,hinge=left,open=false":  { "model": "acacia_door_top", "y": 180 },
-        "facing=north,half=upper,hinge=left,open=false": { "model": "acacia_door_top", "y": 270 },
-        "facing=east,half=upper,hinge=right,open=false":  { "model": "acacia_door_top_rh" },
-        "facing=south,half=upper,hinge=right,open=false": { "model": "acacia_door_top_rh", "y": 90 },
-        "facing=west,half=upper,hinge=right,open=false":  { "model": "acacia_door_top_rh", "y": 180 },
-        "facing=north,half=upper,hinge=right,open=false": { "model": "acacia_door_top_rh", "y": 270 },
-        "facing=east,half=upper,hinge=left,open=true":  { "model": "acacia_door_top_rh", "y": 90 },
-        "facing=south,half=upper,hinge=left,open=true": { "model": "acacia_door_top_rh", "y": 180 },
-        "facing=west,half=upper,hinge=left,open=true":  { "model": "acacia_door_top_rh", "y": 270 },
-        "facing=north,half=upper,hinge=left,open=true": { "model": "acacia_door_top_rh" },
-        "facing=east,half=upper,hinge=right,open=true":  { "model": "acacia_door_top", "y": 270 },
-        "facing=south,half=upper,hinge=right,open=true": { "model": "acacia_door_top" },
-        "facing=west,half=upper,hinge=right,open=true":  { "model": "acacia_door_top", "y": 90 },
-        "facing=north,half=upper,hinge=right,open=true": { "model": "acacia_door_top", "y": 180 }
-    }
-}
+{
+    "variants": {
+        "facing=east,half=lower,hinge=left,open=false":  { "model": "block/acacia_door_bottom" },
+        "facing=south,half=lower,hinge=left,open=false": { "model": "block/acacia_door_bottom", "y": 90 },
+        "facing=west,half=lower,hinge=left,open=false":  { "model": "block/acacia_door_bottom", "y": 180 },
+        "facing=north,half=lower,hinge=left,open=false": { "model": "block/acacia_door_bottom", "y": 270 },
+        "facing=east,half=lower,hinge=right,open=false":  { "model": "block/acacia_door_bottom_hinge" },
+        "facing=south,half=lower,hinge=right,open=false": { "model": "block/acacia_door_bottom_hinge", "y": 90 },
+        "facing=west,half=lower,hinge=right,open=false":  { "model": "block/acacia_door_bottom_hinge", "y": 180 },
+        "facing=north,half=lower,hinge=right,open=false": { "model": "block/acacia_door_bottom_hinge", "y": 270 },
+        "facing=east,half=lower,hinge=left,open=true":  { "model": "block/acacia_door_bottom_hinge", "y": 90 },
+        "facing=south,half=lower,hinge=left,open=true": { "model": "block/acacia_door_bottom_hinge", "y": 180 },
+        "facing=west,half=lower,hinge=left,open=true":  { "model": "block/acacia_door_bottom_hinge", "y": 270 },
+        "facing=north,half=lower,hinge=left,open=true": { "model": "block/acacia_door_bottom_hinge" },
+        "facing=east,half=lower,hinge=right,open=true":  { "model": "block/acacia_door_bottom", "y": 270 },
+        "facing=south,half=lower,hinge=right,open=true": { "model": "block/acacia_door_bottom" },
+        "facing=west,half=lower,hinge=right,open=true":  { "model": "block/acacia_door_bottom", "y": 90 },
+        "facing=north,half=lower,hinge=right,open=true": { "model": "block/acacia_door_bottom", "y": 180 },
+        "facing=east,half=upper,hinge=left,open=false":  { "model": "block/acacia_door_top" },
+        "facing=south,half=upper,hinge=left,open=false": { "model": "block/acacia_door_top", "y": 90 },
+        "facing=west,half=upper,hinge=left,open=false":  { "model": "block/acacia_door_top", "y": 180 },
+        "facing=north,half=upper,hinge=left,open=false": { "model": "block/acacia_door_top", "y": 270 },
+        "facing=east,half=upper,hinge=right,open=false":  { "model": "block/acacia_door_top_hinge" },
+        "facing=south,half=upper,hinge=right,open=false": { "model": "block/acacia_door_top_hinge", "y": 90 },
+        "facing=west,half=upper,hinge=right,open=false":  { "model": "block/acacia_door_top_hinge", "y": 180 },
+        "facing=north,half=upper,hinge=right,open=false": { "model": "block/acacia_door_top_hinge", "y": 270 },
+        "facing=east,half=upper,hinge=left,open=true":  { "model": "block/acacia_door_top_hinge", "y": 90 },
+        "facing=south,half=upper,hinge=left,open=true": { "model": "block/acacia_door_top_hinge", "y": 180 },
+        "facing=west,half=upper,hinge=left,open=true":  { "model": "block/acacia_door_top_hinge", "y": 270 },
+        "facing=north,half=upper,hinge=left,open=true": { "model": "block/acacia_door_top_hinge" },
+        "facing=east,half=upper,hinge=right,open=true":  { "model": "block/acacia_door_top", "y": 270 },
+        "facing=south,half=upper,hinge=right,open=true": { "model": "block/acacia_door_top" },
+        "facing=west,half=upper,hinge=right,open=true":  { "model": "block/acacia_door_top", "y": 90 },
+        "facing=north,half=upper,hinge=right,open=true": { "model": "block/acacia_door_top", "y": 180 }
+    }
+}

assets/minecraft/blockstates/acacia_double_slab.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "acacia_planks" }
-    }
-}

assets/minecraft/blockstates/acacia_fence.json

@@ -1,20 +1,17 @@
-{
-    "variants": {
-        "east=false,north=false,south=false,west=false": { "model": "acacia_fence_post" },
-        "east=false,north=true,south=false,west=false": { "model": "acacia_fence_n", "uvlock": true },
-        "east=true,north=false,south=false,west=false": { "model": "acacia_fence_n", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,west=false": { "model": "acacia_fence_n", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,west=true": { "model": "acacia_fence_n", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,west=false": { "model": "acacia_fence_ne", "uvlock": true },
-        "east=true,north=false,south=true,west=false": { "model": "acacia_fence_ne", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,west=true": { "model": "acacia_fence_ne", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,west=true": { "model": "acacia_fence_ne", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,west=false": { "model": "acacia_fence_ns", "uvlock": true },
-        "east=true,north=false,south=false,west=true": { "model": "acacia_fence_ns", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,west=false": { "model": "acacia_fence_nse", "uvlock": true },
-        "east=true,north=false,south=true,west=true": { "model": "acacia_fence_nse", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,west=true": { "model": "acacia_fence_nse", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,west=true": { "model": "acacia_fence_nse", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,west=true": { "model": "acacia_fence_nsew", "uvlock": true }
-    }
-}
+{
+    "multipart": [
+        {   "apply": { "model": "block/acacia_fence_post" }},
+        {   "when": { "north": "true" },
+            "apply": { "model": "block/acacia_fence_side", "uvlock": true }
+        },
+        {   "when": { "east": "true" },
+            "apply": { "model": "block/acacia_fence_side", "y": 90, "uvlock": true }
+        },
+        {   "when": { "south": "true" },
+            "apply": { "model": "block/acacia_fence_side", "y": 180, "uvlock": true }
+        },
+        {   "when": { "west": "true" },
+            "apply": { "model": "block/acacia_fence_side", "y": 270, "uvlock": true }
+        }
+    ]
+}

assets/minecraft/blockstates/acacia_fence_gate.json

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

assets/minecraft/blockstates/acacia_leaves.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "acacia_leaves" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/acacia_leaves" }
+    }
+}

assets/minecraft/blockstates/acacia_log.json

@@ -1,8 +1,7 @@
-{
-    "variants": {
-        "axis=y":  { "model": "acacia_log" },
-        "axis=z":   { "model": "acacia_log_side" },
-        "axis=x":   { "model": "acacia_log_side", "y": 90 },
-        "axis=none": { "model": "acacia_bark" }
-    }
-}
+{
+    "variants": {
+        "axis=y":  { "model": "block/acacia_log" },
+        "axis=z":   { "model": "block/acacia_log", "x": 90 },
+        "axis=x":   { "model": "block/acacia_log", "x": 90, "y": 90 }
+    }
+}

assets/minecraft/blockstates/acacia_planks.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "acacia_planks" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/acacia_planks" }
+    }
+}

assets/minecraft/blockstates/acacia_pressure_plate.json

@@ -0,0 +1,6 @@
+{
+    "variants": {
+        "powered=false": { "model": "block/acacia_pressure_plate" },
+        "powered=true": { "model": "block/acacia_pressure_plate_down" }
+    }
+}

assets/minecraft/blockstates/acacia_sapling.json

@@ -1,6 +1,5 @@
-{
-    "variants": {
-        "stage=0": { "model": "acacia_sapling" },
-        "stage=1": { "model": "acacia_sapling" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/acacia_sapling" }
+    }
+}

assets/minecraft/blockstates/acacia_slab.json

@@ -1,6 +1,7 @@
-{
-    "variants": {
-        "half=bottom": { "model": "half_slab_acacia" },
-        "half=top": { "model": "upper_slab_acacia" }
-    }
-}
+{
+    "variants": {
+        "type=bottom": { "model": "block/acacia_slab" },
+        "type=top": { "model": "block/acacia_slab_top" },
+        "type=double": { "model": "block/acacia_planks" }
+    }
+}

assets/minecraft/blockstates/acacia_stairs.json

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

assets/minecraft/blockstates/acacia_trapdoor.json

@@ -0,0 +1,20 @@
+{
+    "variants": {
+        "facing=north,half=bottom,open=false": { "model": "block/acacia_trapdoor_bottom" },
+        "facing=south,half=bottom,open=false": { "model": "block/acacia_trapdoor_bottom", "y": 180 },
+        "facing=east,half=bottom,open=false": { "model": "block/acacia_trapdoor_bottom", "y": 90 },
+        "facing=west,half=bottom,open=false": { "model": "block/acacia_trapdoor_bottom", "y": 270 },
+        "facing=north,half=top,open=false": { "model": "block/acacia_trapdoor_top" },
+        "facing=south,half=top,open=false": { "model": "block/acacia_trapdoor_top", "y": 180 },
+        "facing=east,half=top,open=false": { "model": "block/acacia_trapdoor_top", "y": 90 },
+        "facing=west,half=top,open=false": { "model": "block/acacia_trapdoor_top", "y": 270 },
+        "facing=north,half=bottom,open=true": { "model": "block/acacia_trapdoor_open" },
+        "facing=south,half=bottom,open=true": { "model": "block/acacia_trapdoor_open", "y": 180 },
+        "facing=east,half=bottom,open=true": { "model": "block/acacia_trapdoor_open", "y": 90 },
+        "facing=west,half=bottom,open=true": { "model": "block/acacia_trapdoor_open", "y": 270 },
+        "facing=north,half=top,open=true": { "model": "block/acacia_trapdoor_open", "x": 180, "y": 180 },
+        "facing=south,half=top,open=true": { "model": "block/acacia_trapdoor_open", "x": 180, "y": 0 },
+        "facing=east,half=top,open=true": { "model": "block/acacia_trapdoor_open", "x": 180, "y": 270 },
+        "facing=west,half=top,open=true": { "model": "block/acacia_trapdoor_open", "x": 180, "y": 90 }
+    }
+}

assets/minecraft/blockstates/acacia_wood.json

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

assets/minecraft/blockstates/activator_rail.json

@@ -1,16 +1,16 @@
-{
-    "variants": {
-        "powered=false,shape=north_south":  { "model": "activator_rail_flat" },
-        "powered=false,shape=east_west":  { "model": "activator_rail_flat", "y": 90 },
-        "powered=false,shape=ascending_east": { "model": "activator_rail_raised_ne", "y": 90 },
-        "powered=false,shape=ascending_west": { "model": "activator_rail_raised_sw", "y": 90 },
-        "powered=false,shape=ascending_north": { "model": "activator_rail_raised_ne" },
-        "powered=false,shape=ascending_south": { "model": "activator_rail_raised_sw" },
-        "powered=true,shape=north_south":  { "model": "activator_rail_active_flat" },
-        "powered=true,shape=east_west":  { "model": "activator_rail_active_flat", "y": 90 },
-        "powered=true,shape=ascending_east": { "model": "activator_rail_active_raised_ne", "y": 90 },
-        "powered=true,shape=ascending_west": { "model": "activator_rail_active_raised_sw", "y": 90 },
-        "powered=true,shape=ascending_north": { "model": "activator_rail_active_raised_ne" },
-        "powered=true,shape=ascending_south": { "model": "activator_rail_active_raised_sw" }
-    }
-}
+{
+    "variants": {
+        "powered=false,shape=north_south":  { "model": "block/activator_rail" },
+        "powered=false,shape=east_west":  { "model": "block/activator_rail", "y": 90 },
+        "powered=false,shape=ascending_east": { "model": "block/activator_rail_raised_ne", "y": 90 },
+        "powered=false,shape=ascending_west": { "model": "block/activator_rail_raised_sw", "y": 90 },
+        "powered=false,shape=ascending_north": { "model": "block/activator_rail_raised_ne" },
+        "powered=false,shape=ascending_south": { "model": "block/activator_rail_raised_sw" },
+        "powered=true,shape=north_south":  { "model": "block/activator_rail_on" },
+        "powered=true,shape=east_west":  { "model": "block/activator_rail_on", "y": 90 },
+        "powered=true,shape=ascending_east": { "model": "block/activator_rail_on_raised_ne", "y": 90 },
+        "powered=true,shape=ascending_west": { "model": "block/activator_rail_on_raised_sw", "y": 90 },
+        "powered=true,shape=ascending_north": { "model": "block/activator_rail_on_raised_ne" },
+        "powered=true,shape=ascending_south": { "model": "block/activator_rail_on_raised_sw" }
+    }
+}

assets/minecraft/blockstates/air.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/air" }
+    }
+}

assets/minecraft/blockstates/allium.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "allium" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/allium" }
+    }
+}

assets/minecraft/blockstates/andesite.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "andesite" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/andesite" }
+    }
+}

assets/minecraft/blockstates/anvil.json

@@ -1,16 +1,8 @@
-{
-    "variants": {
-        "damage=0,facing=south": { "model": "anvil_undamaged" },
-        "damage=0,facing=west": { "model": "anvil_undamaged", "y": 90 },
-        "damage=0,facing=north": { "model": "anvil_undamaged", "y": 180 },
-        "damage=0,facing=east": { "model": "anvil_undamaged", "y": 270 },
-        "damage=1,facing=south": { "model": "anvil_slightly_damaged" },
-        "damage=1,facing=west": { "model": "anvil_slightly_damaged", "y": 90 },
-        "damage=1,facing=north": { "model": "anvil_slightly_damaged", "y": 180 },
-        "damage=1,facing=east": { "model": "anvil_slightly_damaged", "y": 270 },
-        "damage=2,facing=south": { "model": "anvil_very_damaged" },
-        "damage=2,facing=west": { "model": "anvil_very_damaged", "y": 90 },
-        "damage=2,facing=north": { "model": "anvil_very_damaged", "y": 180 },
-        "damage=2,facing=east": { "model": "anvil_very_damaged", "y": 270 }
-    }
-}
+{
+    "variants": {
+        "facing=south": { "model": "block/anvil" },
+        "facing=west": { "model": "block/anvil", "y": 90 },
+        "facing=north": { "model": "block/anvil", "y": 180 },
+        "facing=east": { "model": "block/anvil", "y": 270 }
+    }
+}

assets/minecraft/blockstates/attached_melon_stem.json

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

assets/minecraft/blockstates/attached_pumpkin_stem.json

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

assets/minecraft/blockstates/azure_bluet.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/azure_bluet" }
+    }
+}

assets/minecraft/blockstates/barrier.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/barrier" }
+    }
+}

assets/minecraft/blockstates/beacon.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "beacon" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/beacon" }
+    }
+}

assets/minecraft/blockstates/bed.json

@@ -1,12 +0,0 @@
-{
-    "variants": {
-        "facing=north,part=foot": { "model": "bed_foot", "y": 180 },
-        "facing=east,part=foot":  { "model": "bed_foot", "y": 270 },
-        "facing=south,part=foot": { "model": "bed_foot" },
-        "facing=west,part=foot":  { "model": "bed_foot", "y": 90 },
-        "facing=north,part=head": { "model": "bed_head", "y": 180 },
-        "facing=east,part=head":  { "model": "bed_head", "y": 270 },
-        "facing=south,part=head": { "model": "bed_head" },
-        "facing=west,part=head":  { "model": "bed_head", "y": 90 }
-    }
-}

assets/minecraft/blockstates/bedrock.json

@@ -1,10 +1,10 @@
-{
-    "variants": {
-        "normal": [
-            { "model": "bedrock" },
-            { "model": "bedrock_mirrored" },
-            { "model": "bedrock", "y": 180 },
-            { "model": "bedrock_mirrored", "y": 180 }
-        ]
-    }
-}
+{
+    "variants": {
+        "": [
+            { "model": "block/bedrock" },
+            { "model": "block/bedrock_mirrored" },
+            { "model": "block/bedrock", "y": 180 },
+            { "model": "block/bedrock_mirrored", "y": 180 }
+        ]
+    }
+}

assets/minecraft/blockstates/beetroots.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "age=0": { "model": "block/beetroots_stage0" },
+        "age=1": { "model": "block/beetroots_stage1" },
+        "age=2": { "model": "block/beetroots_stage2" },
+        "age=3": { "model": "block/beetroots_stage3" }
+    }
+}

assets/minecraft/blockstates/birch_button.json

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

assets/minecraft/blockstates/birch_door.json

@@ -1,36 +1,36 @@
-{
-    "variants": {
-        "facing=east,half=lower,hinge=left,open=false":  { "model": "birch_door_bottom" },
-        "facing=south,half=lower,hinge=left,open=false": { "model": "birch_door_bottom", "y": 90 },
-        "facing=west,half=lower,hinge=left,open=false":  { "model": "birch_door_bottom", "y": 180 },
-        "facing=north,half=lower,hinge=left,open=false": { "model": "birch_door_bottom", "y": 270 },
-        "facing=east,half=lower,hinge=right,open=false":  { "model": "birch_door_bottom_rh" },
-        "facing=south,half=lower,hinge=right,open=false": { "model": "birch_door_bottom_rh", "y": 90 },
-        "facing=west,half=lower,hinge=right,open=false":  { "model": "birch_door_bottom_rh", "y": 180 },
-        "facing=north,half=lower,hinge=right,open=false": { "model": "birch_door_bottom_rh", "y": 270 },
-        "facing=east,half=lower,hinge=left,open=true":  { "model": "birch_door_bottom_rh", "y": 90 },
-        "facing=south,half=lower,hinge=left,open=true": { "model": "birch_door_bottom_rh", "y": 180 },
-        "facing=west,half=lower,hinge=left,open=true":  { "model": "birch_door_bottom_rh", "y": 270 },
-        "facing=north,half=lower,hinge=left,open=true": { "model": "birch_door_bottom_rh" },
-        "facing=east,half=lower,hinge=right,open=true":  { "model": "birch_door_bottom", "y": 270 },
-        "facing=south,half=lower,hinge=right,open=true": { "model": "birch_door_bottom" },
-        "facing=west,half=lower,hinge=right,open=true":  { "model": "birch_door_bottom", "y": 90 },
-        "facing=north,half=lower,hinge=right,open=true": { "model": "birch_door_bottom", "y": 180 },
-        "facing=east,half=upper,hinge=left,open=false":  { "model": "birch_door_top" },
-        "facing=south,half=upper,hinge=left,open=false": { "model": "birch_door_top", "y": 90 },
-        "facing=west,half=upper,hinge=left,open=false":  { "model": "birch_door_top", "y": 180 },
-        "facing=north,half=upper,hinge=left,open=false": { "model": "birch_door_top", "y": 270 },
-        "facing=east,half=upper,hinge=right,open=false":  { "model": "birch_door_top_rh" },
-        "facing=south,half=upper,hinge=right,open=false": { "model": "birch_door_top_rh", "y": 90 },
-        "facing=west,half=upper,hinge=right,open=false":  { "model": "birch_door_top_rh", "y": 180 },
-        "facing=north,half=upper,hinge=right,open=false": { "model": "birch_door_top_rh", "y": 270 },
-        "facing=east,half=upper,hinge=left,open=true":  { "model": "birch_door_top_rh", "y": 90 },
-        "facing=south,half=upper,hinge=left,open=true": { "model": "birch_door_top_rh", "y": 180 },
-        "facing=west,half=upper,hinge=left,open=true":  { "model": "birch_door_top_rh", "y": 270 },
-        "facing=north,half=upper,hinge=left,open=true": { "model": "birch_door_top_rh" },
-        "facing=east,half=upper,hinge=right,open=true":  { "model": "birch_door_top", "y": 270 },
-        "facing=south,half=upper,hinge=right,open=true": { "model": "birch_door_top" },
-        "facing=west,half=upper,hinge=right,open=true":  { "model": "birch_door_top", "y": 90 },
-        "facing=north,half=upper,hinge=right,open=true": { "model": "birch_door_top", "y": 180 }
-    }
-}
+{
+    "variants": {
+        "facing=east,half=lower,hinge=left,open=false":  { "model": "block/birch_door_bottom" },
+        "facing=south,half=lower,hinge=left,open=false": { "model": "block/birch_door_bottom", "y": 90 },
+        "facing=west,half=lower,hinge=left,open=false":  { "model": "block/birch_door_bottom", "y": 180 },
+        "facing=north,half=lower,hinge=left,open=false": { "model": "block/birch_door_bottom", "y": 270 },
+        "facing=east,half=lower,hinge=right,open=false":  { "model": "block/birch_door_bottom_hinge" },
+        "facing=south,half=lower,hinge=right,open=false": { "model": "block/birch_door_bottom_hinge", "y": 90 },
+        "facing=west,half=lower,hinge=right,open=false":  { "model": "block/birch_door_bottom_hinge", "y": 180 },
+        "facing=north,half=lower,hinge=right,open=false": { "model": "block/birch_door_bottom_hinge", "y": 270 },
+        "facing=east,half=lower,hinge=left,open=true":  { "model": "block/birch_door_bottom_hinge", "y": 90 },
+        "facing=south,half=lower,hinge=left,open=true": { "model": "block/birch_door_bottom_hinge", "y": 180 },
+        "facing=west,half=lower,hinge=left,open=true":  { "model": "block/birch_door_bottom_hinge", "y": 270 },
+        "facing=north,half=lower,hinge=left,open=true": { "model": "block/birch_door_bottom_hinge" },
+        "facing=east,half=lower,hinge=right,open=true":  { "model": "block/birch_door_bottom", "y": 270 },
+        "facing=south,half=lower,hinge=right,open=true": { "model": "block/birch_door_bottom" },
+        "facing=west,half=lower,hinge=right,open=true":  { "model": "block/birch_door_bottom", "y": 90 },
+        "facing=north,half=lower,hinge=right,open=true": { "model": "block/birch_door_bottom", "y": 180 },
+        "facing=east,half=upper,hinge=left,open=false":  { "model": "block/birch_door_top" },
+        "facing=south,half=upper,hinge=left,open=false": { "model": "block/birch_door_top", "y": 90 },
+        "facing=west,half=upper,hinge=left,open=false":  { "model": "block/birch_door_top", "y": 180 },
+        "facing=north,half=upper,hinge=left,open=false": { "model": "block/birch_door_top", "y": 270 },
+        "facing=east,half=upper,hinge=right,open=false":  { "model": "block/birch_door_top_hinge" },
+        "facing=south,half=upper,hinge=right,open=false": { "model": "block/birch_door_top_hinge", "y": 90 },
+        "facing=west,half=upper,hinge=right,open=false":  { "model": "block/birch_door_top_hinge", "y": 180 },
+        "facing=north,half=upper,hinge=right,open=false": { "model": "block/birch_door_top_hinge", "y": 270 },
+        "facing=east,half=upper,hinge=left,open=true":  { "model": "block/birch_door_top_hinge", "y": 90 },
+        "facing=south,half=upper,hinge=left,open=true": { "model": "block/birch_door_top_hinge", "y": 180 },
+        "facing=west,half=upper,hinge=left,open=true":  { "model": "block/birch_door_top_hinge", "y": 270 },
+        "facing=north,half=upper,hinge=left,open=true": { "model": "block/birch_door_top_hinge" },
+        "facing=east,half=upper,hinge=right,open=true":  { "model": "block/birch_door_top", "y": 270 },
+        "facing=south,half=upper,hinge=right,open=true": { "model": "block/birch_door_top" },
+        "facing=west,half=upper,hinge=right,open=true":  { "model": "block/birch_door_top", "y": 90 },
+        "facing=north,half=upper,hinge=right,open=true": { "model": "block/birch_door_top", "y": 180 }
+    }
+}

assets/minecraft/blockstates/birch_double_slab.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "birch_planks" }
-    }
-}

assets/minecraft/blockstates/birch_fence.json

@@ -1,20 +1,17 @@
-{
-    "variants": {
-        "east=false,north=false,south=false,west=false": { "model": "birch_fence_post" },
-        "east=false,north=true,south=false,west=false": { "model": "birch_fence_n", "uvlock": true },
-        "east=true,north=false,south=false,west=false": { "model": "birch_fence_n", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,west=false": { "model": "birch_fence_n", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,west=true": { "model": "birch_fence_n", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,west=false": { "model": "birch_fence_ne", "uvlock": true },
-        "east=true,north=false,south=true,west=false": { "model": "birch_fence_ne", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,west=true": { "model": "birch_fence_ne", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,west=true": { "model": "birch_fence_ne", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,west=false": { "model": "birch_fence_ns", "uvlock": true },
-        "east=true,north=false,south=false,west=true": { "model": "birch_fence_ns", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,west=false": { "model": "birch_fence_nse", "uvlock": true },
-        "east=true,north=false,south=true,west=true": { "model": "birch_fence_nse", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,west=true": { "model": "birch_fence_nse", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,west=true": { "model": "birch_fence_nse", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,west=true": { "model": "birch_fence_nsew", "uvlock": true }
-    }
-}
+{
+    "multipart": [
+        {   "apply": { "model": "block/birch_fence_post" }},
+        {   "when": { "north": "true" },
+            "apply": { "model": "block/birch_fence_side", "uvlock": true }
+        },
+        {   "when": { "east": "true" },
+            "apply": { "model": "block/birch_fence_side", "y": 90, "uvlock": true }
+        },
+        {   "when": { "south": "true" },
+            "apply": { "model": "block/birch_fence_side", "y": 180, "uvlock": true }
+        },
+        {   "when": { "west": "true" },
+            "apply": { "model": "block/birch_fence_side", "y": 270, "uvlock": true }
+        }
+    ]
+}

assets/minecraft/blockstates/birch_fence_gate.json

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

assets/minecraft/blockstates/birch_leaves.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "birch_leaves" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/birch_leaves" }
+    }
+}

assets/minecraft/blockstates/birch_log.json

@@ -1,8 +1,7 @@
-{
-    "variants": {
-        "axis=y":  { "model": "birch_log" },
-        "axis=z":   { "model": "birch_log_side" },
-        "axis=x":   { "model": "birch_log_side", "y": 90 },
-        "axis=none": { "model": "birch_bark" }
-    }
-}
+{
+    "variants": {
+        "axis=y":  { "model": "block/birch_log" },
+        "axis=z":   { "model": "block/birch_log", "x": 90 },
+        "axis=x":   { "model": "block/birch_log", "x": 90, "y": 90 }
+    }
+}

assets/minecraft/blockstates/birch_planks.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "birch_planks" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/birch_planks" }
+    }
+}

assets/minecraft/blockstates/birch_pressure_plate.json

@@ -0,0 +1,6 @@
+{
+    "variants": {
+        "powered=false": { "model": "block/birch_pressure_plate" },
+        "powered=true": { "model": "block/birch_pressure_plate_down" }
+    }
+}

assets/minecraft/blockstates/birch_sapling.json

@@ -1,6 +1,5 @@
-{
-    "variants": {
-        "stage=0": { "model": "birch_sapling" },
-        "stage=1": { "model": "birch_sapling" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/birch_sapling" }
+    }
+}

assets/minecraft/blockstates/birch_slab.json

@@ -1,6 +1,7 @@
-{
-    "variants": {
-        "half=bottom": { "model": "half_slab_birch" },
-        "half=top": { "model": "upper_slab_birch" }
-    }
-}
+{
+    "variants": {
+        "type=bottom": { "model": "block/birch_slab" },
+        "type=top": { "model": "block/birch_slab_top" },
+        "type=double": { "model": "block/birch_planks" }
+    }
+}

assets/minecraft/blockstates/birch_stairs.json

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

assets/minecraft/blockstates/birch_trapdoor.json

@@ -0,0 +1,20 @@
+{
+    "variants": {
+        "facing=north,half=bottom,open=false": { "model": "block/birch_trapdoor_bottom" },
+        "facing=south,half=bottom,open=false": { "model": "block/birch_trapdoor_bottom", "y": 180 },
+        "facing=east,half=bottom,open=false": { "model": "block/birch_trapdoor_bottom", "y": 90 },
+        "facing=west,half=bottom,open=false": { "model": "block/birch_trapdoor_bottom", "y": 270 },
+        "facing=north,half=top,open=false": { "model": "block/birch_trapdoor_top" },
+        "facing=south,half=top,open=false": { "model": "block/birch_trapdoor_top", "y": 180 },
+        "facing=east,half=top,open=false": { "model": "block/birch_trapdoor_top", "y": 90 },
+        "facing=west,half=top,open=false": { "model": "block/birch_trapdoor_top", "y": 270 },
+        "facing=north,half=bottom,open=true": { "model": "block/birch_trapdoor_open" },
+        "facing=south,half=bottom,open=true": { "model": "block/birch_trapdoor_open", "y": 180 },
+        "facing=east,half=bottom,open=true": { "model": "block/birch_trapdoor_open", "y": 90 },
+        "facing=west,half=bottom,open=true": { "model": "block/birch_trapdoor_open", "y": 270 },
+        "facing=north,half=top,open=true": { "model": "block/birch_trapdoor_open", "x": 180, "y": 180 },
+        "facing=south,half=top,open=true": { "model": "block/birch_trapdoor_open", "x": 180, "y": 0 },
+        "facing=east,half=top,open=true": { "model": "block/birch_trapdoor_open", "x": 180, "y": 270 },
+        "facing=west,half=top,open=true": { "model": "block/birch_trapdoor_open", "x": 180, "y": 90 }
+    }
+}

assets/minecraft/blockstates/birch_wood.json

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

assets/minecraft/blockstates/black_banner.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/banner" }
+    }
+}

assets/minecraft/blockstates/black_bed.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/bed" }
+    }
+}

assets/minecraft/blockstates/black_carpet.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "carpet_black" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/black_carpet" }
+    }
+}

assets/minecraft/blockstates/black_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/black_concrete" }
+    }
+}

assets/minecraft/blockstates/black_concrete_powder.json

@@ -0,0 +1,10 @@
+{
+    "variants": {
+        "": [
+            { "model": "block/black_concrete_powder" },
+            { "model": "block/black_concrete_powder", "y": 90 },
+            { "model": "block/black_concrete_powder", "y": 180 },
+            { "model": "block/black_concrete_powder", "y": 270 }
+        ]
+    }
+}

assets/minecraft/blockstates/black_glazed_terracotta.json

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

assets/minecraft/blockstates/black_shulker_box.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/black_shulker_box" }
+    }
+}

assets/minecraft/blockstates/black_stained_glass.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "glass_black" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/black_stained_glass" }
+    }
+}

assets/minecraft/blockstates/black_stained_glass_pane.json

@@ -1,20 +1,29 @@
-{
-    "variants": {
-        "east=false,north=false,south=false,west=false": { "model": "black_pane_nsew" },
-        "east=false,north=true,south=false,west=false": { "model": "black_pane_n" },
-        "east=true,north=false,south=false,west=false": { "model": "black_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "black_pane_s" },
-        "east=false,north=false,south=false,west=true": { "model": "black_pane_s", "y": 90 },
-        "east=true,north=true,south=false,west=false": { "model": "black_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "black_pane_se" },
-        "east=false,north=false,south=true,west=true": { "model": "black_pane_sw" },
-        "east=false,north=true,south=false,west=true": { "model": "black_pane_nw" },
-        "east=false,north=true,south=true,west=false": { "model": "black_pane_ns" },
-        "east=true,north=false,south=false,west=true": { "model": "black_pane_ns", "y": 90 },
-        "east=true,north=true,south=true,west=false": { "model": "black_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "black_pane_sew" },
-        "east=false,north=true,south=true,west=true": { "model": "black_pane_nsw" },
-        "east=true,north=true,south=false,west=true": { "model": "black_pane_new" },
-        "east=true,north=true,south=true,west=true": { "model": "black_pane_nsew" }
-    }
-}
+{
+    "multipart": [
+        {   "apply": { "model": "block/black_stained_glass_pane_post" }},
+        {   "when": { "north": true },
+            "apply": { "model": "block/black_stained_glass_pane_side" }
+        },
+        {   "when": { "east": true },
+            "apply": { "model": "block/black_stained_glass_pane_side", "y": 90 }
+        },
+        {   "when": { "south": true },
+            "apply": { "model": "block/black_stained_glass_pane_side_alt" }
+        },
+        {   "when": { "west": true },
+            "apply": { "model": "block/black_stained_glass_pane_side_alt", "y": 90 }
+        },
+        {   "when": { "north": false },
+            "apply": { "model": "block/black_stained_glass_pane_noside" }
+        },
+        {   "when": { "east": false },
+            "apply": { "model": "block/black_stained_glass_pane_noside_alt" }
+        },
+        {   "when": { "south": false },
+            "apply": { "model": "block/black_stained_glass_pane_noside_alt", "y": 90 }
+        },
+        {   "when": { "west": false },
+            "apply": { "model": "block/black_stained_glass_pane_noside", "y": 270 }
+        }
+    ]
+}

assets/minecraft/blockstates/black_stained_hardened_clay.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "hardened_clay_black" }
-    }
-}

assets/minecraft/blockstates/black_terracotta.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/black_terracotta" }
+    }
+}

assets/minecraft/blockstates/black_wall_banner.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/banner" }
+    }
+}

assets/minecraft/blockstates/black_wool.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "black_wool" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/black_wool" }
+    }
+}

assets/minecraft/blockstates/blue_banner.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/banner" }
+    }
+}

assets/minecraft/blockstates/blue_bed.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/bed" }
+    }
+}

assets/minecraft/blockstates/blue_carpet.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "carpet_blue" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/blue_carpet" }
+    }
+}

assets/minecraft/blockstates/blue_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/blue_concrete" }
+    }
+}

assets/minecraft/blockstates/blue_concrete_powder.json

@@ -0,0 +1,10 @@
+{
+    "variants": {
+        "": [
+            { "model": "block/blue_concrete_powder" },
+            { "model": "block/blue_concrete_powder", "y": 90 },
+            { "model": "block/blue_concrete_powder", "y": 180 },
+            { "model": "block/blue_concrete_powder", "y": 270 }
+        ]
+    }
+}

assets/minecraft/blockstates/blue_glazed_terracotta.json

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

assets/minecraft/blockstates/blue_ice.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/blue_ice" }
+    }
+}

assets/minecraft/blockstates/blue_orchid.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "orchid" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/blue_orchid" }
+    }
+}

assets/minecraft/blockstates/blue_shulker_box.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/blue_shulker_box" }
+    }
+}

assets/minecraft/blockstates/blue_stained_glass.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "glass_blue" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/blue_stained_glass" }
+    }
+}

assets/minecraft/blockstates/blue_stained_glass_pane.json

@@ -1,20 +1,29 @@
-{
-    "variants": {
-        "east=false,north=false,south=false,west=false": { "model": "blue_pane_nsew" },
-        "east=false,north=true,south=false,west=false": { "model": "blue_pane_n" },
-        "east=true,north=false,south=false,west=false": { "model": "blue_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "blue_pane_s" },
-        "east=false,north=false,south=false,west=true": { "model": "blue_pane_s", "y": 90 },
-        "east=true,north=true,south=false,west=false": { "model": "blue_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "blue_pane_se" },
-        "east=false,north=false,south=true,west=true": { "model": "blue_pane_sw" },
-        "east=false,north=true,south=false,west=true": { "model": "blue_pane_nw" },
-        "east=false,north=true,south=true,west=false": { "model": "blue_pane_ns" },
-        "east=true,north=false,south=false,west=true": { "model": "blue_pane_ns", "y": 90 },
-        "east=true,north=true,south=true,west=false": { "model": "blue_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "blue_pane_sew" },
-        "east=false,north=true,south=true,west=true": { "model": "blue_pane_nsw" },
-        "east=true,north=true,south=false,west=true": { "model": "blue_pane_new" },
-        "east=true,north=true,south=true,west=true": { "model": "blue_pane_nsew" }
-    }
-}
+{
+    "multipart": [
+        {   "apply": { "model": "block/blue_stained_glass_pane_post" }},
+        {   "when": { "north": true },
+            "apply": { "model": "block/blue_stained_glass_pane_side" }
+        },
+        {   "when": { "east": true },
+            "apply": { "model": "block/blue_stained_glass_pane_side", "y": 90 }
+        },
+        {   "when": { "south": true },
+            "apply": { "model": "block/blue_stained_glass_pane_side_alt" }
+        },
+        {   "when": { "west": true },
+            "apply": { "model": "block/blue_stained_glass_pane_side_alt", "y": 90 }
+        },
+        {   "when": { "north": false },
+            "apply": { "model": "block/blue_stained_glass_pane_noside" }
+        },
+        {   "when": { "east": false },
+            "apply": { "model": "block/blue_stained_glass_pane_noside_alt" }
+        },
+        {   "when": { "south": false },
+            "apply": { "model": "block/blue_stained_glass_pane_noside_alt", "y": 90 }
+        },
+        {   "when": { "west": false },
+            "apply": { "model": "block/blue_stained_glass_pane_noside", "y": 270 }
+        }
+    ]
+}

assets/minecraft/blockstates/blue_stained_hardened_clay.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "hardened_clay_blue" }
-    }
-}

assets/minecraft/blockstates/blue_terracotta.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/blue_terracotta" }
+    }
+}

assets/minecraft/blockstates/blue_wall_banner.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/banner" }
+    }
+}

assets/minecraft/blockstates/blue_wool.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "blue_wool" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/blue_wool" }
+    }
+}

assets/minecraft/blockstates/bone_block.json

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

assets/minecraft/blockstates/bookshelf.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "bookshelf" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/bookshelf" }
+    }
+}

assets/minecraft/blockstates/brain_coral.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/brain_coral" }
+    }
+}

assets/minecraft/blockstates/brain_coral_block.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/brain_coral_block" }
+    }
+}

assets/minecraft/blockstates/brain_coral_fan.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/brain_coral_fan" }
+    }
+}

assets/minecraft/blockstates/brain_coral_wall_fan.json

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

assets/minecraft/blockstates/brewing_stand.json

@@ -1,12 +1,23 @@
-{
-    "variants": {
-        "has_bottle_0=false,has_bottle_1=false,has_bottle_2=false": { "model": "brewing_stand_empty" },
-        "has_bottle_0=true,has_bottle_1=false,has_bottle_2=false": { "model": "brewing_stand_bottles_1" },
-        "has_bottle_0=false,has_bottle_1=true,has_bottle_2=false": { "model": "brewing_stand_bottles_2" },
-        "has_bottle_0=false,has_bottle_1=false,has_bottle_2=true": { "model": "brewing_stand_bottles_3" },
-        "has_bottle_0=true,has_bottle_1=true,has_bottle_2=false": { "model": "brewing_stand_bottles_12" },
-        "has_bottle_0=true,has_bottle_1=false,has_bottle_2=true": { "model": "brewing_stand_bottles_13" },
-        "has_bottle_0=false,has_bottle_1=true,has_bottle_2=true": { "model": "brewing_stand_bottles_23" },
-        "has_bottle_0=true,has_bottle_1=true,has_bottle_2=true": { "model": "brewing_stand_bottles_123" }
-    }
-}
+{
+    "multipart": [
+        {   "apply": { "model": "block/brewing_stand" }},
+        {   "when": { "has_bottle_0": "true" },
+            "apply": { "model": "block/brewing_stand_bottle0" }
+        },
+        {   "when": { "has_bottle_1": "true" },
+            "apply": { "model": "block/brewing_stand_bottle1" }
+        },
+        {   "when": { "has_bottle_2": "true" },
+            "apply": { "model": "block/brewing_stand_bottle2" }
+        },
+        {   "when": { "has_bottle_0": "false" },
+            "apply": { "model": "block/brewing_stand_empty0" }
+        },
+        {   "when": { "has_bottle_1": "false" },
+            "apply": { "model": "block/brewing_stand_empty1" }
+        },
+        {   "when": { "has_bottle_2": "false" },
+            "apply": { "model": "block/brewing_stand_empty2" }
+        }
+    ]
+}

assets/minecraft/blockstates/brick_block.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "brick" }
-    }
-}

assets/minecraft/blockstates/brick_double_slab.json

@@ -1,6 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "brick" },
-        "all":    { "model": "brick" }
-    }
-}

assets/minecraft/blockstates/brick_slab.json

@@ -1,6 +1,7 @@
-{
-    "variants": {
-        "half=bottom": { "model": "half_slab_brick" },
-        "half=top": { "model": "upper_slab_brick" }
-    }
-}
+{
+    "variants": {
+        "type=bottom": { "model": "block/brick_slab" },
+        "type=top": { "model": "block/brick_slab_top" },
+        "type=double": { "model": "block/bricks" }
+    }
+}

assets/minecraft/blockstates/brick_stairs.json

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

assets/minecraft/blockstates/bricks.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/bricks" }
+    }
+}

assets/minecraft/blockstates/brown_banner.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/banner" }
+    }
+}

assets/minecraft/blockstates/brown_bed.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/bed" }
+    }
+}

assets/minecraft/blockstates/brown_carpet.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "carpet_brown" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/brown_carpet" }
+    }
+}

assets/minecraft/blockstates/brown_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/brown_concrete" }
+    }
+}

assets/minecraft/blockstates/brown_concrete_powder.json

@@ -0,0 +1,10 @@
+{
+    "variants": {
+        "": [
+            { "model": "block/brown_concrete_powder" },
+            { "model": "block/brown_concrete_powder", "y": 90 },
+            { "model": "block/brown_concrete_powder", "y": 180 },
+            { "model": "block/brown_concrete_powder", "y": 270 }
+        ]
+    }
+}

assets/minecraft/blockstates/brown_glazed_terracotta.json

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

assets/minecraft/blockstates/brown_mushroom.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "brown_mushroom" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/brown_mushroom" }
+    }
+}

assets/minecraft/blockstates/brown_mushroom_block.json

@@ -1,17 +1,40 @@
-{
-    "variants": {
-        "variant=north_west": { "model": "brown_mushroom_block_nw" },
-        "variant=north": { "model": "brown_mushroom_block_n" },
-        "variant=north_east": { "model": "brown_mushroom_block_ne" },
-        "variant=west": { "model": "brown_mushroom_block_w" },
-        "variant=center": { "model": "brown_mushroom_block_c" },
-        "variant=east": { "model": "brown_mushroom_block_e" },
-        "variant=south_west": { "model": "brown_mushroom_block_sw" },
-        "variant=south": { "model": "brown_mushroom_block_s" },
-        "variant=south_east": { "model": "brown_mushroom_block_se" },
-        "variant=stem": { "model": "brown_mushroom_block_stem" },
-        "variant=all_stem": { "model": "brown_mushroom_block_stem_all" },
-        "variant=all_outside": { "model": "brown_mushroom_block_cap_all" },
-        "variant=all_inside": { "model": "brown_mushroom_block_inside_all" }
-    }
-}
+{
+    "multipart": [
+        {   "when": { "north": true },
+            "apply": { "model": "block/brown_mushroom_block" }
+        },
+        {   "when": { "east": true },
+            "apply": { "model": "block/brown_mushroom_block", "y": 90, "uvlock": true }
+        },
+        {   "when": { "south": true },
+            "apply": { "model": "block/brown_mushroom_block", "y": 180, "uvlock": true }
+        },
+        {   "when": { "west": true },
+            "apply": { "model": "block/brown_mushroom_block", "y": 270, "uvlock": true }
+        },
+        {   "when": { "up": true },
+            "apply": { "model": "block/brown_mushroom_block", "x": 270, "uvlock": true }
+        },
+        {   "when": { "down": true },
+            "apply": { "model": "block/brown_mushroom_block", "x": 90, "uvlock": true }
+        },
+        {   "when": { "north": false },
+            "apply": { "model": "block/mushroom_block_inside" }
+        },
+        {   "when": { "east": false },
+            "apply": { "model": "block/mushroom_block_inside", "y": 90, "uvlock": false }
+        },
+        {   "when": { "south": false },
+            "apply": { "model": "block/mushroom_block_inside", "y": 180, "uvlock": false }
+        },
+        {   "when": { "west": false },
+            "apply": { "model": "block/mushroom_block_inside", "y": 270, "uvlock": false }
+        },
+        {   "when": { "up": false },
+            "apply": { "model": "block/mushroom_block_inside", "x": 270, "uvlock": false }
+        },
+        {   "when": { "down": false },
+            "apply": { "model": "block/mushroom_block_inside", "x": 90, "uvlock": false }
+        }
+    ]
+}

assets/minecraft/blockstates/brown_shulker_box.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/brown_shulker_box" }
+    }
+}

assets/minecraft/blockstates/brown_stained_glass.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "glass_brown" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/brown_stained_glass" }
+    }
+}

assets/minecraft/blockstates/brown_stained_glass_pane.json

@@ -1,20 +1,29 @@
-{
-    "variants": {
-        "east=false,north=false,south=false,west=false": { "model": "brown_pane_nsew" },
-        "east=false,north=true,south=false,west=false": { "model": "brown_pane_n" },
-        "east=true,north=false,south=false,west=false": { "model": "brown_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "brown_pane_s" },
-        "east=false,north=false,south=false,west=true": { "model": "brown_pane_s", "y": 90 },
-        "east=true,north=true,south=false,west=false": { "model": "brown_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "brown_pane_se" },
-        "east=false,north=false,south=true,west=true": { "model": "brown_pane_sw" },
-        "east=false,north=true,south=false,west=true": { "model": "brown_pane_nw" },
-        "east=false,north=true,south=true,west=false": { "model": "brown_pane_ns" },
-        "east=true,north=false,south=false,west=true": { "model": "brown_pane_ns", "y": 90 },
-        "east=true,north=true,south=true,west=false": { "model": "brown_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "brown_pane_sew" },
-        "east=false,north=true,south=true,west=true": { "model": "brown_pane_nsw" },
-        "east=true,north=true,south=false,west=true": { "model": "brown_pane_new" },
-        "east=true,north=true,south=true,west=true": { "model": "brown_pane_nsew" }
-    }
-}
+{
+    "multipart": [
+        {   "apply": { "model": "block/brown_stained_glass_pane_post" }},
+        {   "when": { "north": true },
+            "apply": { "model": "block/brown_stained_glass_pane_side" }
+        },
+        {   "when": { "east": true },
+            "apply": { "model": "block/brown_stained_glass_pane_side", "y": 90 }
+        },
+        {   "when": { "south": true },
+            "apply": { "model": "block/brown_stained_glass_pane_side_alt" }
+        },
+        {   "when": { "west": true },
+            "apply": { "model": "block/brown_stained_glass_pane_side_alt", "y": 90 }
+        },
+        {   "when": { "north": false },
+            "apply": { "model": "block/brown_stained_glass_pane_noside" }
+        },
+        {   "when": { "east": false },
+            "apply": { "model": "block/brown_stained_glass_pane_noside_alt" }
+        },
+        {   "when": { "south": false },
+            "apply": { "model": "block/brown_stained_glass_pane_noside_alt", "y": 90 }
+        },
+        {   "when": { "west": false },
+            "apply": { "model": "block/brown_stained_glass_pane_noside", "y": 270 }
+        }
+    ]
+}

assets/minecraft/blockstates/brown_stained_hardened_clay.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "hardened_clay_brown" }
-    }
-}

assets/minecraft/blockstates/brown_terracotta.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/brown_terracotta" }
+    }
+}

assets/minecraft/blockstates/brown_wall_banner.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/banner" }
+    }
+}

assets/minecraft/blockstates/brown_wool.json

@@ -1,5 +1,5 @@
-{
-    "variants": {
-        "normal": { "model": "brown_wool" }
-    }
-}
+{
+    "variants": {
+        "": { "model": "block/brown_wool" }
+    }
+}

assets/minecraft/blockstates/bubble_column.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/water" }
+    }
+}

assets/minecraft/blockstates/bubble_coral.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/bubble_coral" }
+    }
+}

assets/minecraft/blockstates/bubble_coral_block.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "block/bubble_coral_block" }
+    }
+}