From 4ef854d61d1b148d7d635844ede5076d3cd77340 Mon Sep 17 00:00:00 2001
From: trinsdar <30245301+Trinsdar@users.noreply.github.com>
Date: Mon, 12 Aug 2024 17:20:27 -0400
Subject: [PATCH] fixed rods z fighting with fluid rendering

---
 .../machine/overlay/nuclear_reactor_core/east.json    | 11 ++++++-----
 .../machine/overlay/nuclear_reactor_core/north.json   |  9 +++++----
 .../machine/overlay/nuclear_reactor_core/south.json   | 11 ++++++-----
 .../machine/overlay/nuclear_reactor_core/west.json    |  9 +++++----
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/east.json b/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/east.json
index 5a8d4e1bc..a7967a0c0 100644
--- a/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/east.json
+++ b/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/east.json
@@ -1,6 +1,5 @@
 {
-	"loader": "antimatter:machine_side",
-    "credit": "Made with Blockbench",
+	"credit": "Made with Blockbench",
 	"elements": [
 		{
 			"from": [14, 0, 0],
@@ -19,9 +18,10 @@
 			}
 		},
 		{
-			"from": [14, 2, 2],
-			"to": [14, 14, 14],
+			"from": [14.01, 2, 2],
+			"to": [14.01, 14, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 0]},
+			"color": 1,
 			"faces": {
 				"east": {"uv": [2, 2, 14, 14], "texture": "#missing"}
 			}
@@ -36,5 +36,6 @@
 			"color": 0,
 			"children": [2]
 		}
-	]
+	],
+	"loader": "antimatter:machine_side"
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/north.json b/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/north.json
index 1beb20f81..77ecbcd17 100644
--- a/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/north.json
+++ b/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/north.json
@@ -1,5 +1,4 @@
 {
-    "loader": "antimatter:machine_side",
 	"credit": "Made with Blockbench",
 	"elements": [
 		{
@@ -19,8 +18,9 @@
 			}
 		},
 		{
-			"from": [2, 2, 2],
-			"to": [14, 14, 2],
+			"from": [2, 2, 1.99],
+			"to": [14, 14, 1.99],
+			"color": 7,
 			"faces": {
 				"north": {"uv": [2, 2, 14, 14], "texture": "#missing"}
 			}
@@ -35,5 +35,6 @@
 			"color": 0,
 			"children": [2]
 		}
-	]
+	],
+	"loader": "antimatter:machine_side"
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/south.json b/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/south.json
index 0c0c5f489..99e1a13e4 100644
--- a/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/south.json
+++ b/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/south.json
@@ -1,6 +1,5 @@
 {
-  "loader": "antimatter:machine_side",
-  "credit": "Made with Blockbench",
+	"credit": "Made with Blockbench",
 	"elements": [
 		{
 			"from": [0, 0, 14],
@@ -19,9 +18,10 @@
 			}
 		},
 		{
-			"from": [2, 2, 14],
-			"to": [14, 14, 14],
+			"from": [2, 2, 14.01],
+			"to": [14, 14, 14.01],
 			"rotation": {"angle": 0, "axis": "y", "origin": [2, 2, 0]},
+			"color": 1,
 			"faces": {
 				"south": {"uv": [2, 3, 13, 13], "texture": "#missing"}
 			}
@@ -36,5 +36,6 @@
 			"color": 0,
 			"children": [2]
 		}
-	]
+	],
+	"loader": "antimatter:machine_side"
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/west.json b/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/west.json
index b784004fe..3f868703a 100644
--- a/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/west.json
+++ b/common/src/main/resources/assets/gti/models/block/machine/overlay/nuclear_reactor_core/west.json
@@ -1,5 +1,4 @@
 {
-    "loader": "antimatter:machine_side",
 	"credit": "Made with Blockbench",
 	"elements": [
 		{
@@ -19,8 +18,9 @@
 			}
 		},
 		{
-			"from": [2, 2, 2],
-			"to": [2, 14, 14],
+			"from": [1.99, 2, 2],
+			"to": [1.99, 14, 14],
+			"color": 4,
 			"faces": {
 				"west": {"uv": [2, 2, 14, 14], "texture": "#missing"}
 			}
@@ -35,5 +35,6 @@
 			"color": 0,
 			"children": [2]
 		}
-	]
+	],
+	"loader": "antimatter:machine_side"
 }
\ No newline at end of file