Create/Update assets for version 1.8.2

assets/minecraft/blockstates/acacia_fence.json

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

assets/minecraft/blockstates/acacia_fence_gate.json

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

assets/minecraft/blockstates/acacia_log.json

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

assets/minecraft/blockstates/acacia_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "acacia_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "acacia_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "acacia_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "acacia_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "acacia_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "acacia_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "acacia_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "acacia_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "acacia_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "acacia_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "acacia_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "acacia_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "acacia_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "acacia_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "acacia_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "acacia_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "acacia_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "acacia_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "acacia_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "acacia_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "acacia_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "acacia_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "acacia_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "acacia_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "acacia_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "acacia_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "acacia_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "acacia_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "acacia_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "acacia_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "acacia_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "acacia_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "acacia_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "acacia_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "acacia_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/beetroots.json

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

assets/minecraft/blockstates/birch_fence.json

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

assets/minecraft/blockstates/birch_fence_gate.json

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

assets/minecraft/blockstates/birch_log.json

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

assets/minecraft/blockstates/birch_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "birch_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "birch_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "birch_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "birch_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "birch_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "birch_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "birch_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "birch_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "birch_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "birch_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "birch_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "birch_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "birch_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "birch_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "birch_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "birch_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "birch_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "birch_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "birch_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "birch_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "birch_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "birch_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "birch_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "birch_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "birch_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "birch_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "birch_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "birch_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "birch_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "birch_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "birch_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "birch_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "birch_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "birch_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "birch_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/black_stained_glass_pane.json

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

assets/minecraft/blockstates/blue_stained_glass_pane.json

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

assets/minecraft/blockstates/bone_block.json

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

assets/minecraft/blockstates/brewing_stand.json

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

assets/minecraft/blockstates/brick_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "brick_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "brick_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "brick_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "brick_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "brick_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/brown_stained_glass_pane.json

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

assets/minecraft/blockstates/chain_command_block.json

@@ -1,16 +0,0 @@
-{
-    "variants": {
-        "conditional=false,facing=down":  { "model": "chain_command_block", "x": 90 },
-        "conditional=false,facing=up":    { "model": "chain_command_block", "x": 270 },
-        "conditional=false,facing=north": { "model": "chain_command_block" },
-        "conditional=false,facing=south": { "model": "chain_command_block", "y": 180 },
-        "conditional=false,facing=west":  { "model": "chain_command_block", "y": 270 },
-        "conditional=false,facing=east":  { "model": "chain_command_block", "y": 90 },
-        "conditional=true,facing=down":  { "model": "chain_command_block_conditional", "x": 90 },
-        "conditional=true,facing=up":    { "model": "chain_command_block_conditional", "x": 270 },
-        "conditional=true,facing=north": { "model": "chain_command_block_conditional" },
-        "conditional=true,facing=south": { "model": "chain_command_block_conditional", "y": 180 },
-        "conditional=true,facing=west":  { "model": "chain_command_block_conditional", "y": 270 },
-        "conditional=true,facing=east":  { "model": "chain_command_block_conditional", "y": 90 }
-    }
-}

assets/minecraft/blockstates/chorus_flower.json

@@ -1,10 +0,0 @@
-{
-    "variants": {
-        "age=0": { "model": "chorus_flower" },
-        "age=1": { "model": "chorus_flower" },
-        "age=2": { "model": "chorus_flower" },
-        "age=3": { "model": "chorus_flower" },
-        "age=4": { "model": "chorus_flower" },
-        "age=5": { "model": "chorus_flower_dead" }
-    }
-}

assets/minecraft/blockstates/chorus_plant.json

@@ -1,70 +0,0 @@
-{
-    "multipart": [
-        {   "when": { "north": true },
-            "apply": { "model": "chorus_plant_side" }
-        },
-        {   "when": { "east": true },
-            "apply": { "model": "chorus_plant_side", "y": 90, "uvlock": true }
-        },
-        {   "when": { "south": true },
-            "apply": { "model": "chorus_plant_side", "y": 180, "uvlock": true }
-        },
-        {   "when": { "west": true },
-            "apply": { "model": "chorus_plant_side", "y": 270, "uvlock": true }
-        },
-        {   "when": { "up": true },
-            "apply": { "model": "chorus_plant_side", "x": 270, "uvlock": true }
-        },
-        {   "when": { "down": true },
-            "apply": { "model": "chorus_plant_side", "x": 90, "uvlock": true }
-        },
-        {   "when": { "north": false },
-            "apply": [
-                { "model": "chorus_plant_noside", "weight": 2 },
-                { "model": "chorus_plant_noside1" },
-                { "model": "chorus_plant_noside2" },
-                { "model": "chorus_plant_noside3" }
-            ]
-        },
-        {   "when": { "east": false },
-            "apply": [
-                { "model": "chorus_plant_noside1", "y": 90, "uvlock": true },
-                { "model": "chorus_plant_noside2", "y": 90, "uvlock": true },
-                { "model": "chorus_plant_noside3", "y": 90, "uvlock": true },
-                { "model": "chorus_plant_noside", "weight": 2, "y": 90, "uvlock": true }
-            ]
-        },
-        {   "when": { "south": false },
-            "apply": [
-                { "model": "chorus_plant_noside2", "y": 180, "uvlock": true },
-                { "model": "chorus_plant_noside3", "y": 180, "uvlock": true },
-                { "model": "chorus_plant_noside", "weight": 2, "y": 180, "uvlock": true },
-                { "model": "chorus_plant_noside1", "y": 180, "uvlock": true }
-            ]
-        },
-        {   "when": { "west": false },
-            "apply": [
-                { "model": "chorus_plant_noside3", "y": 270, "uvlock": true },
-                { "model": "chorus_plant_noside", "weight": 2, "y": 270, "uvlock": true },
-                { "model": "chorus_plant_noside1", "y": 270, "uvlock": true },
-                { "model": "chorus_plant_noside2", "y": 270, "uvlock": true }
-            ]
-        },
-        {   "when": { "up": false },
-            "apply": [
-                { "model": "chorus_plant_noside", "weight": 2, "x": 270, "uvlock": true },
-                { "model": "chorus_plant_noside3", "x": 270, "uvlock": true },
-                { "model": "chorus_plant_noside1", "x": 270, "uvlock": true },
-                { "model": "chorus_plant_noside2", "x": 270, "uvlock": true }
-            ]
-        },
-        {   "when": { "down": false },
-            "apply": [
-                { "model": "chorus_plant_noside3", "x": 90, "uvlock": true },
-                { "model": "chorus_plant_noside2", "x": 90, "uvlock": true },
-                { "model": "chorus_plant_noside1", "x": 90, "uvlock": true },
-                { "model": "chorus_plant_noside", "weight": 2, "x": 90, "uvlock": true }
-            ]
-        }
-    ]
-}

assets/minecraft/blockstates/cobblestone_wall.json

@@ -1,19 +1,36 @@
 {
-    "multipart": [
+    "variants": {
-        {   "when": { "up": "true" },
+        "east=false,north=false,south=false,up=false,west=false": { "model": "cobblestone_wall_post" },
-            "apply": { "model": "cobblestone_wall_post" }
+        "east=false,north=true,south=false,up=false,west=false":  { "model": "cobblestone_wall_n" },
-        },
+        "east=true,north=false,south=false,up=false,west=false":  { "model": "cobblestone_wall_n", "y": 90, "uvlock": true },
-        {   "when": { "north": "true" },
+        "east=false,north=false,south=true,up=false,west=false":  { "model": "cobblestone_wall_n", "y": 180, "uvlock": true },
-            "apply": { "model": "cobblestone_wall_side", "uvlock": true }
+        "east=false,north=false,south=false,up=false,west=true":  { "model": "cobblestone_wall_n", "y": 270, "uvlock": true },
-        },
+        "east=true,north=true,south=false,up=false,west=false":   { "model": "cobblestone_wall_ne" },
-        {   "when": { "east": "true" },
+        "east=true,north=false,south=true,up=false,west=false":   { "model": "cobblestone_wall_ne", "y": 90, "uvlock": true },
-            "apply": { "model": "cobblestone_wall_side", "y": 90, "uvlock": true }
+        "east=false,north=false,south=true,up=false,west=true":   { "model": "cobblestone_wall_ne", "y": 180, "uvlock": true },
-        },
+        "east=false,north=true,south=false,up=false,west=true":   { "model": "cobblestone_wall_ne", "y": 270, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=true,south=true,up=false,west=false":   { "model": "cobblestone_wall_ns" },
-            "apply": { "model": "cobblestone_wall_side", "y": 180, "uvlock": true }
+        "east=true,north=false,south=false,up=false,west=true":   { "model": "cobblestone_wall_ns", "y": 90, "uvlock": true },
-        },
+        "east=true,north=true,south=true,up=false,west=false":    { "model": "cobblestone_wall_nse" },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=true,up=false,west=true":    { "model": "cobblestone_wall_nse", "y": 90, "uvlock": true },
-            "apply": { "model": "cobblestone_wall_side", "y": 270, "uvlock": true }
+        "east=false,north=true,south=true,up=false,west=true":    { "model": "cobblestone_wall_nse", "y": 180, "uvlock": true },
-        }
+        "east=true,north=true,south=false,up=false,west=true":    { "model": "cobblestone_wall_nse", "y": 270, "uvlock": true },
-    ]
+        "east=true,north=true,south=true,up=false,west=true":     { "model": "cobblestone_wall_nsew" },
+        "east=false,north=false,south=false,up=true,west=false":  { "model": "cobblestone_wall_post" },
+        "east=false,north=true,south=false,up=true,west=false":   { "model": "cobblestone_wall_n" },
+        "east=true,north=false,south=false,up=true,west=false":   { "model": "cobblestone_wall_n", "y": 90, "uvlock": true },
+        "east=false,north=false,south=true,up=true,west=false":   { "model": "cobblestone_wall_n", "y": 180, "uvlock": true },
+        "east=false,north=false,south=false,up=true,west=true":   { "model": "cobblestone_wall_n", "y": 270, "uvlock": true },
+        "east=true,north=true,south=false,up=true,west=false":    { "model": "cobblestone_wall_ne" },
+        "east=true,north=false,south=true,up=true,west=false":    { "model": "cobblestone_wall_ne", "y": 90, "uvlock": true },
+        "east=false,north=false,south=true,up=true,west=true":    { "model": "cobblestone_wall_ne", "y": 180, "uvlock": true },
+        "east=false,north=true,south=false,up=true,west=true":    { "model": "cobblestone_wall_ne", "y": 270, "uvlock": true },
+        "east=false,north=true,south=true,up=true,west=false":    { "model": "cobblestone_wall_ns_above" },
+        "east=true,north=false,south=false,up=true,west=true":    { "model": "cobblestone_wall_ns_above", "y": 90, "uvlock": true },
+        "east=true,north=true,south=true,up=true,west=false":     { "model": "cobblestone_wall_nse" },
+        "east=true,north=false,south=true,up=true,west=true":     { "model": "cobblestone_wall_nse", "y": 90, "uvlock": true },
+        "east=false,north=true,south=true,up=true,west=true":     { "model": "cobblestone_wall_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,up=true,west=true":     { "model": "cobblestone_wall_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,up=true,west=true":      { "model": "cobblestone_wall_nsew" }
+    }
 }

assets/minecraft/blockstates/command_block.json

@@ -1,16 +1,5 @@
 {
     "variants": {
-        "conditional=false,facing=down":  { "model": "command_block", "x": 90 },
+        "normal": { "model": "command_block" }
-        "conditional=false,facing=up":    { "model": "command_block", "x": 270 },
-        "conditional=false,facing=north": { "model": "command_block" },
-        "conditional=false,facing=south": { "model": "command_block", "y": 180 },
-        "conditional=false,facing=west":  { "model": "command_block", "y": 270 },
-        "conditional=false,facing=east":  { "model": "command_block", "y": 90 },
-        "conditional=true,facing=down":  { "model": "command_block_conditional", "x": 90 },
-        "conditional=true,facing=up":    { "model": "command_block_conditional", "x": 270 },
-        "conditional=true,facing=north": { "model": "command_block_conditional" },
-        "conditional=true,facing=south": { "model": "command_block_conditional", "y": 180 },
-        "conditional=true,facing=west":  { "model": "command_block_conditional", "y": 270 },
-        "conditional=true,facing=east":  { "model": "command_block_conditional", "y": 90 }
     }
 }

assets/minecraft/blockstates/cyan_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "cyan_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "cyan_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "cyan_pane_n" },
-            "apply": { "model": "cyan_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "cyan_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "cyan_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "cyan_pane_s", "y": 90 },
-            "apply": { "model": "cyan_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "cyan_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "cyan_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "cyan_pane_sw" },
-            "apply": { "model": "cyan_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "cyan_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "cyan_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "cyan_pane_ns", "y": 90 },
-            "apply": { "model": "cyan_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "cyan_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "cyan_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "cyan_pane_nsw" },
-            "apply": { "model": "cyan_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "cyan_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "cyan_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "cyan_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "cyan_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "cyan_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/dark_oak_fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "dark_oak_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "dark_oak_fence_post" },
-        {   "when": { "north": "true" },
+        "east=false,north=true,south=false,west=false": { "model": "dark_oak_fence_n", "uvlock": true },
-            "apply": { "model": "dark_oak_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "dark_oak_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "dark_oak_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": "true" },
+        "east=false,north=false,south=false,west=true": { "model": "dark_oak_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "dark_oak_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "dark_oak_fence_ne", "uvlock": true },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "dark_oak_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=false,south=true,west=true": { "model": "dark_oak_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "dark_oak_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "dark_oak_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "dark_oak_fence_ns", "uvlock": true },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=false,west=true": { "model": "dark_oak_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "dark_oak_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "dark_oak_fence_nse", "uvlock": true },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "dark_oak_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "dark_oak_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "dark_oak_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "dark_oak_fence_nsew", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/dark_oak_fence_gate.json

@@ -1,20 +1,20 @@
 {
     "variants": {
-        "facing=south,in_wall=false,open=false": { "model": "dark_oak_fence_gate_closed", "uvlock": true },
+        "facing=south,in_wall=false,open=false": { "model": "dark_oak_fence_gate_closed" },
-        "facing=west,in_wall=false,open=false":  { "model": "dark_oak_fence_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=false":  { "model": "dark_oak_fence_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=false": { "model": "dark_oak_fence_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=false": { "model": "dark_oak_fence_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=false":  { "model": "dark_oak_fence_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=false":  { "model": "dark_oak_fence_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=false,open=true": { "model": "dark_oak_fence_gate_open", "uvlock": true },
+        "facing=south,in_wall=false,open=true": { "model": "dark_oak_fence_gate_open" },
-        "facing=west,in_wall=false,open=true":  { "model": "dark_oak_fence_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=true":  { "model": "dark_oak_fence_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=true": { "model": "dark_oak_fence_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=true": { "model": "dark_oak_fence_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=true":  { "model": "dark_oak_fence_gate_open", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=true":  { "model": "dark_oak_fence_gate_open", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=false": { "model": "dark_oak_wall_gate_closed", "uvlock": true },
+        "facing=south,in_wall=true,open=false": { "model": "dark_oak_wall_gate_closed" },
-        "facing=west,in_wall=true,open=false":  { "model": "dark_oak_wall_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=false":  { "model": "dark_oak_wall_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=false": { "model": "dark_oak_wall_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=false": { "model": "dark_oak_wall_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=false":  { "model": "dark_oak_wall_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=true,open=false":  { "model": "dark_oak_wall_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=true": { "model": "dark_oak_wall_gate_open", "uvlock": true },
+        "facing=south,in_wall=true,open=true": { "model": "dark_oak_wall_gate_open" },
-        "facing=west,in_wall=true,open=true":  { "model": "dark_oak_wall_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=true":  { "model": "dark_oak_wall_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=true": { "model": "dark_oak_wall_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=true": { "model": "dark_oak_wall_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=true":  { "model": "dark_oak_wall_gate_open", "uvlock": true, "y": 270 }
+        "facing=east,in_wall=true,open=true":  { "model": "dark_oak_wall_gate_open", "y": 270, "uvlock": true }
     }
 }

assets/minecraft/blockstates/dark_oak_log.json

@@ -1,8 +1,8 @@
 {
     "variants": {
         "axis=y":  { "model": "dark_oak_log" },
-        "axis=z":   { "model": "dark_oak_log", "x": 90 },
+        "axis=z":   { "model": "dark_oak_log_side" },
-        "axis=x":   { "model": "dark_oak_log", "x": 90, "y": 90 },
+        "axis=x":   { "model": "dark_oak_log_side", "y": 90 },
         "axis=none": { "model": "dark_oak_bark" }
     }
 }

assets/minecraft/blockstates/dark_oak_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "dark_oak_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "dark_oak_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "dark_oak_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "dark_oak_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "dark_oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "dark_oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "dark_oak_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "dark_oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "dark_oak_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "dark_oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "dark_oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "dark_oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "dark_oak_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "dark_oak_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "dark_oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "dark_oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "dark_oak_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "dark_oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "dark_oak_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "dark_oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "dark_oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "dark_oak_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "dark_oak_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/end_bricks.json

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

assets/minecraft/blockstates/end_rod.json

@@ -1,10 +0,0 @@
-{
-    "variants": {
-        "facing=up": { "model": "end_rod" },
-        "facing=down": { "model": "end_rod", "x": 180 },
-        "facing=east": { "model": "end_rod", "y": 90, "x": 90 },
-        "facing=south": { "model": "end_rod", "y": 180, "x": 90 },
-        "facing=west": { "model": "end_rod", "y": 270, "x": 90 },
-        "facing=north": { "model": "end_rod", "y": 0, "x": 90 }
-    }
-}

assets/minecraft/blockstates/fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "oak_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "oak_fence_post" },
-        {   "when": { "north": "true" },
+        "east=false,north=true,south=false,west=false": { "model": "oak_fence_n", "uvlock": true },
-            "apply": { "model": "oak_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "oak_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "oak_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": "true" },
+        "east=false,north=false,south=false,west=true": { "model": "oak_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "oak_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "oak_fence_ne", "uvlock": true },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "oak_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=false,south=true,west=true": { "model": "oak_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "oak_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "oak_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "oak_fence_ns", "uvlock": true },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=false,west=true": { "model": "oak_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "oak_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "oak_fence_nse", "uvlock": true },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "oak_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "oak_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "oak_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "oak_fence_nsew", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/fence_gate.json

@@ -1,20 +1,20 @@
 {
     "variants": {
-        "facing=south,in_wall=false,open=false": { "model": "oak_fence_gate_closed", "uvlock": true },
+        "facing=south,in_wall=false,open=false": { "model": "oak_fence_gate_closed" },
-        "facing=west,in_wall=false,open=false":  { "model": "oak_fence_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=false":  { "model": "oak_fence_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=false": { "model": "oak_fence_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=false": { "model": "oak_fence_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=false":  { "model": "oak_fence_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=false":  { "model": "oak_fence_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=false,open=true": { "model": "oak_fence_gate_open", "uvlock": true },
+        "facing=south,in_wall=false,open=true": { "model": "oak_fence_gate_open" },
-        "facing=west,in_wall=false,open=true":  { "model": "oak_fence_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=true":  { "model": "oak_fence_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=true": { "model": "oak_fence_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=true": { "model": "oak_fence_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=true":  { "model": "oak_fence_gate_open", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=true":  { "model": "oak_fence_gate_open", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=false": { "model": "oak_wall_gate_closed", "uvlock": true },
+        "facing=south,in_wall=true,open=false": { "model": "oak_wall_gate_closed" },
-        "facing=west,in_wall=true,open=false":  { "model": "oak_wall_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=false":  { "model": "oak_wall_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=false": { "model": "oak_wall_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=false": { "model": "oak_wall_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=false":  { "model": "oak_wall_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=true,open=false":  { "model": "oak_wall_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=true": { "model": "oak_wall_gate_open", "uvlock": true },
+        "facing=south,in_wall=true,open=true": { "model": "oak_wall_gate_open" },
-        "facing=west,in_wall=true,open=true":  { "model": "oak_wall_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=true":  { "model": "oak_wall_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=true": { "model": "oak_wall_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=true": { "model": "oak_wall_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=true":  { "model": "oak_wall_gate_open", "uvlock": true, "y": 270 }
+        "facing=east,in_wall=true,open=true":  { "model": "oak_wall_gate_open", "y": 270, "uvlock": true }
     }
 }

assets/minecraft/blockstates/fire.json

@@ -1,50 +1,196 @@
 {
-    "multipart": [
+    "variants": {
-        {   "when": {"north": false, "east": false, "south": false, "west": false, "up": false},
+        "alt=false,east=false,flip=false,north=false,south=false,upper=0,west=false": { "model": "fire_floor_main" },
-            "apply": [
+        "alt=false,east=false,flip=false,north=false,south=true,upper=0,west=false": { "model": "fire_n_main", "y": 180 },
-                { "model": "fire_floor0" },
+        "alt=false,east=false,flip=false,north=false,south=false,upper=0,west=true": { "model": "fire_n_main", "y": 270 },
-                { "model": "fire_floor1" }
+        "alt=false,east=false,flip=false,north=true,south=false,upper=0,west=false": { "model": "fire_n_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=false,upper=0,west=false": { "model": "fire_n_main", "y": 90 },
-        },
+        "alt=false,east=true,flip=false,north=true,south=false,upper=0,west=false": { "model": "fire_ne_main" },
-        {   "when": {"OR": [{"north": true}, {"north": false, "east": false, "south": false, "west": false, "up": false}]},
+        "alt=false,east=true,flip=false,north=false,south=true,upper=0,west=false": { "model": "fire_ne_main", "y": 90 },
-            "apply": [
+        "alt=false,east=false,flip=false,north=false,south=true,upper=0,west=true": { "model": "fire_ne_main", "y": 180 },
-                { "model": "fire_side0" },
+        "alt=false,east=false,flip=false,north=true,south=false,upper=0,west=true": { "model": "fire_ne_main", "y": 270 },
-                { "model": "fire_side1" },
+        "alt=false,east=false,flip=false,north=true,south=true,upper=0,west=false": { "model": "fire_ns_main" },
-                { "model": "fire_side_alt0" },
+        "alt=false,east=true,flip=false,north=false,south=false,upper=0,west=true": { "model": "fire_ns_main", "y": 90 },
-                { "model": "fire_side_alt1" }
+        "alt=false,east=true,flip=false,north=true,south=true,upper=0,west=false": { "model": "fire_nse_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=true,upper=0,west=true": { "model": "fire_nse_main", "y": 90 },
-        },
+        "alt=false,east=false,flip=false,north=true,south=true,upper=0,west=true": { "model": "fire_nse_main", "y": 180 },
-        {   "when": {"OR": [{"east": true}, {"north": false, "east": false, "south": false, "west": false, "up": false}]},
+        "alt=false,east=true,flip=false,north=true,south=false,upper=0,west=true": { "model": "fire_nse_main", "y": 270 },
-            "apply": [
+        "alt=false,east=true,flip=false,north=true,south=true,upper=0,west=true": { "model": "fire_nsew_main" },
-                { "model": "fire_side0", "y": 90 },
+        "alt=false,east=false,flip=false,north=false,south=false,upper=1,west=false": { "model": "fire_u1_main" },
-                { "model": "fire_side1", "y": 90 },
+        "alt=false,east=false,flip=false,north=false,south=true,upper=1,west=false": { "model": "fire_nu1_main", "y": 180 },
-                { "model": "fire_side_alt0", "y": 90 },
+        "alt=false,east=false,flip=false,north=false,south=false,upper=1,west=true": { "model": "fire_nu1_main", "y": 270 },
-                { "model": "fire_side_alt1", "y": 90 }
+        "alt=false,east=false,flip=false,north=true,south=false,upper=1,west=false": { "model": "fire_nu1_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=false,upper=1,west=false": { "model": "fire_nu1_main", "y": 90 },
-        },
+        "alt=false,east=true,flip=false,north=true,south=false,upper=1,west=false": { "model": "fire_neu1_main" },
-        {   "when": {"OR": [{"south": true}, {"north": false, "east": false, "south": false, "west": false, "up": false}]},
+        "alt=false,east=true,flip=false,north=false,south=true,upper=1,west=false": { "model": "fire_neu1_main", "y": 90 },
-            "apply": [
+        "alt=false,east=false,flip=false,north=false,south=true,upper=1,west=true": { "model": "fire_neu1_main", "y": 180 },
-                { "model": "fire_side0", "y": 180 },
+        "alt=false,east=false,flip=false,north=true,south=false,upper=1,west=true": { "model": "fire_neu1_main", "y": 270 },
-                { "model": "fire_side1", "y": 180 },
+        "alt=false,east=false,flip=false,north=true,south=true,upper=1,west=false": { "model": "fire_nsu1_main" },
-                { "model": "fire_side_alt0", "y": 180 },
+        "alt=false,east=true,flip=false,north=false,south=false,upper=1,west=true": { "model": "fire_nsu1_main", "y": 90 },
-                { "model": "fire_side_alt1", "y": 180 }
+        "alt=false,east=true,flip=false,north=true,south=true,upper=1,west=false": { "model": "fire_nseu1_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=true,upper=1,west=true": { "model": "fire_nseu1_main", "y": 90 },
-        },
+        "alt=false,east=false,flip=false,north=true,south=true,upper=1,west=true": { "model": "fire_nseu1_main", "y": 180 },
-        {   "when": {"OR": [{"west": true}, {"north": false, "east": false, "south": false, "west": false, "up": false}]},
+        "alt=false,east=true,flip=false,north=true,south=false,upper=1,west=true": { "model": "fire_nseu1_main", "y": 270 },
-            "apply": [
+        "alt=false,east=true,flip=false,north=true,south=true,upper=1,west=true": { "model": "fire_nsewu1_main" },
-                { "model": "fire_side0", "y": 270 },
+        "alt=false,east=false,flip=false,north=false,south=false,upper=2,west=false": { "model": "fire_u2_main" },
-                { "model": "fire_side1", "y": 270 },
+        "alt=false,east=false,flip=false,north=false,south=true,upper=2,west=false": { "model": "fire_nu2_main", "y": 180 },
-                { "model": "fire_side_alt0", "y": 270 },
+        "alt=false,east=false,flip=false,north=false,south=false,upper=2,west=true": { "model": "fire_nu2_main", "y": 270 },
-                { "model": "fire_side_alt1", "y": 270 }
+        "alt=false,east=false,flip=false,north=true,south=false,upper=2,west=false": { "model": "fire_nu2_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=false,upper=2,west=false": { "model": "fire_nu2_main", "y": 90 },
-        },
+        "alt=false,east=true,flip=false,north=true,south=false,upper=2,west=false": { "model": "fire_neu2_main" },
-        {   "when": {"up": true},
+        "alt=false,east=true,flip=false,north=false,south=true,upper=2,west=false": { "model": "fire_neu2_main", "y": 90 },
-            "apply": [
+        "alt=false,east=false,flip=false,north=false,south=true,upper=2,west=true": { "model": "fire_neu2_main", "y": 180 },
-                { "model": "fire_up0" },
+        "alt=false,east=false,flip=false,north=true,south=false,upper=2,west=true": { "model": "fire_neu2_main", "y": 270 },
-                { "model": "fire_up1" },
+        "alt=false,east=false,flip=false,north=true,south=true,upper=2,west=false": { "model": "fire_nsu2_main" },
-                { "model": "fire_up_alt0" },
+        "alt=false,east=true,flip=false,north=false,south=false,upper=2,west=true": { "model": "fire_nsu2_main", "y": 90 },
-                { "model": "fire_up_alt1" }
+        "alt=false,east=true,flip=false,north=true,south=true,upper=2,west=false": { "model": "fire_nseu2_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=true,upper=2,west=true": { "model": "fire_nseu2_main", "y": 90 },
-        }
+        "alt=false,east=false,flip=false,north=true,south=true,upper=2,west=true": { "model": "fire_nseu2_main", "y": 180 },
-    ]
+        "alt=false,east=true,flip=false,north=true,south=false,upper=2,west=true": { "model": "fire_nseu2_main", "y": 270 },
+        "alt=false,east=true,flip=false,north=true,south=true,upper=2,west=true": { "model": "fire_nsewu2_main" },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=0,west=false": { "model": "fire_floor_main" },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=0,west=false": { "model": "fire_n_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=0,west=true": { "model": "fire_n_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=0,west=false": { "model": "fire_n_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=0,west=false": { "model": "fire_n_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=0,west=false": { "model": "fire_ne_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=0,west=false": { "model": "fire_ne_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=0,west=true": { "model": "fire_ne_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=0,west=true": { "model": "fire_ne_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=0,west=false": { "model": "fire_ns_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=0,west=true": { "model": "fire_ns_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=0,west=false": { "model": "fire_nse_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=0,west=true": { "model": "fire_nse_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=0,west=true": { "model": "fire_nse_alt", "y": 180 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=0,west=true": { "model": "fire_nse_alt", "y": 270 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=0,west=true": { "model": "fire_nsew_alt" },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=1,west=false": { "model": "fire_u1_main" },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=1,west=false": { "model": "fire_nu1_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=1,west=true": { "model": "fire_nu1_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=1,west=false": { "model": "fire_nu1_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=1,west=false": { "model": "fire_nu1_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=1,west=false": { "model": "fire_neu1_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=1,west=false": { "model": "fire_neu1_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=1,west=true": { "model": "fire_neu1_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=1,west=true": { "model": "fire_neu1_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=1,west=false": { "model": "fire_nsu1_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=1,west=true": { "model": "fire_nsu1_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=1,west=false": { "model": "fire_nseu1_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=1,west=true": { "model": "fire_nseu1_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=1,west=true": { "model": "fire_nseu1_alt", "y": 180 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=1,west=true": { "model": "fire_nseu1_alt", "y": 270 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=1,west=true": { "model": "fire_nsewu1_alt" },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=2,west=false": { "model": "fire_u2_main" },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=2,west=false": { "model": "fire_nu2_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=2,west=true": { "model": "fire_nu2_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=2,west=false": { "model": "fire_nu2_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=2,west=false": { "model": "fire_nu2_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=2,west=false": { "model": "fire_neu2_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=2,west=false": { "model": "fire_neu2_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=2,west=true": { "model": "fire_neu2_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=2,west=true": { "model": "fire_neu2_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=2,west=false": { "model": "fire_nsu2_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=2,west=true": { "model": "fire_nsu2_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=2,west=false": { "model": "fire_nseu2_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=2,west=true": { "model": "fire_nseu2_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=2,west=true": { "model": "fire_nseu2_alt", "y": 180 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=2,west=true": { "model": "fire_nseu2_alt", "y": 270 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=2,west=true": { "model": "fire_nsewu2_alt" },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=0,west=false": { "model": "fire_floor_main" },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=0,west=false": { "model": "fire_n_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=0,west=true": { "model": "fire_n_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=0,west=false": { "model": "fire_n_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=0,west=false": { "model": "fire_n_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=0,west=false": { "model": "fire_ne_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=0,west=false": { "model": "fire_ne_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=0,west=true": { "model": "fire_ne_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=0,west=true": { "model": "fire_ne_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=0,west=false": { "model": "fire_ns_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=0,west=true": { "model": "fire_ns_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=0,west=false": { "model": "fire_nse_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=0,west=true": { "model": "fire_nse_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=0,west=true": { "model": "fire_nse_flip_main", "y": 180 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=0,west=true": { "model": "fire_nse_flip_main", "y": 270 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=0,west=true": { "model": "fire_nsew_flip_main" },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=1,west=false": { "model": "fire_u1_main" },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=1,west=false": { "model": "fire_nu1_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=1,west=true": { "model": "fire_nu1_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=1,west=false": { "model": "fire_nu1_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=1,west=false": { "model": "fire_nu1_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=1,west=false": { "model": "fire_neu1_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=1,west=false": { "model": "fire_neu1_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=1,west=true": { "model": "fire_neu1_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=1,west=true": { "model": "fire_neu1_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=1,west=false": { "model": "fire_nsu1_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=1,west=true": { "model": "fire_nsu1_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=1,west=false": { "model": "fire_nseu1_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=1,west=true": { "model": "fire_nseu1_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=1,west=true": { "model": "fire_nseu1_flip_main", "y": 180 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=1,west=true": { "model": "fire_nseu1_flip_main", "y": 270 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=1,west=true": { "model": "fire_nsewu1_flip_main" },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=2,west=false": { "model": "fire_u2_main" },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=2,west=false": { "model": "fire_nu2_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=2,west=true": { "model": "fire_nu2_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=2,west=false": { "model": "fire_nu2_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=2,west=false": { "model": "fire_nu2_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=2,west=false": { "model": "fire_neu2_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=2,west=false": { "model": "fire_neu2_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=2,west=true": { "model": "fire_neu2_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=2,west=true": { "model": "fire_neu2_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=2,west=false": { "model": "fire_nsu2_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=2,west=true": { "model": "fire_nsu2_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=2,west=false": { "model": "fire_nseu2_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=2,west=true": { "model": "fire_nseu2_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=2,west=true": { "model": "fire_nseu2_flip_main", "y": 180 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=2,west=true": { "model": "fire_nseu2_flip_main", "y": 270 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=2,west=true": { "model": "fire_nsewu2_flip_main" },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=0,west=false": { "model": "fire_floor_main" },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=0,west=false": { "model": "fire_n_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=0,west=true": { "model": "fire_n_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=0,west=false": { "model": "fire_n_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=0,west=false": { "model": "fire_n_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=0,west=false": { "model": "fire_ne_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=0,west=false": { "model": "fire_ne_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=0,west=true": { "model": "fire_ne_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=0,west=true": { "model": "fire_ne_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=0,west=false": { "model": "fire_ns_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=0,west=true": { "model": "fire_ns_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=0,west=false": { "model": "fire_nse_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=0,west=true": { "model": "fire_nse_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=0,west=true": { "model": "fire_nse_alt_flip", "y": 180 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=0,west=true": { "model": "fire_nse_alt_flip", "y": 270 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=0,west=true": { "model": "fire_nsew_alt_flip" },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=1,west=false": { "model": "fire_u1_main" },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=1,west=false": { "model": "fire_nu1_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=1,west=true": { "model": "fire_nu1_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=1,west=false": { "model": "fire_nu1_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=1,west=false": { "model": "fire_nu1_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=1,west=false": { "model": "fire_neu1_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=1,west=false": { "model": "fire_neu1_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=1,west=true": { "model": "fire_neu1_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=1,west=true": { "model": "fire_neu1_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=1,west=false": { "model": "fire_nsu1_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=1,west=true": { "model": "fire_nsu1_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=1,west=false": { "model": "fire_nseu1_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=1,west=true": { "model": "fire_nseu1_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=1,west=true": { "model": "fire_nseu1_alt_flip", "y": 180 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=1,west=true": { "model": "fire_nseu1_alt_flip", "y": 270 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=1,west=true": { "model": "fire_nsewu1_alt_flip" },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=2,west=false": { "model": "fire_u2_main" },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=2,west=false": { "model": "fire_nu2_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=2,west=true": { "model": "fire_nu2_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=2,west=false": { "model": "fire_nu2_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=2,west=false": { "model": "fire_nu2_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=2,west=false": { "model": "fire_neu2_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=2,west=false": { "model": "fire_neu2_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=2,west=true": { "model": "fire_neu2_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=2,west=true": { "model": "fire_neu2_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=2,west=false": { "model": "fire_nsu2_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=2,west=true": { "model": "fire_nsu2_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=2,west=false": { "model": "fire_nseu2_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=2,west=true": { "model": "fire_nseu2_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=2,west=true": { "model": "fire_nseu2_alt_flip", "y": 180 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=2,west=true": { "model": "fire_nseu2_alt_flip", "y": 270 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=2,west=true": { "model": "fire_nsewu2_alt_flip" }
+    }
 }

assets/minecraft/blockstates/frosted_ice.json

@@ -1,8 +0,0 @@
-{
-    "variants": {
-        "age=0": { "model": "frosted_ice_0" },
-        "age=1": { "model": "frosted_ice_1" },
-        "age=2": { "model": "frosted_ice_2" },
-        "age=3": { "model": "frosted_ice_3" }
-    }
-}

assets/minecraft/blockstates/glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "glass_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "glass_pane_n" },
-            "apply": { "model": "glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "glass_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "glass_pane_n", "y": 180 },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "glass_pane_n", "y": 270 },
-            "apply": { "model": "glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "glass_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "glass_pane_ne", "y": 90 },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "glass_pane_ne", "y": 180 },
-            "apply": { "model": "glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "glass_pane_ne", "y": 270 },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "glass_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "glass_pane_ns", "y": 90 },
-            "apply": { "model": "glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "glass_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "glass_pane_nse", "y": 90 },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "glass_pane_nse", "y": 180 },
-            "apply": { "model": "glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "glass_pane_nse", "y": 270 },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "glass_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/grass_path.json

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

assets/minecraft/blockstates/gray_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "gray_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "gray_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "gray_pane_n" },
-            "apply": { "model": "gray_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "gray_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "gray_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "gray_pane_s", "y": 90 },
-            "apply": { "model": "gray_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "gray_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "gray_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "gray_pane_sw" },
-            "apply": { "model": "gray_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "gray_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "gray_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "gray_pane_ns", "y": 90 },
-            "apply": { "model": "gray_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "gray_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "gray_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "gray_pane_nsw" },
-            "apply": { "model": "gray_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "gray_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "gray_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "gray_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "gray_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "gray_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/green_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "green_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "green_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "green_pane_n" },
-            "apply": { "model": "green_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "green_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "green_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "green_pane_s", "y": 90 },
-            "apply": { "model": "green_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "green_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "green_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "green_pane_sw" },
-            "apply": { "model": "green_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "green_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "green_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "green_pane_ns", "y": 90 },
-            "apply": { "model": "green_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "green_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "green_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "green_pane_nsw" },
-            "apply": { "model": "green_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "green_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "green_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "green_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "green_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "green_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/hay_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "axis=y": { "model": "hay" },
-        "axis=z": { "model": "hay", "x": 90 },
+        "axis=z": { "model": "hay_side" },
-        "axis=x": { "model": "hay", "x": 90, "y": 90 }
+        "axis=x": { "model": "hay_side", "y": 90 }
     }
 }

assets/minecraft/blockstates/iron_bars.json

@@ -1,32 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "iron_bars_post_ends" }},
+        "east=false,north=false,south=false,west=false": { "model": "bars_nsew" },
-        {   "when": { "north": false, "east": false, "south": false, "west": false },
+        "east=false,north=true,south=false,west=false": { "model": "bars_n" },
-            "apply": { "model": "iron_bars_post" }
+        "east=true,north=false,south=false,west=false": { "model": "bars_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "bars_n", "y": 180 },
-        {   "when": { "north": true, "east": false, "south": false, "west": false },
+        "east=false,north=false,south=false,west=true": { "model": "bars_n", "y": 270 },
-            "apply": { "model": "iron_bars_cap" }
+        "east=true,north=true,south=false,west=false": { "model": "bars_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "bars_ne", "y": 90 },
-        {   "when": { "north": false, "east": true, "south": false, "west": false },
+        "east=false,north=false,south=true,west=true": { "model": "bars_ne", "y": 180 },
-            "apply": { "model": "iron_bars_cap", "y": 90 }
+        "east=false,north=true,south=false,west=true": { "model": "bars_ne", "y": 270 },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "bars_ns" },
-        {   "when": { "north": false, "east": false, "south": true, "west": false },
+        "east=true,north=false,south=false,west=true": { "model": "bars_ns", "y": 90 },
-            "apply": { "model": "iron_bars_cap_alt" }
+        "east=true,north=true,south=true,west=false": { "model": "bars_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "bars_nse", "y": 90 },
-        {   "when": { "north": false, "east": false, "south": false, "west": true },
+        "east=false,north=true,south=true,west=true": { "model": "bars_nse", "y": 180 },
-            "apply": { "model": "iron_bars_cap_alt", "y": 90 }
+        "east=true,north=true,south=false,west=true": { "model": "bars_nse", "y": 270 },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "bars_nsew" }
-        {   "when": { "north": true },
+    }
-            "apply": { "model": "iron_bars_side" }
-        },
-        {   "when": { "east": true },
-            "apply": { "model": "iron_bars_side", "y": 90 }
-        },
-        {   "when": { "south": true },
-            "apply": { "model": "iron_bars_side_alt" }
-        },
-        {   "when": { "west": true },
-            "apply": { "model": "iron_bars_side_alt", "y": 90 }
-        }
-    ]
 }

assets/minecraft/blockstates/jungle_fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "jungle_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "jungle_fence_post" },
-        {   "when": { "north": "true" },
+        "east=false,north=true,south=false,west=false": { "model": "jungle_fence_n", "uvlock": true },
-            "apply": { "model": "jungle_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "jungle_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "jungle_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": "true" },
+        "east=false,north=false,south=false,west=true": { "model": "jungle_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "jungle_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "jungle_fence_ne", "uvlock": true },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "jungle_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=false,south=true,west=true": { "model": "jungle_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "jungle_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "jungle_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "jungle_fence_ns", "uvlock": true },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=false,west=true": { "model": "jungle_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "jungle_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "jungle_fence_nse", "uvlock": true },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "jungle_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "jungle_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "jungle_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "jungle_fence_nsew", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/jungle_fence_gate.json

@@ -1,20 +1,20 @@
 {
     "variants": {
-        "facing=south,in_wall=false,open=false": { "model": "jungle_fence_gate_closed", "uvlock": true },
+        "facing=south,in_wall=false,open=false": { "model": "jungle_fence_gate_closed" },
-        "facing=west,in_wall=false,open=false":  { "model": "jungle_fence_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=false":  { "model": "jungle_fence_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=false": { "model": "jungle_fence_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=false": { "model": "jungle_fence_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=false":  { "model": "jungle_fence_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=false":  { "model": "jungle_fence_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=false,open=true": { "model": "jungle_fence_gate_open", "uvlock": true },
+        "facing=south,in_wall=false,open=true": { "model": "jungle_fence_gate_open" },
-        "facing=west,in_wall=false,open=true":  { "model": "jungle_fence_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=true":  { "model": "jungle_fence_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=true": { "model": "jungle_fence_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=true": { "model": "jungle_fence_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=true":  { "model": "jungle_fence_gate_open", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=true":  { "model": "jungle_fence_gate_open", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=false": { "model": "jungle_wall_gate_closed", "uvlock": true },
+        "facing=south,in_wall=true,open=false": { "model": "jungle_wall_gate_closed" },
-        "facing=west,in_wall=true,open=false":  { "model": "jungle_wall_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=false":  { "model": "jungle_wall_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=false": { "model": "jungle_wall_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=false": { "model": "jungle_wall_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=false":  { "model": "jungle_wall_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=true,open=false":  { "model": "jungle_wall_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=true": { "model": "jungle_wall_gate_open", "uvlock": true },
+        "facing=south,in_wall=true,open=true": { "model": "jungle_wall_gate_open" },
-        "facing=west,in_wall=true,open=true":  { "model": "jungle_wall_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=true":  { "model": "jungle_wall_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=true": { "model": "jungle_wall_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=true": { "model": "jungle_wall_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=true":  { "model": "jungle_wall_gate_open", "uvlock": true, "y": 270 }
+        "facing=east,in_wall=true,open=true":  { "model": "jungle_wall_gate_open", "y": 270, "uvlock": true }
     }
 }

assets/minecraft/blockstates/jungle_log.json

@@ -1,8 +1,8 @@
 {
     "variants": {
         "axis=y":  { "model": "jungle_log" },
-        "axis=z":   { "model": "jungle_log", "x": 90 },
+        "axis=z":   { "model": "jungle_log_side" },
-        "axis=x":   { "model": "jungle_log", "x": 90, "y": 90 },
+        "axis=x":   { "model": "jungle_log_side", "y": 90 },
         "axis=none": { "model": "jungle_bark" }
     }
 }

assets/minecraft/blockstates/jungle_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "jungle_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "jungle_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "jungle_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "jungle_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "jungle_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "jungle_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "jungle_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "jungle_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "jungle_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "jungle_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "jungle_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "jungle_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "jungle_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "jungle_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "jungle_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "jungle_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "jungle_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "jungle_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "jungle_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "jungle_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "jungle_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "jungle_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "jungle_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "jungle_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "jungle_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "jungle_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "jungle_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "jungle_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "jungle_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "jungle_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "jungle_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "jungle_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "jungle_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "jungle_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "jungle_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/light_blue_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "light_blue_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "light_blue_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "light_blue_pane_n" },
-            "apply": { "model": "light_blue_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "light_blue_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "light_blue_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "light_blue_pane_s", "y": 90 },
-            "apply": { "model": "light_blue_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "light_blue_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "light_blue_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "light_blue_pane_sw" },
-            "apply": { "model": "light_blue_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "light_blue_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "light_blue_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "light_blue_pane_ns", "y": 90 },
-            "apply": { "model": "light_blue_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "light_blue_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "light_blue_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "light_blue_pane_nsw" },
-            "apply": { "model": "light_blue_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "light_blue_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "light_blue_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "light_blue_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "light_blue_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "light_blue_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/lime_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "lime_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "lime_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "lime_pane_n" },
-            "apply": { "model": "lime_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "lime_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "lime_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "lime_pane_s", "y": 90 },
-            "apply": { "model": "lime_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "lime_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "lime_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "lime_pane_sw" },
-            "apply": { "model": "lime_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "lime_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "lime_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "lime_pane_ns", "y": 90 },
-            "apply": { "model": "lime_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "lime_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "lime_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "lime_pane_nsw" },
-            "apply": { "model": "lime_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "lime_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "lime_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "lime_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "lime_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "lime_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/magenta_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "magenta_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "magenta_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "magenta_pane_n" },
-            "apply": { "model": "magenta_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "magenta_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "magenta_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "magenta_pane_s", "y": 90 },
-            "apply": { "model": "magenta_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "magenta_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "magenta_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "magenta_pane_sw" },
-            "apply": { "model": "magenta_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "magenta_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "magenta_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "magenta_pane_ns", "y": 90 },
-            "apply": { "model": "magenta_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "magenta_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "magenta_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "magenta_pane_nsw" },
-            "apply": { "model": "magenta_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "magenta_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "magenta_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "magenta_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "magenta_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "magenta_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/magma.json

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

assets/minecraft/blockstates/mossy_cobblestone_wall.json

@@ -1,19 +1,36 @@
 {
-    "multipart": [
+    "variants": {
-        {   "when": { "up": true },
+        "east=false,north=false,south=false,up=false,west=false": { "model": "mossy_wall_post" },
-            "apply": { "model": "mossy_cobblestone_wall_post" }
+        "east=false,north=true,south=false,up=false,west=false":  { "model": "mossy_wall_n" },
-        },
+        "east=true,north=false,south=false,up=false,west=false":  { "model": "mossy_wall_n", "y": 90, "uvlock": true },
-        {   "when": { "north": true },
+        "east=false,north=false,south=true,up=false,west=false":  { "model": "mossy_wall_n", "y": 180, "uvlock": true },
-            "apply": { "model": "mossy_cobblestone_wall_side", "uvlock": true }
+        "east=false,north=false,south=false,up=false,west=true":  { "model": "mossy_wall_n", "y": 270, "uvlock": true },
-        },
+        "east=true,north=true,south=false,up=false,west=false":   { "model": "mossy_wall_ne" },
-        {   "when": { "east": true },
+        "east=true,north=false,south=true,up=false,west=false":   { "model": "mossy_wall_ne", "y": 90, "uvlock": true },
-            "apply": { "model": "mossy_cobblestone_wall_side", "y": 90, "uvlock": true }
+        "east=false,north=false,south=true,up=false,west=true":   { "model": "mossy_wall_ne", "y": 180, "uvlock": true },
-        },
+        "east=false,north=true,south=false,up=false,west=true":   { "model": "mossy_wall_ne", "y": 270, "uvlock": true },
-        {   "when": { "south": true },
+        "east=false,north=true,south=true,up=false,west=false":   { "model": "mossy_wall_ns" },
-            "apply": { "model": "mossy_cobblestone_wall_side", "y": 180, "uvlock": true }
+        "east=true,north=false,south=false,up=false,west=true":   { "model": "mossy_wall_ns", "y": 90, "uvlock": true },
-        },
+        "east=true,north=true,south=true,up=false,west=false":    { "model": "mossy_wall_nse" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=true,up=false,west=true":    { "model": "mossy_wall_nse", "y": 90, "uvlock": true },
-            "apply": { "model": "mossy_cobblestone_wall_side", "y": 270, "uvlock": true }
+        "east=false,north=true,south=true,up=false,west=true":    { "model": "mossy_wall_nse", "y": 180, "uvlock": true },
-        }
+        "east=true,north=true,south=false,up=false,west=true":    { "model": "mossy_wall_nse", "y": 270, "uvlock": true },
-    ]
+        "east=true,north=true,south=true,up=false,west=true":     { "model": "mossy_wall_nsew" },
+        "east=false,north=false,south=false,up=true,west=false":  { "model": "mossy_wall_post" },
+        "east=false,north=true,south=false,up=true,west=false":   { "model": "mossy_wall_n" },
+        "east=true,north=false,south=false,up=true,west=false":   { "model": "mossy_wall_n", "y": 90, "uvlock": true },
+        "east=false,north=false,south=true,up=true,west=false":   { "model": "mossy_wall_n", "y": 180, "uvlock": true },
+        "east=false,north=false,south=false,up=true,west=true":   { "model": "mossy_wall_n", "y": 270, "uvlock": true },
+        "east=true,north=true,south=false,up=true,west=false":    { "model": "mossy_wall_ne" },
+        "east=true,north=false,south=true,up=true,west=false":    { "model": "mossy_wall_ne", "y": 90, "uvlock": true },
+        "east=false,north=false,south=true,up=true,west=true":    { "model": "mossy_wall_ne", "y": 180, "uvlock": true },
+        "east=false,north=true,south=false,up=true,west=true":    { "model": "mossy_wall_ne", "y": 270, "uvlock": true },
+        "east=false,north=true,south=true,up=true,west=false":    { "model": "mossy_wall_ns_above" },
+        "east=true,north=false,south=false,up=true,west=true":    { "model": "mossy_wall_ns_above", "y": 90, "uvlock": true },
+        "east=true,north=true,south=true,up=true,west=false":     { "model": "mossy_wall_nse" },
+        "east=true,north=false,south=true,up=true,west=true":     { "model": "mossy_wall_nse", "y": 90, "uvlock": true },
+        "east=false,north=true,south=true,up=true,west=true":     { "model": "mossy_wall_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,up=true,west=true":     { "model": "mossy_wall_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,up=true,west=true":      { "model": "mossy_wall_nsew" }
+    }
 }

assets/minecraft/blockstates/nether_brick_fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "nether_brick_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "nether_brick_fence_post" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "nether_brick_fence_n" },
-            "apply": { "model": "nether_brick_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "nether_brick_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "nether_brick_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "nether_brick_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "nether_brick_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "nether_brick_fence_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "nether_brick_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "nether_brick_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "nether_brick_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "nether_brick_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "nether_brick_fence_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "nether_brick_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "nether_brick_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "nether_brick_fence_nse" },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "nether_brick_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "nether_brick_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "nether_brick_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "nether_brick_fence_nsew" }
+    }
 }

assets/minecraft/blockstates/nether_brick_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "nether_brick_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "nether_brick_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "nether_brick_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "nether_brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "nether_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "nether_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "nether_brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "nether_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "nether_brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "nether_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "nether_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "nether_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "nether_brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "nether_brick_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "nether_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "nether_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "nether_brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "nether_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "nether_brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "nether_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "nether_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "nether_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "nether_brick_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/nether_wart_block.json

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

assets/minecraft/blockstates/oak_log.json

@@ -1,8 +1,8 @@
 {
     "variants": {
         "axis=y":    { "model": "oak_log" },
-        "axis=z":     { "model": "oak_log", "x": 90 },
+        "axis=z":     { "model": "oak_log_side" },
-        "axis=x":     { "model": "oak_log", "x": 90, "y": 90 },
+        "axis=x":     { "model": "oak_log_side", "y": 90 },
         "axis=none":   { "model": "oak_bark" }
     }
 }

assets/minecraft/blockstates/oak_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "oak_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "oak_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "oak_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "oak_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "oak_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "oak_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "oak_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "oak_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "oak_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "oak_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "oak_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "oak_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/orange_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "orange_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "orange_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "orange_pane_n" },
-            "apply": { "model": "orange_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "orange_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "orange_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "orange_pane_s", "y": 90 },
-            "apply": { "model": "orange_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "orange_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "orange_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "orange_pane_sw" },
-            "apply": { "model": "orange_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "orange_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "orange_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "orange_pane_ns", "y": 90 },
-            "apply": { "model": "orange_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "orange_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "orange_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "orange_pane_nsw" },
-            "apply": { "model": "orange_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "orange_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "orange_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "orange_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "orange_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "orange_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/pink_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "pink_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "pink_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "pink_pane_n" },
-            "apply": { "model": "pink_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "pink_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "pink_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "pink_pane_s", "y": 90 },
-            "apply": { "model": "pink_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "pink_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "pink_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "pink_pane_sw" },
-            "apply": { "model": "pink_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "pink_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "pink_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "pink_pane_ns", "y": 90 },
-            "apply": { "model": "pink_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "pink_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "pink_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "pink_pane_nsw" },
-            "apply": { "model": "pink_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "pink_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "pink_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "pink_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "pink_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "pink_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/purple_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "purple_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "purple_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "purple_pane_n" },
-            "apply": { "model": "purple_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "purple_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "purple_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "purple_pane_s", "y": 90 },
-            "apply": { "model": "purple_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "purple_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "purple_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "purple_pane_sw" },
-            "apply": { "model": "purple_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "purple_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "purple_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "purple_pane_ns", "y": 90 },
-            "apply": { "model": "purple_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "purple_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "purple_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "purple_pane_nsw" },
-            "apply": { "model": "purple_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "purple_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "purple_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "purple_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "purple_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "purple_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/purpur_block.json

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

assets/minecraft/blockstates/purpur_double_slab.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "variant=default": { "model": "purpur_block" }
-    }
-}

assets/minecraft/blockstates/purpur_pillar.json

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

assets/minecraft/blockstates/purpur_slab.json

@@ -1,6 +0,0 @@
-{
-    "variants": {
-        "half=bottom,variant=default": { "model": "half_slab_purpur" },
-        "half=top,variant=default": { "model": "upper_slab_purpur" }
-    }
-}

assets/minecraft/blockstates/purpur_stairs.json

@@ -1,44 +0,0 @@
-{
-    "variants": {
-        "facing=east,half=bottom,shape=straight":  { "model": "purpur_stairs" },
-        "facing=west,half=bottom,shape=straight":  { "model": "purpur_stairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=straight": { "model": "purpur_stairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=straight": { "model": "purpur_stairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_right":  { "model": "purpur_outer_stairs" },
-        "facing=west,half=bottom,shape=outer_right":  { "model": "purpur_outer_stairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_right": { "model": "purpur_outer_stairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=outer_right": { "model": "purpur_outer_stairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_left":  { "model": "purpur_outer_stairs", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=outer_left":  { "model": "purpur_outer_stairs", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_left": { "model": "purpur_outer_stairs" },
-        "facing=north,half=bottom,shape=outer_left": { "model": "purpur_outer_stairs", "y": 180, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_right":  { "model": "purpur_inner_stairs" },
-        "facing=west,half=bottom,shape=inner_right":  { "model": "purpur_inner_stairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_right": { "model": "purpur_inner_stairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=inner_right": { "model": "purpur_inner_stairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_left":  { "model": "purpur_inner_stairs", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=inner_left":  { "model": "purpur_inner_stairs", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_left": { "model": "purpur_inner_stairs" },
-        "facing=north,half=bottom,shape=inner_left": { "model": "purpur_inner_stairs", "y": 180, "uvlock": true },
-        "facing=east,half=top,shape=straight":  { "model": "purpur_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=straight":  { "model": "purpur_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=straight": { "model": "purpur_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=straight": { "model": "purpur_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "purpur_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "purpur_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "purpur_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "purpur_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "purpur_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "purpur_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "purpur_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "purpur_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "purpur_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "purpur_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "purpur_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "purpur_inner_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "purpur_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "purpur_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "purpur_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "purpur_inner_stairs", "x": 180, "y": 270, "uvlock": true }
-    }
-}

assets/minecraft/blockstates/quartz_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "quartz_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "quartz_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "quartz_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "quartz_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "quartz_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "quartz_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "quartz_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "quartz_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "quartz_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "quartz_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "quartz_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "quartz_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "quartz_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "quartz_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "quartz_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "quartz_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "quartz_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "quartz_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "quartz_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "quartz_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "quartz_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "quartz_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "quartz_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "quartz_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "quartz_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "quartz_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "quartz_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "quartz_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "quartz_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "quartz_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "quartz_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "quartz_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "quartz_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "quartz_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "quartz_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/red_nether_brick.json

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

assets/minecraft/blockstates/red_sandstone_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "red_sandstone_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "red_sandstone_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "red_sandstone_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "red_sandstone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "red_sandstone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "red_sandstone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "red_sandstone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "red_sandstone_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "red_sandstone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "red_sandstone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "red_sandstone_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/red_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "red_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "red_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "red_pane_n" },
-            "apply": { "model": "red_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "red_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "red_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "red_pane_s", "y": 90 },
-            "apply": { "model": "red_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "red_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "red_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "red_pane_sw" },
-            "apply": { "model": "red_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "red_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "red_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "red_pane_ns", "y": 90 },
-            "apply": { "model": "red_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "red_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "red_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "red_pane_nsw" },
-            "apply": { "model": "red_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "red_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "red_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "red_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "red_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "red_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/redstone_wire.json

@@ -1,49 +1,103 @@
 {
-    "multipart": [
+    "variants": {
-        {   "when": { "OR": [
+        "east=none,north=none,south=none,west=none": { "model": "redstone_none" },
-                {"north": "none", "east": "none", "south": "none", "west": "none"},
+
-                {"north": "side|up", "east": "side|up" },
+        "east=none,north=side,south=none,west=none": { "model": "redstone_n" },
-                {"east": "side|up", "south": "side|up" },
+        "east=none,north=none,south=side,west=none": { "model": "redstone_n" },
-                {"south": "side|up", "west": "side|up"},
+        "east=side,north=none,south=none,west=none": { "model": "redstone_n", "y": 90 },
-                {"west": "side|up", "north": "side|up"}
+        "east=none,north=none,south=none,west=side": { "model": "redstone_n", "y": 90 },
-            ]},
+
-            "apply": { "model": "redstone_dot" }
+        "east=none,north=up,south=none,west=none": { "model": "redstone_uns" },
-        },
+        "east=none,north=none,south=up,west=none": { "model": "redstone_uns", "y": 180, "uvlock": true },
-        {   "when": { "OR": [
+        "east=up,north=none,south=none,west=none": { "model": "redstone_uew" },
-                { "north": "side|up" },
+        "east=none,north=none,south=none,west=up": { "model": "redstone_uew", "y": 180, "uvlock": true },
-                { "north": "none", "east": "none", "south": "side|up", "west": "none" }
+
-            ]},
+        "east=side,north=side,south=none,west=none":   { "model": "redstone_ne", "uvlock": true },
-            "apply": { "model": "redstone_side0" }
+        "east=side,north=up,south=none,west=none":  { "model": "redstone_une", "uvlock": true },
-        },
+        "east=up,north=side,south=none,west=none":  { "model": "redstone_nue", "uvlock": true },
-        {   "when": { "OR": [
+        "east=up,north=up,south=none,west=none": { "model": "redstone_unue", "uvlock": true },
-                { "south": "side|up" },
+
-                { "north": "side|up", "east": "none", "south": "none", "west": "none" }
+        "east=side,north=none,south=side,west=none":   { "model": "redstone_ne", "y": 90, "uvlock": true },
-            ]},
+        "east=up,north=none,south=side,west=none":  { "model": "redstone_une", "y": 90, "uvlock": true },
-            "apply": { "model": "redstone_side_alt0" }
+        "east=side,north=none,south=up,west=none":  { "model": "redstone_nue", "y": 90, "uvlock": true },
-        },
+        "east=up,north=none,south=up,west=none": { "model": "redstone_unue", "y": 90, "uvlock": true },
-        {   "when": { "OR": [
+
-                { "east": "side|up" },
+        "east=none,north=none,south=side,west=side":   { "model": "redstone_ne", "y": 180, "uvlock": true },
-                { "north": "none", "east": "none", "south": "none", "west": "side|up" }
+        "east=none,north=none,south=up,west=side":  { "model": "redstone_une", "y": 180, "uvlock": true },
-            ]},
+        "east=none,north=none,south=side,west=up":  { "model": "redstone_nue", "y": 180, "uvlock": true },
-            "apply": { "model": "redstone_side_alt1", "y": 270 }
+        "east=none,north=none,south=up,west=up": { "model": "redstone_unue", "y": 180, "uvlock": true },
-        },
+
-        {   "when": { "OR": [
+        "east=none,north=side,south=none,west=side":   { "model": "redstone_ne", "y": 270, "uvlock": true },
-                { "west": "side|up" },
+        "east=none,north=side,south=none,west=up":  { "model": "redstone_une", "y": 270, "uvlock": true },
-                { "north": "none", "east": "side|up", "south": "none", "west": "none" }
+        "east=none,north=up,south=none,west=side":  { "model": "redstone_nue", "y": 270, "uvlock": true },
-            ]},
+        "east=none,north=up,south=none,west=up": { "model": "redstone_unue", "y": 270, "uvlock": true },
-            "apply": { "model": "redstone_side1", "y": 270 }
+
-        },
+        "east=none,north=side,south=side,west=none":  { "model": "redstone_n" },
-        {   "when": { "north": "up" },
+        "east=none,north=up,south=side,west=none": { "model": "redstone_uns" },
-            "apply": { "model": "redstone_up" }
+        "east=none,north=side,south=up,west=none": { "model": "redstone_uns", "y": 180 },
-        },
+        "east=none,north=up,south=up,west=none": { "model": "redstone_unus" },
-        {   "when": { "east": "up" },
+
-            "apply": { "model": "redstone_up", "y": 90 }
+        "east=side,north=none,south=none,west=side":  { "model": "redstone_n", "y": 90 },
-        },
+        "east=up,north=none,south=none,west=side": { "model": "redstone_uns", "y": 90 },
-        {   "when": { "south": "up" },
+        "east=side,north=none,south=none,west=up": { "model": "redstone_uns", "y": 270 },
-            "apply": { "model": "redstone_up", "y": 180 }
+        "east=up,north=none,south=none,west=up": { "model": "redstone_ueuw" },
-        },
+
-        {   "when": { "west": "up" },
+        "east=side,north=side,south=side,west=none":    { "model": "redstone_nse", "uvlock": true },
-            "apply": { "model": "redstone_up", "y": 270 }
+        "east=side,north=up,south=side,west=none":   { "model": "redstone_unse", "uvlock": true },
-        }
+        "east=side,north=side,south=up,west=none":   { "model": "redstone_nuse", "uvlock": true },
-    ]
+        "east=up,north=side,south=side,west=none":   { "model": "redstone_nsue", "uvlock": true },
+        "east=up,north=side,south=up,west=none":  { "model": "redstone_nusue", "uvlock": true },
+        "east=side,north=up,south=up,west=none":  { "model": "redstone_unuse", "uvlock": true },
+        "east=up,north=up,south=side,west=none":  { "model": "redstone_unsue", "uvlock": true },
+        "east=up,north=up,south=up,west=none": { "model": "redstone_unusue", "uvlock": true },
+
+        "east=side,north=none,south=side,west=side":    { "model": "redstone_nse", "y": 90, "uvlock": true },
+        "east=up,north=none,south=side,west=side":   { "model": "redstone_unse", "y": 90, "uvlock": true },
+        "east=side,north=none,south=side,west=up":   { "model": "redstone_nuse", "y": 90, "uvlock": true },
+        "east=side,north=none,south=up,west=side":   { "model": "redstone_nsue", "y": 90, "uvlock": true },
+        "east=side,north=none,south=up,west=up":  { "model": "redstone_nusue", "y": 90, "uvlock": true },
+        "east=up,north=none,south=side,west=up":  { "model": "redstone_unuse", "y": 90, "uvlock": true },
+        "east=up,north=none,south=up,west=side":  { "model": "redstone_unsue", "y": 90, "uvlock": true },
+        "east=up,north=none,south=up,west=up": { "model": "redstone_unusue", "y": 90, "uvlock": true },
+
+        "east=none,north=side,south=side,west=side":    { "model": "redstone_nse", "y": 180, "uvlock": true },
+        "east=none,north=side,south=up,west=side":   { "model": "redstone_unse", "y": 180, "uvlock": true },
+        "east=none,north=up,south=side,west=side":   { "model": "redstone_nuse", "y": 180, "uvlock": true },
+        "east=none,north=side,south=side,west=up":   { "model": "redstone_nsue", "y": 180, "uvlock": true },
+        "east=none,north=up,south=side,west=up":  { "model": "redstone_nusue", "y": 180, "uvlock": true },
+        "east=none,north=up,south=up,west=side":  { "model": "redstone_unuse", "y": 180, "uvlock": true },
+        "east=none,north=side,south=up,west=up":  { "model": "redstone_unsue", "y": 180, "uvlock": true },
+        "east=none,north=up,south=up,west=up": { "model": "redstone_unusue", "y": 180, "uvlock": true },
+
+        "east=side,north=side,south=none,west=side":    { "model": "redstone_nse", "y": 270, "uvlock": true },
+        "east=side,north=side,south=none,west=up":   { "model": "redstone_unse", "y": 270, "uvlock": true },
+        "east=up,north=side,south=none,west=side":   { "model": "redstone_nuse", "y": 270, "uvlock": true },
+        "east=side,north=up,south=none,west=side":   { "model": "redstone_nsue", "y": 270, "uvlock": true },
+        "east=up,north=up,south=none,west=side":  { "model": "redstone_nusue", "y": 270, "uvlock": true },
+        "east=up,north=side,south=none,west=up":  { "model": "redstone_unuse", "y": 270, "uvlock": true },
+        "east=side,north=up,south=none,west=up":  { "model": "redstone_unsue", "y": 270, "uvlock": true },
+        "east=up,north=up,south=none,west=up": { "model": "redstone_unusue", "y": 270, "uvlock": true },
+
+        "east=side,north=side,south=side,west=side": { "model": "redstone_nsew", "uvlock": true },
+
+        "east=side,north=up,south=side,west=side": { "model": "redstone_unsew", "uvlock": true },
+        "east=side,north=side,south=up,west=side": { "model": "redstone_unsew", "y": 180, "uvlock": true },
+        "east=up,north=side,south=side,west=side": { "model": "redstone_unsew", "y": 90, "uvlock": true },
+        "east=side,north=side,south=side,west=up": { "model": "redstone_unsew", "y": 270, "uvlock": true },
+
+        "east=side,north=up,south=up,west=side": { "model": "redstone_unusew", "uvlock": true },
+        "east=up,north=side,south=side,west=up": { "model": "redstone_unusew", "y": 90, "uvlock": true },
+
+        "east=up,north=up,south=side,west=side": { "model": "redstone_unsuew", "uvlock": true },
+        "east=up,north=side,south=up,west=side": { "model": "redstone_unsuew", "y": 90, "uvlock": true },
+        "east=side,north=side,south=up,west=up": { "model": "redstone_unsuew", "y": 180, "uvlock": true },
+        "east=side,north=up,south=side,west=up": { "model": "redstone_unsuew", "y": 270, "uvlock": true },
+
+        "east=up,north=up,south=up,west=side": { "model": "redstone_unusuew", "uvlock": true },
+        "east=up,north=side,south=up,west=up": { "model": "redstone_unusuew", "y": 90, "uvlock": true },
+        "east=side,north=up,south=up,west=up": { "model": "redstone_unusuew", "y": 180, "uvlock": true },
+        "east=up,north=up,south=side,west=up": { "model": "redstone_unusuew", "y": 270, "uvlock": true },
+
+        "east=up,north=up,south=up,west=up": { "model": "redstone_unusueuw", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/repeating_command_block.json

@@ -1,16 +0,0 @@
-{
-    "variants": {
-        "conditional=false,facing=down":  { "model": "repeating_command_block", "x": 90 },
-        "conditional=false,facing=up":    { "model": "repeating_command_block", "x": 270 },
-        "conditional=false,facing=north": { "model": "repeating_command_block" },
-        "conditional=false,facing=south": { "model": "repeating_command_block", "y": 180 },
-        "conditional=false,facing=west":  { "model": "repeating_command_block", "y": 270 },
-        "conditional=false,facing=east":  { "model": "repeating_command_block", "y": 90 },
-        "conditional=true,facing=down":  { "model": "repeating_command_block_conditional", "x": 90 },
-        "conditional=true,facing=up":    { "model": "repeating_command_block_conditional", "x": 270 },
-        "conditional=true,facing=north": { "model": "repeating_command_block_conditional" },
-        "conditional=true,facing=south": { "model": "repeating_command_block_conditional", "y": 180 },
-        "conditional=true,facing=west":  { "model": "repeating_command_block_conditional", "y": 270 },
-        "conditional=true,facing=east":  { "model": "repeating_command_block_conditional", "y": 90 }
-    }
-}

assets/minecraft/blockstates/sandstone_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "sandstone_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "sandstone_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "sandstone_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "sandstone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "sandstone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "sandstone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "sandstone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "sandstone_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "sandstone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "sandstone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "sandstone_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/silver_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "silver_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "silver_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "silver_pane_n" },
-            "apply": { "model": "silver_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "silver_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "silver_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "silver_pane_s", "y": 90 },
-            "apply": { "model": "silver_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "silver_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "silver_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "silver_pane_sw" },
-            "apply": { "model": "silver_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "silver_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "silver_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "silver_pane_ns", "y": 90 },
-            "apply": { "model": "silver_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "silver_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "silver_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "silver_pane_nsw" },
-            "apply": { "model": "silver_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "silver_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "silver_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "silver_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "silver_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "silver_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/spruce_fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "spruce_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "spruce_fence_post" },
-        {   "when": { "north": "true" },
+        "east=false,north=true,south=false,west=false": { "model": "spruce_fence_n", "uvlock": true },
-            "apply": { "model": "spruce_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "spruce_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "spruce_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": "true" },
+        "east=false,north=false,south=false,west=true": { "model": "spruce_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "spruce_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "spruce_fence_ne", "uvlock": true },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "spruce_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=false,south=true,west=true": { "model": "spruce_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "spruce_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "spruce_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "spruce_fence_ns", "uvlock": true },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=false,west=true": { "model": "spruce_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "spruce_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "spruce_fence_nse", "uvlock": true },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "spruce_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "spruce_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "spruce_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "spruce_fence_nsew", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/spruce_fence_gate.json

@@ -1,20 +1,20 @@
 {
     "variants": {
-        "facing=south,in_wall=false,open=false": { "model": "spruce_fence_gate_closed", "uvlock": true },
+        "facing=south,in_wall=false,open=false": { "model": "spruce_fence_gate_closed" },
-        "facing=west,in_wall=false,open=false":  { "model": "spruce_fence_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=false":  { "model": "spruce_fence_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=false": { "model": "spruce_fence_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=false": { "model": "spruce_fence_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=false":  { "model": "spruce_fence_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=false":  { "model": "spruce_fence_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=false,open=true": { "model": "spruce_fence_gate_open", "uvlock": true },
+        "facing=south,in_wall=false,open=true": { "model": "spruce_fence_gate_open" },
-        "facing=west,in_wall=false,open=true":  { "model": "spruce_fence_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=true":  { "model": "spruce_fence_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=true": { "model": "spruce_fence_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=true": { "model": "spruce_fence_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=true":  { "model": "spruce_fence_gate_open", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=true":  { "model": "spruce_fence_gate_open", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=false": { "model": "spruce_wall_gate_closed", "uvlock": true },
+        "facing=south,in_wall=true,open=false": { "model": "spruce_wall_gate_closed" },
-        "facing=west,in_wall=true,open=false":  { "model": "spruce_wall_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=false":  { "model": "spruce_wall_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=false": { "model": "spruce_wall_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=false": { "model": "spruce_wall_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=false":  { "model": "spruce_wall_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=true,open=false":  { "model": "spruce_wall_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=true": { "model": "spruce_wall_gate_open", "uvlock": true },
+        "facing=south,in_wall=true,open=true": { "model": "spruce_wall_gate_open" },
-        "facing=west,in_wall=true,open=true":  { "model": "spruce_wall_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=true":  { "model": "spruce_wall_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=true": { "model": "spruce_wall_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=true": { "model": "spruce_wall_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=true":  { "model": "spruce_wall_gate_open", "uvlock": true, "y": 270 }
+        "facing=east,in_wall=true,open=true":  { "model": "spruce_wall_gate_open", "y": 270, "uvlock": true }
     }
 }

assets/minecraft/blockstates/spruce_log.json

@@ -1,8 +1,8 @@
 {
     "variants": {
         "axis=y":  { "model": "spruce_log" },
-        "axis=z":   { "model": "spruce_log", "x": 90 },
+        "axis=z":   { "model": "spruce_log_side" },
-        "axis=x":   { "model": "spruce_log", "x": 90, "y": 90 },
+        "axis=x":   { "model": "spruce_log_side", "y": 90 },
         "axis=none": { "model": "spruce_bark" }
     }
 }

assets/minecraft/blockstates/spruce_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "spruce_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "spruce_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "spruce_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "spruce_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "spruce_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "spruce_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "spruce_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "spruce_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "spruce_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "spruce_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "spruce_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "spruce_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "spruce_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "spruce_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "spruce_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "spruce_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "spruce_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "spruce_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "spruce_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "spruce_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "spruce_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "spruce_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "spruce_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "spruce_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "spruce_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "spruce_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "spruce_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "spruce_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "spruce_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "spruce_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "spruce_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "spruce_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "spruce_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "spruce_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "spruce_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/stone_brick_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "stone_brick_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "stone_brick_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "stone_brick_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "stone_brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "stone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "stone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "stone_brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "stone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "stone_brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "stone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "stone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "stone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "stone_brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "stone_brick_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "stone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "stone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "stone_brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "stone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "stone_brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "stone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "stone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "stone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "stone_brick_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/stone_button.json

@@ -1,16 +1,16 @@
 {
     "variants": {
-        "facing=up,powered=false":    { "model": "stone_button", "uvlock": true },
+        "facing=up,powered=false":    { "model": "stone_button" },
-        "facing=down,powered=false":  { "model": "stone_button", "uvlock": true, "x": 180 },
+        "facing=down,powered=false":  { "model": "stone_button", "x": 180 },
-        "facing=east,powered=false":  { "model": "stone_button", "uvlock": true, "x": 90, "y": 90 },
+        "facing=east,powered=false":  { "model": "stone_button", "x": 90, "y": 90 },
-        "facing=west,powered=false":  { "model": "stone_button", "uvlock": true, "x": 90, "y": 270 },
+        "facing=west,powered=false":  { "model": "stone_button", "x": 90, "y": 270 },
-        "facing=south,powered=false": { "model": "stone_button", "uvlock": true, "x": 90, "y": 180 },
+        "facing=south,powered=false": { "model": "stone_button", "x": 90, "y": 180 },
-        "facing=north,powered=false": { "model": "stone_button", "uvlock": true, "x": 90 },
+        "facing=north,powered=false": { "model": "stone_button", "x": 90 },
-        "facing=up,powered=true":     { "model": "stone_button_pressed", "uvlock": true },
+        "facing=up,powered=true":     { "model": "stone_button_pressed" },
-        "facing=down,powered=true":   { "model": "stone_button_pressed", "uvlock": true, "x": 180 },
+        "facing=down,powered=true":   { "model": "stone_button_pressed", "x": 180 },
-        "facing=east,powered=true":   { "model": "stone_button_pressed", "uvlock": true, "x": 90, "y": 90 },
+        "facing=east,powered=true":   { "model": "stone_button_pressed", "x": 90, "y": 90 },
-        "facing=west,powered=true":   { "model": "stone_button_pressed", "uvlock": true, "x": 90, "y": 270 },
+        "facing=west,powered=true":   { "model": "stone_button_pressed", "x": 90, "y": 270 },
-        "facing=south,powered=true":  { "model": "stone_button_pressed", "uvlock": true, "x": 90, "y": 180 },
+        "facing=south,powered=true":  { "model": "stone_button_pressed", "x": 90, "y": 180 },
-        "facing=north,powered=true":  { "model": "stone_button_pressed", "uvlock": true, "x": 90 }
+        "facing=north,powered=true":  { "model": "stone_button_pressed", "x": 90 }
     }
 }

assets/minecraft/blockstates/stone_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "stone_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "stone_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "stone_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "stone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "stone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "stone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "stone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "stone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "stone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "stone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "stone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "stone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "stone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "stone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "stone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "stone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "stone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "stone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "stone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "stone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "stone_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "stone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "stone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "stone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "stone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "stone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "stone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/structure_block.json

@@ -1,8 +0,0 @@
-{
-    "variants": {
-        "mode=save": { "model": "structure_block_save" },
-        "mode=load": { "model": "structure_block_load" },
-        "mode=corner": { "model": "structure_block_corner" },
-        "mode=data": { "model": "structure_block_data" }
-    }
-}

assets/minecraft/blockstates/structure_void.json

@@ -1,10 +0,0 @@
-{
-    "variants": {
-        "normal": [
-            { "model": "structure_void" },
-            { "model": "structure_void", "y": 90 },
-            { "model": "structure_void", "y": 180 },
-            { "model": "structure_void", "y": 270 }
-        ]
-    }
-}

assets/minecraft/blockstates/tnt.json

@@ -1,5 +1,10 @@
 {
     "variants": {
-        "normal": { "model": "tnt" }
+        "normal": [
+            { "model": "tnt" },
+            { "model": "tnt", "y": 90 },
+            { "model": "tnt", "y": 180 },
+            { "model": "tnt", "y": 270 }
+        ]
     }
 }

assets/minecraft/blockstates/tripwire.json

@@ -1,36 +1,68 @@
 {
     "variants": {
-        "attached=false,east=false,north=false,south=false,west=false": { "model": "tripwire_ns" },
+        "attached=false,east=false,north=false,south=false,suspended=false,west=false": { "model": "tripwire_ns" },
-        "attached=false,east=false,north=true,south=false,west=false": { "model": "tripwire_n" },
+        "attached=false,east=false,north=true,south=false,suspended=false,west=false": { "model": "tripwire_n" },
-        "attached=false,east=false,north=false,south=true,west=false": { "model": "tripwire_n", "y": 180 },
+        "attached=false,east=false,north=false,south=true,suspended=false,west=false": { "model": "tripwire_n", "y": 180 },
-        "attached=false,east=true,north=false,south=false,west=false": { "model": "tripwire_n", "y": 90 },
+        "attached=false,east=true,north=false,south=false,suspended=false,west=false": { "model": "tripwire_n", "y": 90 },
-        "attached=false,east=false,north=false,south=false,west=true": { "model": "tripwire_n", "y": 270 },
+        "attached=false,east=false,north=false,south=false,suspended=false,west=true": { "model": "tripwire_n", "y": 270 },
-        "attached=false,east=true,north=true,south=false,west=false": { "model": "tripwire_ne" },
+        "attached=false,east=true,north=true,south=false,suspended=false,west=false": { "model": "tripwire_ne" },
-        "attached=false,east=true,north=false,south=true,west=false": { "model": "tripwire_ne", "y": 90 },
+        "attached=false,east=true,north=false,south=true,suspended=false,west=false": { "model": "tripwire_ne", "y": 90 },
-        "attached=false,east=false,north=false,south=true,west=true": { "model": "tripwire_ne", "y": 180 },
+        "attached=false,east=false,north=false,south=true,suspended=false,west=true": { "model": "tripwire_ne", "y": 180 },
-        "attached=false,east=false,north=true,south=false,west=true": { "model": "tripwire_ne", "y": 270 },
+        "attached=false,east=false,north=true,south=false,suspended=false,west=true": { "model": "tripwire_ne", "y": 270 },
-        "attached=false,east=false,north=true,south=true,west=false": { "model": "tripwire_ns" },
+        "attached=false,east=false,north=true,south=true,suspended=false,west=false": { "model": "tripwire_ns" },
-        "attached=false,east=true,north=false,south=false,west=true": { "model": "tripwire_ns", "y": 90 },
+        "attached=false,east=true,north=false,south=false,suspended=false,west=true": { "model": "tripwire_ns", "y": 90 },
-        "attached=false,east=true,north=true,south=true,west=false": { "model": "tripwire_nse" },
+        "attached=false,east=true,north=true,south=true,suspended=false,west=false": { "model": "tripwire_nse" },
-        "attached=false,east=true,north=false,south=true,west=true": { "model": "tripwire_nse", "y": 90 },
+        "attached=false,east=true,north=false,south=true,suspended=false,west=true": { "model": "tripwire_nse", "y": 90 },
-        "attached=false,east=false,north=true,south=true,west=true": { "model": "tripwire_nse", "y": 180 },
+        "attached=false,east=false,north=true,south=true,suspended=false,west=true": { "model": "tripwire_nse", "y": 180 },
-        "attached=false,east=true,north=true,south=false,west=true": { "model": "tripwire_nse", "y": 270 },
+        "attached=false,east=true,north=true,south=false,suspended=false,west=true": { "model": "tripwire_nse", "y": 270 },
-        "attached=false,east=true,north=true,south=true,west=true": { "model": "tripwire_nsew" },
+        "attached=false,east=true,north=true,south=true,suspended=false,west=true": { "model": "tripwire_nsew" },
-        "attached=true,east=false,north=false,south=false,west=false": { "model": "tripwire_attached_ns" },
+        "attached=false,east=false,north=false,south=false,suspended=true,west=false": { "model": "tripwire_suspended_ns" },
-        "attached=true,east=false,north=true,south=false,west=false": { "model": "tripwire_attached_n" },
+        "attached=false,east=false,north=true,south=false,suspended=true,west=false": { "model": "tripwire_suspended_n" },
-        "attached=true,east=false,north=false,south=true,west=false": { "model": "tripwire_attached_n", "y": 180 },
+        "attached=false,east=false,north=false,south=true,suspended=true,west=false": { "model": "tripwire_suspended_n", "y": 180 },
-        "attached=true,east=true,north=false,south=false,west=false": { "model": "tripwire_attached_n", "y": 90 },
+        "attached=false,east=true,north=false,south=false,suspended=true,west=false": { "model": "tripwire_suspended_n", "y": 90 },
-        "attached=true,east=false,north=false,south=false,west=true": { "model": "tripwire_attached_n", "y": 270 },
+        "attached=false,east=false,north=false,south=false,suspended=true,west=true": { "model": "tripwire_suspended_n", "y": 270 },
-        "attached=true,east=true,north=true,south=false,west=false": { "model": "tripwire_attached_ne" },
+        "attached=false,east=true,north=true,south=false,suspended=true,west=false": { "model": "tripwire_suspended_ne" },
-        "attached=true,east=true,north=false,south=true,west=false": { "model": "tripwire_attached_ne", "y": 90 },
+        "attached=false,east=true,north=false,south=true,suspended=true,west=false": { "model": "tripwire_suspended_ne", "y": 90 },
-        "attached=true,east=false,north=false,south=true,west=true": { "model": "tripwire_attached_ne", "y": 180 },
+        "attached=false,east=false,north=false,south=true,suspended=true,west=true": { "model": "tripwire_suspended_ne", "y": 180 },
-        "attached=true,east=false,north=true,south=false,west=true": { "model": "tripwire_attached_ne", "y": 270 },
+        "attached=false,east=false,north=true,south=false,suspended=true,west=true": { "model": "tripwire_suspended_ne", "y": 270 },
-        "attached=true,east=false,north=true,south=true,west=false": { "model": "tripwire_attached_ns" },
+        "attached=false,east=false,north=true,south=true,suspended=true,west=false": { "model": "tripwire_suspended_ns" },
-        "attached=true,east=true,north=false,south=false,west=true": { "model": "tripwire_attached_ns", "y": 90 },
+        "attached=false,east=true,north=false,south=false,suspended=true,west=true": { "model": "tripwire_suspended_ns", "y": 90 },
-        "attached=true,east=true,north=true,south=true,west=false": { "model": "tripwire_attached_nse" },
+        "attached=false,east=true,north=true,south=true,suspended=true,west=false": { "model": "tripwire_suspended_nse" },
-        "attached=true,east=true,north=false,south=true,west=true": { "model": "tripwire_attached_nse", "y": 90 },
+        "attached=false,east=true,north=false,south=true,suspended=true,west=true": { "model": "tripwire_suspended_nse", "y": 90 },
-        "attached=true,east=false,north=true,south=true,west=true": { "model": "tripwire_attached_nse", "y": 180 },
+        "attached=false,east=false,north=true,south=true,suspended=true,west=true": { "model": "tripwire_suspended_nse", "y": 180 },
-        "attached=true,east=true,north=true,south=false,west=true": { "model": "tripwire_attached_nse", "y": 270 },
+        "attached=false,east=true,north=true,south=false,suspended=true,west=true": { "model": "tripwire_suspended_nse", "y": 270 },
-        "attached=true,east=true,north=true,south=true,west=true": { "model": "tripwire_attached_nsew" }
+        "attached=false,east=true,north=true,south=true,suspended=true,west=true": { "model": "tripwire_suspended_nsew" },
+        "attached=true,east=false,north=false,south=false,suspended=false,west=false": { "model": "tripwire_attached_ns" },
+        "attached=true,east=false,north=true,south=false,suspended=false,west=false": { "model": "tripwire_attached_n" },
+        "attached=true,east=false,north=false,south=true,suspended=false,west=false": { "model": "tripwire_attached_n", "y": 180 },
+        "attached=true,east=true,north=false,south=false,suspended=false,west=false": { "model": "tripwire_attached_n", "y": 90 },
+        "attached=true,east=false,north=false,south=false,suspended=false,west=true": { "model": "tripwire_attached_n", "y": 270 },
+        "attached=true,east=true,north=true,south=false,suspended=false,west=false": { "model": "tripwire_attached_ne" },
+        "attached=true,east=true,north=false,south=true,suspended=false,west=false": { "model": "tripwire_attached_ne", "y": 90 },
+        "attached=true,east=false,north=false,south=true,suspended=false,west=true": { "model": "tripwire_attached_ne", "y": 180 },
+        "attached=true,east=false,north=true,south=false,suspended=false,west=true": { "model": "tripwire_attached_ne", "y": 270 },
+        "attached=true,east=false,north=true,south=true,suspended=false,west=false": { "model": "tripwire_attached_ns" },
+        "attached=true,east=true,north=false,south=false,suspended=false,west=true": { "model": "tripwire_attached_ns", "y": 90 },
+        "attached=true,east=true,north=true,south=true,suspended=false,west=false": { "model": "tripwire_attached_nse" },
+        "attached=true,east=true,north=false,south=true,suspended=false,west=true": { "model": "tripwire_attached_nse", "y": 90 },
+        "attached=true,east=false,north=true,south=true,suspended=false,west=true": { "model": "tripwire_attached_nse", "y": 180 },
+        "attached=true,east=true,north=true,south=false,suspended=false,west=true": { "model": "tripwire_attached_nse", "y": 270 },
+        "attached=true,east=true,north=true,south=true,suspended=false,west=true": { "model": "tripwire_attached_nsew" },
+        "attached=true,east=false,north=false,south=false,suspended=true,west=false": { "model": "tripwire_attached_suspended_ns" },
+        "attached=true,east=false,north=true,south=false,suspended=true,west=false": { "model": "tripwire_attached_suspended_n" },
+        "attached=true,east=false,north=false,south=true,suspended=true,west=false": { "model": "tripwire_attached_suspended_n", "y": 180 },
+        "attached=true,east=true,north=false,south=false,suspended=true,west=false": { "model": "tripwire_attached_suspended_n", "y": 90 },
+        "attached=true,east=false,north=false,south=false,suspended=true,west=true": { "model": "tripwire_attached_suspended_n", "y": 270 },
+        "attached=true,east=true,north=true,south=false,suspended=true,west=false": { "model": "tripwire_attached_suspended_ne" },
+        "attached=true,east=true,north=false,south=true,suspended=true,west=false": { "model": "tripwire_attached_suspended_ne", "y": 90 },
+        "attached=true,east=false,north=false,south=true,suspended=true,west=true": { "model": "tripwire_attached_suspended_ne", "y": 180 },
+        "attached=true,east=false,north=true,south=false,suspended=true,west=true": { "model": "tripwire_attached_suspended_ne", "y": 270 },
+        "attached=true,east=false,north=true,south=true,suspended=true,west=false": { "model": "tripwire_attached_suspended_ns" },
+        "attached=true,east=true,north=false,south=false,suspended=true,west=true": { "model": "tripwire_attached_suspended_ns", "y": 90 },
+        "attached=true,east=true,north=true,south=true,suspended=true,west=false": { "model": "tripwire_attached_suspended_nse" },
+        "attached=true,east=true,north=false,south=true,suspended=true,west=true": { "model": "tripwire_attached_suspended_nse", "y": 90 },
+        "attached=true,east=false,north=true,south=true,suspended=true,west=true": { "model": "tripwire_attached_suspended_nse", "y": 180 },
+        "attached=true,east=true,north=true,south=false,suspended=true,west=true": { "model": "tripwire_attached_suspended_nse", "y": 270 },
+        "attached=true,east=true,north=true,south=true,suspended=true,west=true": { "model": "tripwire_attached_suspended_nsew" }
     }
 }

assets/minecraft/blockstates/tripwire_hook.json

@@ -1,20 +1,36 @@
 {
     "variants": {
-        "attached=false,facing=north,powered=false": { "model": "tripwire_hook" },
+        "attached=false,facing=north,powered=false,suspended=false": { "model": "tripwire_hook" },
-        "attached=false,facing=south,powered=false": { "model": "tripwire_hook", "y": 180 },
+        "attached=false,facing=south,powered=false,suspended=false": { "model": "tripwire_hook", "y": 180 },
-        "attached=false,facing=west,powered=false": { "model": "tripwire_hook", "y": 270 },
+        "attached=false,facing=west,powered=false,suspended=false": { "model": "tripwire_hook", "y": 270 },
-        "attached=false,facing=east,powered=false": { "model": "tripwire_hook", "y": 90 },
+        "attached=false,facing=east,powered=false,suspended=false": { "model": "tripwire_hook", "y": 90 },
-        "attached=true,facing=north,powered=false": { "model": "tripwire_hook_attached" },
+        "attached=false,facing=north,powered=false,suspended=true": { "model": "tripwire_hook" },
-        "attached=true,facing=south,powered=false": { "model": "tripwire_hook_attached", "y": 180 },
+        "attached=false,facing=south,powered=false,suspended=true": { "model": "tripwire_hook", "y": 180 },
-        "attached=true,facing=west,powered=false": { "model": "tripwire_hook_attached", "y": 270 },
+        "attached=false,facing=west,powered=false,suspended=true": { "model": "tripwire_hook", "y": 270 },
-        "attached=true,facing=east,powered=false": { "model": "tripwire_hook_attached", "y": 90 },
+        "attached=false,facing=east,powered=false,suspended=true": { "model": "tripwire_hook", "y": 90 },
-        "attached=false,facing=north,powered=true": { "model": "tripwire_hook_powered" },
+        "attached=true,facing=north,powered=false,suspended=false": { "model": "tripwire_hook_attached" },
-        "attached=false,facing=south,powered=true": { "model": "tripwire_hook_powered", "y": 180 },
+        "attached=true,facing=south,powered=false,suspended=false": { "model": "tripwire_hook_attached", "y": 180 },
-        "attached=false,facing=west,powered=true": { "model": "tripwire_hook_powered", "y": 270 },
+        "attached=true,facing=west,powered=false,suspended=false": { "model": "tripwire_hook_attached", "y": 270 },
-        "attached=false,facing=east,powered=true": { "model": "tripwire_hook_powered", "y": 90 },
+        "attached=true,facing=east,powered=false,suspended=false": { "model": "tripwire_hook_attached", "y": 90 },
-        "attached=true,facing=north,powered=true": { "model": "tripwire_hook_attached_powered" },
+        "attached=true,facing=north,powered=false,suspended=true": { "model": "tripwire_hook_attached_suspended" },
-        "attached=true,facing=south,powered=true": { "model": "tripwire_hook_attached_powered", "y": 180 },
+        "attached=true,facing=south,powered=false,suspended=true": { "model": "tripwire_hook_attached_suspended", "y": 180 },
-        "attached=true,facing=west,powered=true": { "model": "tripwire_hook_attached_powered", "y": 270 },
+        "attached=true,facing=west,powered=false,suspended=true": { "model": "tripwire_hook_attached_suspended", "y": 270 },
-        "attached=true,facing=east,powered=true": { "model": "tripwire_hook_attached_powered", "y": 90 }
+        "attached=true,facing=east,powered=false,suspended=true": { "model": "tripwire_hook_attached_suspended", "y": 90 },
+        "attached=false,facing=north,powered=true,suspended=false": { "model": "tripwire_hook_powered" },
+        "attached=false,facing=south,powered=true,suspended=false": { "model": "tripwire_hook_powered", "y": 180 },
+        "attached=false,facing=west,powered=true,suspended=false": { "model": "tripwire_hook_powered", "y": 270 },
+        "attached=false,facing=east,powered=true,suspended=false": { "model": "tripwire_hook_powered", "y": 90 },
+        "attached=false,facing=north,powered=true,suspended=true": { "model": "tripwire_hook_powered" },
+        "attached=false,facing=south,powered=true,suspended=true": { "model": "tripwire_hook_powered", "y": 180 },
+        "attached=false,facing=west,powered=true,suspended=true": { "model": "tripwire_hook_powered", "y": 270 },
+        "attached=false,facing=east,powered=true,suspended=true": { "model": "tripwire_hook_powered", "y": 90 },
+        "attached=true,facing=north,powered=true,suspended=false": { "model": "tripwire_hook_attached_powered" },
+        "attached=true,facing=south,powered=true,suspended=false": { "model": "tripwire_hook_attached_powered", "y": 180 },
+        "attached=true,facing=west,powered=true,suspended=false": { "model": "tripwire_hook_attached_powered", "y": 270 },
+        "attached=true,facing=east,powered=true,suspended=false": { "model": "tripwire_hook_attached_powered", "y": 90 },
+        "attached=true,facing=north,powered=true,suspended=true": { "model": "tripwire_hook_attached_suspended_powered" },
+        "attached=true,facing=south,powered=true,suspended=true": { "model": "tripwire_hook_attached_suspended_powered", "y": 180 },
+        "attached=true,facing=west,powered=true,suspended=true": { "model": "tripwire_hook_attached_suspended_powered", "y": 270 },
+        "attached=true,facing=east,powered=true,suspended=true": { "model": "tripwire_hook_attached_suspended_powered", "y": 90 }
     }
 }

assets/minecraft/blockstates/white_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "white_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "white_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "white_pane_n" },
-            "apply": { "model": "white_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "white_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "white_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "white_pane_s", "y": 90 },
-            "apply": { "model": "white_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "white_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "white_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "white_pane_sw" },
-            "apply": { "model": "white_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "white_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "white_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "white_pane_ns", "y": 90 },
-            "apply": { "model": "white_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "white_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "white_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "white_pane_nsw" },
-            "apply": { "model": "white_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "white_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "white_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "white_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "white_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "white_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/wooden_button.json

@@ -1,16 +1,16 @@
 {
     "variants": {
-        "facing=up,powered=false":    { "model": "wooden_button", "uvlock": true },
+        "facing=up,powered=false":    { "model": "wooden_button" },
-        "facing=down,powered=false":  { "model": "wooden_button", "uvlock": true, "x": 180 },
+        "facing=down,powered=false":  { "model": "wooden_button", "x": 180 },
-        "facing=east,powered=false":  { "model": "wooden_button", "uvlock": true, "x": 90, "y": 90 },
+        "facing=east,powered=false":  { "model": "wooden_button", "x": 90, "y": 90 },
-        "facing=west,powered=false":  { "model": "wooden_button", "uvlock": true, "x": 90, "y": 270 },
+        "facing=west,powered=false":  { "model": "wooden_button", "x": 90, "y": 270 },
-        "facing=south,powered=false": { "model": "wooden_button", "uvlock": true, "x": 90, "y": 180 },
+        "facing=south,powered=false": { "model": "wooden_button", "x": 90, "y": 180 },
-        "facing=north,powered=false": { "model": "wooden_button", "uvlock": true, "x": 90 },
+        "facing=north,powered=false": { "model": "wooden_button", "x": 90 },
-        "facing=up,powered=true":     { "model": "wooden_button_pressed", "uvlock": true },
+        "facing=up,powered=true":     { "model": "wooden_button_pressed" },
-        "facing=down,powered=true":   { "model": "wooden_button_pressed", "uvlock": true, "x": 180 },
+        "facing=down,powered=true":   { "model": "wooden_button_pressed", "x": 180 },
-        "facing=east,powered=true":   { "model": "wooden_button_pressed", "uvlock": true, "x": 90, "y": 90 },
+        "facing=east,powered=true":   { "model": "wooden_button_pressed", "x": 90, "y": 90 },
-        "facing=west,powered=true":   { "model": "wooden_button_pressed", "uvlock": true, "x": 90, "y": 270 },
+        "facing=west,powered=true":   { "model": "wooden_button_pressed", "x": 90, "y": 270 },
-        "facing=south,powered=true":  { "model": "wooden_button_pressed", "uvlock": true, "x": 90, "y": 180 },
+        "facing=south,powered=true":  { "model": "wooden_button_pressed", "x": 90, "y": 180 },
-        "facing=north,powered=true":  { "model": "wooden_button_pressed", "uvlock": true, "x": 90 }
+        "facing=north,powered=true":  { "model": "wooden_button_pressed", "x": 90 }
     }
 }

assets/minecraft/blockstates/yellow_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "yellow_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "yellow_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "yellow_pane_n" },
-            "apply": { "model": "yellow_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "yellow_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "yellow_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "yellow_pane_s", "y": 90 },
-            "apply": { "model": "yellow_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "yellow_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "yellow_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "yellow_pane_sw" },
-            "apply": { "model": "yellow_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "yellow_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "yellow_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "yellow_pane_ns", "y": 90 },
-            "apply": { "model": "yellow_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "yellow_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "yellow_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "yellow_pane_nsw" },
-            "apply": { "model": "yellow_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "yellow_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "yellow_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "yellow_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "yellow_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "yellow_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }