Layers of Insanity

- Fixed flipped uvs on horizontal capped faces
- Layered blocks once again can only face the vertical axis (for now)
- Texture updates by Kryppers

src/generated/resources/.cache/cache

@@ -196,20 +196,20 @@ be3bef7e091d8b50bfc1c6b7275946d1f636aefd assets/create/blockstates/horizontal_fr
 5d851c90d23de5087ce546d4bbe509e112b84c49 assets/create/blockstates/jungle_window.json
 b15bea757ef981e0ca60f740ca234ee2014eb7b7 assets/create/blockstates/jungle_window_pane.json
 f651091db216b009b3379b2f48d56d03481c8675 assets/create/blockstates/large_cogwheel.json
-894fe02a64c201380aaa4c1039467a9ea543f6e4 assets/create/blockstates/layered_andesite.json
-caa3b6154c61185618dd33a0ddddc1a74eb0e97f assets/create/blockstates/layered_asurine.json
-577938c6d421d0377073826ffb6da61b6e23141f assets/create/blockstates/layered_calcite.json
-db9272ae5ecca36ac98c1601cdd016c12df44ec8 assets/create/blockstates/layered_crimsite.json
-facce42b2807a7132578fdc3ec7cb95706ecf8a5 assets/create/blockstates/layered_deepslate.json
-1b339c2d83081ef3bceb25fc64939b811681de5e assets/create/blockstates/layered_diorite.json
-5c9cc42e2414739c690eb34dea6cfd79f11544a7 assets/create/blockstates/layered_dripstone.json
-957e3a1b018d8675cab2e27a0de20de7522b14a3 assets/create/blockstates/layered_granite.json
-6adc8a26679c600894baa16ccfcfb33f17e681a5 assets/create/blockstates/layered_limestone.json
-f767775d369e941af4520ff604447e3fedd0a527 assets/create/blockstates/layered_ochrum.json
-6aa8b0c14387db1c646b15216e120b31ff0fcd70 assets/create/blockstates/layered_scorchia.json
-2d70c6dde4b1bd084417967c6da33892fe57f021 assets/create/blockstates/layered_scoria.json
-a73f0e8600d27d66916ffd75da47be92cac75760 assets/create/blockstates/layered_tuff.json
-e5696a1642994affb0453be77681790d62c57956 assets/create/blockstates/layered_veridium.json
+a38184e035c2ebca7471e1714494fea213af259e assets/create/blockstates/layered_andesite.json
+2409f04042380a8ad086f9c4f98032e85771c3f3 assets/create/blockstates/layered_asurine.json
+ca1648840d9f5786f85e4214a0951306c1247c73 assets/create/blockstates/layered_calcite.json
+4e9e99f93fe5cfca2e661cae4e7357ececc214c2 assets/create/blockstates/layered_crimsite.json
+fc2e19a6206deb31c622b0ccf3452dcd14565ae3 assets/create/blockstates/layered_deepslate.json
+924a0291410406c86ded448f95c97ac3b9d2bd2e assets/create/blockstates/layered_diorite.json
+88453017441f762c5f62862980c540b5c99fb880 assets/create/blockstates/layered_dripstone.json
+8dccf7882a46a3d3eb9df16f324711f5f7809486 assets/create/blockstates/layered_granite.json
+038f532f7364c1e793196fcc5856df9ceff93578 assets/create/blockstates/layered_limestone.json
+89d7d1a64f3ca49ff56834bfe4527fe5a8746888 assets/create/blockstates/layered_ochrum.json
+aed03a18238b6635de06f351d872076248e94476 assets/create/blockstates/layered_scorchia.json
+8535d628f8834be62cdf62ef4b60c2ce3a7af99f assets/create/blockstates/layered_scoria.json
+b743ef11048fc284ba5622e1fbae3082f0616382 assets/create/blockstates/layered_tuff.json
+21233210f6e68a47bb66207613c08df6cd97e796 assets/create/blockstates/layered_veridium.json
 6a3c81d62c7c5a5fa2f4a1e239319d83875bbe55 assets/create/blockstates/lectern_controller.json
 e0c8fc35bfa28f025bdc14085b01b179e36c9f96 assets/create/blockstates/light_blue_nixie_tube.json
 029904f21970947a4423a6e0c8c65c4e02f2e8e6 assets/create/blockstates/light_blue_sail.json
@@ -270,20 +270,20 @@ b0be3d4ff92cb123ec21ec2788db35d0f392ba8a assets/create/blockstates/orange_sail.j
 8e2028e1a0450a592eed5e10276ba19b1195a206 assets/create/blockstates/ornate_iron_window.json
 f59198fd966927e21e9bf76e64de533d05ea893b assets/create/blockstates/ornate_iron_window_pane.json
 005cc195712aca252326ae8239ed0caf9a69a314 assets/create/blockstates/peculiar_bell.json
-106ef56205ee92afcc638016798952937c4c88f7 assets/create/blockstates/pillar_andesite.json
-e535a85018b2c274d8b3da71df8ab2759394384b assets/create/blockstates/pillar_asurine.json
-43490c87731a920f379e0ec79dc90f396face055 assets/create/blockstates/pillar_calcite.json
-22efa9b0362ee7cda07c3873f07d26d76cd304d0 assets/create/blockstates/pillar_crimsite.json
-2facb10517c40635fd64715d4e2ad9f1c81ab687 assets/create/blockstates/pillar_deepslate.json
-ad7612fa699d936ffda9dd290ba561b01cc47a39 assets/create/blockstates/pillar_diorite.json
-4bd6d6c38171896cccea4aef418f4698757414fa assets/create/blockstates/pillar_dripstone.json
-f03bab342e7451bd4b9eba25efcb0e1679d1b2a9 assets/create/blockstates/pillar_granite.json
-be39a0b57fd25b5a71fc085e02c7ccacbaf015e5 assets/create/blockstates/pillar_limestone.json
-0cab47030d70e916f1c2cfc05892f92ef9662bfe assets/create/blockstates/pillar_ochrum.json
-29e3a6a4239bff28f50fde59b4f9d365d977d032 assets/create/blockstates/pillar_scorchia.json
-991b2adae69475bc20dfef43529cce96cde2c780 assets/create/blockstates/pillar_scoria.json
-59f34df53439f0b9f51a0683f5f815b496064860 assets/create/blockstates/pillar_tuff.json
-63fe84ae4fe18b42a3524e04b9b15f0654b1000c assets/create/blockstates/pillar_veridium.json
+31b33e3a1798b625770130ccc65655453abb09a6 assets/create/blockstates/pillar_andesite.json
+4deff708b7e0cdda4a6e0c1f30c6d9faca702ff7 assets/create/blockstates/pillar_asurine.json
+c08c25679afadca7f172d7561d5872b73b07da38 assets/create/blockstates/pillar_calcite.json
+5d7c9549e3bc0994b89bcdcde92f074b20e6612a assets/create/blockstates/pillar_crimsite.json
+4da487e84615b0209287a1420bd248ef979a7b64 assets/create/blockstates/pillar_deepslate.json
+3e922673141b80dda7d591f201624b5698e0757b assets/create/blockstates/pillar_diorite.json
+8096962aa935f44598fc017aa918d6a4579f4e48 assets/create/blockstates/pillar_dripstone.json
+aec8d681e44640d4b4db4df148c0f891035e515c assets/create/blockstates/pillar_granite.json
+3f98a6de6163e7f47f975bf945462b547a80ae39 assets/create/blockstates/pillar_limestone.json
+7d08ac608b5e8e666c0b176312528b3d1c06967e assets/create/blockstates/pillar_ochrum.json
+29aebbca0d491310444b9c15013e26ddccebf505 assets/create/blockstates/pillar_scorchia.json
+f2866819265ebd68ee9f6280ee2cf60aae910bd3 assets/create/blockstates/pillar_scoria.json
+717a4de1cd6b2198ca71cde3748c8c637a8f5e6d assets/create/blockstates/pillar_tuff.json
+e8b3baa0fd16a2cdbf08283cf8128806b8a834c4 assets/create/blockstates/pillar_veridium.json
 06ad2ce2f1730488d51daf12b4a985c86d43bbb4 assets/create/blockstates/pink_nixie_tube.json
 30971f2f76fe56f144178c33ad6bde5fc9fb61c3 assets/create/blockstates/pink_sail.json
 919a79e4a4a5fab0aac3ef48e1c786017d6aa001 assets/create/blockstates/pink_seat.json
@@ -1026,19 +1026,33 @@ a4e5715d04bd13860e2d5981c2122fbc6b435e80 assets/create/models/block/oxidized/cop
 44371c13450dd41d84769a3a50250de1d86e75c5 assets/create/models/block/peculiar_bell_floor.json
 57e48a613ce2c81992623a46792fca4bcafb33ce assets/create/models/block/peculiar_bell_single_wall.json
 882871d4cd7b4925f300c09d00ba58785b27119e assets/create/models/block/pillar_andesite.json
+587491f19767bd682bbef00eaa890d4b8a320b7a assets/create/models/block/pillar_andesite_horizontal.json
 a9167990e3f894f92a9de24c8b77d040b1c1ff0a assets/create/models/block/pillar_asurine.json
+e40c3a7e6f7b895770f544d79536c744d18c462f assets/create/models/block/pillar_asurine_horizontal.json
 3fd5c08a6fe54d38383c8bd92ff7331218ca396c assets/create/models/block/pillar_calcite.json
+c4d1e1b6e195c0b71c0b96546978cd24c4a4bfc4 assets/create/models/block/pillar_calcite_horizontal.json
 3ad2613e9d29b1174b6829d28abb2dc0e7477e6b assets/create/models/block/pillar_crimsite.json
+e93336aeb8513d85d6bffd9ea520b0747731d55b assets/create/models/block/pillar_crimsite_horizontal.json
 7127475aeadd76ec72e25012332be5fa24c1670b assets/create/models/block/pillar_deepslate.json
+faa427e011f11807909232194df6cfc5310e16af assets/create/models/block/pillar_deepslate_horizontal.json
 d1c0a266ca0f5ce7ddeb170cd36635b10b8ccc0f assets/create/models/block/pillar_diorite.json
+64704a24de13b33326944a6779ca2c0bfd71d803 assets/create/models/block/pillar_diorite_horizontal.json
 0d02622fc395760d1807fab74c53e83760e6a91c assets/create/models/block/pillar_dripstone.json
+3e00a1807b94a1365cf5ef925c63b55587c11b1d assets/create/models/block/pillar_dripstone_horizontal.json
 26ce92ff30b3f2f05cbf296e868e53233728e4b6 assets/create/models/block/pillar_granite.json
+2c434b3221c506a968fbf96bd516b9075bc4d5aa assets/create/models/block/pillar_granite_horizontal.json
 3a5027b8e4dafa27b5c999b084c2a298574902af assets/create/models/block/pillar_limestone.json
+7ada3d2c45fd649b48ce1727495ad17977609c17 assets/create/models/block/pillar_limestone_horizontal.json
 37758cc8bd6c7cfe452aab5dd3b91fd1ada2d906 assets/create/models/block/pillar_ochrum.json
+889872c17f117008606b3bdad6fc80252fd25121 assets/create/models/block/pillar_ochrum_horizontal.json
 79a6136536775bdfef7844ab97889f75fbe9169b assets/create/models/block/pillar_scorchia.json
+21862a9eb051b382ad5a57579c3c214cef27ad6c assets/create/models/block/pillar_scorchia_horizontal.json
 a9aa5b82069607081a270eaa27c8ec6f459e31a1 assets/create/models/block/pillar_scoria.json
+15effb0f523834850f529f24dedba4e2c3c5eeff assets/create/models/block/pillar_scoria_horizontal.json
 6b44ab14b227f3c46ee99eecfe47a86c9fb0865c assets/create/models/block/pillar_tuff.json
+f0faeee9e124a25280fb58bd66045cfb2758b42e assets/create/models/block/pillar_tuff_horizontal.json
 ebfad96e85ac6107642eaaf48b57315b268355ff assets/create/models/block/pillar_veridium.json
+c49bb21ef60ff10540952271c863415b4ad07aa0 assets/create/models/block/pillar_veridium_horizontal.json
 71cd22dc2d847d317f19afb4b21802fbf5347e0b assets/create/models/block/pink_nixie_tube.json
 1b5f9e819cd4b5f5fe6e8c24920b916e8d93c95e assets/create/models/block/pink_sail.json
 ecc60ce7ee6b753073a99c597db95d6d9df3d438 assets/create/models/block/pink_seat.json

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_andesite",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_andesite"
-    },
-    "axis=z": {
-      "model": "create:block/layered_andesite",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_asurine",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_asurine"
-    },
-    "axis=z": {
-      "model": "create:block/layered_asurine",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_calcite",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_calcite"
-    },
-    "axis=z": {
-      "model": "create:block/layered_calcite",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_crimsite",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_crimsite"
-    },
-    "axis=z": {
-      "model": "create:block/layered_crimsite",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_deepslate",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_deepslate"
-    },
-    "axis=z": {
-      "model": "create:block/layered_deepslate",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_diorite",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_diorite"
-    },
-    "axis=z": {
-      "model": "create:block/layered_diorite",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_dripstone",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_dripstone"
-    },
-    "axis=z": {
-      "model": "create:block/layered_dripstone",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_granite",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_granite"
-    },
-    "axis=z": {
-      "model": "create:block/layered_granite",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_limestone",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_limestone"
-    },
-    "axis=z": {
-      "model": "create:block/layered_limestone",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_ochrum",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_ochrum"
-    },
-    "axis=z": {
-      "model": "create:block/layered_ochrum",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_scorchia",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_scorchia"
-    },
-    "axis=z": {
-      "model": "create:block/layered_scorchia",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_scoria",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_scoria"
-    },
-    "axis=z": {
-      "model": "create:block/layered_scoria",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_tuff",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_tuff"
-    },
-    "axis=z": {
-      "model": "create:block/layered_tuff",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,17 +1,7 @@
 {
   "variants": {
-    "axis=x": {
-      "model": "create:block/layered_veridium",
-      "x": 90,
-      "y": 90
-    },
-    "axis=y": {
+    "": {
       "model": "create:block/layered_veridium"
-    },
-    "axis=z": {
-      "model": "create:block/layered_veridium",
-      "x": 90,
-      "y": 180
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_andesite",
+      "model": "create:block/pillar_andesite_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_andesite"
     },
     "axis=z": {
-      "model": "create:block/pillar_andesite",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_andesite_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_asurine",
+      "model": "create:block/pillar_asurine_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_asurine"
     },
     "axis=z": {
-      "model": "create:block/pillar_asurine",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_asurine_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_calcite",
+      "model": "create:block/pillar_calcite_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_calcite"
     },
     "axis=z": {
-      "model": "create:block/pillar_calcite",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_calcite_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_crimsite",
+      "model": "create:block/pillar_crimsite_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_crimsite"
     },
     "axis=z": {
-      "model": "create:block/pillar_crimsite",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_crimsite_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_deepslate",
+      "model": "create:block/pillar_deepslate_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_deepslate"
     },
     "axis=z": {
-      "model": "create:block/pillar_deepslate",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_deepslate_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_diorite",
+      "model": "create:block/pillar_diorite_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_diorite"
     },
     "axis=z": {
-      "model": "create:block/pillar_diorite",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_diorite_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_dripstone",
+      "model": "create:block/pillar_dripstone_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_dripstone"
     },
     "axis=z": {
-      "model": "create:block/pillar_dripstone",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_dripstone_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_granite",
+      "model": "create:block/pillar_granite_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_granite"
     },
     "axis=z": {
-      "model": "create:block/pillar_granite",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_granite_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_limestone",
+      "model": "create:block/pillar_limestone_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_limestone"
     },
     "axis=z": {
-      "model": "create:block/pillar_limestone",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_limestone_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_ochrum",
+      "model": "create:block/pillar_ochrum_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_ochrum"
     },
     "axis=z": {
-      "model": "create:block/pillar_ochrum",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_ochrum_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_scorchia",
+      "model": "create:block/pillar_scorchia_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_scorchia"
     },
     "axis=z": {
-      "model": "create:block/pillar_scorchia",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_scorchia_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_scoria",
+      "model": "create:block/pillar_scoria_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_scoria"
     },
     "axis=z": {
-      "model": "create:block/pillar_scoria",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_scoria_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_tuff",
+      "model": "create:block/pillar_tuff_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_tuff"
     },
     "axis=z": {
-      "model": "create:block/pillar_tuff",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_tuff_horizontal",
+      "x": 90
     }
   }
 }

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "create:block/pillar_veridium",
+      "model": "create:block/pillar_veridium_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,9 +9,8 @@
       "model": "create:block/pillar_veridium"
     },
     "axis=z": {
-      "model": "create:block/pillar_veridium",
-      "x": 90,
-      "y": 180
+      "model": "create:block/pillar_veridium_horizontal",
+      "x": 90
     }
   }
 }

src/generated/resources/assets/create/models/block/pillar_andesite_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/andesite_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/andesite_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_asurine_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/asurine_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/asurine_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_calcite_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/calcite_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/calcite_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_crimsite_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/crimsite_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/crimsite_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_deepslate_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/deepslate_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/deepslate_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_diorite_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/diorite_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/diorite_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_dripstone_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/dripstone_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/dripstone_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_granite_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/granite_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/granite_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_limestone_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/limestone_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/limestone_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_ochrum_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/ochrum_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/ochrum_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_scorchia_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/scorchia_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/scorchia_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_scoria_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/scoria_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/scoria_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_tuff_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/tuff_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/tuff_cut_cap"
+  }
+}

src/generated/resources/assets/create/models/block/pillar_veridium_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "create:block/palettes/stone_types/pillar/veridium_cut_pillar",
+    "end": "create:block/palettes/stone_types/cap/veridium_cut_cap"
+  }
+}

src/main/java/com/simibubi/create/content/palettes/PaletteBlockPattern.java

@@ -14,8 +14,8 @@ import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry;
 import com.simibubi.create.foundation.block.connected.CTSpriteShifter;
 import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType;
 import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour;
-import com.simibubi.create.foundation.block.connected.RotatedLayerCTBehaviour;
-import com.simibubi.create.foundation.data.BlockStateGen;
+import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour;
+import com.simibubi.create.foundation.block.connected.RotatedPillarCTBehaviour;
 import com.tterrag.registrate.providers.DataGenContext;
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
 import com.tterrag.registrate.providers.RegistrateRecipeProvider;
@@ -25,13 +25,16 @@ import com.tterrag.registrate.util.nullness.NonNullFunction;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.core.Direction.Axis;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.Tag;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.client.model.generators.ConfiguredModel;
 
 public class PaletteBlockPattern {
 
@@ -46,15 +49,14 @@ public class PaletteBlockPattern {
 
 		POLISHED = create("polished", PREFIX, FOR_POLISHED).textures("polished", "slab"),
 
-		LAYERED = create("layered", PREFIX).blockStateFactory(p -> p::pillar)
-			.block(LayeredBlock::new)
+		LAYERED = create("layered", PREFIX).blockStateFactory(p -> p::cubeColumn)
 			.textures("layered", "cap")
-			.connectedTextures(v -> new RotatedLayerCTBehaviour(ct(v, CTs.LAYERED), ct(v, CTs.CAP))),
+			.connectedTextures(v -> new HorizontalCTBehaviour(ct(v, CTs.LAYERED), ct(v, CTs.CAP))),
 
 		PILLAR = create("pillar", PREFIX).blockStateFactory(p -> p::pillar)
 			.block(LayeredBlock::new)
 			.textures("pillar", "cap")
-			.connectedTextures(v -> new RotatedLayerCTBehaviour(ct(v, CTs.PILLAR), ct(v, CTs.CAP)))
+			.connectedTextures(v -> new RotatedPillarCTBehaviour(ct(v, CTs.PILLAR), ct(v, CTs.CAP)))
 
 	;
 
@@ -192,8 +194,24 @@ public class PaletteBlockPattern {
 	public IBlockStateProvider pillar(String variant) {
 		ResourceLocation side = toLocation(variant, textures[0]);
 		ResourceLocation end = toLocation(variant, textures[1]);
-		return (ctx, prov) -> BlockStateGen.axisBlock(ctx, prov, $ -> prov.models()
-			.cubeColumn(createName(variant), side, end));
+
+		return (ctx, prov) -> prov.getVariantBuilder(ctx.getEntry())
+			.forAllStatesExcept(state -> {
+				Axis axis = state.getValue(BlockStateProperties.AXIS);
+				if (axis == Axis.Y)
+					return ConfiguredModel.builder()
+						.modelFile(prov.models()
+							.cubeColumn(createName(variant), side, end))
+						.uvLock(false)
+						.build();
+				return ConfiguredModel.builder()
+					.modelFile(prov.models()
+						.cubeColumnHorizontal(createName(variant) + "_horizontal", side, end))
+					.uvLock(false)
+					.rotationX(90)
+					.rotationY(axis == Axis.X ? 90 : 0)
+					.build();
+			}, BlockStateProperties.WATERLOGGED);
 	}
 
 	public IBlockStateProvider cubeColumn(String variant) {
@@ -223,9 +241,10 @@ public class PaletteBlockPattern {
 	}
 
 	protected static CTSpriteShiftEntry ct(String variant, CTs texture) {
-		ResourceLocation resLoc = texture.target.apply(variant);
+		ResourceLocation resLoc = texture.srcFactory.apply(variant);
+		ResourceLocation resLocTarget = texture.targetFactory.apply(variant);
 		return CTSpriteShifter.getCT(texture.type, resLoc,
-			new ResourceLocation(resLoc.getNamespace(), resLoc.getPath() + "_connected"));
+			new ResourceLocation(resLocTarget.getNamespace(), resLocTarget.getPath() + "_connected"));
 	}
 
 	@FunctionalInterface
@@ -253,11 +272,18 @@ public class PaletteBlockPattern {
 		;
 
 		public CTType type;
-		private Function<String, ResourceLocation> target;
+		private Function<String, ResourceLocation> srcFactory;
+		private Function<String, ResourceLocation> targetFactory;
 
 		private CTs(CTType type, Function<String, ResourceLocation> factory) {
+			this(type, factory, factory);
+		}
+
+		private CTs(CTType type, Function<String, ResourceLocation> srcFactory,
+			Function<String, ResourceLocation> targetFactory) {
 			this.type = type;
-			this.target = factory;
+			this.srcFactory = srcFactory;
+			this.targetFactory = targetFactory;
 		}
 
 	}

src/main/java/com/simibubi/create/foundation/block/connected/RotatedPillarCTBehaviour.java

@@ -9,9 +9,9 @@ import net.minecraft.core.Direction.AxisDirection;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
 
-public class RotatedLayerCTBehaviour extends HorizontalCTBehaviour {
+public class RotatedPillarCTBehaviour extends HorizontalCTBehaviour {
 
-	public RotatedLayerCTBehaviour(CTSpriteShiftEntry layerShift, CTSpriteShiftEntry topShift) {
+	public RotatedPillarCTBehaviour(CTSpriteShiftEntry layerShift, CTSpriteShiftEntry topShift) {
 		super(layerShift, topShift);
 	}
 
@@ -24,10 +24,10 @@ public class RotatedLayerCTBehaviour extends HorizontalCTBehaviour {
 	@Override
 	protected boolean reverseUVs(BlockState state, Direction face) {
 		Axis axis = state.getValue(LayeredBlock.AXIS);
-		if (axis == Axis.X) 
-			return face.getAxisDirection() == AxisDirection.POSITIVE == (face.getAxis() == Axis.X);
+		if (axis == Axis.X)
+			return face.getAxisDirection() == AxisDirection.NEGATIVE && face.getAxis() != Axis.X;
 		if (axis == Axis.Z)
-			return face.getAxisDirection() == AxisDirection.POSITIVE;
+			return face != Direction.NORTH && face.getAxisDirection() != AxisDirection.POSITIVE;
 		return super.reverseUVs(state, face);
 	}