Create/Update assets for version 18w02a

assets/minecraft/blockstates/acacia_bark.json

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

assets/minecraft/blockstates/acacia_button.json

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

assets/minecraft/blockstates/acacia_door.json

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

assets/minecraft/blockstates/acacia_double_slab.json

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

assets/minecraft/blockstates/acacia_fence_gate.json

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

assets/minecraft/blockstates/acacia_log.json

@@ -2,7 +2,6 @@
     "variants": {
         "axis=y":  { "model": "acacia_log" },
         "axis=z":   { "model": "acacia_log", "x": 90 },
-        "axis=x":   { "model": "acacia_log", "x": 90, "y": 90 },
-        "axis=none": { "model": "acacia_bark" }
+        "axis=x":   { "model": "acacia_log", "x": 90, "y": 90 }
     }
 }

assets/minecraft/blockstates/acacia_pressure_plate.json

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

assets/minecraft/blockstates/acacia_slab.json

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

assets/minecraft/blockstates/acacia_stairs.json

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

assets/minecraft/blockstates/acacia_trapdoor.json

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

assets/minecraft/blockstates/activator_rail.json

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

assets/minecraft/blockstates/anvil.json

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

assets/minecraft/blockstates/attached_melon_stem.json

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

assets/minecraft/blockstates/attached_pumpkin_stem.json

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

assets/minecraft/blockstates/azure_bluet.json

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

assets/minecraft/blockstates/bed.json

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

assets/minecraft/blockstates/birch_bark.json

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

assets/minecraft/blockstates/birch_button.json

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

assets/minecraft/blockstates/birch_door.json

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

assets/minecraft/blockstates/birch_double_slab.json

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

assets/minecraft/blockstates/birch_fence_gate.json

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

assets/minecraft/blockstates/birch_log.json

@@ -2,7 +2,6 @@
     "variants": {
         "axis=y":  { "model": "birch_log" },
         "axis=z":   { "model": "birch_log", "x": 90 },
-        "axis=x":   { "model": "birch_log", "x": 90, "y": 90 },
-        "axis=none": { "model": "birch_bark" }
+        "axis=x":   { "model": "birch_log", "x": 90, "y": 90 }
     }
 }

assets/minecraft/blockstates/birch_pressure_plate.json

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

assets/minecraft/blockstates/birch_slab.json

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

assets/minecraft/blockstates/birch_stairs.json

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

assets/minecraft/blockstates/birch_trapdoor.json

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

assets/minecraft/blockstates/black_carpet.json

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

assets/minecraft/blockstates/black_concrete.json

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

assets/minecraft/blockstates/black_concrete_powder.json

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

assets/minecraft/blockstates/black_glazed_terracotta.json

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

assets/minecraft/blockstates/black_stained_glass.json

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

assets/minecraft/blockstates/black_stained_hardened_clay.json

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

assets/minecraft/blockstates/black_terracotta.json

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

assets/minecraft/blockstates/blue_carpet.json

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

assets/minecraft/blockstates/blue_concrete.json

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

assets/minecraft/blockstates/blue_concrete_powder.json

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

assets/minecraft/blockstates/blue_glazed_terracotta.json

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

assets/minecraft/blockstates/blue_orchid.json

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

assets/minecraft/blockstates/blue_stained_glass.json

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

assets/minecraft/blockstates/blue_stained_hardened_clay.json

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

assets/minecraft/blockstates/blue_terracotta.json

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

assets/minecraft/blockstates/brick_block.json

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

assets/minecraft/blockstates/brick_double_slab.json

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

assets/minecraft/blockstates/brick_slab.json

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

assets/minecraft/blockstates/brick_stairs.json

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

assets/minecraft/blockstates/bricks.json

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

assets/minecraft/blockstates/brown_carpet.json

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

assets/minecraft/blockstates/brown_concrete.json

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

assets/minecraft/blockstates/brown_concrete_powder.json

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

assets/minecraft/blockstates/brown_glazed_terracotta.json

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

assets/minecraft/blockstates/brown_mushroom_block.json

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

assets/minecraft/blockstates/brown_stained_glass.json

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

assets/minecraft/blockstates/brown_stained_hardened_clay.json

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

assets/minecraft/blockstates/brown_terracotta.json

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

assets/minecraft/blockstates/cake.json

@@ -1,6 +1,6 @@
 {
     "variants": {
-        "bites=0": { "model": "cake_uneaten" },
+        "bites=0": { "model": "cake" },
         "bites=1": { "model": "cake_slice1" },
         "bites=2": { "model": "cake_slice2" },
         "bites=3": { "model": "cake_slice3" },

assets/minecraft/blockstates/carved_pumpkin.json

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

assets/minecraft/blockstates/cauldron.json

@@ -1,6 +1,6 @@
 {
     "variants": {
-        "level=0": { "model": "cauldron_empty" },
+        "level=0": { "model": "cauldron" },
         "level=1": { "model": "cauldron_level1" },
         "level=2": { "model": "cauldron_level2" },
         "level=3": { "model": "cauldron_level3" }

assets/minecraft/blockstates/chipped_anvil.json

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

assets/minecraft/blockstates/chiseled_brick_monster_egg.json

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

assets/minecraft/blockstates/chiseled_quartz_block.json

@@ -1,6 +1,5 @@
 {
     "variants": {
-        "normal": { "model": "quartz_chiseled" }
+        "normal": { "model": "chiseled_quartz_block" }
     }
 }
-

assets/minecraft/blockstates/chiseled_red_sandstone.json

@@ -1,5 +1,5 @@
 {
     "variants": {
-        "normal": { "model": "red_sandstone_chiseled" }
+        "normal": { "model": "chiseled_red_sandstone" }
     }
 }

assets/minecraft/blockstates/chiseled_sandstone.json

@@ -1,5 +1,5 @@
 {
     "variants": {
-        "normal": { "model": "sandstone_chiseled" }
+        "normal": { "model": "chiseled_sandstone" }
     }
 }

assets/minecraft/blockstates/chiseled_stone_bricks.json

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

assets/minecraft/blockstates/chiseled_stonebrick.json

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

assets/minecraft/blockstates/cobblestone_double_slab.json

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

assets/minecraft/blockstates/cobblestone_slab.json

@@ -1,6 +1,7 @@
 {
     "variants": {
-        "half=bottom": { "model": "half_slab_cobblestone" },
-        "half=top": { "model": "upper_slab_cobblestone" }
+        "type=bottom": { "model": "cobblestone_slab" },
+        "type=top": { "model": "cobblestone_slab_top" },
+        "type=double": { "model": "cobblestone" }
     }
 }

assets/minecraft/blockstates/cobblestone_stairs.json

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

assets/minecraft/blockstates/cobweb.json

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

assets/minecraft/blockstates/cocoa.json

@@ -1,16 +1,16 @@
 {
     "variants": {
-        "age=0,facing=south": { "model": "cocoa_age0_s" },
-        "age=0,facing=west": { "model": "cocoa_age0_s", "y": 90 },
-        "age=0,facing=north": { "model": "cocoa_age0_s", "y": 180 },
-        "age=0,facing=east": { "model": "cocoa_age0_s", "y": 270 },
-        "age=1,facing=south": { "model": "cocoa_age1_s" },
-        "age=1,facing=west": { "model": "cocoa_age1_s", "y": 90 },
-        "age=1,facing=north": { "model": "cocoa_age1_s", "y": 180 },
-        "age=1,facing=east": { "model": "cocoa_age1_s", "y": 270 },
-        "age=2,facing=south": { "model": "cocoa_age2_s" },
-        "age=2,facing=west": { "model": "cocoa_age2_s", "y": 90 },
-        "age=2,facing=north": { "model": "cocoa_age2_s", "y": 180 },
-        "age=2,facing=east": { "model": "cocoa_age2_s", "y": 270 }
+        "age=0,facing=south": { "model": "cocoa_stage0" },
+        "age=0,facing=west": { "model": "cocoa_stage0", "y": 90 },
+        "age=0,facing=north": { "model": "cocoa_stage0", "y": 180 },
+        "age=0,facing=east": { "model": "cocoa_stage0", "y": 270 },
+        "age=1,facing=south": { "model": "cocoa_stage1" },
+        "age=1,facing=west": { "model": "cocoa_stage1", "y": 90 },
+        "age=1,facing=north": { "model": "cocoa_stage1", "y": 180 },
+        "age=1,facing=east": { "model": "cocoa_stage1", "y": 270 },
+        "age=2,facing=south": { "model": "cocoa_stage2" },
+        "age=2,facing=west": { "model": "cocoa_stage2", "y": 90 },
+        "age=2,facing=north": { "model": "cocoa_stage2", "y": 180 },
+        "age=2,facing=east": { "model": "cocoa_stage2", "y": 270 }
     }
 }

assets/minecraft/blockstates/comparator.json

@@ -1,20 +1,20 @@
 {
     "variants": {
-        "facing=south,mode=compare,powered=false": { "model": "comparator_unlit" },
-        "facing=west,mode=compare,powered=false": { "model": "comparator_unlit", "y": 90 },
-        "facing=north,mode=compare,powered=false": { "model": "comparator_unlit", "y": 180 },
-        "facing=east,mode=compare,powered=false": { "model": "comparator_unlit", "y": 270 },
-        "facing=south,mode=subtract,powered=false": { "model": "comparator_unlit_subtract" },
-        "facing=west,mode=subtract,powered=false": { "model": "comparator_unlit_subtract", "y": 90 },
-        "facing=north,mode=subtract,powered=false": { "model": "comparator_unlit_subtract", "y": 180 },
-        "facing=east,mode=subtract,powered=false": { "model": "comparator_unlit_subtract", "y": 270 },
-        "facing=south,mode=compare,powered=true": { "model": "comparator_lit" },
-        "facing=west,mode=compare,powered=true": { "model": "comparator_lit", "y": 90 },
-        "facing=north,mode=compare,powered=true": { "model": "comparator_lit", "y": 180 },
-        "facing=east,mode=compare,powered=true": { "model": "comparator_lit", "y": 270 },
-        "facing=south,mode=subtract,powered=true": { "model": "comparator_lit_subtract" },
-        "facing=west,mode=subtract,powered=true": { "model": "comparator_lit_subtract", "y": 90 },
-        "facing=north,mode=subtract,powered=true": { "model": "comparator_lit_subtract", "y": 180 },
-        "facing=east,mode=subtract,powered=true": { "model": "comparator_lit_subtract", "y": 270 }
+        "facing=south,mode=compare,powered=false": { "model": "comparator" },
+        "facing=west,mode=compare,powered=false": { "model": "comparator", "y": 90 },
+        "facing=north,mode=compare,powered=false": { "model": "comparator", "y": 180 },
+        "facing=east,mode=compare,powered=false": { "model": "comparator", "y": 270 },
+        "facing=south,mode=subtract,powered=false": { "model": "comparator_subtract" },
+        "facing=west,mode=subtract,powered=false": { "model": "comparator_subtract", "y": 90 },
+        "facing=north,mode=subtract,powered=false": { "model": "comparator_subtract", "y": 180 },
+        "facing=east,mode=subtract,powered=false": { "model": "comparator_subtract", "y": 270 },
+        "facing=south,mode=compare,powered=true": { "model": "comparator_on" },
+        "facing=west,mode=compare,powered=true": { "model": "comparator_on", "y": 90 },
+        "facing=north,mode=compare,powered=true": { "model": "comparator_on", "y": 180 },
+        "facing=east,mode=compare,powered=true": { "model": "comparator_on", "y": 270 },
+        "facing=south,mode=subtract,powered=true": { "model": "comparator_on_subtract" },
+        "facing=west,mode=subtract,powered=true": { "model": "comparator_on_subtract", "y": 90 },
+        "facing=north,mode=subtract,powered=true": { "model": "comparator_on_subtract", "y": 180 },
+        "facing=east,mode=subtract,powered=true": { "model": "comparator_on_subtract", "y": 270 }
     }
 }

assets/minecraft/blockstates/cracked_brick_monster_egg.json

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

assets/minecraft/blockstates/cracked_stone_bricks.json

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

assets/minecraft/blockstates/cracked_stonebrick.json

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

assets/minecraft/blockstates/cut_red_sandstone.json

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

assets/minecraft/blockstates/cut_sandstone.json

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

assets/minecraft/blockstates/cyan_carpet.json

@@ -1,5 +1,5 @@
 {
     "variants": {
-        "normal": { "model": "carpet_cyan" }
+        "normal": { "model": "cyan_carpet" }
     }
 }

assets/minecraft/blockstates/cyan_concrete.json

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

assets/minecraft/blockstates/cyan_concrete_powder.json

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

assets/minecraft/blockstates/cyan_glazed_terracotta.json

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

assets/minecraft/blockstates/cyan_stained_glass.json

@@ -1,5 +1,5 @@
 {
     "variants": {
-        "normal": { "model": "glass_cyan" }
+        "normal": { "model": "cyan_stained_glass" }
     }
 }

assets/minecraft/blockstates/cyan_stained_hardened_clay.json

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

assets/minecraft/blockstates/cyan_terracotta.json

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

assets/minecraft/blockstates/damaged_anvil.json

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

assets/minecraft/blockstates/dark_oak_bark.json

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

assets/minecraft/blockstates/dark_oak_button.json

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

assets/minecraft/blockstates/dark_oak_door.json

@@ -4,14 +4,14 @@
         "facing=south,half=lower,hinge=left,open=false": { "model": "dark_oak_door_bottom", "y": 90 },
         "facing=west,half=lower,hinge=left,open=false":  { "model": "dark_oak_door_bottom", "y": 180 },
         "facing=north,half=lower,hinge=left,open=false": { "model": "dark_oak_door_bottom", "y": 270 },
-        "facing=east,half=lower,hinge=right,open=false":  { "model": "dark_oak_door_bottom_rh" },
-        "facing=south,half=lower,hinge=right,open=false": { "model": "dark_oak_door_bottom_rh", "y": 90 },
-        "facing=west,half=lower,hinge=right,open=false":  { "model": "dark_oak_door_bottom_rh", "y": 180 },
-        "facing=north,half=lower,hinge=right,open=false": { "model": "dark_oak_door_bottom_rh", "y": 270 },
-        "facing=east,half=lower,hinge=left,open=true":  { "model": "dark_oak_door_bottom_rh", "y": 90 },
-        "facing=south,half=lower,hinge=left,open=true": { "model": "dark_oak_door_bottom_rh", "y": 180 },
-        "facing=west,half=lower,hinge=left,open=true":  { "model": "dark_oak_door_bottom_rh", "y": 270 },
-        "facing=north,half=lower,hinge=left,open=true": { "model": "dark_oak_door_bottom_rh" },
+        "facing=east,half=lower,hinge=right,open=false":  { "model": "dark_oak_door_bottom_hinge" },
+        "facing=south,half=lower,hinge=right,open=false": { "model": "dark_oak_door_bottom_hinge", "y": 90 },
+        "facing=west,half=lower,hinge=right,open=false":  { "model": "dark_oak_door_bottom_hinge", "y": 180 },
+        "facing=north,half=lower,hinge=right,open=false": { "model": "dark_oak_door_bottom_hinge", "y": 270 },
+        "facing=east,half=lower,hinge=left,open=true":  { "model": "dark_oak_door_bottom_hinge", "y": 90 },
+        "facing=south,half=lower,hinge=left,open=true": { "model": "dark_oak_door_bottom_hinge", "y": 180 },
+        "facing=west,half=lower,hinge=left,open=true":  { "model": "dark_oak_door_bottom_hinge", "y": 270 },
+        "facing=north,half=lower,hinge=left,open=true": { "model": "dark_oak_door_bottom_hinge" },
         "facing=east,half=lower,hinge=right,open=true":  { "model": "dark_oak_door_bottom", "y": 270 },
         "facing=south,half=lower,hinge=right,open=true": { "model": "dark_oak_door_bottom" },
         "facing=west,half=lower,hinge=right,open=true":  { "model": "dark_oak_door_bottom", "y": 90 },
@@ -20,14 +20,14 @@
         "facing=south,half=upper,hinge=left,open=false": { "model": "dark_oak_door_top", "y": 90 },
         "facing=west,half=upper,hinge=left,open=false":  { "model": "dark_oak_door_top", "y": 180 },
         "facing=north,half=upper,hinge=left,open=false": { "model": "dark_oak_door_top", "y": 270 },
-        "facing=east,half=upper,hinge=right,open=false":  { "model": "dark_oak_door_top_rh" },
-        "facing=south,half=upper,hinge=right,open=false": { "model": "dark_oak_door_top_rh", "y": 90 },
-        "facing=west,half=upper,hinge=right,open=false":  { "model": "dark_oak_door_top_rh", "y": 180 },
-        "facing=north,half=upper,hinge=right,open=false": { "model": "dark_oak_door_top_rh", "y": 270 },
-        "facing=east,half=upper,hinge=left,open=true":  { "model": "dark_oak_door_top_rh", "y": 90 },
-        "facing=south,half=upper,hinge=left,open=true": { "model": "dark_oak_door_top_rh", "y": 180 },
-        "facing=west,half=upper,hinge=left,open=true":  { "model": "dark_oak_door_top_rh", "y": 270 },
-        "facing=north,half=upper,hinge=left,open=true": { "model": "dark_oak_door_top_rh" },
+        "facing=east,half=upper,hinge=right,open=false":  { "model": "dark_oak_door_top_hinge" },
+        "facing=south,half=upper,hinge=right,open=false": { "model": "dark_oak_door_top_hinge", "y": 90 },
+        "facing=west,half=upper,hinge=right,open=false":  { "model": "dark_oak_door_top_hinge", "y": 180 },
+        "facing=north,half=upper,hinge=right,open=false": { "model": "dark_oak_door_top_hinge", "y": 270 },
+        "facing=east,half=upper,hinge=left,open=true":  { "model": "dark_oak_door_top_hinge", "y": 90 },
+        "facing=south,half=upper,hinge=left,open=true": { "model": "dark_oak_door_top_hinge", "y": 180 },
+        "facing=west,half=upper,hinge=left,open=true":  { "model": "dark_oak_door_top_hinge", "y": 270 },
+        "facing=north,half=upper,hinge=left,open=true": { "model": "dark_oak_door_top_hinge" },
         "facing=east,half=upper,hinge=right,open=true":  { "model": "dark_oak_door_top", "y": 270 },
         "facing=south,half=upper,hinge=right,open=true": { "model": "dark_oak_door_top" },
         "facing=west,half=upper,hinge=right,open=true":  { "model": "dark_oak_door_top", "y": 90 },

assets/minecraft/blockstates/dark_oak_double_slab.json

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

assets/minecraft/blockstates/dark_oak_fence_gate.json

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

assets/minecraft/blockstates/dark_oak_log.json

@@ -2,7 +2,6 @@
     "variants": {
         "axis=y":  { "model": "dark_oak_log" },
         "axis=z":   { "model": "dark_oak_log", "x": 90 },
-        "axis=x":   { "model": "dark_oak_log", "x": 90, "y": 90 },
-        "axis=none": { "model": "dark_oak_bark" }
+        "axis=x":   { "model": "dark_oak_log", "x": 90, "y": 90 }
     }
 }

assets/minecraft/blockstates/dark_oak_pressure_plate.json

@@ -0,0 +1,6 @@
+{
+    "variants": {
+        "powered=false": { "model": "dark_oak_pressure_plate" },
+        "powered=true": { "model": "dark_oak_pressure_plate_down" }
+    }
+}

assets/minecraft/blockstates/dark_oak_slab.json

@@ -1,6 +1,7 @@
 {
     "variants": {
-        "half=bottom": { "model": "half_slab_dark_oak" },
-        "half=top": { "model": "upper_slab_dark_oak" }
+        "type=bottom": { "model": "dark_oak_slab" },
+        "type=top": { "model": "dark_oak_slab_top" },
+        "type=double": { "model": "dark_oak_planks" }
     }
 }

assets/minecraft/blockstates/dark_oak_stairs.json

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

assets/minecraft/blockstates/dark_oak_trapdoor.json

@@ -0,0 +1,20 @@
+{
+    "variants": {
+        "facing=north,half=bottom,open=false": { "model": "dark_oak_trapdoor_bottom" },
+        "facing=south,half=bottom,open=false": { "model": "dark_oak_trapdoor_bottom" },
+        "facing=east,half=bottom,open=false": { "model": "dark_oak_trapdoor_bottom" },
+        "facing=west,half=bottom,open=false": { "model": "dark_oak_trapdoor_bottom" },
+        "facing=north,half=top,open=false": { "model": "dark_oak_trapdoor_top" },
+        "facing=south,half=top,open=false": { "model": "dark_oak_trapdoor_top" },
+        "facing=east,half=top,open=false": { "model": "dark_oak_trapdoor_top" },
+        "facing=west,half=top,open=false": { "model": "dark_oak_trapdoor_top" },
+        "facing=north,half=bottom,open=true": { "model": "dark_oak_trapdoor_open" },
+        "facing=south,half=bottom,open=true": { "model": "dark_oak_trapdoor_open", "y": 180 },
+        "facing=east,half=bottom,open=true": { "model": "dark_oak_trapdoor_open", "y": 90 },
+        "facing=west,half=bottom,open=true": { "model": "dark_oak_trapdoor_open", "y": 270 },
+        "facing=north,half=top,open=true": { "model": "dark_oak_trapdoor_open" },
+        "facing=south,half=top,open=true": { "model": "dark_oak_trapdoor_open", "y": 180 },
+        "facing=east,half=top,open=true": { "model": "dark_oak_trapdoor_open", "y": 90 },
+        "facing=west,half=top,open=true": { "model": "dark_oak_trapdoor_open", "y": 270 }
+    }
+}

assets/minecraft/blockstates/dark_prismarine.json

@@ -1,5 +1,5 @@
 {
     "variants": {
-        "normal": { "model": "prismarine_dark" }
+        "normal": { "model": "dark_prismarine" }
     }
 }

assets/minecraft/blockstates/daylight_detector.json

@@ -1,20 +1,36 @@
 {
     "variants": {
-        "power=0": { "model": "daylight_detector" },
-        "power=1": { "model": "daylight_detector" },
-        "power=2": { "model": "daylight_detector" },
-        "power=3": { "model": "daylight_detector" },
-        "power=4": { "model": "daylight_detector" },
-        "power=5": { "model": "daylight_detector" },
-        "power=6": { "model": "daylight_detector" },
-        "power=7": { "model": "daylight_detector" },
-        "power=8": { "model": "daylight_detector" },
-        "power=9": { "model": "daylight_detector" },
-        "power=10": { "model": "daylight_detector" },
-        "power=11": { "model": "daylight_detector" },
-        "power=12": { "model": "daylight_detector" },
-        "power=13": { "model": "daylight_detector" },
-        "power=14": { "model": "daylight_detector" },
-        "power=15": { "model": "daylight_detector" }
+        "inverted=false,power=0": { "model": "daylight_detector" },
+        "inverted=false,power=1": { "model": "daylight_detector" },
+        "inverted=false,power=2": { "model": "daylight_detector" },
+        "inverted=false,power=3": { "model": "daylight_detector" },
+        "inverted=false,power=4": { "model": "daylight_detector" },
+        "inverted=false,power=5": { "model": "daylight_detector" },
+        "inverted=false,power=6": { "model": "daylight_detector" },
+        "inverted=false,power=7": { "model": "daylight_detector" },
+        "inverted=false,power=8": { "model": "daylight_detector" },
+        "inverted=false,power=9": { "model": "daylight_detector" },
+        "inverted=false,power=10": { "model": "daylight_detector" },
+        "inverted=false,power=11": { "model": "daylight_detector" },
+        "inverted=false,power=12": { "model": "daylight_detector" },
+        "inverted=false,power=13": { "model": "daylight_detector" },
+        "inverted=false,power=14": { "model": "daylight_detector" },
+        "inverted=false,power=15": { "model": "daylight_detector" },
+        "inverted=true,power=0": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=1": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=2": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=3": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=4": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=5": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=6": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=7": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=8": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=9": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=10": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=11": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=12": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=13": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=14": { "model": "daylight_detector_inverted" },
+        "inverted=true,power=15": { "model": "daylight_detector_inverted" }
     }
 }

assets/minecraft/blockstates/daylight_detector_inverted.json

@@ -1,20 +0,0 @@
-{
-    "variants": {
-        "power=0": { "model": "daylight_detector_inverted" },
-        "power=1": { "model": "daylight_detector_inverted" },
-        "power=2": { "model": "daylight_detector_inverted" },
-        "power=3": { "model": "daylight_detector_inverted" },
-        "power=4": { "model": "daylight_detector_inverted" },
-        "power=5": { "model": "daylight_detector_inverted" },
-        "power=6": { "model": "daylight_detector_inverted" },
-        "power=7": { "model": "daylight_detector_inverted" },
-        "power=8": { "model": "daylight_detector_inverted" },
-        "power=9": { "model": "daylight_detector_inverted" },
-        "power=10": { "model": "daylight_detector_inverted" },
-        "power=11": { "model": "daylight_detector_inverted" },
-        "power=12": { "model": "daylight_detector_inverted" },
-        "power=13": { "model": "daylight_detector_inverted" },
-        "power=14": { "model": "daylight_detector_inverted" },
-        "power=15": { "model": "daylight_detector_inverted" }
-    }
-}

assets/minecraft/blockstates/detector_rail.json

@@ -1,16 +1,16 @@
 {
     "variants": {
-        "powered=false,shape=north_south":  { "model": "detector_rail_flat" },
-        "powered=false,shape=east_west":  { "model": "detector_rail_flat", "y": 90 },
+        "powered=false,shape=north_south":  { "model": "detector_rail" },
+        "powered=false,shape=east_west":  { "model": "detector_rail", "y": 90 },
         "powered=false,shape=ascending_east": { "model": "detector_rail_raised_ne", "y": 90 },
         "powered=false,shape=ascending_west": { "model": "detector_rail_raised_sw", "y": 90 },
         "powered=false,shape=ascending_north": { "model": "detector_rail_raised_ne" },
         "powered=false,shape=ascending_south": { "model": "detector_rail_raised_sw" },
-        "powered=true,shape=north_south":  { "model": "detector_rail_powered_flat" },
-        "powered=true,shape=east_west":  { "model": "detector_rail_powered_flat", "y": 90 },
-        "powered=true,shape=ascending_east": { "model": "detector_rail_powered_raised_ne", "y": 90 },
-        "powered=true,shape=ascending_west": { "model": "detector_rail_powered_raised_sw", "y": 90 },
-        "powered=true,shape=ascending_north": { "model": "detector_rail_powered_raised_ne" },
-        "powered=true,shape=ascending_south": { "model": "detector_rail_powered_raised_sw" }
+        "powered=true,shape=north_south":  { "model": "detector_rail_on" },
+        "powered=true,shape=east_west":  { "model": "detector_rail_on", "y": 90 },
+        "powered=true,shape=ascending_east": { "model": "detector_rail_on_raised_ne", "y": 90 },
+        "powered=true,shape=ascending_west": { "model": "detector_rail_on_raised_sw", "y": 90 },
+        "powered=true,shape=ascending_north": { "model": "detector_rail_on_raised_ne" },
+        "powered=true,shape=ascending_south": { "model": "detector_rail_on_raised_sw" }
     }
 }

assets/minecraft/blockstates/double_fern.json

@@ -1,6 +0,0 @@
-{
-    "variants": {
-        "half=lower": { "model": "double_fern_bottom" },
-        "half=upper":    { "model": "double_fern_top" }
-    }
-}

assets/minecraft/blockstates/double_grass.json

@@ -1,6 +0,0 @@
-{
-    "variants": {
-        "half=lower": { "model": "double_grass_bottom" },
-        "half=upper":    { "model": "double_grass_top" }
-    }
-}