Firing up the tunnel generator

src/generated/resources/.cache/cache

@@ -11,7 +11,7 @@ a891d5abbc133288a9ad377b3ea9adad8ee92972 assets/create/blockstates/andesite_allo
 7c5ac6149a991dfe125be3ae3c27c0c841e11f6c assets/create/blockstates/andesite_funnel.json
 73154ab9fe5463116d06d0732f9a1c2fa817dc3f assets/create/blockstates/andesite_ladder.json
 3adca59d03198c273f13c21c6058348c9fa71735 assets/create/blockstates/andesite_pillar.json
-1d2d8081581e07d9be4b382aede4f2de4401cc6b assets/create/blockstates/andesite_tunnel.json
+98e95355fc7d45fc9d3706ed3912cd0bfb4a41c3 assets/create/blockstates/andesite_tunnel.json
 70a2eff30918c6369fc90aaa6a56ffa5c959065a assets/create/blockstates/asurine.json
 bb61f3f336ebe0ff08d84cb6a83e86a823dac7aa assets/create/blockstates/asurine_pillar.json
 e555e3c2b2d3f01440e48db4ba88f7e00fd99b6f assets/create/blockstates/basin.json
@@ -37,7 +37,7 @@ e69a71fdeb5855b2a59a31598f25eaea589c1748 assets/create/blockstates/brass_encased
 288bad07593a8a2c8efaf44bba0ffb0011d36cd3 assets/create/blockstates/brass_encased_shaft.json
 bd8f3073f3208d0116719a25044a91dd46fc11ac assets/create/blockstates/brass_funnel.json
 f9234ab4324892587c4b0bf38523ee7770072f6b assets/create/blockstates/brass_ladder.json
-672eedcd3520c6d39603449165a23be9c612c620 assets/create/blockstates/brass_tunnel.json
+769e12a65262f79b57df9e3300df20d3fca6c3bb assets/create/blockstates/brass_tunnel.json
 ffe31d5ad0486949b049cf2060d1f34ef7ceaa82 assets/create/blockstates/brown_nixie_tube.json
 11ebdd9bd0815833e62ec1bea03a4cdd86ce00f3 assets/create/blockstates/brown_sail.json
 e81608346d43406ee72cae0f78b8bcfb37ba2d75 assets/create/blockstates/brown_seat.json
@@ -629,11 +629,6 @@ eeb2637590e8af1342c5494dea7faab0490f2f3e assets/create/models/block/andesite_fun
 ee665cf464ead6135de3f60c7e2ac475af6496d7 assets/create/models/block/andesite_ladder.json
 882871d4cd7b4925f300c09d00ba58785b27119e assets/create/models/block/andesite_pillar.json
 587491f19767bd682bbef00eaa890d4b8a320b7a assets/create/models/block/andesite_pillar_horizontal.json
-2294f74b5c30430de89a345af60f6669c975f33a assets/create/models/block/andesite_tunnel/cross.json
-17f860947f51e84a3f9b32b10cdf61f863db3afc assets/create/models/block/andesite_tunnel/straight.json
-e74aa39f8142293c202e57dbd92e8660818b18b5 assets/create/models/block/andesite_tunnel/t_left.json
-c93978d636fe70d456a6e1914b65527cbc18544c assets/create/models/block/andesite_tunnel/t_right.json
-2a86780c6825edce8fbdaa118a267fc09ce410b0 assets/create/models/block/andesite_tunnel/window.json
 7b2e3b7e9d72286b202bb38ab6e4d69465365d47 assets/create/models/block/asurine.json
 a9167990e3f894f92a9de24c8b77d040b1c1ff0a assets/create/models/block/asurine_pillar.json
 e40c3a7e6f7b895770f544d79536c744d18c462f assets/create/models/block/asurine_pillar_horizontal.json
@@ -692,11 +687,6 @@ c76668b6b61a3f81a08a1eadaa34fa8bfe68f912 assets/create/models/block/brass_funnel
 2d78db12acd90364658b36e8fe7dee7f24ea361b assets/create/models/block/brass_funnel_vertical_push_powered.json
 aa81eeb9771e59173ecf635f7c5334ac64c83b6d assets/create/models/block/brass_funnel_vertical_push_unpowered.json
 5620cf6b033dbfb3c43d03ddad18c432eb821997 assets/create/models/block/brass_ladder.json
-520087db8d479c66f85f3483af813fb668f27503 assets/create/models/block/brass_tunnel/cross.json
-347ed67bf3426e323354e2d959fc9563dc7eeecd assets/create/models/block/brass_tunnel/straight.json
-a959e03ca339badb49fe58ba53d86a84352e91f3 assets/create/models/block/brass_tunnel/t_left.json
-0585fbe58da3a8ed0dc98cc7ed79ac067312078d assets/create/models/block/brass_tunnel/t_right.json
-a0612a633756433e1b37ddc6d290aa1fc07839ef assets/create/models/block/brass_tunnel/window.json
 71cd22dc2d847d317f19afb4b21802fbf5347e0b assets/create/models/block/brown_nixie_tube.json
 8ab097caaa0db0915ae9254f7d65092d9171bc60 assets/create/models/block/brown_sail.json
 4eed0ad902f5e84f2b6c160f3283e8028640e77d assets/create/models/block/brown_seat.json
@@ -1541,6 +1531,16 @@ d257b024117a6003196c1feb85e759a3e1c180f7 assets/create/models/block/tiled_glass_
 6b1727111d9178162598b4ef7106da807d590bf0 assets/create/models/block/tiled_glass_pane_side_alt.json
 6b44ab14b227f3c46ee99eecfe47a86c9fb0865c assets/create/models/block/tuff_pillar.json
 f0faeee9e124a25280fb58bd66045cfb2758b42e assets/create/models/block/tuff_pillar_horizontal.json
+adfd211b3eb33497fad7e58de0d4784b8ce698b1 assets/create/models/block/tunnel/andesite_tunnel/cross.json
+8765e95adeed03fa8203ca7a9f221392a6f038be assets/create/models/block/tunnel/andesite_tunnel/straight.json
+429cd29a4c4781cf09e11c4e90451bdc61d455f6 assets/create/models/block/tunnel/andesite_tunnel/t_left.json
+9c679b1033abfe4c44df69eeef60eb44efff47a2 assets/create/models/block/tunnel/andesite_tunnel/t_right.json
+7cb18c3795d1481b588ce9d5dd013f45902aac47 assets/create/models/block/tunnel/andesite_tunnel/window.json
+6eca538d20ccbc2974ed7c6f01dc6227d33ebc1d assets/create/models/block/tunnel/brass_tunnel/cross.json
+ec2bf287791e891f85b71f97ee196002f9b03bf2 assets/create/models/block/tunnel/brass_tunnel/straight.json
+37d15648b9358cb8bd4a3f20df40c36ddc07efd7 assets/create/models/block/tunnel/brass_tunnel/t_left.json
+2f75336b25f5f0a008878488599e59b3e3504174 assets/create/models/block/tunnel/brass_tunnel/t_right.json
+8ac0130f727696786141d7d61261072739c7f72e assets/create/models/block/tunnel/brass_tunnel/window.json
 dee64127644e7b09168be26b6665389885476e05 assets/create/models/block/veridium.json
 ebfad96e85ac6107642eaaf48b57315b268355ff assets/create/models/block/veridium_pillar.json
 c49bb21ef60ff10540952271c863415b4ad07aa0 assets/create/models/block/veridium_pillar_horizontal.json
@@ -1641,7 +1641,7 @@ bc6e7469744604e578200ea87690e4dd3b25e447 assets/create/models/item/andesite_enca
 105a9946b9e4d5e949f6d557cfde750227463bff assets/create/models/item/andesite_funnel.json
 4c9232a6249ad1ef51a7978a8e642a8c88dda0ab assets/create/models/item/andesite_ladder.json
 75b8b00c2418b9660d35a7fabd0774925cf1c02f assets/create/models/item/andesite_pillar.json
-795541cf7205d90531a23cd5b388f93a03bbf925 assets/create/models/item/andesite_tunnel.json
+473be56fe1f44809ffecbb3eb86107af3ca7a569 assets/create/models/item/andesite_tunnel.json
 cc6471e712a6db7856e62a99b8ef7e378480fa27 assets/create/models/item/asurine.json
 840a34731a823e185a180bef029dd16ee3f78541 assets/create/models/item/asurine_pillar.json
 cf9e35bfea0b0a324e1c6384990425b3d359792c assets/create/models/item/bar_of_chocolate.json
@@ -1669,7 +1669,7 @@ d5e8b577aee56671e117a4a2ac93e58680b51949 assets/create/models/item/brass_ingot.j
 1f93ec11bd28a3f063f27e8c53fc45d027218560 assets/create/models/item/brass_ladder.json
 44565b9b2c227e99e336357e5caa588438e7076b assets/create/models/item/brass_nugget.json
 f7aca6aff65e1de269a99cf2a280d9841b7a0076 assets/create/models/item/brass_sheet.json
-427bef12405e2a99fbf49e27ea5944add244252a assets/create/models/item/brass_tunnel.json
+d8ee5b3cc82e5465f5c7ada88cfd444c62e3c84d assets/create/models/item/brass_tunnel.json
 24df6f8391d8ba09cef46e69d65d32ea770745cd assets/create/models/item/brown_seat.json
 9d66f8bdc2db7cacf52168d5a267d5f52a2b351c assets/create/models/item/brown_toolbox.json
 54211d3bdbeba2ea4dbaed43daa740ae3331640f assets/create/models/item/brown_valve_handle.json

src/generated/resources/assets/create/blockstates/andesite_tunnel.json

@@ -1,45 +1,45 @@
 {
   "variants": {
     "axis=x,shape=straight": {
-      "model": "create:block/andesite_tunnel/straight"
+      "model": "create:block/tunnel/andesite_tunnel/straight"
     },
     "axis=z,shape=straight": {
-      "model": "create:block/andesite_tunnel/straight",
+      "model": "create:block/tunnel/andesite_tunnel/straight",
       "y": 90
     },
     "axis=x,shape=window": {
-      "model": "create:block/andesite_tunnel/window"
+      "model": "create:block/tunnel/andesite_tunnel/window"
     },
     "axis=z,shape=window": {
-      "model": "create:block/andesite_tunnel/window",
+      "model": "create:block/tunnel/andesite_tunnel/window",
       "y": 90
     },
     "axis=x,shape=closed": {
-      "model": "create:block/andesite_tunnel/straight"
+      "model": "create:block/tunnel/andesite_tunnel/straight"
     },
     "axis=z,shape=closed": {
-      "model": "create:block/andesite_tunnel/straight",
+      "model": "create:block/tunnel/andesite_tunnel/straight",
       "y": 90
     },
     "axis=x,shape=t_left": {
-      "model": "create:block/andesite_tunnel/t_left"
+      "model": "create:block/tunnel/andesite_tunnel/t_left"
     },
     "axis=z,shape=t_left": {
-      "model": "create:block/andesite_tunnel/t_left",
+      "model": "create:block/tunnel/andesite_tunnel/t_left",
       "y": 90
     },
     "axis=x,shape=t_right": {
-      "model": "create:block/andesite_tunnel/t_right"
+      "model": "create:block/tunnel/andesite_tunnel/t_right"
     },
     "axis=z,shape=t_right": {
-      "model": "create:block/andesite_tunnel/t_right",
+      "model": "create:block/tunnel/andesite_tunnel/t_right",
       "y": 90
     },
     "axis=x,shape=cross": {
-      "model": "create:block/andesite_tunnel/cross"
+      "model": "create:block/tunnel/andesite_tunnel/cross"
     },
     "axis=z,shape=cross": {
-      "model": "create:block/andesite_tunnel/cross",
+      "model": "create:block/tunnel/andesite_tunnel/cross",
       "y": 90
     }
   }

src/generated/resources/assets/create/blockstates/brass_tunnel.json

@@ -1,45 +1,45 @@
 {
   "variants": {
     "axis=x,shape=straight": {
-      "model": "create:block/brass_tunnel/straight"
+      "model": "create:block/tunnel/brass_tunnel/straight"
     },
     "axis=z,shape=straight": {
-      "model": "create:block/brass_tunnel/straight",
+      "model": "create:block/tunnel/brass_tunnel/straight",
       "y": 90
     },
     "axis=x,shape=window": {
-      "model": "create:block/brass_tunnel/window"
+      "model": "create:block/tunnel/brass_tunnel/window"
     },
     "axis=z,shape=window": {
-      "model": "create:block/brass_tunnel/window",
+      "model": "create:block/tunnel/brass_tunnel/window",
       "y": 90
     },
     "axis=x,shape=closed": {
-      "model": "create:block/brass_tunnel/straight"
+      "model": "create:block/tunnel/brass_tunnel/straight"
     },
     "axis=z,shape=closed": {
-      "model": "create:block/brass_tunnel/straight",
+      "model": "create:block/tunnel/brass_tunnel/straight",
       "y": 90
     },
     "axis=x,shape=t_left": {
-      "model": "create:block/brass_tunnel/t_left"
+      "model": "create:block/tunnel/brass_tunnel/t_left"
     },
     "axis=z,shape=t_left": {
-      "model": "create:block/brass_tunnel/t_left",
+      "model": "create:block/tunnel/brass_tunnel/t_left",
       "y": 90
     },
     "axis=x,shape=t_right": {
-      "model": "create:block/brass_tunnel/t_right"
+      "model": "create:block/tunnel/brass_tunnel/t_right"
     },
     "axis=z,shape=t_right": {
-      "model": "create:block/brass_tunnel/t_right",
+      "model": "create:block/tunnel/brass_tunnel/t_right",
       "y": 90
     },
     "axis=x,shape=cross": {
-      "model": "create:block/brass_tunnel/cross"
+      "model": "create:block/tunnel/brass_tunnel/cross"
     },
     "axis=z,shape=cross": {
-      "model": "create:block/brass_tunnel/cross",
+      "model": "create:block/tunnel/brass_tunnel/cross",
       "y": 90
     }
   }

src/generated/resources/assets/create/models/block/andesite_tunnel/cross.json

@@ -1,9 +0,0 @@
-{
-  "parent": "create:block/belt_tunnel/cross",
-  "textures": {
-    "1": "create:block/andesite_tunnel_top",
-    "2": "create:block/andesite_tunnel",
-    "3": "create:block/andesite_tunnel_top_window",
-    "particle": "minecraft:block/polished_andesite"
-  }
-}

src/generated/resources/assets/create/models/block/andesite_tunnel/straight.json

@@ -1,9 +0,0 @@
-{
-  "parent": "create:block/belt_tunnel/straight",
-  "textures": {
-    "1": "create:block/andesite_tunnel_top",
-    "2": "create:block/andesite_tunnel",
-    "3": "create:block/andesite_tunnel_top_window",
-    "particle": "minecraft:block/polished_andesite"
-  }
-}

src/generated/resources/assets/create/models/block/andesite_tunnel/t_left.json

@@ -1,9 +0,0 @@
-{
-  "parent": "create:block/belt_tunnel/t_left",
-  "textures": {
-    "1": "create:block/andesite_tunnel_top",
-    "2": "create:block/andesite_tunnel",
-    "3": "create:block/andesite_tunnel_top_window",
-    "particle": "minecraft:block/polished_andesite"
-  }
-}

src/generated/resources/assets/create/models/block/andesite_tunnel/t_right.json

@@ -1,9 +0,0 @@
-{
-  "parent": "create:block/belt_tunnel/t_right",
-  "textures": {
-    "1": "create:block/andesite_tunnel_top",
-    "2": "create:block/andesite_tunnel",
-    "3": "create:block/andesite_tunnel_top_window",
-    "particle": "minecraft:block/polished_andesite"
-  }
-}

src/generated/resources/assets/create/models/block/andesite_tunnel/window.json

@@ -1,9 +0,0 @@
-{
-  "parent": "create:block/belt_tunnel/window",
-  "textures": {
-    "1": "create:block/andesite_tunnel_top",
-    "2": "create:block/andesite_tunnel",
-    "3": "create:block/andesite_tunnel_top_window",
-    "particle": "minecraft:block/polished_andesite"
-  }
-}

src/generated/resources/assets/create/models/block/brass_tunnel/cross.json

@@ -1,9 +0,0 @@
-{
-  "parent": "create:block/belt_tunnel/cross",
-  "textures": {
-    "1": "create:block/brass_tunnel_top",
-    "2": "create:block/brass_tunnel",
-    "3": "create:block/brass_tunnel_top_window",
-    "particle": "create:block/brass_block"
-  }
-}

src/generated/resources/assets/create/models/block/brass_tunnel/straight.json

@@ -1,9 +0,0 @@
-{
-  "parent": "create:block/belt_tunnel/straight",
-  "textures": {
-    "1": "create:block/brass_tunnel_top",
-    "2": "create:block/brass_tunnel",
-    "3": "create:block/brass_tunnel_top_window",
-    "particle": "create:block/brass_block"
-  }
-}

src/generated/resources/assets/create/models/block/brass_tunnel/t_left.json

@@ -1,9 +0,0 @@
-{
-  "parent": "create:block/belt_tunnel/t_left",
-  "textures": {
-    "1": "create:block/brass_tunnel_top",
-    "2": "create:block/brass_tunnel",
-    "3": "create:block/brass_tunnel_top_window",
-    "particle": "create:block/brass_block"
-  }
-}

src/generated/resources/assets/create/models/block/brass_tunnel/t_right.json

@@ -1,9 +0,0 @@
-{
-  "parent": "create:block/belt_tunnel/t_right",
-  "textures": {
-    "1": "create:block/brass_tunnel_top",
-    "2": "create:block/brass_tunnel",
-    "3": "create:block/brass_tunnel_top_window",
-    "particle": "create:block/brass_block"
-  }
-}

src/generated/resources/assets/create/models/block/brass_tunnel/window.json

@@ -1,9 +0,0 @@
-{
-  "parent": "create:block/belt_tunnel/window",
-  "textures": {
-    "1": "create:block/brass_tunnel_top",
-    "2": "create:block/brass_tunnel",
-    "3": "create:block/brass_tunnel_top_window",
-    "particle": "create:block/brass_block"
-  }
-}

src/generated/resources/assets/create/models/block/tunnel/andesite_tunnel/cross.json

@@ -0,0 +1,10 @@
+{
+  "parent": "create:block/belt_tunnel/cross",
+  "textures": {
+    "top": "create:block/tunnel/andesite_tunnel_top",
+    "tunnel": "create:block/tunnel/andesite_tunnel",
+    "direction": "create:block/funnel/andesite_funnel_neutral",
+    "frame": "create:block/funnel/andesite_funnel_frame",
+    "particle": "minecraft:block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/tunnel/andesite_tunnel/straight.json

@@ -0,0 +1,10 @@
+{
+  "parent": "create:block/belt_tunnel/straight",
+  "textures": {
+    "top": "create:block/tunnel/andesite_tunnel_top",
+    "tunnel": "create:block/tunnel/andesite_tunnel",
+    "direction": "create:block/funnel/andesite_funnel_neutral",
+    "frame": "create:block/funnel/andesite_funnel_frame",
+    "particle": "minecraft:block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/tunnel/andesite_tunnel/t_left.json

@@ -0,0 +1,10 @@
+{
+  "parent": "create:block/belt_tunnel/t_left",
+  "textures": {
+    "top": "create:block/tunnel/andesite_tunnel_top",
+    "tunnel": "create:block/tunnel/andesite_tunnel",
+    "direction": "create:block/funnel/andesite_funnel_neutral",
+    "frame": "create:block/funnel/andesite_funnel_frame",
+    "particle": "minecraft:block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/tunnel/andesite_tunnel/t_right.json

@@ -0,0 +1,10 @@
+{
+  "parent": "create:block/belt_tunnel/t_right",
+  "textures": {
+    "top": "create:block/tunnel/andesite_tunnel_top",
+    "tunnel": "create:block/tunnel/andesite_tunnel",
+    "direction": "create:block/funnel/andesite_funnel_neutral",
+    "frame": "create:block/funnel/andesite_funnel_frame",
+    "particle": "minecraft:block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/tunnel/andesite_tunnel/window.json

@@ -0,0 +1,10 @@
+{
+  "parent": "create:block/belt_tunnel/window",
+  "textures": {
+    "top": "create:block/tunnel/andesite_tunnel_top_window",
+    "tunnel": "create:block/tunnel/andesite_tunnel",
+    "direction": "create:block/funnel/andesite_funnel_neutral",
+    "frame": "create:block/funnel/andesite_funnel_frame",
+    "particle": "minecraft:block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/tunnel/brass_tunnel/cross.json

@@ -0,0 +1,10 @@
+{
+  "parent": "create:block/belt_tunnel/cross",
+  "textures": {
+    "top": "create:block/tunnel/brass_tunnel_top",
+    "tunnel": "create:block/tunnel/brass_tunnel",
+    "direction": "create:block/funnel/brass_funnel_neutral",
+    "frame": "create:block/funnel/brass_funnel_frame",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/block/tunnel/brass_tunnel/straight.json

@@ -0,0 +1,10 @@
+{
+  "parent": "create:block/belt_tunnel/straight",
+  "textures": {
+    "top": "create:block/tunnel/brass_tunnel_top",
+    "tunnel": "create:block/tunnel/brass_tunnel",
+    "direction": "create:block/funnel/brass_funnel_neutral",
+    "frame": "create:block/funnel/brass_funnel_frame",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/block/tunnel/brass_tunnel/t_left.json

@@ -0,0 +1,10 @@
+{
+  "parent": "create:block/belt_tunnel/t_left",
+  "textures": {
+    "top": "create:block/tunnel/brass_tunnel_top",
+    "tunnel": "create:block/tunnel/brass_tunnel",
+    "direction": "create:block/funnel/brass_funnel_neutral",
+    "frame": "create:block/funnel/brass_funnel_frame",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/block/tunnel/brass_tunnel/t_right.json

@@ -0,0 +1,10 @@
+{
+  "parent": "create:block/belt_tunnel/t_right",
+  "textures": {
+    "top": "create:block/tunnel/brass_tunnel_top",
+    "tunnel": "create:block/tunnel/brass_tunnel",
+    "direction": "create:block/funnel/brass_funnel_neutral",
+    "frame": "create:block/funnel/brass_funnel_frame",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/block/tunnel/brass_tunnel/window.json

@@ -0,0 +1,10 @@
+{
+  "parent": "create:block/belt_tunnel/window",
+  "textures": {
+    "top": "create:block/tunnel/brass_tunnel_top_window",
+    "tunnel": "create:block/tunnel/brass_tunnel",
+    "direction": "create:block/funnel/brass_funnel_neutral",
+    "frame": "create:block/funnel/brass_funnel_frame",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/item/andesite_tunnel.json

@@ -1,8 +1,10 @@
 {
   "parent": "create:block/belt_tunnel/item",
   "textures": {
-    "1": "create:block/andesite_tunnel_top",
+    "top": "create:block/tunnel/andesite_tunnel_top",
-    "2": "create:block/andesite_tunnel",
+    "tunnel": "create:block/tunnel/andesite_tunnel",
+    "direction": "create:block/funnel/andesite_funnel_neutral",
+    "frame": "create:block/funnel/andesite_funnel_frame",
     "particle": "minecraft:block/polished_andesite"
   }
 }

src/generated/resources/assets/create/models/item/brass_tunnel.json

@@ -1,8 +1,10 @@
 {
   "parent": "create:block/belt_tunnel/item",
   "textures": {
-    "1": "create:block/brass_tunnel_top",
+    "top": "create:block/tunnel/brass_tunnel_top",
-    "2": "create:block/brass_tunnel",
+    "tunnel": "create:block/tunnel/brass_tunnel",
+    "direction": "create:block/funnel/brass_funnel_neutral",
+    "frame": "create:block/funnel/brass_funnel_frame",
     "particle": "create:block/brass_block"
   }
 }

src/main/java/com/simibubi/create/AllSpriteShifts.java

@@ -25,8 +25,7 @@ public class AllSpriteShifts {
 
 	public static final SpriteShiftEntry BURNER_FLAME =
 		get("block/blaze_burner_flame", "block/blaze_burner_flame_scroll"),
-		SUPER_BURNER_FLAME =
+		SUPER_BURNER_FLAME = get("block/blaze_burner_flame", "block/blaze_burner_flame_superheated_scroll");
-			get("block/blaze_burner_flame", "block/blaze_burner_flame_superheated_scroll");
 
 	public static final CTSpriteShiftEntry FRAMED_GLASS =
 		getCT(AllCTTypes.OMNIDIRECTIONAL, "palettes/framed_glass", "palettes/framed_glass"),
@@ -35,8 +34,9 @@ public class AllSpriteShifts {
 		VERTICAL_FRAMED_GLASS = getCT(AllCTTypes.VERTICAL, "palettes/framed_glass", "palettes/vertical_framed_glass"),
 		ORNATE_IRON_WINDOW = vertical("palettes/ornate_iron_window");
 
-	public static final CTSpriteShiftEntry CRAFTER_FRONT = getCT(AllCTTypes.OMNIDIRECTIONAL, "crafter_top", "brass_casing"),
+	public static final CTSpriteShiftEntry CRAFTER_FRONT =
-		CRAFTER_SIDE = vertical("crafter_side"), CRAFTER_OTHERSIDE = horizontal("crafter_side"),
+		getCT(AllCTTypes.OMNIDIRECTIONAL, "crafter_top", "brass_casing"), CRAFTER_SIDE = vertical("crafter_side"),
+		CRAFTER_OTHERSIDE = horizontal("crafter_side"),
 		ANDESITE_ENCASED_COGWHEEL_SIDE = vertical("andesite_encased_cogwheel_side"),
 		ANDESITE_ENCASED_COGWHEEL_OTHERSIDE = horizontal("andesite_encased_cogwheel_side"),
 		BRASS_ENCASED_COGWHEEL_SIDE = vertical("brass_encased_cogwheel_side"),
@@ -47,17 +47,17 @@ public class AllSpriteShifts {
 		BRASS_CASING = omni("brass_casing"), COPPER_CASING = omni("copper_casing"),
 		SHADOW_STEEL_CASING = omni("shadow_steel_casing"), REFINED_RADIANCE_CASING = omni("refined_radiance_casing"),
 		RAILWAY_CASING = omni("railway_casing"), RAILWAY_CASING_SIDE = omni("railway_casing_side"),
-		CREATIVE_CASING = getCT(AllCTTypes.CROSS, "creative_casing");
+		CREATIVE_CASING = getCT(AllCTTypes.RECTANGLE, "creative_casing");
 
 	public static final CTSpriteShiftEntry CHASSIS_SIDE = omni("linear_chassis_side"),
 		SECONDARY_CHASSIS_SIDE = omni("secondary_linear_chassis_side"), CHASSIS = omni("linear_chassis_end"),
 		CHASSIS_STICKY = omni("linear_chassis_end_sticky");
 
-	public static final CTSpriteShiftEntry BRASS_TUNNEL_TOP = vertical("brass_tunnel_top"),
+	public static final CTSpriteShiftEntry BRASS_TUNNEL_TOP = vertical("tunnel/brass_tunnel_top"),
 		FLUID_TANK = getCT(AllCTTypes.RECTANGLE, "fluid_tank"),
 		FLUID_TANK_TOP = getCT(AllCTTypes.RECTANGLE, "fluid_tank_top"),
 		FLUID_TANK_INNER = getCT(AllCTTypes.RECTANGLE, "fluid_tank_inner"),
-		CREATIVE_FLUID_TANK = getCT(AllCTTypes.CROSS, "creative_fluid_tank");
+		CREATIVE_FLUID_TANK = getCT(AllCTTypes.RECTANGLE, "creative_fluid_tank");
 
 	public static final Couple<CTSpriteShiftEntry> VAULT_TOP = vault("top"), VAULT_FRONT = vault("front"),
 		VAULT_SIDE = vault("side"), VAULT_BOTTOM = vault("bottom");
@@ -86,14 +86,15 @@ public class AllSpriteShifts {
 			String id = color.getSerializedName();
 			DYED_BELTS.put(color, get("block/belt", "block/belt/" + id + "_scroll"));
 			DYED_OFFSET_BELTS.put(color, get("block/belt_offset", "block/belt/" + id + "_scroll"));
-			DYED_DIAGONAL_BELTS.put(color,
+			DYED_DIAGONAL_BELTS.put(color, get("block/belt_diagonal", "block/belt/" + id + "_diagonal_scroll"));
-				get("block/belt_diagonal", "block/belt/" + id + "_diagonal_scroll"));
 		}
 	}
 
 	private static Couple<CTSpriteShiftEntry> vault(String name) {
-		final String prefixed = "vault_" + name;
+		final String prefixed = "block/vault/vault_" + name;
-		return Couple.createWithContext(b -> getCT(AllCTTypes.CROSS, prefixed, b ? prefixed : prefixed + "_large"));
+		return Couple.createWithContext(
+			medium -> CTSpriteShifter.getCT(AllCTTypes.RECTANGLE, Create.asResource(prefixed + "_small"),
+				Create.asResource(medium ? prefixed + "_medium" : prefixed + "_large")));
 	}
 
 	//
@@ -117,7 +118,8 @@ public class AllSpriteShifts {
 	}
 
 	private static CTSpriteShiftEntry getCT(CTType type, String blockTextureName, String connectedTextureName) {
-		return CTSpriteShifter.getCT(type, Create.asResource("block/" + blockTextureName), Create.asResource("block/" + connectedTextureName + "_connected"));
+		return CTSpriteShifter.getCT(type, Create.asResource("block/" + blockTextureName),
+			Create.asResource("block/" + connectedTextureName + "_connected"));
 	}
 
 	private static CTSpriteShiftEntry getCT(CTType type, String blockTextureName) {

src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelCTBehaviour.java

@@ -19,6 +19,11 @@ public class BrassTunnelCTBehaviour extends ConnectedTextureBehaviour.Base {
 	public CTSpriteShiftEntry getShift(BlockState state, Direction direction, @Nullable TextureAtlasSprite sprite) {
 		return direction == Direction.UP ? AllSpriteShifts.BRASS_TUNNEL_TOP : null;
 	}
+	
+	@Override
+	protected boolean reverseUVs(BlockState state, Direction face) {
+		return true;
+	}
 
 	@Override
 	public boolean connectsTo(BlockState state, BlockState other, BlockAndTintGetter reader, BlockPos pos, BlockPos otherPos,

src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java

@@ -292,33 +292,37 @@ public class BuilderTransformers {
 
 	public static <B extends BeltTunnelBlock> NonNullUnaryOperator<BlockBuilder<B, CreateRegistrate>> beltTunnel(
 		String type, ResourceLocation particleTexture) {
+		String prefix = "block/tunnel/" + type + "_tunnel";
+		String funnel_prefix = "block/funnel/" + type + "_funnel";
 		return b -> b.initialProperties(SharedProperties::stone)
 			.addLayer(() -> RenderType::cutoutMipped)
 			.properties(BlockBehaviour.Properties::noOcclusion)
 			.transform(pickaxeOnly())
 			.blockstate((c, p) -> p.getVariantBuilder(c.get())
 				.forAllStates(state -> {
-					String id = "block/" + type + "_tunnel";
 					Shape shape = state.getValue(BeltTunnelBlock.SHAPE);
+					String window = shape == Shape.WINDOW ? "_window" : "";
 					if (shape == BeltTunnelBlock.Shape.CLOSED)
 						shape = BeltTunnelBlock.Shape.STRAIGHT;
 					String shapeName = shape.getSerializedName();
 					return ConfiguredModel.builder()
 						.modelFile(p.models()
-							.withExistingParent(id + "/" + shapeName, p.modLoc("block/belt_tunnel/" + shapeName))
+							.withExistingParent(prefix + "/" + shapeName, p.modLoc("block/belt_tunnel/" + shapeName))
-							.texture("1", p.modLoc(id + "_top"))
+							.texture("top", p.modLoc(prefix + "_top" + window))
-							.texture("2", p.modLoc(id))
+							.texture("tunnel", p.modLoc(prefix))
-							.texture("3", p.modLoc(id + "_top_window"))
+							.texture("direction", p.modLoc(funnel_prefix + "_neutral"))
+							.texture("frame", p.modLoc(funnel_prefix + "_frame"))
 							.texture("particle", particleTexture))
 						.rotationY(state.getValue(BeltTunnelBlock.HORIZONTAL_AXIS) == Axis.X ? 0 : 90)
 						.build();
 				}))
 			.item(BeltTunnelItem::new)
 			.model((c, p) -> {
-				String id = type + "_tunnel";
+				p.withExistingParent("item/" + type + "_tunnel", p.modLoc("block/belt_tunnel/item"))
-				p.withExistingParent("item/" + id, p.modLoc("block/belt_tunnel/item"))
+					.texture("top", p.modLoc(prefix + "_top"))
-					.texture("1", p.modLoc("block/" + id + "_top"))
+					.texture("tunnel", p.modLoc(prefix))
-					.texture("2", p.modLoc("block/" + id))
+					.texture("direction", p.modLoc(funnel_prefix + "_neutral"))
+					.texture("frame", p.modLoc(funnel_prefix + "_frame"))
 					.texture("particle", particleTexture);
 			})
 			.build();
@@ -390,8 +394,7 @@ public class BuilderTransformers {
 	}
 
 	public static <B extends Block, P> NonNullUnaryOperator<BlockBuilder<B, P>> backtank(Supplier<ItemLike> drop) {
-		return b -> b
+		return b -> b.blockstate((c, p) -> p.horizontalBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p)))
-			.blockstate((c, p) -> p.horizontalBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p)))
 			.transform(pickaxeOnly())
 			.addLayer(() -> RenderType::cutoutMipped)
 			.transform(BlockStressDefaults.setImpact(4.0))

src/main/resources/assets/create/models/block/item_vault.json

@@ -2,11 +2,11 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"0": "create:block/vault_bottom",
+		"0": "create:block/vault/vault_bottom_small",
-		"1": "create:block/vault_front",
+		"1": "create:block/vault/vault_front_small",
-		"2": "create:block/vault_side",
+		"2": "create:block/vault/vault_side_small",
-		"3": "create:block/vault_top",
+		"3": "create:block/vault/vault_top_small",
-		"particle": "create:block/vault_bottom"
+		"particle": "create:block/vault/vault_top_small"
 	},
 	"elements": [
 		{