From f53fb5a9e3d60e76fafc5b677b7376d30d553352 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Fri, 22 Apr 2022 15:46:10 +0200
Subject: [PATCH] fix rotation and uv bugs in sign model

---
 doc/rendering/CubeModel.md                    |  2 +-
 .../models/block/template_standing_sign.json  | 26 ++++++++++++-------
 .../models/block/template_wall_sign.json      | 14 +++++-----
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/doc/rendering/CubeModel.md b/doc/rendering/CubeModel.md
index 5e463857f..148f7a705 100644
--- a/doc/rendering/CubeModel.md
+++ b/doc/rendering/CubeModel.md
@@ -1,4 +1,4 @@
 Cube uv:
 
 bottom->top
-east->north->south->west
+east->north->west->south
diff --git a/src/main/resources/assets_overwrite/minecraft/models/block/template_standing_sign.json b/src/main/resources/assets_overwrite/minecraft/models/block/template_standing_sign.json
index bb8960a60..b5020e7ec 100644
--- a/src/main/resources/assets_overwrite/minecraft/models/block/template_standing_sign.json
+++ b/src/main/resources/assets_overwrite/minecraft/models/block/template_standing_sign.json
@@ -4,7 +4,10 @@
       "__comment": "Sign",
       "from": [0, 9.5, 7],
       "to": [16, 17.5, 9],
-      "y": 180,
+      "rotation": {
+        "axis": "Y",
+        "angle": 180.0
+      },
       "faces": {
         "down": {
           "uv": [0.5, 0, 4.5, 1],
@@ -19,15 +22,15 @@
           "texture": "#sign"
         },
         "north": {
-          "uv": [0.5, 1, 4.5, 7],
-          "texture": "#sign"
-        },
-        "south": {
-          "uv": [4.5, 1, 8.0, 7],
+          "uv": [0.5, 1, 6.5, 7],
           "texture": "#sign"
         },
         "west": {
-          "uv": [8.0, 1, 8.5, 7],
+          "uv": [6.5, 1, 7.0, 7],
+          "texture": "#sign"
+        },
+        "south": {
+          "uv": [7.0, 1, 13.0, 7],
           "texture": "#sign"
         }
       }
@@ -36,7 +39,10 @@
       "__comment": "Stick",
       "from": [7.5, 0, 7.5],
       "to": [8.5, 9.5, 8.5],
-      "y": 180,
+      "rotation": {
+        "axis": "Y",
+        "angle": 180.0
+      },
       "faces": {
         "down": {
           "uv": [0.5, 7, 1.0, 7.5],
@@ -51,11 +57,11 @@
           "uv": [0.5, 8, 1.0, 15],
           "texture": "#sign"
         },
-        "south": {
+        "west": {
           "uv": [1.0, 8, 1.5, 15],
           "texture": "#sign"
         },
-        "west": {
+        "south": {
           "uv": [1.5, 8, 2.0, 15],
           "texture": "#sign"
         }
diff --git a/src/main/resources/assets_overwrite/minecraft/models/block/template_wall_sign.json b/src/main/resources/assets_overwrite/minecraft/models/block/template_wall_sign.json
index b1f7506ea..24ac6199e 100644
--- a/src/main/resources/assets_overwrite/minecraft/models/block/template_wall_sign.json
+++ b/src/main/resources/assets_overwrite/minecraft/models/block/template_wall_sign.json
@@ -19,19 +19,19 @@
           "cullface": "east"
         },
         "north": {
-          "uv": [0.5, 1, 4.5, 7],
+          "uv": [0.5, 1, 6.5, 7],
           "texture": "#sign",
           "cullface": "north"
         },
-        "south": {
-          "uv": [4.5, 1, 8.0, 7],
-          "texture": "#sign",
-          "cullface": "south"
-        },
         "west": {
-          "uv": [8.0, 1, 8.5, 7],
+          "uv": [6.5, 1, 7.0, 7],
           "texture": "#sign",
           "cullface": "west"
+        },
+        "south": {
+          "uv": [7.0, 1, 13.0, 7],
+          "texture": "#sign",
+          "cullface": "south"
         }
       }
     }