From ae75a05e649203ce147f25966133b8e8f09db903 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Mon, 30 Jan 2023 23:03:04 +0600
Subject: [PATCH] Fix funny z-fighting on holo signs

---
 .../models/block/holo_sign.json               |  99 +++++++++---------
 .../textures/block/holo_sign.png              | Bin 418 -> 424 bytes
 2 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json b/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json
index 8af9b0feb..fb314ebd6 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json
@@ -1,6 +1,7 @@
 {
+	"credit": "Made with Blockbench",
 	"parent": "block/cube_all",
-    "render_type": "translucent",
+	"render_type": "translucent",
 	"textures": {
 		"0": "overdrive_that_matters:block/holo_sign",
 		"particle": "overdrive_that_matters:block/holo_sign"
@@ -73,80 +74,80 @@
 		},
 		{
 			"name": "light",
-			"from": [1, 14, 10],
-			"to": [2, 15, 10],
+			"from": [14, 14, 9.99],
+			"to": [15, 15, 9.99],
 			"faces": {
-				"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "forge_data": {"block_light": 15}},
-				"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "forge_data": {"block_light": 15}},
-				"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
+				"north": {"uv": [8.5, 8.5, 9, 9], "texture": "#0", "forge_data": {"block_light": 15}},
+				"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
+				"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
+				"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
+				"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
 			}
 		},
 		{
 			"name": "light",
-			"from": [1, 1, 10],
-			"to": [2, 2, 10],
+			"from": [1, 14, 9.99],
+			"to": [2, 15, 9.99],
 			"faces": {
-				"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "forge_data": {"block_light": 15}},
-				"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "forge_data": {"block_light": 15}},
-				"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
+				"north": {"uv": [15, 8.5, 15.5, 9], "texture": "#0", "forge_data": {"block_light": 15}},
+				"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
+				"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
+				"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
+				"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
 			}
 		},
 		{
 			"name": "light",
-			"from": [14, 1, 10],
-			"to": [15, 2, 10],
+			"from": [1, 1, 9.99],
+			"to": [2, 2, 9.99],
 			"faces": {
-				"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "forge_data": {"block_light": 15}},
-				"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "forge_data": {"block_light": 15}},
-				"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
+				"north": {"uv": [15, 15, 15.5, 15.5], "texture": "#0", "forge_data": {"block_light": 15}},
+				"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
+				"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
+				"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
+				"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
 			}
 		},
 		{
 			"name": "light",
-			"from": [14, 14, 10],
-			"to": [15, 15, 10],
+			"from": [14, 1, 9.99],
+			"to": [15, 2, 9.99],
 			"faces": {
-				"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "forge_data": {"block_light": 15}},
-				"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "forge_data": {"block_light": 15}},
-				"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
+				"north": {"uv": [8.5, 15, 9, 15.5], "texture": "#0", "forge_data": {"block_light": 15}},
+				"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
+				"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
+				"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
+				"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
 			}
 		},
 		{
 			"name": "light",
-			"from": [14, 6, 9],
-			"to": [14, 10, 10],
+			"from": [2.01, 6, 9],
+			"to": [2.01, 10, 10],
 			"faces": {
-				"north": {"uv": [0, 0, 0, 2], "texture": "#missing"},
-				"east": {"uv": [0, 0, 0.5, 2], "texture": "#missing"},
-				"south": {"uv": [0, 0, 0, 2], "texture": "#missing"},
-				"west": {"uv": [2, 13, 2.5, 15], "texture": "#0", "forge_data": {"block_light": 15}},
-				"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
+				"north": {"uv": [0, 0, 0, 4], "texture": "#missing"},
+				"east": {"uv": [1.5, 13, 2, 15], "texture": "#0", "forge_data": {"block_light": 15}},
+				"south": {"uv": [0, 0, 0, 4], "texture": "#missing"},
+				"west": {"uv": [0, 0, 1, 4], "texture": "#missing"},
+				"up": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 1], "texture": "#missing"}
 			}
 		},
 		{
 			"name": "light",
-			"from": [2, 6, 9],
-			"to": [2, 10, 10],
+			"from": [13.99, 6, 9],
+			"to": [13.99, 10, 10],
 			"faces": {
-				"north": {"uv": [0, 0, 0, 2], "texture": "#missing"},
-				"east": {"uv": [2, 13, 2.5, 15], "texture": "#0", "forge_data": {"block_light": 15}},
-				"south": {"uv": [0, 0, 0, 2], "texture": "#missing"},
-				"west": {"uv": [2, 13, 2.5, 15], "texture": "#0", "forge_data": {"block_light": 15}},
-				"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
+				"north": {"uv": [0, 0, 0, 4], "texture": "#missing"},
+				"east": {"uv": [0, 0, 1, 4], "texture": "#missing"},
+				"south": {"uv": [0, 0, 0, 4], "texture": "#missing"},
+				"west": {"uv": [1.5, 13, 2, 15], "texture": "#0", "forge_data": {"block_light": 15}},
+				"up": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 1], "texture": "#missing"}
 			}
 		}
 	],
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/holo_sign.png b/src/main/resources/assets/overdrive_that_matters/textures/block/holo_sign.png
index 1100a2d1bbb7608b6c5d8195f46b14d808dfcdd9..8e3d643a89386d032f9f4d0346dc4ad1d521e269 100644
GIT binary patch
delta 318
zcmV-E0m1&F1E>R#RTlr?Nfs6se}8|6hll^z000001@_!Sk!vD<!T<mc!T}X1N`L?W
z0QpHoK~y+TjZ%vegdhk6(KP@6gKrn9N$alLnP_<{D5A--C8J15p{s&tg9-{gPf#ru
z6tJR_U=!xK$O-8em<Qm$0q`g+;R>i&7W@&xOwdHLR~e-kK!!s?Nc<^Xc#e27U|R&x
z8Gb{$j`D27<B)oP#2~0J2MnA6w-&)1P8mSv>bFDEbX?Po%QdG#rH4VijC#$uEeq?$
zuH#h4x~XCPzHZ@nLZvT20v`;^jwjMfcpRmB$qVik{%PS4a`Zrp1@A2|K%XNgX<Jw?
zK!xjI9uFC}q<jjfwYKT%3q)$$_fVdI3a$LC@EY((i`s%653I}Ti+@J%AEPuCn-8?)
Q^Z)<=07*qoM6N<$f+?+xVgLXD

delta 312
zcmV-80muHR1EK?vRTdT&7Jq+#hlhv%;7R}300000YbN{lk!vD<!vFvd!vV){sAK>D
z0P{&iK~y+Tol*%BgD?o>h_TK8AKYDnPSjL8-5CkT0udsj=Ecn^%oMgN^x`m~!Y&7>
zHcu7sreg33^FkCu`T!3C&ILe3;mJ@!#f#tsgPBl`?x@mBkw6WXgpfQbLqv{5GT=)R
z7|ggMU3+=9;dQ8g2BRyea3pl>giDLm0-=&XEzED1q-*=laGrkiFesZ0>S5I9jLWjH
zZtOa5wXK^L)*tH@emhj!2}t0BVcGsf(!V204!BnMrA0i*-s7JZ7+}nilk_FM15jZc
z%=D7^my|O?t#y5+F@s25+dGXJP+@Ji6&?vcv;gA<(r)7yt$hHYr4^*(<&eDq0000<
KMNUMnLSTZHOO2!e