Create/Update assets for version 1.13.2

.github\FUNDING.yml

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

assets/minecraft/blockstates/acacia_button.json

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

assets/minecraft/blockstates/acacia_door.json

@@ -1,124 +1,36 @@
 {
-  "variants": {
+    "variants": {
-    "facing=east,half=lower,hinge=left,open=false": {
+        "facing=east,half=lower,hinge=left,open=false":  { "model": "block/acacia_door_bottom" },
-      "model": "minecraft: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=east,half=lower,hinge=left,open=true": {
+        "facing=north,half=lower,hinge=left,open=false": { "model": "block/acacia_door_bottom", "y": 270 },
-      "model": "minecraft:block/acacia_door_bottom_hinge",
+        "facing=east,half=lower,hinge=right,open=false":  { "model": "block/acacia_door_bottom_hinge" },
-      "y": 90
+        "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=east,half=lower,hinge=right,open=false": {
+        "facing=north,half=lower,hinge=right,open=false": { "model": "block/acacia_door_bottom_hinge", "y": 270 },
-      "model": "minecraft:block/acacia_door_bottom_hinge"
+        "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=east,half=lower,hinge=right,open=true": {
+        "facing=west,half=lower,hinge=left,open=true":  { "model": "block/acacia_door_bottom_hinge", "y": 270 },
-      "model": "minecraft:block/acacia_door_bottom",
+        "facing=north,half=lower,hinge=left,open=true": { "model": "block/acacia_door_bottom_hinge" },
-      "y": 270
+        "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=east,half=upper,hinge=left,open=false": {
+        "facing=west,half=lower,hinge=right,open=true":  { "model": "block/acacia_door_bottom", "y": 90 },
-      "model": "minecraft:block/acacia_door_top"
+        "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=east,half=upper,hinge=left,open=true": {
+        "facing=south,half=upper,hinge=left,open=false": { "model": "block/acacia_door_top", "y": 90 },
-      "model": "minecraft:block/acacia_door_top_hinge",
+        "facing=west,half=upper,hinge=left,open=false":  { "model": "block/acacia_door_top", "y": 180 },
-      "y": 90
+        "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=east,half=upper,hinge=right,open=false": {
+        "facing=south,half=upper,hinge=right,open=false": { "model": "block/acacia_door_top_hinge", "y": 90 },
-      "model": "minecraft:block/acacia_door_top_hinge"
+        "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=right,open=true": {
+        "facing=east,half=upper,hinge=left,open=true":  { "model": "block/acacia_door_top_hinge", "y": 90 },
-      "model": "minecraft:block/acacia_door_top",
+        "facing=south,half=upper,hinge=left,open=true": { "model": "block/acacia_door_top_hinge", "y": 180 },
-      "y": 270
+        "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=north,half=lower,hinge=left,open=false": {
+        "facing=east,half=upper,hinge=right,open=true":  { "model": "block/acacia_door_top", "y": 270 },
-      "model": "minecraft:block/acacia_door_bottom",
+        "facing=south,half=upper,hinge=right,open=true": { "model": "block/acacia_door_top" },
-      "y": 270
+        "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 }
-    "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_hinge"
-    },
-    "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_hinge",
-      "y": 270
-    },
-    "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_bottom",
-      "y": 180
-    },
-    "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_top",
-      "y": 270
-    },
-    "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_top_hinge"
-    },
-    "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_top_hinge",
-      "y": 270
-    },
-    "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_top",
-      "y": 180
-    },
-    "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_bottom",
-      "y": 90
-    },
-    "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_hinge",
-      "y": 180
-    },
-    "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_hinge",
-      "y": 90
-    },
-    "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_bottom"
-    },
-    "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_top",
-      "y": 90
-    },
-    "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_top_hinge",
-      "y": 180
-    },
-    "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_top_hinge",
-      "y": 90
-    },
-    "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_top"
-    },
-    "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_bottom",
-      "y": 180
-    },
-    "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_bottom_hinge",
-      "y": 270
-    },
-    "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_bottom_hinge",
-      "y": 180
-    },
-    "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_bottom",
-      "y": 90
-    },
-    "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/acacia_door_top",
-      "y": 180
-    },
-    "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/acacia_door_top_hinge",
-      "y": 270
-    },
-    "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/acacia_door_top_hinge",
-      "y": 180
-    },
-    "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/acacia_door_top",
-      "y": 90
     }
-  }
+}
-}

assets/minecraft/blockstates/acacia_fence.json

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

assets/minecraft/blockstates/acacia_fence_gate.json

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

assets/minecraft/blockstates/acacia_leaves.json

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

assets/minecraft/blockstates/acacia_log.json

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

assets/minecraft/blockstates/acacia_planks.json

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

assets/minecraft/blockstates/acacia_pressure_plate.json

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

assets/minecraft/blockstates/acacia_sapling.json

@@ -1,7 +1,5 @@
 {
-  "variants": {
+    "variants": {
-    "": {
+        "": { "model": "block/acacia_sapling" }
-      "model": "minecraft:block/acacia_sapling"
     }
-  }
+}
-}

assets/minecraft/blockstates/acacia_sign.json

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

assets/minecraft/blockstates/acacia_slab.json

@@ -1,13 +1,7 @@
 {
-  "variants": {
+    "variants": {
-    "type=bottom": {
+        "type=bottom": { "model": "block/acacia_slab" },
-      "model": "minecraft:block/acacia_slab"
+        "type=top": { "model": "block/acacia_slab_top" },
-    },
+        "type=double": { "model": "block/acacia_planks" }
-    "type=double": {
-      "model": "minecraft:block/acacia_planks"
-    },
-    "type=top": {
-      "model": "minecraft:block/acacia_slab_top"
     }
-  }
+}
-}

assets/minecraft/blockstates/acacia_stairs.json

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

assets/minecraft/blockstates/acacia_trapdoor.json

@@ -1,69 +1,20 @@
 {
-  "variants": {
+    "variants": {
-    "facing=east,half=bottom,open=false": {
+        "facing=north,half=bottom,open=false": { "model": "block/acacia_trapdoor_bottom" },
-      "model": "minecraft:block/acacia_trapdoor_bottom",
+        "facing=south,half=bottom,open=false": { "model": "block/acacia_trapdoor_bottom", "y": 180 },
-      "y": 90
+        "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=east,half=bottom,open=true": {
+        "facing=north,half=top,open=false": { "model": "block/acacia_trapdoor_top" },
-      "model": "minecraft:block/acacia_trapdoor_open",
+        "facing=south,half=top,open=false": { "model": "block/acacia_trapdoor_top", "y": 180 },
-      "y": 90
+        "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=east,half=top,open=false": {
+        "facing=north,half=bottom,open=true": { "model": "block/acacia_trapdoor_open" },
-      "model": "minecraft:block/acacia_trapdoor_top",
+        "facing=south,half=bottom,open=true": { "model": "block/acacia_trapdoor_open", "y": 180 },
-      "y": 90
+        "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=east,half=top,open=true": {
+        "facing=north,half=top,open=true": { "model": "block/acacia_trapdoor_open", "x": 180, "y": 180 },
-      "model": "minecraft:block/acacia_trapdoor_open",
+        "facing=south,half=top,open=true": { "model": "block/acacia_trapdoor_open", "x": 180, "y": 0 },
-      "x": 180,
+        "facing=east,half=top,open=true": { "model": "block/acacia_trapdoor_open", "x": 180, "y": 270 },
-      "y": 270
+        "facing=west,half=top,open=true": { "model": "block/acacia_trapdoor_open", "x": 180, "y": 90 }
-    },
-    "facing=north,half=bottom,open=false": {
-      "model": "minecraft:block/acacia_trapdoor_bottom"
-    },
-    "facing=north,half=bottom,open=true": {
-      "model": "minecraft:block/acacia_trapdoor_open"
-    },
-    "facing=north,half=top,open=false": {
-      "model": "minecraft:block/acacia_trapdoor_top"
-    },
-    "facing=north,half=top,open=true": {
-      "model": "minecraft:block/acacia_trapdoor_open",
-      "x": 180,
-      "y": 180
-    },
-    "facing=south,half=bottom,open=false": {
-      "model": "minecraft:block/acacia_trapdoor_bottom",
-      "y": 180
-    },
-    "facing=south,half=bottom,open=true": {
-      "model": "minecraft:block/acacia_trapdoor_open",
-      "y": 180
-    },
-    "facing=south,half=top,open=false": {
-      "model": "minecraft:block/acacia_trapdoor_top",
-      "y": 180
-    },
-    "facing=south,half=top,open=true": {
-      "model": "minecraft:block/acacia_trapdoor_open",
-      "x": 180,
-      "y": 0
-    },
-    "facing=west,half=bottom,open=false": {
-      "model": "minecraft:block/acacia_trapdoor_bottom",
-      "y": 270
-    },
-    "facing=west,half=bottom,open=true": {
-      "model": "minecraft:block/acacia_trapdoor_open",
-      "y": 270
-    },
-    "facing=west,half=top,open=false": {
-      "model": "minecraft:block/acacia_trapdoor_top",
-      "y": 270
-    },
-    "facing=west,half=top,open=true": {
-      "model": "minecraft:block/acacia_trapdoor_open",
-      "x": 180,
-      "y": 90
     }
-  }
+}
-}

assets/minecraft/blockstates/acacia_wall_sign.json

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

assets/minecraft/blockstates/acacia_wood.json

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

assets/minecraft/blockstates/activator_rail.json

@@ -1,46 +1,16 @@
 {
-  "variants": {
+    "variants": {
-    "powered=false,shape=ascending_east": {
+        "powered=false,shape=north_south":  { "model": "block/activator_rail" },
-      "model": "minecraft:block/activator_rail_raised_ne",
+        "powered=false,shape=east_west":  { "model": "block/activator_rail", "y": 90 },
-      "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": {
+        "powered=false,shape=ascending_north": { "model": "block/activator_rail_raised_ne" },
-      "model": "minecraft: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=false,shape=ascending_south": {
+        "powered=true,shape=east_west":  { "model": "block/activator_rail_on", "y": 90 },
-      "model": "minecraft:block/activator_rail_raised_sw"
+        "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=false,shape=ascending_west": {
+        "powered=true,shape=ascending_north": { "model": "block/activator_rail_on_raised_ne" },
-      "model": "minecraft:block/activator_rail_raised_sw",
+        "powered=true,shape=ascending_south": { "model": "block/activator_rail_on_raised_sw" }
-      "y": 90
-    },
-    "powered=false,shape=east_west": {
-      "model": "minecraft:block/activator_rail",
-      "y": 90
-    },
-    "powered=false,shape=north_south": {
-      "model": "minecraft:block/activator_rail"
-    },
-    "powered=true,shape=ascending_east": {
-      "model": "minecraft:block/activator_rail_on_raised_ne",
-      "y": 90
-    },
-    "powered=true,shape=ascending_north": {
-      "model": "minecraft:block/activator_rail_on_raised_ne"
-    },
-    "powered=true,shape=ascending_south": {
-      "model": "minecraft:block/activator_rail_on_raised_sw"
-    },
-    "powered=true,shape=ascending_west": {
-      "model": "minecraft:block/activator_rail_on_raised_sw",
-      "y": 90
-    },
-    "powered=true,shape=east_west": {
-      "model": "minecraft:block/activator_rail_on",
-      "y": 90
-    },
-    "powered=true,shape=north_south": {
-      "model": "minecraft:block/activator_rail_on"
     }
-  }
+}
-}

assets/minecraft/blockstates/air.json

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

assets/minecraft/blockstates/allium.json

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

assets/minecraft/blockstates/ancient_debris.json

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

assets/minecraft/blockstates/andesite.json

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

assets/minecraft/blockstates/andesite_slab.json

@@ -1,13 +0,0 @@
-{
-  "variants": {
-    "type=bottom": {
-      "model": "minecraft:block/andesite_slab"
-    },
-    "type=double": {
-      "model": "minecraft:block/andesite"
-    },
-    "type=top": {
-      "model": "minecraft:block/andesite_slab_top"
-    }
-  }
-}

assets/minecraft/blockstates/andesite_stairs.json

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

assets/minecraft/blockstates/andesite_wall.json

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

assets/minecraft/blockstates/anvil.json

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

assets/minecraft/blockstates/attached_melon_stem.json

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

assets/minecraft/blockstates/attached_pumpkin_stem.json

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

assets/minecraft/blockstates/azure_bluet.json

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

assets/minecraft/blockstates/bamboo.json

@@ -1,58 +0,0 @@
-{
-  "multipart": [
-    {
-      "when": {
-        "age": "0"
-      },
-      "apply": [
-        {
-          "model": "minecraft:block/bamboo1_age0"
-        },
-        {
-          "model": "minecraft:block/bamboo2_age0"
-        },
-        {
-          "model": "minecraft:block/bamboo3_age0"
-        },
-        {
-          "model": "minecraft:block/bamboo4_age0"
-        }
-      ]
-    },
-    {
-      "when": {
-        "age": "1"
-      },
-      "apply": [
-        {
-          "model": "minecraft:block/bamboo1_age1"
-        },
-        {
-          "model": "minecraft:block/bamboo2_age1"
-        },
-        {
-          "model": "minecraft:block/bamboo3_age1"
-        },
-        {
-          "model": "minecraft:block/bamboo4_age1"
-        }
-      ]
-    },
-    {
-      "when": {
-        "leaves": "small"
-      },
-      "apply": {
-        "model": "minecraft:block/bamboo_small_leaves"
-      }
-    },
-    {
-      "when": {
-        "leaves": "large"
-      },
-      "apply": {
-        "model": "minecraft:block/bamboo_large_leaves"
-      }
-    }
-  ]
-}

assets/minecraft/blockstates/bamboo_sapling.json

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

assets/minecraft/blockstates/barrel.json

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

assets/minecraft/blockstates/barrier.json

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

assets/minecraft/blockstates/basalt.json

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

assets/minecraft/blockstates/beacon.json

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

assets/minecraft/blockstates/bedrock.json

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

assets/minecraft/blockstates/bee_nest.json

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

assets/minecraft/blockstates/beehive.json

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

assets/minecraft/blockstates/beetroots.json

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

assets/minecraft/blockstates/bell.json

@@ -1,64 +0,0 @@
-{
-  "variants": {
-    "attachment=ceiling,facing=east": {
-      "model": "minecraft:block/bell_ceiling",
-      "y": 90
-    },
-    "attachment=ceiling,facing=north": {
-      "model": "minecraft:block/bell_ceiling"
-    },
-    "attachment=ceiling,facing=south": {
-      "model": "minecraft:block/bell_ceiling",
-      "y": 180
-    },
-    "attachment=ceiling,facing=west": {
-      "model": "minecraft:block/bell_ceiling",
-      "y": 270
-    },
-    "attachment=double_wall,facing=east": {
-      "model": "minecraft:block/bell_between_walls"
-    },
-    "attachment=double_wall,facing=north": {
-      "model": "minecraft:block/bell_between_walls",
-      "y": 270
-    },
-    "attachment=double_wall,facing=south": {
-      "model": "minecraft:block/bell_between_walls",
-      "y": 90
-    },
-    "attachment=double_wall,facing=west": {
-      "model": "minecraft:block/bell_between_walls",
-      "y": 180
-    },
-    "attachment=floor,facing=east": {
-      "model": "minecraft:block/bell_floor",
-      "y": 90
-    },
-    "attachment=floor,facing=north": {
-      "model": "minecraft:block/bell_floor"
-    },
-    "attachment=floor,facing=south": {
-      "model": "minecraft:block/bell_floor",
-      "y": 180
-    },
-    "attachment=floor,facing=west": {
-      "model": "minecraft:block/bell_floor",
-      "y": 270
-    },
-    "attachment=single_wall,facing=east": {
-      "model": "minecraft:block/bell_wall"
-    },
-    "attachment=single_wall,facing=north": {
-      "model": "minecraft:block/bell_wall",
-      "y": 270
-    },
-    "attachment=single_wall,facing=south": {
-      "model": "minecraft:block/bell_wall",
-      "y": 90
-    },
-    "attachment=single_wall,facing=west": {
-      "model": "minecraft:block/bell_wall",
-      "y": 180
-    }
-  }
-}

assets/minecraft/blockstates/birch_button.json

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

assets/minecraft/blockstates/birch_door.json

@@ -1,124 +1,36 @@
 {
-  "variants": {
+    "variants": {
-    "facing=east,half=lower,hinge=left,open=false": {
+        "facing=east,half=lower,hinge=left,open=false":  { "model": "block/birch_door_bottom" },
-      "model": "minecraft: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=east,half=lower,hinge=left,open=true": {
+        "facing=north,half=lower,hinge=left,open=false": { "model": "block/birch_door_bottom", "y": 270 },
-      "model": "minecraft:block/birch_door_bottom_hinge",
+        "facing=east,half=lower,hinge=right,open=false":  { "model": "block/birch_door_bottom_hinge" },
-      "y": 90
+        "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=east,half=lower,hinge=right,open=false": {
+        "facing=north,half=lower,hinge=right,open=false": { "model": "block/birch_door_bottom_hinge", "y": 270 },
-      "model": "minecraft:block/birch_door_bottom_hinge"
+        "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=east,half=lower,hinge=right,open=true": {
+        "facing=west,half=lower,hinge=left,open=true":  { "model": "block/birch_door_bottom_hinge", "y": 270 },
-      "model": "minecraft:block/birch_door_bottom",
+        "facing=north,half=lower,hinge=left,open=true": { "model": "block/birch_door_bottom_hinge" },
-      "y": 270
+        "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=east,half=upper,hinge=left,open=false": {
+        "facing=west,half=lower,hinge=right,open=true":  { "model": "block/birch_door_bottom", "y": 90 },
-      "model": "minecraft:block/birch_door_top"
+        "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=east,half=upper,hinge=left,open=true": {
+        "facing=south,half=upper,hinge=left,open=false": { "model": "block/birch_door_top", "y": 90 },
-      "model": "minecraft:block/birch_door_top_hinge",
+        "facing=west,half=upper,hinge=left,open=false":  { "model": "block/birch_door_top", "y": 180 },
-      "y": 90
+        "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=east,half=upper,hinge=right,open=false": {
+        "facing=south,half=upper,hinge=right,open=false": { "model": "block/birch_door_top_hinge", "y": 90 },
-      "model": "minecraft:block/birch_door_top_hinge"
+        "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=right,open=true": {
+        "facing=east,half=upper,hinge=left,open=true":  { "model": "block/birch_door_top_hinge", "y": 90 },
-      "model": "minecraft:block/birch_door_top",
+        "facing=south,half=upper,hinge=left,open=true": { "model": "block/birch_door_top_hinge", "y": 180 },
-      "y": 270
+        "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=north,half=lower,hinge=left,open=false": {
+        "facing=east,half=upper,hinge=right,open=true":  { "model": "block/birch_door_top", "y": 270 },
-      "model": "minecraft:block/birch_door_bottom",
+        "facing=south,half=upper,hinge=right,open=true": { "model": "block/birch_door_top" },
-      "y": 270
+        "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 }
-    "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_bottom_hinge"
-    },
-    "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_bottom_hinge",
-      "y": 270
-    },
-    "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_bottom",
-      "y": 180
-    },
-    "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_top",
-      "y": 270
-    },
-    "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_top_hinge"
-    },
-    "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_top_hinge",
-      "y": 270
-    },
-    "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_top",
-      "y": 180
-    },
-    "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_bottom",
-      "y": 90
-    },
-    "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_bottom_hinge",
-      "y": 180
-    },
-    "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_bottom_hinge",
-      "y": 90
-    },
-    "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_bottom"
-    },
-    "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_top",
-      "y": 90
-    },
-    "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_top_hinge",
-      "y": 180
-    },
-    "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_top_hinge",
-      "y": 90
-    },
-    "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_top"
-    },
-    "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_bottom",
-      "y": 180
-    },
-    "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_bottom_hinge",
-      "y": 270
-    },
-    "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_bottom_hinge",
-      "y": 180
-    },
-    "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_bottom",
-      "y": 90
-    },
-    "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/birch_door_top",
-      "y": 180
-    },
-    "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/birch_door_top_hinge",
-      "y": 270
-    },
-    "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/birch_door_top_hinge",
-      "y": 180
-    },
-    "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/birch_door_top",
-      "y": 90
     }
-  }
+}
-}

assets/minecraft/blockstates/birch_fence.json

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

assets/minecraft/blockstates/birch_fence_gate.json

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

assets/minecraft/blockstates/birch_leaves.json

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

assets/minecraft/blockstates/birch_log.json

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

assets/minecraft/blockstates/birch_planks.json

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

assets/minecraft/blockstates/birch_pressure_plate.json

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

assets/minecraft/blockstates/birch_sapling.json

@@ -1,7 +1,5 @@
 {
-  "variants": {
+    "variants": {
-    "": {
+        "": { "model": "block/birch_sapling" }
-      "model": "minecraft:block/birch_sapling"
     }
-  }
+}
-}

assets/minecraft/blockstates/birch_sign.json

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

assets/minecraft/blockstates/birch_slab.json

@@ -1,13 +1,7 @@
 {
-  "variants": {
+    "variants": {
-    "type=bottom": {
+        "type=bottom": { "model": "block/birch_slab" },
-      "model": "minecraft:block/birch_slab"
+        "type=top": { "model": "block/birch_slab_top" },
-    },
+        "type=double": { "model": "block/birch_planks" }
-    "type=double": {
-      "model": "minecraft:block/birch_planks"
-    },
-    "type=top": {
-      "model": "minecraft:block/birch_slab_top"
     }
-  }
+}
-}

assets/minecraft/blockstates/birch_stairs.json

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

assets/minecraft/blockstates/birch_trapdoor.json

@@ -1,69 +1,20 @@
 {
-  "variants": {
+    "variants": {
-    "facing=east,half=bottom,open=false": {
+        "facing=north,half=bottom,open=false": { "model": "block/birch_trapdoor_bottom" },
-      "model": "minecraft:block/birch_trapdoor_bottom",
+        "facing=south,half=bottom,open=false": { "model": "block/birch_trapdoor_bottom", "y": 180 },
-      "y": 90
+        "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=east,half=bottom,open=true": {
+        "facing=north,half=top,open=false": { "model": "block/birch_trapdoor_top" },
-      "model": "minecraft:block/birch_trapdoor_open",
+        "facing=south,half=top,open=false": { "model": "block/birch_trapdoor_top", "y": 180 },
-      "y": 90
+        "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=east,half=top,open=false": {
+        "facing=north,half=bottom,open=true": { "model": "block/birch_trapdoor_open" },
-      "model": "minecraft:block/birch_trapdoor_top",
+        "facing=south,half=bottom,open=true": { "model": "block/birch_trapdoor_open", "y": 180 },
-      "y": 90
+        "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=east,half=top,open=true": {
+        "facing=north,half=top,open=true": { "model": "block/birch_trapdoor_open", "x": 180, "y": 180 },
-      "model": "minecraft:block/birch_trapdoor_open",
+        "facing=south,half=top,open=true": { "model": "block/birch_trapdoor_open", "x": 180, "y": 0 },
-      "x": 180,
+        "facing=east,half=top,open=true": { "model": "block/birch_trapdoor_open", "x": 180, "y": 270 },
-      "y": 270
+        "facing=west,half=top,open=true": { "model": "block/birch_trapdoor_open", "x": 180, "y": 90 }
-    },
-    "facing=north,half=bottom,open=false": {
-      "model": "minecraft:block/birch_trapdoor_bottom"
-    },
-    "facing=north,half=bottom,open=true": {
-      "model": "minecraft:block/birch_trapdoor_open"
-    },
-    "facing=north,half=top,open=false": {
-      "model": "minecraft:block/birch_trapdoor_top"
-    },
-    "facing=north,half=top,open=true": {
-      "model": "minecraft:block/birch_trapdoor_open",
-      "x": 180,
-      "y": 180
-    },
-    "facing=south,half=bottom,open=false": {
-      "model": "minecraft:block/birch_trapdoor_bottom",
-      "y": 180
-    },
-    "facing=south,half=bottom,open=true": {
-      "model": "minecraft:block/birch_trapdoor_open",
-      "y": 180
-    },
-    "facing=south,half=top,open=false": {
-      "model": "minecraft:block/birch_trapdoor_top",
-      "y": 180
-    },
-    "facing=south,half=top,open=true": {
-      "model": "minecraft:block/birch_trapdoor_open",
-      "x": 180,
-      "y": 0
-    },
-    "facing=west,half=bottom,open=false": {
-      "model": "minecraft:block/birch_trapdoor_bottom",
-      "y": 270
-    },
-    "facing=west,half=bottom,open=true": {
-      "model": "minecraft:block/birch_trapdoor_open",
-      "y": 270
-    },
-    "facing=west,half=top,open=false": {
-      "model": "minecraft:block/birch_trapdoor_top",
-      "y": 270
-    },
-    "facing=west,half=top,open=true": {
-      "model": "minecraft:block/birch_trapdoor_open",
-      "x": 180,
-      "y": 90
     }
-  }
+}
-}

assets/minecraft/blockstates/birch_wall_sign.json

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

assets/minecraft/blockstates/birch_wood.json

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

assets/minecraft/blockstates/black_banner.json

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

assets/minecraft/blockstates/black_bed.json

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

assets/minecraft/blockstates/black_carpet.json

@@ -1,7 +1,5 @@
 {
-  "variants": {
+    "variants": {
-    "": {
+        "": { "model": "block/black_carpet" }
-      "model": "minecraft:block/black_carpet"
     }
-  }
+}
-}

assets/minecraft/blockstates/black_concrete.json

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

assets/minecraft/blockstates/black_concrete_powder.json

@@ -1,21 +1,10 @@
 {
-  "variants": {
+    "variants": {
-    "": [
+        "": [
-      {
+            { "model": "block/black_concrete_powder" },
-        "model": "minecraft: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 }
-        "model": "minecraft:block/black_concrete_powder",
+        ]
-        "y": 90
+    }
-      },
+}
-      {
-        "model": "minecraft:block/black_concrete_powder",
-        "y": 180
-      },
-      {
-        "model": "minecraft:block/black_concrete_powder",
-        "y": 270
-      }
-    ]
-  }
-}

assets/minecraft/blockstates/black_glazed_terracotta.json

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

assets/minecraft/blockstates/black_shulker_box.json

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

assets/minecraft/blockstates/black_stained_glass.json

@@ -1,7 +1,5 @@
 {
-  "variants": {
+    "variants": {
-    "": {
+        "": { "model": "block/black_stained_glass" }
-      "model": "minecraft:block/black_stained_glass"
     }
-  }
+}
-}

assets/minecraft/blockstates/black_stained_glass_pane.json

@@ -1,77 +1,29 @@
 {
-  "multipart": [
+    "multipart": [
-    {
+        {   "apply": { "model": "block/black_stained_glass_pane_post" }},
-      "apply": {
+        {   "when": { "north": true },
-        "model": "minecraft:block/black_stained_glass_pane_post"
+            "apply": { "model": "block/black_stained_glass_pane_side" }
-      }
+        },
-    },
+        {   "when": { "east": true },
-    {
+            "apply": { "model": "block/black_stained_glass_pane_side", "y": 90 }
-      "when": {
+        },
-        "north": "true"
+        {   "when": { "south": true },
-      },
+            "apply": { "model": "block/black_stained_glass_pane_side_alt" }
-      "apply": {
+        },
-        "model": "minecraft:block/black_stained_glass_pane_side"
+        {   "when": { "west": true },
-      }
+            "apply": { "model": "block/black_stained_glass_pane_side_alt", "y": 90 }
-    },
+        },
-    {
+        {   "when": { "north": false },
-      "when": {
+            "apply": { "model": "block/black_stained_glass_pane_noside" }
-        "east": "true"
+        },
-      },
+        {   "when": { "east": false },
-      "apply": {
+            "apply": { "model": "block/black_stained_glass_pane_noside_alt" }
-        "model": "minecraft:block/black_stained_glass_pane_side",
+        },
-        "y": 90
+        {   "when": { "south": false },
-      }
+            "apply": { "model": "block/black_stained_glass_pane_noside_alt", "y": 90 }
-    },
+        },
-    {
+        {   "when": { "west": false },
-      "when": {
+            "apply": { "model": "block/black_stained_glass_pane_noside", "y": 270 }
-        "south": "true"
+        }
-      },
+    ]
-      "apply": {
+}
-        "model": "minecraft:block/black_stained_glass_pane_side_alt"
-      }
-    },
-    {
-      "when": {
-        "west": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/black_stained_glass_pane_side_alt",
-        "y": 90
-      }
-    },
-    {
-      "when": {
-        "north": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/black_stained_glass_pane_noside"
-      }
-    },
-    {
-      "when": {
-        "east": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/black_stained_glass_pane_noside_alt"
-      }
-    },
-    {
-      "when": {
-        "south": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/black_stained_glass_pane_noside_alt",
-        "y": 90
-      }
-    },
-    {
-      "when": {
-        "west": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/black_stained_glass_pane_noside",
-        "y": 270
-      }
-    }
-  ]
-}

assets/minecraft/blockstates/black_terracotta.json

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

assets/minecraft/blockstates/black_wall_banner.json

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

assets/minecraft/blockstates/black_wool.json

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

assets/minecraft/blockstates/blackstone.json

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

assets/minecraft/blockstates/blackstone_slab.json

@@ -1,13 +0,0 @@
-{
-  "variants": {
-    "type=bottom": {
-      "model": "minecraft:block/blackstone_slab"
-    },
-    "type=double": {
-      "model": "minecraft:block/blackstone"
-    },
-    "type=top": {
-      "model": "minecraft:block/blackstone_slab_top"
-    }
-  }
-}

assets/minecraft/blockstates/blackstone_stairs.json

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

assets/minecraft/blockstates/blackstone_wall.json

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

assets/minecraft/blockstates/blast_furnace.json

@@ -1,34 +0,0 @@
-{
-  "variants": {
-    "facing=east,lit=false": {
-      "model": "minecraft:block/blast_furnace",
-      "y": 90
-    },
-    "facing=east,lit=true": {
-      "model": "minecraft:block/blast_furnace_on",
-      "y": 90
-    },
-    "facing=north,lit=false": {
-      "model": "minecraft:block/blast_furnace"
-    },
-    "facing=north,lit=true": {
-      "model": "minecraft:block/blast_furnace_on"
-    },
-    "facing=south,lit=false": {
-      "model": "minecraft:block/blast_furnace",
-      "y": 180
-    },
-    "facing=south,lit=true": {
-      "model": "minecraft:block/blast_furnace_on",
-      "y": 180
-    },
-    "facing=west,lit=false": {
-      "model": "minecraft:block/blast_furnace",
-      "y": 270
-    },
-    "facing=west,lit=true": {
-      "model": "minecraft:block/blast_furnace_on",
-      "y": 270
-    }
-  }
-}

assets/minecraft/blockstates/blue_banner.json

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

assets/minecraft/blockstates/blue_bed.json

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

assets/minecraft/blockstates/blue_carpet.json

@@ -1,7 +1,5 @@
 {
-  "variants": {
+    "variants": {
-    "": {
+        "": { "model": "block/blue_carpet" }
-      "model": "minecraft:block/blue_carpet"
     }
-  }
+}
-}

assets/minecraft/blockstates/blue_concrete.json

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

assets/minecraft/blockstates/blue_concrete_powder.json

@@ -1,21 +1,10 @@
 {
-  "variants": {
+    "variants": {
-    "": [
+        "": [
-      {
+            { "model": "block/blue_concrete_powder" },
-        "model": "minecraft: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 }
-        "model": "minecraft:block/blue_concrete_powder",
+        ]
-        "y": 90
+    }
-      },
+}
-      {
-        "model": "minecraft:block/blue_concrete_powder",
-        "y": 180
-      },
-      {
-        "model": "minecraft:block/blue_concrete_powder",
-        "y": 270
-      }
-    ]
-  }
-}

assets/minecraft/blockstates/blue_glazed_terracotta.json

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

assets/minecraft/blockstates/blue_ice.json

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

assets/minecraft/blockstates/blue_orchid.json

@@ -1,7 +1,5 @@
 {
-  "variants": {
+    "variants": {
-    "": {
+        "": { "model": "block/blue_orchid" }
-      "model": "minecraft:block/blue_orchid"
     }
-  }
+}
-}

assets/minecraft/blockstates/blue_shulker_box.json

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

assets/minecraft/blockstates/blue_stained_glass.json

@@ -1,7 +1,5 @@
 {
-  "variants": {
+    "variants": {
-    "": {
+        "": { "model": "block/blue_stained_glass" }
-      "model": "minecraft:block/blue_stained_glass"
     }
-  }
+}
-}

assets/minecraft/blockstates/blue_stained_glass_pane.json

@@ -1,77 +1,29 @@
 {
-  "multipart": [
+    "multipart": [
-    {
+        {   "apply": { "model": "block/blue_stained_glass_pane_post" }},
-      "apply": {
+        {   "when": { "north": true },
-        "model": "minecraft:block/blue_stained_glass_pane_post"
+            "apply": { "model": "block/blue_stained_glass_pane_side" }
-      }
+        },
-    },
+        {   "when": { "east": true },
-    {
+            "apply": { "model": "block/blue_stained_glass_pane_side", "y": 90 }
-      "when": {
+        },
-        "north": "true"
+        {   "when": { "south": true },
-      },
+            "apply": { "model": "block/blue_stained_glass_pane_side_alt" }
-      "apply": {
+        },
-        "model": "minecraft:block/blue_stained_glass_pane_side"
+        {   "when": { "west": true },
-      }
+            "apply": { "model": "block/blue_stained_glass_pane_side_alt", "y": 90 }
-    },
+        },
-    {
+        {   "when": { "north": false },
-      "when": {
+            "apply": { "model": "block/blue_stained_glass_pane_noside" }
-        "east": "true"
+        },
-      },
+        {   "when": { "east": false },
-      "apply": {
+            "apply": { "model": "block/blue_stained_glass_pane_noside_alt" }
-        "model": "minecraft:block/blue_stained_glass_pane_side",
+        },
-        "y": 90
+        {   "when": { "south": false },
-      }
+            "apply": { "model": "block/blue_stained_glass_pane_noside_alt", "y": 90 }
-    },
+        },
-    {
+        {   "when": { "west": false },
-      "when": {
+            "apply": { "model": "block/blue_stained_glass_pane_noside", "y": 270 }
-        "south": "true"
+        }
-      },
+    ]
-      "apply": {
+}
-        "model": "minecraft:block/blue_stained_glass_pane_side_alt"
-      }
-    },
-    {
-      "when": {
-        "west": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/blue_stained_glass_pane_side_alt",
-        "y": 90
-      }
-    },
-    {
-      "when": {
-        "north": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/blue_stained_glass_pane_noside"
-      }
-    },
-    {
-      "when": {
-        "east": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/blue_stained_glass_pane_noside_alt"
-      }
-    },
-    {
-      "when": {
-        "south": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/blue_stained_glass_pane_noside_alt",
-        "y": 90
-      }
-    },
-    {
-      "when": {
-        "west": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/blue_stained_glass_pane_noside",
-        "y": 270
-      }
-    }
-  ]
-}

assets/minecraft/blockstates/blue_terracotta.json

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

assets/minecraft/blockstates/blue_wall_banner.json

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

assets/minecraft/blockstates/blue_wool.json

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

assets/minecraft/blockstates/bone_block.json

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

assets/minecraft/blockstates/bookshelf.json

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

assets/minecraft/blockstates/brain_coral.json

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

assets/minecraft/blockstates/brain_coral_block.json

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

assets/minecraft/blockstates/brain_coral_fan.json

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

assets/minecraft/blockstates/brain_coral_wall_fan.json

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

assets/minecraft/blockstates/brewing_stand.json

@@ -1,57 +1,23 @@
 {
-  "multipart": [
+    "multipart": [
-    {
+        {   "apply": { "model": "block/brewing_stand" }},
-      "apply": {
+        {   "when": { "has_bottle_0": "true" },
-        "model": "minecraft:block/brewing_stand"
+            "apply": { "model": "block/brewing_stand_bottle0" }
-      }
+        },
-    },
+        {   "when": { "has_bottle_1": "true" },
-    {
+            "apply": { "model": "block/brewing_stand_bottle1" }
-      "when": {
+        },
-        "has_bottle_0": "true"
+        {   "when": { "has_bottle_2": "true" },
-      },
+            "apply": { "model": "block/brewing_stand_bottle2" }
-      "apply": {
+        },
-        "model": "minecraft:block/brewing_stand_bottle0"
+        {   "when": { "has_bottle_0": "false" },
-      }
+            "apply": { "model": "block/brewing_stand_empty0" }
-    },
+        },
-    {
+        {   "when": { "has_bottle_1": "false" },
-      "when": {
+            "apply": { "model": "block/brewing_stand_empty1" }
-        "has_bottle_1": "true"
+        },
-      },
+        {   "when": { "has_bottle_2": "false" },
-      "apply": {
+            "apply": { "model": "block/brewing_stand_empty2" }
-        "model": "minecraft:block/brewing_stand_bottle1"
+        }
-      }
+    ]
-    },
+}
-    {
-      "when": {
-        "has_bottle_2": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/brewing_stand_bottle2"
-      }
-    },
-    {
-      "when": {
-        "has_bottle_0": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/brewing_stand_empty0"
-      }
-    },
-    {
-      "when": {
-        "has_bottle_1": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/brewing_stand_empty1"
-      }
-    },
-    {
-      "when": {
-        "has_bottle_2": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/brewing_stand_empty2"
-      }
-    }
-  ]
-}

assets/minecraft/blockstates/brick_slab.json

@@ -1,13 +1,7 @@
 {
-  "variants": {
+    "variants": {
-    "type=bottom": {
+        "type=bottom": { "model": "block/brick_slab" },
-      "model": "minecraft:block/brick_slab"
+        "type=top": { "model": "block/brick_slab_top" },
-    },
+        "type=double": { "model": "block/bricks" }
-    "type=double": {
-      "model": "minecraft:block/bricks"
-    },
-    "type=top": {
-      "model": "minecraft:block/brick_slab_top"
     }
-  }
+}
-}

assets/minecraft/blockstates/brick_stairs.json

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

assets/minecraft/blockstates/brick_wall.json

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

assets/minecraft/blockstates/bricks.json

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

assets/minecraft/blockstates/brown_banner.json

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

assets/minecraft/blockstates/brown_bed.json

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