From 2201d87da7744cf9ee3f83e1e4c21643244f342b Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:30:32 +0100 Subject: [PATCH] Asset patches - Fixed uvs on stress- and speedometers' block models - Toolbox hotbar slot overlay now uses the revised brass palette from 0.5.1 --- .../create/models/block/gauge/base.json | 8 ++++---- .../create/models/block/gauge/base_wall.json | 6 +++--- .../models/block/gauge/speedometer/item.json | 8 +++++--- .../models/block/gauge/stressometer/item.json | 6 +++--- .../assets/create/textures/gui/widgets.png | Bin 7399 -> 9904 bytes 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/resources/assets/create/models/block/gauge/base.json b/src/main/resources/assets/create/models/block/gauge/base.json index 6ea216f22..bd05255c6 100644 --- a/src/main/resources/assets/create/models/block/gauge/base.json +++ b/src/main/resources/assets/create/models/block/gauge/base.json @@ -24,12 +24,12 @@ "from": [1, 0, 0], "to": [15, 2, 16], "faces": { - "north": {"uv": [0, 9, 8, 10], "texture": "#2"}, + "north": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"}, "east": {"uv": [0, 9, 8, 10], "texture": "#2"}, - "south": {"uv": [0, 9, 7, 10], "texture": "#2"}, + "south": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"}, "west": {"uv": [0, 9, 8, 10], "texture": "#2"}, - "up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 8, 7], "texture": "#2"} + "up": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"}, + "down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"} } } ] diff --git a/src/main/resources/assets/create/models/block/gauge/base_wall.json b/src/main/resources/assets/create/models/block/gauge/base_wall.json index efd0a1be5..f2055f4e5 100644 --- a/src/main/resources/assets/create/models/block/gauge/base_wall.json +++ b/src/main/resources/assets/create/models/block/gauge/base_wall.json @@ -24,10 +24,10 @@ "from": [0, 1, 0], "to": [2, 15, 16], "faces": { - "north": {"uv": [0, 9, 8, 10], "rotation": 270, "texture": "#2"}, + "north": {"uv": [0.5, 9, 7.5, 10], "rotation": 270, "texture": "#2"}, "east": {"uv": [0, 0, 8, 7], "texture": "#2"}, - "south": {"uv": [0, 9, 7, 10], "rotation": 90, "texture": "#2"}, - "west": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"}, + "south": {"uv": [0.5, 9, 7.5, 10], "rotation": 90, "texture": "#2"}, + "west": {"uv": [0, 0, 8, 7], "texture": "#2"}, "up": {"uv": [0, 9, 8, 10], "rotation": 90, "texture": "#2"}, "down": {"uv": [0, 9, 8, 10], "rotation": 90, "texture": "#2"} } diff --git a/src/main/resources/assets/create/models/block/gauge/speedometer/item.json b/src/main/resources/assets/create/models/block/gauge/speedometer/item.json index 4df920337..0480e362f 100644 --- a/src/main/resources/assets/create/models/block/gauge/speedometer/item.json +++ b/src/main/resources/assets/create/models/block/gauge/speedometer/item.json @@ -26,12 +26,12 @@ "from": [1, 0, 0], "to": [15, 2, 16], "faces": { - "north": {"uv": [0, 9, 8, 10], "texture": "#2"}, + "north": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"}, "east": {"uv": [0, 9, 8, 10], "texture": "#2"}, - "south": {"uv": [0, 9, 7, 10], "texture": "#2"}, + "south": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"}, "west": {"uv": [0, 9, 8, 10], "texture": "#2"}, "up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 8, 7], "texture": "#2"} + "down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"} } }, { @@ -148,11 +148,13 @@ { "name": "Gauge", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] }, { "name": "shaft", "origin": [8, 8, 8], + "color": 0, "children": [7] } ] diff --git a/src/main/resources/assets/create/models/block/gauge/stressometer/item.json b/src/main/resources/assets/create/models/block/gauge/stressometer/item.json index 7df82d7b9..ab3d3e53b 100644 --- a/src/main/resources/assets/create/models/block/gauge/stressometer/item.json +++ b/src/main/resources/assets/create/models/block/gauge/stressometer/item.json @@ -26,12 +26,12 @@ "from": [1, 0, 0], "to": [15, 2, 16], "faces": { - "north": {"uv": [0, 9, 8, 10], "texture": "#2"}, + "north": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"}, "east": {"uv": [0, 9, 8, 10], "texture": "#2"}, - "south": {"uv": [0, 9, 7, 10], "texture": "#2"}, + "south": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"}, "west": {"uv": [0, 9, 8, 10], "texture": "#2"}, "up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 8, 7], "texture": "#2"} + "down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"} } }, { diff --git a/src/main/resources/assets/create/textures/gui/widgets.png b/src/main/resources/assets/create/textures/gui/widgets.png index 12af4c9ccd2608b49740314844c6231698852582..cc8cf5bef63005aae0a1a6dc73e7910080d3cf8e 100644 GIT binary patch literal 9904 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

l3(WeG@7AhzXz17Ms8Ioe?#2<^)L zesB}`PJ{z;n^1oNJ$B_AKXMrHNw7aoqP-O*A?F9SHtE=^e6CMnx5+tT=YtjWI za;@1|j|+LDs5eipx_C%1q*q29KB_ZYO}To6?jbR`yVOp+O9QKV6@^-gm94Lha!}DRDgHzY}zO447R-?79-)4WjQKQoWsSU5}y^)dUJ4 zT1bMUefe>YAq7xyUjyW1c5rR4=JEBs8sDyOWD)LkQJ1F`a}=Guy_2(pq}fDn%4%vv z*#wPX+D5+}CE*sp9bvA;O$k^4m8NvdJQ;DXiUJZV76}kg~NlOa0vh-4&cxL zauxtc0N4c`Q#6(WQhSZ!zaK%FozPb)&$JqYs<-=)W+cpC*7}gN{?sLnH#wIKD^ANF z^p-Uf)Ly4#f)YbZ@yiojwsrs)5uyiBzYQc)V6ND|!zLujp{0+7b<4i@rpMZO)^+1i kDSb#icjEsL{t@SOs+)HB7c*Svwg0LQRJ8AZQnCpBf9US0y8r+H