Create/Update assets for version 21w17a

_list.json

@@ -1 +1 @@
-{"directories":["assets","data","mappings"],"files":["22w15a.json","version.json"]}
+{"directories":["assets","data","mappings"],"files":["21w17a.json","version.json"]}

assets/minecraft/_list.json

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

assets/minecraft/blockstates/acacia_door.json

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

assets/minecraft/blockstates/azalea_leaves_flowers.json

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

assets/minecraft/blockstates/birch_door.json

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

assets/minecraft/blockstates/black_candle.json

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

assets/minecraft/blockstates/black_candle_cake.json

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

assets/minecraft/blockstates/blue_candle.json

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

assets/minecraft/blockstates/blue_candle_cake.json

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

assets/minecraft/blockstates/brown_candle.json

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

assets/minecraft/blockstates/brown_candle_cake.json

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

assets/minecraft/blockstates/candle.json

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

assets/minecraft/blockstates/candle_cake.json

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

assets/minecraft/blockstates/crimson_door.json

@@ -1,123 +1,123 @@
 {
   "variants": {
     "facing=east,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/crimson_door_bottom_left"
+      "model": "minecraft:block/crimson_door_bottom"
     },
     "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/crimson_door_bottom_left_open",
+      "model": "minecraft:block/crimson_door_bottom_hinge",
       "y": 90
     },
     "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/crimson_door_bottom_right"
+      "model": "minecraft:block/crimson_door_bottom_hinge"
     },
     "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/crimson_door_bottom_right_open",
+      "model": "minecraft:block/crimson_door_bottom",
       "y": 270
     },
     "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/crimson_door_top_left"
+      "model": "minecraft:block/crimson_door_top"
     },
     "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/crimson_door_top_left_open",
+      "model": "minecraft:block/crimson_door_top_hinge",
       "y": 90
     },
     "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/crimson_door_top_right"
+      "model": "minecraft:block/crimson_door_top_hinge"
     },
     "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/crimson_door_top_right_open",
+      "model": "minecraft:block/crimson_door_top",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/crimson_door_bottom_left",
+      "model": "minecraft:block/crimson_door_bottom",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/crimson_door_bottom_left_open"
+      "model": "minecraft:block/crimson_door_bottom_hinge"
     },
     "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/crimson_door_bottom_right",
+      "model": "minecraft:block/crimson_door_bottom_hinge",
       "y": 270
     },
     "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/crimson_door_bottom_right_open",
+      "model": "minecraft:block/crimson_door_bottom",
       "y": 180
     },
     "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/crimson_door_top_left",
+      "model": "minecraft:block/crimson_door_top",
       "y": 270
     },
     "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/crimson_door_top_left_open"
+      "model": "minecraft:block/crimson_door_top_hinge"
     },
     "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/crimson_door_top_right",
+      "model": "minecraft:block/crimson_door_top_hinge",
       "y": 270
     },
     "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/crimson_door_top_right_open",
+      "model": "minecraft:block/crimson_door_top",
       "y": 180
     },
     "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/crimson_door_bottom_left",
+      "model": "minecraft:block/crimson_door_bottom",
       "y": 90
     },
     "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/crimson_door_bottom_left_open",
+      "model": "minecraft:block/crimson_door_bottom_hinge",
       "y": 180
     },
     "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/crimson_door_bottom_right",
+      "model": "minecraft:block/crimson_door_bottom_hinge",
       "y": 90
     },
     "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/crimson_door_bottom_right_open"
+      "model": "minecraft:block/crimson_door_bottom"
     },
     "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/crimson_door_top_left",
+      "model": "minecraft:block/crimson_door_top",
       "y": 90
     },
     "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/crimson_door_top_left_open",
+      "model": "minecraft:block/crimson_door_top_hinge",
       "y": 180
     },
     "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/crimson_door_top_right",
+      "model": "minecraft:block/crimson_door_top_hinge",
       "y": 90
     },
     "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/crimson_door_top_right_open"
+      "model": "minecraft:block/crimson_door_top"
     },
     "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/crimson_door_bottom_left",
+      "model": "minecraft:block/crimson_door_bottom",
       "y": 180
     },
     "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/crimson_door_bottom_left_open",
+      "model": "minecraft:block/crimson_door_bottom_hinge",
       "y": 270
     },
     "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/crimson_door_bottom_right",
+      "model": "minecraft:block/crimson_door_bottom_hinge",
       "y": 180
     },
     "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/crimson_door_bottom_right_open",
+      "model": "minecraft:block/crimson_door_bottom",
       "y": 90
     },
     "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/crimson_door_top_left",
+      "model": "minecraft:block/crimson_door_top",
       "y": 180
     },
     "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/crimson_door_top_left_open",
+      "model": "minecraft:block/crimson_door_top_hinge",
       "y": 270
     },
     "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/crimson_door_top_right",
+      "model": "minecraft:block/crimson_door_top_hinge",
       "y": 180
     },
     "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/crimson_door_top_right_open",
+      "model": "minecraft:block/crimson_door_top",
       "y": 90
     }
   }

assets/minecraft/blockstates/cyan_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/cyan_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/cyan_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/cyan_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/cyan_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/cyan_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/cyan_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/cyan_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/cyan_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/cyan_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/cyan_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/cyan_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/dark_oak_door.json

@@ -1,123 +1,123 @@
 {
   "variants": {
     "facing=east,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/dark_oak_door_bottom_left"
+      "model": "minecraft:block/dark_oak_door_bottom"
     },
     "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/dark_oak_door_bottom_left_open",
+      "model": "minecraft:block/dark_oak_door_bottom_hinge",
       "y": 90
     },
     "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/dark_oak_door_bottom_right"
+      "model": "minecraft:block/dark_oak_door_bottom_hinge"
     },
     "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/dark_oak_door_bottom_right_open",
+      "model": "minecraft:block/dark_oak_door_bottom",
       "y": 270
     },
     "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/dark_oak_door_top_left"
+      "model": "minecraft:block/dark_oak_door_top"
     },
     "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/dark_oak_door_top_left_open",
+      "model": "minecraft:block/dark_oak_door_top_hinge",
       "y": 90
     },
     "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/dark_oak_door_top_right"
+      "model": "minecraft:block/dark_oak_door_top_hinge"
     },
     "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/dark_oak_door_top_right_open",
+      "model": "minecraft:block/dark_oak_door_top",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/dark_oak_door_bottom_left",
+      "model": "minecraft:block/dark_oak_door_bottom",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/dark_oak_door_bottom_left_open"
+      "model": "minecraft:block/dark_oak_door_bottom_hinge"
     },
     "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/dark_oak_door_bottom_right",
+      "model": "minecraft:block/dark_oak_door_bottom_hinge",
       "y": 270
     },
     "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/dark_oak_door_bottom_right_open",
+      "model": "minecraft:block/dark_oak_door_bottom",
       "y": 180
     },
     "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/dark_oak_door_top_left",
+      "model": "minecraft:block/dark_oak_door_top",
       "y": 270
     },
     "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/dark_oak_door_top_left_open"
+      "model": "minecraft:block/dark_oak_door_top_hinge"
     },
     "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/dark_oak_door_top_right",
+      "model": "minecraft:block/dark_oak_door_top_hinge",
       "y": 270
     },
     "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/dark_oak_door_top_right_open",
+      "model": "minecraft:block/dark_oak_door_top",
       "y": 180
     },
     "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/dark_oak_door_bottom_left",
+      "model": "minecraft:block/dark_oak_door_bottom",
       "y": 90
     },
     "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/dark_oak_door_bottom_left_open",
+      "model": "minecraft:block/dark_oak_door_bottom_hinge",
       "y": 180
     },
     "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/dark_oak_door_bottom_right",
+      "model": "minecraft:block/dark_oak_door_bottom_hinge",
       "y": 90
     },
     "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/dark_oak_door_bottom_right_open"
+      "model": "minecraft:block/dark_oak_door_bottom"
     },
     "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/dark_oak_door_top_left",
+      "model": "minecraft:block/dark_oak_door_top",
       "y": 90
     },
     "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/dark_oak_door_top_left_open",
+      "model": "minecraft:block/dark_oak_door_top_hinge",
       "y": 180
     },
     "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/dark_oak_door_top_right",
+      "model": "minecraft:block/dark_oak_door_top_hinge",
       "y": 90
     },
     "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/dark_oak_door_top_right_open"
+      "model": "minecraft:block/dark_oak_door_top"
     },
     "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/dark_oak_door_bottom_left",
+      "model": "minecraft:block/dark_oak_door_bottom",
       "y": 180
     },
     "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/dark_oak_door_bottom_left_open",
+      "model": "minecraft:block/dark_oak_door_bottom_hinge",
       "y": 270
     },
     "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/dark_oak_door_bottom_right",
+      "model": "minecraft:block/dark_oak_door_bottom_hinge",
       "y": 180
     },
     "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/dark_oak_door_bottom_right_open",
+      "model": "minecraft:block/dark_oak_door_bottom",
       "y": 90
     },
     "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/dark_oak_door_top_left",
+      "model": "minecraft:block/dark_oak_door_top",
       "y": 180
     },
     "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/dark_oak_door_top_left_open",
+      "model": "minecraft:block/dark_oak_door_top_hinge",
       "y": 270
     },
     "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/dark_oak_door_top_right",
+      "model": "minecraft:block/dark_oak_door_top_hinge",
       "y": 180
     },
     "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/dark_oak_door_top_right_open",
+      "model": "minecraft:block/dark_oak_door_top",
       "y": 90
     }
   }

assets/minecraft/blockstates/fire.json

@@ -2,11 +2,11 @@
   "multipart": [
     {
       "when": {
+        "south": "false",
         "up": "false",
         "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false"
+        "east": "false",
+        "west": "false"
       },
       "apply": [
         {
@@ -24,11 +24,11 @@
             "north": "true"
           },
           {
+            "south": "false",
             "up": "false",
             "north": "false",
-            "west": "false",
-            "south": "false",
-            "east": "false"
+            "east": "false",
+            "west": "false"
           }
         ]
       },
@@ -54,11 +54,11 @@
             "east": "true"
           },
           {
+            "south": "false",
             "up": "false",
             "north": "false",
-            "west": "false",
-            "south": "false",
-            "east": "false"
+            "east": "false",
+            "west": "false"
           }
         ]
       },
@@ -88,11 +88,11 @@
             "south": "true"
           },
           {
+            "south": "false",
             "up": "false",
             "north": "false",
-            "west": "false",
-            "south": "false",
-            "east": "false"
+            "east": "false",
+            "west": "false"
           }
         ]
       },
@@ -122,11 +122,11 @@
             "west": "true"
           },
           {
+            "south": "false",
             "up": "false",
             "north": "false",
-            "west": "false",
-            "south": "false",
-            "east": "false"
+            "east": "false",
+            "west": "false"
           }
         ]
       },

assets/minecraft/blockstates/flowering_azalea_leaves.json

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

assets/minecraft/blockstates/frogspawn.json

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

assets/minecraft/blockstates/glow_lichen.json

@@ -1,76 +1,5 @@
 {
   "multipart": [
-    {
-      "when": {
-        "up": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/glow_lichen",
-        "x": 270,
-        "uvlock": true
-      }
-    },
-    {
-      "when": {
-        "up": "false",
-        "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false",
-        "down": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/glow_lichen",
-        "x": 270,
-        "uvlock": true
-      }
-    },
-    {
-      "when": {
-        "north": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/glow_lichen"
-      }
-    },
-    {
-      "when": {
-        "up": "false",
-        "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false",
-        "down": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/glow_lichen"
-      }
-    },
-    {
-      "when": {
-        "west": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/glow_lichen",
-        "y": 270,
-        "uvlock": true
-      }
-    },
-    {
-      "when": {
-        "up": "false",
-        "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false",
-        "down": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/glow_lichen",
-        "y": 270,
-        "uvlock": true
-      }
-    },
     {
       "when": {
         "south": "true"
@@ -83,41 +12,11 @@
     },
     {
       "when": {
-        "up": "false",
-        "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false",
-        "down": "false"
+        "up": "true"
       },
       "apply": {
         "model": "minecraft:block/glow_lichen",
-        "y": 180,
-        "uvlock": true
-      }
-    },
-    {
-      "when": {
-        "east": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/glow_lichen",
-        "y": 90,
-        "uvlock": true
-      }
-    },
-    {
-      "when": {
-        "up": "false",
-        "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false",
-        "down": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/glow_lichen",
-        "y": 90,
+        "x": 270,
         "uvlock": true
       }
     },
@@ -133,16 +32,29 @@
     },
     {
       "when": {
-        "up": "false",
-        "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false",
-        "down": "false"
+        "north": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/glow_lichen"
+      }
+    },
+    {
+      "when": {
+        "east": "true"
       },
       "apply": {
         "model": "minecraft:block/glow_lichen",
-        "x": 90,
+        "y": 90,
+        "uvlock": true
+      }
+    },
+    {
+      "when": {
+        "west": "true"
+      },
+      "apply": {
+        "model": "minecraft:block/glow_lichen",
+        "y": 270,
         "uvlock": true
       }
     }

assets/minecraft/blockstates/gray_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/gray_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/gray_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/gray_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/gray_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/gray_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/gray_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/gray_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/gray_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/gray_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/gray_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/gray_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/green_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/green_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/green_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/green_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/green_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/green_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/green_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/green_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/green_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/green_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/green_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/green_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/iron_bars.json

@@ -7,10 +7,10 @@
     },
     {
       "when": {
-        "north": "false",
-        "west": "false",
         "south": "false",
-        "east": "false"
+        "north": "false",
+        "east": "false",
+        "west": "false"
       },
       "apply": {
         "model": "minecraft:block/iron_bars_post"
@@ -18,10 +18,10 @@
     },
     {
       "when": {
-        "north": "true",
-        "west": "false",
         "south": "false",
-        "east": "false"
+        "north": "true",
+        "east": "false",
+        "west": "false"
       },
       "apply": {
         "model": "minecraft:block/iron_bars_cap"
@@ -29,10 +29,10 @@
     },
     {
       "when": {
-        "north": "false",
-        "west": "false",
         "south": "false",
-        "east": "true"
+        "north": "false",
+        "east": "true",
+        "west": "false"
       },
       "apply": {
         "model": "minecraft:block/iron_bars_cap",
@@ -41,10 +41,10 @@
     },
     {
       "when": {
-        "north": "false",
-        "west": "false",
         "south": "true",
-        "east": "false"
+        "north": "false",
+        "east": "false",
+        "west": "false"
       },
       "apply": {
         "model": "minecraft:block/iron_bars_cap_alt"
@@ -52,10 +52,10 @@
     },
     {
       "when": {
-        "north": "false",
-        "west": "true",
         "south": "false",
-        "east": "false"
+        "north": "false",
+        "east": "false",
+        "west": "true"
       },
       "apply": {
         "model": "minecraft:block/iron_bars_cap_alt",

assets/minecraft/blockstates/iron_door.json

@@ -1,123 +1,123 @@
 {
   "variants": {
     "facing=east,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/iron_door_bottom_left"
+      "model": "minecraft:block/iron_door_bottom"
     },
     "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/iron_door_bottom_left_open",
+      "model": "minecraft:block/iron_door_bottom_hinge",
       "y": 90
     },
     "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/iron_door_bottom_right"
+      "model": "minecraft:block/iron_door_bottom_hinge"
     },
     "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/iron_door_bottom_right_open",
+      "model": "minecraft:block/iron_door_bottom",
       "y": 270
     },
     "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/iron_door_top_left"
+      "model": "minecraft:block/iron_door_top"
     },
     "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/iron_door_top_left_open",
+      "model": "minecraft:block/iron_door_top_hinge",
       "y": 90
     },
     "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/iron_door_top_right"
+      "model": "minecraft:block/iron_door_top_hinge"
     },
     "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/iron_door_top_right_open",
+      "model": "minecraft:block/iron_door_top",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/iron_door_bottom_left",
+      "model": "minecraft:block/iron_door_bottom",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/iron_door_bottom_left_open"
+      "model": "minecraft:block/iron_door_bottom_hinge"
     },
     "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/iron_door_bottom_right",
+      "model": "minecraft:block/iron_door_bottom_hinge",
       "y": 270
     },
     "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/iron_door_bottom_right_open",
+      "model": "minecraft:block/iron_door_bottom",
       "y": 180
     },
     "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/iron_door_top_left",
+      "model": "minecraft:block/iron_door_top",
       "y": 270
     },
     "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/iron_door_top_left_open"
+      "model": "minecraft:block/iron_door_top_hinge"
     },
     "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/iron_door_top_right",
+      "model": "minecraft:block/iron_door_top_hinge",
       "y": 270
     },
     "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/iron_door_top_right_open",
+      "model": "minecraft:block/iron_door_top",
       "y": 180
     },
     "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/iron_door_bottom_left",
+      "model": "minecraft:block/iron_door_bottom",
       "y": 90
     },
     "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/iron_door_bottom_left_open",
+      "model": "minecraft:block/iron_door_bottom_hinge",
       "y": 180
     },
     "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/iron_door_bottom_right",
+      "model": "minecraft:block/iron_door_bottom_hinge",
       "y": 90
     },
     "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/iron_door_bottom_right_open"
+      "model": "minecraft:block/iron_door_bottom"
     },
     "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/iron_door_top_left",
+      "model": "minecraft:block/iron_door_top",
       "y": 90
     },
     "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/iron_door_top_left_open",
+      "model": "minecraft:block/iron_door_top_hinge",
       "y": 180
     },
     "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/iron_door_top_right",
+      "model": "minecraft:block/iron_door_top_hinge",
       "y": 90
     },
     "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/iron_door_top_right_open"
+      "model": "minecraft:block/iron_door_top"
     },
     "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/iron_door_bottom_left",
+      "model": "minecraft:block/iron_door_bottom",
       "y": 180
     },
     "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/iron_door_bottom_left_open",
+      "model": "minecraft:block/iron_door_bottom_hinge",
       "y": 270
     },
     "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/iron_door_bottom_right",
+      "model": "minecraft:block/iron_door_bottom_hinge",
       "y": 180
     },
     "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/iron_door_bottom_right_open",
+      "model": "minecraft:block/iron_door_bottom",
       "y": 90
     },
     "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/iron_door_top_left",
+      "model": "minecraft:block/iron_door_top",
       "y": 180
     },
     "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/iron_door_top_left_open",
+      "model": "minecraft:block/iron_door_top_hinge",
       "y": 270
     },
     "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/iron_door_top_right",
+      "model": "minecraft:block/iron_door_top_hinge",
       "y": 180
     },
     "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/iron_door_top_right_open",
+      "model": "minecraft:block/iron_door_top",
       "y": 90
     }
   }

assets/minecraft/blockstates/jungle_door.json

@@ -1,123 +1,123 @@
 {
   "variants": {
     "facing=east,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/jungle_door_bottom_left"
+      "model": "minecraft:block/jungle_door_bottom"
     },
     "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/jungle_door_bottom_left_open",
+      "model": "minecraft:block/jungle_door_bottom_hinge",
       "y": 90
     },
     "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/jungle_door_bottom_right"
+      "model": "minecraft:block/jungle_door_bottom_hinge"
     },
     "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/jungle_door_bottom_right_open",
+      "model": "minecraft:block/jungle_door_bottom",
       "y": 270
     },
     "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/jungle_door_top_left"
+      "model": "minecraft:block/jungle_door_top"
     },
     "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/jungle_door_top_left_open",
+      "model": "minecraft:block/jungle_door_top_hinge",
       "y": 90
     },
     "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/jungle_door_top_right"
+      "model": "minecraft:block/jungle_door_top_hinge"
     },
     "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/jungle_door_top_right_open",
+      "model": "minecraft:block/jungle_door_top",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/jungle_door_bottom_left",
+      "model": "minecraft:block/jungle_door_bottom",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/jungle_door_bottom_left_open"
+      "model": "minecraft:block/jungle_door_bottom_hinge"
     },
     "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/jungle_door_bottom_right",
+      "model": "minecraft:block/jungle_door_bottom_hinge",
       "y": 270
     },
     "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/jungle_door_bottom_right_open",
+      "model": "minecraft:block/jungle_door_bottom",
       "y": 180
     },
     "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/jungle_door_top_left",
+      "model": "minecraft:block/jungle_door_top",
       "y": 270
     },
     "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/jungle_door_top_left_open"
+      "model": "minecraft:block/jungle_door_top_hinge"
     },
     "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/jungle_door_top_right",
+      "model": "minecraft:block/jungle_door_top_hinge",
       "y": 270
     },
     "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/jungle_door_top_right_open",
+      "model": "minecraft:block/jungle_door_top",
       "y": 180
     },
     "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/jungle_door_bottom_left",
+      "model": "minecraft:block/jungle_door_bottom",
       "y": 90
     },
     "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/jungle_door_bottom_left_open",
+      "model": "minecraft:block/jungle_door_bottom_hinge",
       "y": 180
     },
     "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/jungle_door_bottom_right",
+      "model": "minecraft:block/jungle_door_bottom_hinge",
       "y": 90
     },
     "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/jungle_door_bottom_right_open"
+      "model": "minecraft:block/jungle_door_bottom"
     },
     "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/jungle_door_top_left",
+      "model": "minecraft:block/jungle_door_top",
       "y": 90
     },
     "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/jungle_door_top_left_open",
+      "model": "minecraft:block/jungle_door_top_hinge",
       "y": 180
     },
     "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/jungle_door_top_right",
+      "model": "minecraft:block/jungle_door_top_hinge",
       "y": 90
     },
     "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/jungle_door_top_right_open"
+      "model": "minecraft:block/jungle_door_top"
     },
     "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/jungle_door_bottom_left",
+      "model": "minecraft:block/jungle_door_bottom",
       "y": 180
     },
     "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/jungle_door_bottom_left_open",
+      "model": "minecraft:block/jungle_door_bottom_hinge",
       "y": 270
     },
     "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/jungle_door_bottom_right",
+      "model": "minecraft:block/jungle_door_bottom_hinge",
       "y": 180
     },
     "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/jungle_door_bottom_right_open",
+      "model": "minecraft:block/jungle_door_bottom",
       "y": 90
     },
     "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/jungle_door_top_left",
+      "model": "minecraft:block/jungle_door_top",
       "y": 180
     },
     "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/jungle_door_top_left_open",
+      "model": "minecraft:block/jungle_door_top_hinge",
       "y": 270
     },
     "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/jungle_door_top_right",
+      "model": "minecraft:block/jungle_door_top_hinge",
       "y": 180
     },
     "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/jungle_door_top_right_open",
+      "model": "minecraft:block/jungle_door_top",
       "y": 90
     }
   }

assets/minecraft/blockstates/light.json

@@ -1,52 +1,7 @@
 {
   "variants": {
-    "level=0": {
-      "model": "minecraft:block/light_00"
-    },
-    "level=1": {
-      "model": "minecraft:block/light_01"
-    },
-    "level=10": {
-      "model": "minecraft:block/light_10"
-    },
-    "level=11": {
-      "model": "minecraft:block/light_11"
-    },
-    "level=12": {
-      "model": "minecraft:block/light_12"
-    },
-    "level=13": {
-      "model": "minecraft:block/light_13"
-    },
-    "level=14": {
-      "model": "minecraft:block/light_14"
-    },
-    "level=15": {
-      "model": "minecraft:block/light_15"
-    },
-    "level=2": {
-      "model": "minecraft:block/light_02"
-    },
-    "level=3": {
-      "model": "minecraft:block/light_03"
-    },
-    "level=4": {
-      "model": "minecraft:block/light_04"
-    },
-    "level=5": {
-      "model": "minecraft:block/light_05"
-    },
-    "level=6": {
-      "model": "minecraft:block/light_06"
-    },
-    "level=7": {
-      "model": "minecraft:block/light_07"
-    },
-    "level=8": {
-      "model": "minecraft:block/light_08"
-    },
-    "level=9": {
-      "model": "minecraft:block/light_09"
+    "": {
+      "model": "minecraft:block/light"
     }
   }
 }

assets/minecraft/blockstates/light_blue_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/light_blue_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/light_blue_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/light_blue_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/light_blue_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/light_blue_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/light_blue_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/light_blue_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/light_blue_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/light_blue_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/light_blue_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/light_blue_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/light_gray_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/light_gray_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/light_gray_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/light_gray_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/light_gray_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/light_gray_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/light_gray_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/light_gray_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/light_gray_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/light_gray_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/light_gray_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/light_gray_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/lime_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/lime_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/lime_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/lime_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/lime_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/lime_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/lime_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/lime_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/lime_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/lime_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/lime_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/lime_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/magenta_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/magenta_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/magenta_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/magenta_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/magenta_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/magenta_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/magenta_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/magenta_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/magenta_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/magenta_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/magenta_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/magenta_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/mangrove_button.json

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

assets/minecraft/blockstates/mangrove_door.json

@@ -1,124 +0,0 @@
-{
-  "variants": {
-    "facing=east,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/mangrove_door_bottom_left"
-    },
-    "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/mangrove_door_bottom_left_open",
-      "y": 90
-    },
-    "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/mangrove_door_bottom_right"
-    },
-    "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/mangrove_door_bottom_right_open",
-      "y": 270
-    },
-    "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/mangrove_door_top_left"
-    },
-    "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/mangrove_door_top_left_open",
-      "y": 90
-    },
-    "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/mangrove_door_top_right"
-    },
-    "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/mangrove_door_top_right_open",
-      "y": 270
-    },
-    "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/mangrove_door_bottom_left",
-      "y": 270
-    },
-    "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/mangrove_door_bottom_left_open"
-    },
-    "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/mangrove_door_bottom_right",
-      "y": 270
-    },
-    "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/mangrove_door_bottom_right_open",
-      "y": 180
-    },
-    "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/mangrove_door_top_left",
-      "y": 270
-    },
-    "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/mangrove_door_top_left_open"
-    },
-    "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/mangrove_door_top_right",
-      "y": 270
-    },
-    "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/mangrove_door_top_right_open",
-      "y": 180
-    },
-    "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/mangrove_door_bottom_left",
-      "y": 90
-    },
-    "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/mangrove_door_bottom_left_open",
-      "y": 180
-    },
-    "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/mangrove_door_bottom_right",
-      "y": 90
-    },
-    "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/mangrove_door_bottom_right_open"
-    },
-    "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/mangrove_door_top_left",
-      "y": 90
-    },
-    "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/mangrove_door_top_left_open",
-      "y": 180
-    },
-    "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/mangrove_door_top_right",
-      "y": 90
-    },
-    "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/mangrove_door_top_right_open"
-    },
-    "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/mangrove_door_bottom_left",
-      "y": 180
-    },
-    "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/mangrove_door_bottom_left_open",
-      "y": 270
-    },
-    "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/mangrove_door_bottom_right",
-      "y": 180
-    },
-    "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/mangrove_door_bottom_right_open",
-      "y": 90
-    },
-    "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/mangrove_door_top_left",
-      "y": 180
-    },
-    "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/mangrove_door_top_left_open",
-      "y": 270
-    },
-    "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/mangrove_door_top_right",
-      "y": 180
-    },
-    "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/mangrove_door_top_right_open",
-      "y": 90
-    }
-  }
-}

assets/minecraft/blockstates/mangrove_fence.json

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

assets/minecraft/blockstates/mangrove_fence_gate.json

@@ -1,80 +0,0 @@
-{
-  "variants": {
-    "facing=east,in_wall=false,open=false": {
-      "uvlock": true,
-      "y": 270,
-      "model": "minecraft:block/mangrove_fence_gate"
-    },
-    "facing=east,in_wall=false,open=true": {
-      "uvlock": true,
-      "y": 270,
-      "model": "minecraft:block/mangrove_fence_gate_open"
-    },
-    "facing=east,in_wall=true,open=false": {
-      "uvlock": true,
-      "y": 270,
-      "model": "minecraft:block/mangrove_fence_gate_wall"
-    },
-    "facing=east,in_wall=true,open=true": {
-      "uvlock": true,
-      "y": 270,
-      "model": "minecraft:block/mangrove_fence_gate_wall_open"
-    },
-    "facing=north,in_wall=false,open=false": {
-      "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/mangrove_fence_gate"
-    },
-    "facing=north,in_wall=false,open=true": {
-      "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/mangrove_fence_gate_open"
-    },
-    "facing=north,in_wall=true,open=false": {
-      "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/mangrove_fence_gate_wall"
-    },
-    "facing=north,in_wall=true,open=true": {
-      "uvlock": true,
-      "y": 180,
-      "model": "minecraft:block/mangrove_fence_gate_wall_open"
-    },
-    "facing=south,in_wall=false,open=false": {
-      "uvlock": true,
-      "model": "minecraft:block/mangrove_fence_gate"
-    },
-    "facing=south,in_wall=false,open=true": {
-      "uvlock": true,
-      "model": "minecraft:block/mangrove_fence_gate_open"
-    },
-    "facing=south,in_wall=true,open=false": {
-      "uvlock": true,
-      "model": "minecraft:block/mangrove_fence_gate_wall"
-    },
-    "facing=south,in_wall=true,open=true": {
-      "uvlock": true,
-      "model": "minecraft:block/mangrove_fence_gate_wall_open"
-    },
-    "facing=west,in_wall=false,open=false": {
-      "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/mangrove_fence_gate"
-    },
-    "facing=west,in_wall=false,open=true": {
-      "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/mangrove_fence_gate_open"
-    },
-    "facing=west,in_wall=true,open=false": {
-      "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/mangrove_fence_gate_wall"
-    },
-    "facing=west,in_wall=true,open=true": {
-      "uvlock": true,
-      "y": 90,
-      "model": "minecraft:block/mangrove_fence_gate_wall_open"
-    }
-  }
-}

assets/minecraft/blockstates/mangrove_leaves.json

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

assets/minecraft/blockstates/mangrove_log.json

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

assets/minecraft/blockstates/mangrove_planks.json

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

assets/minecraft/blockstates/mangrove_pressure_plate.json

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

assets/minecraft/blockstates/mangrove_propagule.json

@@ -1,34 +0,0 @@
-{
-  "variants": {
-    "age=0,hanging=false": {
-      "model": "minecraft:block/mangrove_propagule"
-    },
-    "age=0,hanging=true": {
-      "model": "minecraft:block/mangrove_propagule_hanging_0"
-    },
-    "age=1,hanging=false": {
-      "model": "minecraft:block/mangrove_propagule"
-    },
-    "age=1,hanging=true": {
-      "model": "minecraft:block/mangrove_propagule_hanging_1"
-    },
-    "age=2,hanging=false": {
-      "model": "minecraft:block/mangrove_propagule"
-    },
-    "age=2,hanging=true": {
-      "model": "minecraft:block/mangrove_propagule_hanging_2"
-    },
-    "age=3,hanging=false": {
-      "model": "minecraft:block/mangrove_propagule"
-    },
-    "age=3,hanging=true": {
-      "model": "minecraft:block/mangrove_propagule_hanging_3"
-    },
-    "age=4,hanging=false": {
-      "model": "minecraft:block/mangrove_propagule"
-    },
-    "age=4,hanging=true": {
-      "model": "minecraft:block/mangrove_propagule_hanging_4"
-    }
-  }
-}

assets/minecraft/blockstates/mangrove_roots.json

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

assets/minecraft/blockstates/mangrove_sign.json

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

assets/minecraft/blockstates/mangrove_slab.json

@@ -1,13 +0,0 @@
-{
-  "variants": {
-    "type=bottom": {
-      "model": "minecraft:block/mangrove_slab"
-    },
-    "type=double": {
-      "model": "minecraft:block/mangrove_planks"
-    },
-    "type=top": {
-      "model": "minecraft:block/mangrove_slab_top"
-    }
-  }
-}

assets/minecraft/blockstates/mangrove_stairs.json

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

assets/minecraft/blockstates/mangrove_trapdoor.json

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

assets/minecraft/blockstates/mangrove_wall_sign.json

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

assets/minecraft/blockstates/mangrove_wood.json

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

assets/minecraft/blockstates/mud.json

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

assets/minecraft/blockstates/mud_brick_slab.json

@@ -1,13 +0,0 @@
-{
-  "variants": {
-    "type=bottom": {
-      "model": "minecraft:block/mud_brick_slab"
-    },
-    "type=double": {
-      "model": "minecraft:block/mud_bricks"
-    },
-    "type=top": {
-      "model": "minecraft:block/mud_brick_slab_top"
-    }
-  }
-}

assets/minecraft/blockstates/mud_brick_stairs.json

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

assets/minecraft/blockstates/mud_brick_wall.json

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

assets/minecraft/blockstates/mud_bricks.json

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

assets/minecraft/blockstates/muddy_mangrove_roots.json

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

assets/minecraft/blockstates/oak_door.json

@@ -1,123 +1,123 @@
 {
   "variants": {
     "facing=east,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/oak_door_bottom_left"
+      "model": "minecraft:block/oak_door_bottom"
     },
     "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/oak_door_bottom_left_open",
+      "model": "minecraft:block/oak_door_bottom_hinge",
       "y": 90
     },
     "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/oak_door_bottom_right"
+      "model": "minecraft:block/oak_door_bottom_hinge"
     },
     "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/oak_door_bottom_right_open",
+      "model": "minecraft:block/oak_door_bottom",
       "y": 270
     },
     "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/oak_door_top_left"
+      "model": "minecraft:block/oak_door_top"
     },
     "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/oak_door_top_left_open",
+      "model": "minecraft:block/oak_door_top_hinge",
       "y": 90
     },
     "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/oak_door_top_right"
+      "model": "minecraft:block/oak_door_top_hinge"
     },
     "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/oak_door_top_right_open",
+      "model": "minecraft:block/oak_door_top",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/oak_door_bottom_left",
+      "model": "minecraft:block/oak_door_bottom",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/oak_door_bottom_left_open"
+      "model": "minecraft:block/oak_door_bottom_hinge"
     },
     "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/oak_door_bottom_right",
+      "model": "minecraft:block/oak_door_bottom_hinge",
       "y": 270
     },
     "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/oak_door_bottom_right_open",
+      "model": "minecraft:block/oak_door_bottom",
       "y": 180
     },
     "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/oak_door_top_left",
+      "model": "minecraft:block/oak_door_top",
       "y": 270
     },
     "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/oak_door_top_left_open"
+      "model": "minecraft:block/oak_door_top_hinge"
     },
     "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/oak_door_top_right",
+      "model": "minecraft:block/oak_door_top_hinge",
       "y": 270
     },
     "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/oak_door_top_right_open",
+      "model": "minecraft:block/oak_door_top",
       "y": 180
     },
     "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/oak_door_bottom_left",
+      "model": "minecraft:block/oak_door_bottom",
       "y": 90
     },
     "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/oak_door_bottom_left_open",
+      "model": "minecraft:block/oak_door_bottom_hinge",
       "y": 180
     },
     "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/oak_door_bottom_right",
+      "model": "minecraft:block/oak_door_bottom_hinge",
       "y": 90
     },
     "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/oak_door_bottom_right_open"
+      "model": "minecraft:block/oak_door_bottom"
     },
     "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/oak_door_top_left",
+      "model": "minecraft:block/oak_door_top",
       "y": 90
     },
     "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/oak_door_top_left_open",
+      "model": "minecraft:block/oak_door_top_hinge",
       "y": 180
     },
     "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/oak_door_top_right",
+      "model": "minecraft:block/oak_door_top_hinge",
       "y": 90
     },
     "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/oak_door_top_right_open"
+      "model": "minecraft:block/oak_door_top"
     },
     "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/oak_door_bottom_left",
+      "model": "minecraft:block/oak_door_bottom",
       "y": 180
     },
     "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/oak_door_bottom_left_open",
+      "model": "minecraft:block/oak_door_bottom_hinge",
       "y": 270
     },
     "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/oak_door_bottom_right",
+      "model": "minecraft:block/oak_door_bottom_hinge",
       "y": 180
     },
     "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/oak_door_bottom_right_open",
+      "model": "minecraft:block/oak_door_bottom",
       "y": 90
     },
     "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/oak_door_top_left",
+      "model": "minecraft:block/oak_door_top",
       "y": 180
     },
     "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/oak_door_top_left_open",
+      "model": "minecraft:block/oak_door_top_hinge",
       "y": 270
     },
     "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/oak_door_top_right",
+      "model": "minecraft:block/oak_door_top_hinge",
       "y": 180
     },
     "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/oak_door_top_right_open",
+      "model": "minecraft:block/oak_door_top",
       "y": 90
     }
   }

assets/minecraft/blockstates/ochre_froglight.json

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

assets/minecraft/blockstates/orange_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/orange_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/orange_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/orange_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/orange_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/orange_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/orange_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/orange_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/orange_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/orange_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/orange_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/orange_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/packed_mud.json

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

assets/minecraft/blockstates/pearlescent_froglight.json

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

assets/minecraft/blockstates/pink_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/pink_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/pink_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/pink_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/pink_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/pink_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/pink_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/pink_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/pink_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/pink_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/pink_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/pink_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/potted_azalea_bush.json

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

assets/minecraft/blockstates/potted_flowering_azalea_bush.json

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

assets/minecraft/blockstates/potted_mangrove_propagule.json

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

assets/minecraft/blockstates/purple_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/purple_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/purple_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/purple_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/purple_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/purple_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/purple_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/purple_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/purple_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/purple_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/purple_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/purple_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/red_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/red_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/red_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/red_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/red_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/red_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/red_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/red_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/red_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/red_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/red_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/red_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/redstone_wire.json

@@ -4,9 +4,9 @@
       "when": {
         "OR": [
           {
-            "west": "none",
             "east": "none",
             "north": "none",
+            "west": "none",
             "south": "none"
           },
           {

assets/minecraft/blockstates/reinforced_deepslate.json

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

assets/minecraft/blockstates/sculk.json

@@ -1,20 +0,0 @@
-{
-  "variants": {
-    "": [
-      {
-        "model": "minecraft:block/sculk"
-      },
-      {
-        "model": "minecraft:block/sculk_mirrored"
-      },
-      {
-        "model": "minecraft:block/sculk",
-        "y": 180
-      },
-      {
-        "model": "minecraft:block/sculk_mirrored",
-        "y": 180
-      }
-    ]
-  }
-}

assets/minecraft/blockstates/sculk_catalyst.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "bloom=false": {
-      "model": "minecraft:block/sculk_catalyst"
-    },
-    "bloom=true": {
-      "model": "minecraft:block/sculk_catalyst_bloom"
-    }
-  }
-}

assets/minecraft/blockstates/sculk_shrieker.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "can_summon=false": {
-      "model": "minecraft:block/sculk_shrieker"
-    },
-    "can_summon=true": {
-      "model": "minecraft:block/sculk_shrieker_can_summon"
-    }
-  }
-}

assets/minecraft/blockstates/sculk_vein.json

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

assets/minecraft/blockstates/spruce_door.json

@@ -1,123 +1,123 @@
 {
   "variants": {
     "facing=east,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/spruce_door_bottom_left"
+      "model": "minecraft:block/spruce_door_bottom"
     },
     "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/spruce_door_bottom_left_open",
+      "model": "minecraft:block/spruce_door_bottom_hinge",
       "y": 90
     },
     "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/spruce_door_bottom_right"
+      "model": "minecraft:block/spruce_door_bottom_hinge"
     },
     "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/spruce_door_bottom_right_open",
+      "model": "minecraft:block/spruce_door_bottom",
       "y": 270
     },
     "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/spruce_door_top_left"
+      "model": "minecraft:block/spruce_door_top"
     },
     "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/spruce_door_top_left_open",
+      "model": "minecraft:block/spruce_door_top_hinge",
       "y": 90
     },
     "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/spruce_door_top_right"
+      "model": "minecraft:block/spruce_door_top_hinge"
     },
     "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/spruce_door_top_right_open",
+      "model": "minecraft:block/spruce_door_top",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/spruce_door_bottom_left",
+      "model": "minecraft:block/spruce_door_bottom",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/spruce_door_bottom_left_open"
+      "model": "minecraft:block/spruce_door_bottom_hinge"
     },
     "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/spruce_door_bottom_right",
+      "model": "minecraft:block/spruce_door_bottom_hinge",
       "y": 270
     },
     "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/spruce_door_bottom_right_open",
+      "model": "minecraft:block/spruce_door_bottom",
       "y": 180
     },
     "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/spruce_door_top_left",
+      "model": "minecraft:block/spruce_door_top",
       "y": 270
     },
     "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/spruce_door_top_left_open"
+      "model": "minecraft:block/spruce_door_top_hinge"
     },
     "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/spruce_door_top_right",
+      "model": "minecraft:block/spruce_door_top_hinge",
       "y": 270
     },
     "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/spruce_door_top_right_open",
+      "model": "minecraft:block/spruce_door_top",
       "y": 180
     },
     "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/spruce_door_bottom_left",
+      "model": "minecraft:block/spruce_door_bottom",
       "y": 90
     },
     "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/spruce_door_bottom_left_open",
+      "model": "minecraft:block/spruce_door_bottom_hinge",
       "y": 180
     },
     "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/spruce_door_bottom_right",
+      "model": "minecraft:block/spruce_door_bottom_hinge",
       "y": 90
     },
     "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/spruce_door_bottom_right_open"
+      "model": "minecraft:block/spruce_door_bottom"
     },
     "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/spruce_door_top_left",
+      "model": "minecraft:block/spruce_door_top",
       "y": 90
     },
     "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/spruce_door_top_left_open",
+      "model": "minecraft:block/spruce_door_top_hinge",
       "y": 180
     },
     "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/spruce_door_top_right",
+      "model": "minecraft:block/spruce_door_top_hinge",
       "y": 90
     },
     "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/spruce_door_top_right_open"
+      "model": "minecraft:block/spruce_door_top"
     },
     "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/spruce_door_bottom_left",
+      "model": "minecraft:block/spruce_door_bottom",
       "y": 180
     },
     "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/spruce_door_bottom_left_open",
+      "model": "minecraft:block/spruce_door_bottom_hinge",
       "y": 270
     },
     "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/spruce_door_bottom_right",
+      "model": "minecraft:block/spruce_door_bottom_hinge",
       "y": 180
     },
     "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/spruce_door_bottom_right_open",
+      "model": "minecraft:block/spruce_door_bottom",
       "y": 90
     },
     "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/spruce_door_top_left",
+      "model": "minecraft:block/spruce_door_top",
       "y": 180
     },
     "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/spruce_door_top_left_open",
+      "model": "minecraft:block/spruce_door_top_hinge",
       "y": 270
     },
     "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/spruce_door_top_right",
+      "model": "minecraft:block/spruce_door_top_hinge",
       "y": 180
     },
     "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/spruce_door_top_right_open",
+      "model": "minecraft:block/spruce_door_top",
       "y": 90
     }
   }

assets/minecraft/blockstates/stripped_mangrove_log.json

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

assets/minecraft/blockstates/stripped_mangrove_wood.json

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

assets/minecraft/blockstates/verdant_froglight.json

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

assets/minecraft/blockstates/vine.json

@@ -2,21 +2,17 @@
   "multipart": [
     {
       "when": {
-        "up": "true"
+        "south": "true"
       },
       "apply": {
         "model": "minecraft:block/vine",
-        "x": 270,
+        "y": 180,
         "uvlock": true
       }
     },
     {
       "when": {
-        "up": "false",
-        "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false"
+        "up": "true"
       },
       "apply": {
         "model": "minecraft:block/vine",
@@ -34,14 +30,12 @@
     },
     {
       "when": {
-        "up": "false",
-        "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false"
+        "east": "true"
       },
       "apply": {
-        "model": "minecraft:block/vine"
+        "model": "minecraft:block/vine",
+        "y": 90,
+        "uvlock": true
       }
     },
     {
@@ -53,68 +47,6 @@
         "y": 270,
         "uvlock": true
       }
-    },
-    {
-      "when": {
-        "up": "false",
-        "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/vine",
-        "y": 270,
-        "uvlock": true
-      }
-    },
-    {
-      "when": {
-        "south": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/vine",
-        "y": 180,
-        "uvlock": true
-      }
-    },
-    {
-      "when": {
-        "up": "false",
-        "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/vine",
-        "y": 180,
-        "uvlock": true
-      }
-    },
-    {
-      "when": {
-        "east": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/vine",
-        "y": 90,
-        "uvlock": true
-      }
-    },
-    {
-      "when": {
-        "up": "false",
-        "north": "false",
-        "west": "false",
-        "south": "false",
-        "east": "false"
-      },
-      "apply": {
-        "model": "minecraft:block/vine",
-        "y": 90,
-        "uvlock": true
-      }
     }
   ]
 }

assets/minecraft/blockstates/warped_door.json

@@ -1,123 +1,123 @@
 {
   "variants": {
     "facing=east,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/warped_door_bottom_left"
+      "model": "minecraft:block/warped_door_bottom"
     },
     "facing=east,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/warped_door_bottom_left_open",
+      "model": "minecraft:block/warped_door_bottom_hinge",
       "y": 90
     },
     "facing=east,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/warped_door_bottom_right"
+      "model": "minecraft:block/warped_door_bottom_hinge"
     },
     "facing=east,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/warped_door_bottom_right_open",
+      "model": "minecraft:block/warped_door_bottom",
       "y": 270
     },
     "facing=east,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/warped_door_top_left"
+      "model": "minecraft:block/warped_door_top"
     },
     "facing=east,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/warped_door_top_left_open",
+      "model": "minecraft:block/warped_door_top_hinge",
       "y": 90
     },
     "facing=east,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/warped_door_top_right"
+      "model": "minecraft:block/warped_door_top_hinge"
     },
     "facing=east,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/warped_door_top_right_open",
+      "model": "minecraft:block/warped_door_top",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/warped_door_bottom_left",
+      "model": "minecraft:block/warped_door_bottom",
       "y": 270
     },
     "facing=north,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/warped_door_bottom_left_open"
+      "model": "minecraft:block/warped_door_bottom_hinge"
     },
     "facing=north,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/warped_door_bottom_right",
+      "model": "minecraft:block/warped_door_bottom_hinge",
       "y": 270
     },
     "facing=north,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/warped_door_bottom_right_open",
+      "model": "minecraft:block/warped_door_bottom",
       "y": 180
     },
     "facing=north,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/warped_door_top_left",
+      "model": "minecraft:block/warped_door_top",
       "y": 270
     },
     "facing=north,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/warped_door_top_left_open"
+      "model": "minecraft:block/warped_door_top_hinge"
     },
     "facing=north,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/warped_door_top_right",
+      "model": "minecraft:block/warped_door_top_hinge",
       "y": 270
     },
     "facing=north,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/warped_door_top_right_open",
+      "model": "minecraft:block/warped_door_top",
       "y": 180
     },
     "facing=south,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/warped_door_bottom_left",
+      "model": "minecraft:block/warped_door_bottom",
       "y": 90
     },
     "facing=south,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/warped_door_bottom_left_open",
+      "model": "minecraft:block/warped_door_bottom_hinge",
       "y": 180
     },
     "facing=south,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/warped_door_bottom_right",
+      "model": "minecraft:block/warped_door_bottom_hinge",
       "y": 90
     },
     "facing=south,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/warped_door_bottom_right_open"
+      "model": "minecraft:block/warped_door_bottom"
     },
     "facing=south,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/warped_door_top_left",
+      "model": "minecraft:block/warped_door_top",
       "y": 90
     },
     "facing=south,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/warped_door_top_left_open",
+      "model": "minecraft:block/warped_door_top_hinge",
       "y": 180
     },
     "facing=south,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/warped_door_top_right",
+      "model": "minecraft:block/warped_door_top_hinge",
       "y": 90
     },
     "facing=south,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/warped_door_top_right_open"
+      "model": "minecraft:block/warped_door_top"
     },
     "facing=west,half=lower,hinge=left,open=false": {
-      "model": "minecraft:block/warped_door_bottom_left",
+      "model": "minecraft:block/warped_door_bottom",
       "y": 180
     },
     "facing=west,half=lower,hinge=left,open=true": {
-      "model": "minecraft:block/warped_door_bottom_left_open",
+      "model": "minecraft:block/warped_door_bottom_hinge",
       "y": 270
     },
     "facing=west,half=lower,hinge=right,open=false": {
-      "model": "minecraft:block/warped_door_bottom_right",
+      "model": "minecraft:block/warped_door_bottom_hinge",
       "y": 180
     },
     "facing=west,half=lower,hinge=right,open=true": {
-      "model": "minecraft:block/warped_door_bottom_right_open",
+      "model": "minecraft:block/warped_door_bottom",
       "y": 90
     },
     "facing=west,half=upper,hinge=left,open=false": {
-      "model": "minecraft:block/warped_door_top_left",
+      "model": "minecraft:block/warped_door_top",
       "y": 180
     },
     "facing=west,half=upper,hinge=left,open=true": {
-      "model": "minecraft:block/warped_door_top_left_open",
+      "model": "minecraft:block/warped_door_top_hinge",
       "y": 270
     },
     "facing=west,half=upper,hinge=right,open=false": {
-      "model": "minecraft:block/warped_door_top_right",
+      "model": "minecraft:block/warped_door_top_hinge",
       "y": 180
     },
     "facing=west,half=upper,hinge=right,open=true": {
-      "model": "minecraft:block/warped_door_top_right_open",
+      "model": "minecraft:block/warped_door_top",
       "y": 90
     }
   }

assets/minecraft/blockstates/white_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/white_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/white_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/white_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/white_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/white_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/white_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/white_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/white_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/white_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/white_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/white_candle_cake_lit"
     }
   }
 }

assets/minecraft/blockstates/yellow_candle.json

@@ -1,28 +1,16 @@
 {
   "variants": {
-    "candles=1,lit=false": {
+    "candles=1": {
       "model": "minecraft:block/yellow_candle_one_candle"
     },
-    "candles=1,lit=true": {
-      "model": "minecraft:block/yellow_candle_one_candle_lit"
-    },
-    "candles=2,lit=false": {
+    "candles=2": {
       "model": "minecraft:block/yellow_candle_two_candles"
     },
-    "candles=2,lit=true": {
-      "model": "minecraft:block/yellow_candle_two_candles_lit"
-    },
-    "candles=3,lit=false": {
+    "candles=3": {
       "model": "minecraft:block/yellow_candle_three_candles"
     },
-    "candles=3,lit=true": {
-      "model": "minecraft:block/yellow_candle_three_candles_lit"
-    },
-    "candles=4,lit=false": {
+    "candles=4": {
       "model": "minecraft:block/yellow_candle_four_candles"
-    },
-    "candles=4,lit=true": {
-      "model": "minecraft:block/yellow_candle_four_candles_lit"
     }
   }
 }

assets/minecraft/blockstates/yellow_candle_cake.json

@@ -1,10 +1,7 @@
 {
   "variants": {
-    "lit=false": {
+    "": {
       "model": "minecraft:block/yellow_candle_cake"
-    },
-    "lit=true": {
-      "model": "minecraft:block/yellow_candle_cake_lit"
     }
   }
 }

assets/minecraft/font/_list.json

@@ -1 +1 @@
-{"directories":[],"files":["alt.json","default.json","glyph_sizes.bin","illageralt.json","uniform.json"]}
+{"directories":[],"files":["alt.json","default.json","glyph_sizes.bin","uniform.json"]}

assets/minecraft/font/alt.json

@@ -1,11 +1,5 @@
 {
     "providers": [
-        {
-            "type": "space",
-            "advances": {
-                " ": 4
-            }
-        },
         {
             "type": "bitmap",
             "file": "minecraft:font/ascii_sga.png",
@@ -30,4 +24,4 @@
             ]
         }
     ]
-}
+}

assets/minecraft/font/default.json

@@ -1,12 +1,5 @@
 {
     "providers": [
-        {
-            "type": "space",
-            "advances": {
-                " ": 4,
-                "\u200c": 0
-            }
-        },
         {
             "type": "bitmap",
             "file": "minecraft:font/nonlatin_european.png",
@@ -76,9 +69,7 @@
                 "\ua7a8\ua7a9\ud800\udf30\ud800\udf31\ud800\udf32\ud800\udf33\ud800\udf34\ud800\udf35\ud800\udf36\ud800\udf37\ud800\udf38\ud800\udf39\ud800\udf3a\ud800\udf3b\ud800\udf3c\ud800\udf3d",
                 "\ud800\udf3e\ud800\udf3f\ud800\udf40\ud800\udf41\ud800\udf42\ud800\udf43\ud800\udf44\ud800\udf45\ud800\udf46\ud800\udf47\ud800\udf48\ud800\udf49\ud800\udf4a\ud83c\udf27\ud83d\udd25\ud83c\udf0a",
                 "\u2150\u2151\u2155\u2156\u2157\u2159\u215a\u215f\u2189\ud83d\udde1\ud83c\udff9\ud83e\ude93\ud83d\udd31\ud83c\udfa3\ud83e\uddea\u2697",
-                "\u2bea\u2beb\u2c6d\ud83d\udee1\u2702\ud83c\udf56\ud83e\udea3\ud83d\udd14\u23f3\u2691\u20a0\u20a1\u20a2\u20a3\u20a4\u20a5",
-                "\u20a6\u20a9\u20ab\u20ad\u20ae\u20b0\u20b1\u20b2\u20b3\u20b5\u20b6\u20b7\u20b8\u20b9\u20ba\u20bb",
-                "\u20bc\u20bf\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+                "\u2bea\u2beb\u2c6d\ud83d\udee1\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
             ]
         },
         {
@@ -161,7 +152,7 @@
                 "\u1faf\u1fa7\u1ffc\u1ff3\u1ff2\u1ff4\u1ff6\u1ff7\u262f\u2610\u2611\u2612\u018d\u01ba\u2c7e\u023f",
                 "\u2c7f\u0240\u1d80\ua7c4\ua794\u1d81\u1d82\u1d83\ua795\u1d84\u1d85\u1d86\u1d87\u1d88\u1d89\u1d8a",
                 "\u1d8b\u1d8c\u1d8d\ua7c6\u1d8e\u1d8f\u1d90\u1d92\u1d93\u1d94\u1d95\u1d96\u1d97\u1d98\u1d99\u1d9a",
-                "\u1e9a\u2152\u2158\u20a8\u20af\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+                "\u1e9a\u2152\u2158\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
             ]
         },
         {
@@ -184,7 +175,7 @@
                 "\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567",
                 "\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580",
                 "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u2205\u2208\u0000",
-                "\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u0000\u221a\u207f\u00b2\u25a0\u0000"
+                "\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000"
             ]
         },
         {