From e7a273e678814bad81cccf6518843b18cd8ec248 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Thu, 3 Mar 2022 17:18:53 +0100
Subject: [PATCH] Tunnel touch-ups

- Fixed some of the kinetic item models not using the updated cogwheel uvs
- Fixed inconsistent uv scaling on belt tunnel assets
- Removed one of the textured seams visible on tunnel sides
---
 .../models/block/belt_tunnel/straight.json    |   2 +-
 .../models/block/belt_tunnel/window.json      |   2 +-
 .../models/block/mechanical_crafter/item.json |  96 +++++----
 .../models/block/mechanical_mixer/block.json  |   2 +-
 .../models/block/mechanical_mixer/item.json   | 195 ++++++++++--------
 .../create/textures/block/andesite_tunnel.png | Bin 878 -> 1493 bytes
 .../create/textures/block/brass_tunnel.png    | Bin 632 -> 1185 bytes
 7 files changed, 162 insertions(+), 135 deletions(-)

diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/straight.json b/src/main/resources/assets/create/models/block/belt_tunnel/straight.json
index ba208112f..bad0cdc8b 100644
--- a/src/main/resources/assets/create/models/block/belt_tunnel/straight.json
+++ b/src/main/resources/assets/create/models/block/belt_tunnel/straight.json
@@ -38,7 +38,7 @@
 			"faces": {
 				"north": {"uv": [0, 0, 8, 9.5], "texture": "#2"},
 				"east": {"uv": [0, 9.5, 9.5, 10.5], "rotation": 90, "texture": "#2"},
-				"south": {"uv": [0, 0, 8, 9], "texture": "#2"},
+				"south": {"uv": [0, 0, 8, 9.5], "texture": "#2"},
 				"west": {"uv": [0, 10.5, 9.5, 11.5], "rotation": 90, "texture": "#2"},
 				"up": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"}
 			}
diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/window.json b/src/main/resources/assets/create/models/block/belt_tunnel/window.json
index 0d65fed25..670987e89 100644
--- a/src/main/resources/assets/create/models/block/belt_tunnel/window.json
+++ b/src/main/resources/assets/create/models/block/belt_tunnel/window.json
@@ -38,7 +38,7 @@
 			"faces": {
 				"north": {"uv": [8, 0, 16, 9.5], "texture": "#2"},
 				"east": {"uv": [0, 9.5, 9.5, 10.5], "rotation": 90, "texture": "#2"},
-				"south": {"uv": [8, 0, 16, 9], "texture": "#2"},
+				"south": {"uv": [8, 0, 16, 9.5], "texture": "#2"},
 				"west": {"uv": [0, 10.5, 9.5, 11.5], "rotation": 90, "texture": "#2"},
 				"up": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#3"}
 			}
diff --git a/src/main/resources/assets/create/models/block/mechanical_crafter/item.json b/src/main/resources/assets/create/models/block/mechanical_crafter/item.json
index f0a221f11..428d2e7ee 100644
--- a/src/main/resources/assets/create/models/block/mechanical_crafter/item.json
+++ b/src/main/resources/assets/create/models/block/mechanical_crafter/item.json
@@ -1,6 +1,7 @@
 {
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
+	"texture_size": [32, 32],
 	"textures": {
 		"3": "create:block/crafter_thingies",
 		"4": "create:block/crafter_side",
@@ -8,8 +9,8 @@
 		"6": "create:block/crafter_top",
 		"7": "create:block/crafter_topunderside",
 		"8": "create:block/smooth_dark_log_top",
-		"particle": "create:block/crafter_top",
-		"1_2": "create:block/cogwheel"
+		"9": "create:block/cogwheel",
+		"particle": "create:block/brass_casing"
 	},
 	"elements": [
 		{
@@ -147,12 +148,12 @@
 			"from": [-1, 6.5, 6.5],
 			"to": [17, 9.5, 9.5],
 			"faces": {
-				"north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
-				"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
+				"north": {"uv": [7, 8, 16, 9.5], "texture": "#9"},
+				"east": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"},
+				"south": {"uv": [7, 8, 16, 9.5], "texture": "#9"},
+				"west": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"},
+				"up": {"uv": [7, 6, 16, 7.5], "texture": "#9"},
+				"down": {"uv": [7, 6, 16, 7.5], "texture": "#9"}
 			}
 		},
 		{
@@ -161,12 +162,12 @@
 			"to": [17, 9.5, 9.5],
 			"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]},
 			"faces": {
-				"north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
-				"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
+				"north": {"uv": [7, 8, 16, 9.5], "texture": "#9"},
+				"east": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"},
+				"south": {"uv": [7, 8, 16, 9.5], "texture": "#9"},
+				"west": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"},
+				"up": {"uv": [7, 6, 16, 7.5], "texture": "#9"},
+				"down": {"uv": [7, 6, 16, 7.5], "texture": "#9"}
 			}
 		},
 		{
@@ -175,12 +176,12 @@
 			"to": [17, 9.5, 9.5],
 			"rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]},
 			"faces": {
-				"north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
-				"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
+				"north": {"uv": [7, 8, 16, 9.5], "texture": "#9"},
+				"east": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"},
+				"south": {"uv": [7, 8, 16, 9.5], "texture": "#9"},
+				"west": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"},
+				"up": {"uv": [7, 6, 16, 7.5], "texture": "#9"},
+				"down": {"uv": [7, 6, 16, 7.5], "texture": "#9"}
 			}
 		},
 		{
@@ -188,25 +189,25 @@
 			"from": [6.5, 6.5, -1],
 			"to": [9.5, 9.5, 17],
 			"faces": {
-				"north": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"east": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"south": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"west": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"up": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"},
-				"down": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"}
+				"north": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"},
+				"east": {"uv": [7, 8, 16, 9.5], "texture": "#9"},
+				"south": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"},
+				"west": {"uv": [7, 8, 16, 9.5], "texture": "#9"},
+				"up": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#9"},
+				"down": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#9"}
 			}
 		},
 		{
 			"name": "GearCaseInner",
-			"from": [2, 7, 2],
-			"to": [14, 9, 14],
+			"from": [2, 6.55, 2],
+			"to": [14, 9.45, 14],
 			"faces": {
-				"north": {"uv": [0, 6, 6, 7], "texture": "#1_2"},
-				"east": {"uv": [0, 6, 6, 7], "texture": "#1_2"},
-				"south": {"uv": [0, 6, 6, 7], "texture": "#1_2"},
-				"west": {"uv": [0, 6, 6, 7], "texture": "#1_2"},
-				"up": {"uv": [4, 0, 10, 6], "texture": "#1_2"},
-				"down": {"uv": [4, 0, 10, 6], "texture": "#1_2"}
+				"north": {"uv": [0, 6, 6, 7.5], "texture": "#9"},
+				"east": {"uv": [0, 6, 6, 7.5], "texture": "#9"},
+				"south": {"uv": [0, 6, 6, 7.5], "texture": "#9"},
+				"west": {"uv": [0, 6, 6, 7.5], "texture": "#9"},
+				"up": {"uv": [4, 0, 10, 6], "texture": "#9"},
+				"down": {"uv": [4, 0, 10, 6], "texture": "#9"}
 			}
 		},
 		{
@@ -214,24 +215,37 @@
 			"from": [4, 6, 4],
 			"to": [12, 10, 12],
 			"faces": {
-				"north": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
-				"east": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
-				"south": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
-				"west": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
-				"up": {"uv": [0, 0, 4, 4], "texture": "#1_2"},
-				"down": {"uv": [0, 0, 4, 4], "texture": "#1_2"}
+				"north": {"uv": [0, 4, 4, 6], "texture": "#9"},
+				"east": {"uv": [0, 4, 4, 6], "texture": "#9"},
+				"south": {"uv": [0, 4, 4, 6], "texture": "#9"},
+				"west": {"uv": [0, 4, 4, 6], "texture": "#9"},
+				"up": {"uv": [0, 0, 4, 4], "texture": "#9"},
+				"down": {"uv": [0, 0, 4, 4], "texture": "#9"}
 			}
 		}
 	],
-	"groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+	"groups": [
+		0,
+		1,
+		2,
+		3,
+		4,
+		5,
+		6,
+		7,
+		8,
+		9,
+		10,
 		{
 			"name": "lid",
 			"origin": [8, 8, 8],
+			"color": 0,
 			"children": [11]
 		},
 		{
 			"name": "cogwheel_shaftless",
 			"origin": [8, 8, 8],
+			"color": 0,
 			"children": [12, 13, 14, 15, 16, 17]
 		}
 	]
diff --git a/src/main/resources/assets/create/models/block/mechanical_mixer/block.json b/src/main/resources/assets/create/models/block/mechanical_mixer/block.json
index c266f74ba..45c159a61 100644
--- a/src/main/resources/assets/create/models/block/mechanical_mixer/block.json
+++ b/src/main/resources/assets/create/models/block/mechanical_mixer/block.json
@@ -6,7 +6,7 @@
 		"2": "block/spruce_log_top",
 		"4": "create:block/mixer_base_side",
 		"11": "create:block/mechanical_press_top",
-		"particle": "block/stripped_spruce_log"
+		"particle": "create:block/mixer_base_side"
 	},
 	"elements": [
 		{
diff --git a/src/main/resources/assets/create/models/block/mechanical_mixer/item.json b/src/main/resources/assets/create/models/block/mechanical_mixer/item.json
index 93dd7cdd5..e423867e7 100644
--- a/src/main/resources/assets/create/models/block/mechanical_mixer/item.json
+++ b/src/main/resources/assets/create/models/block/mechanical_mixer/item.json
@@ -1,6 +1,6 @@
 {
 	"credit": "Made with Blockbench",
-	"parent": "block/block",
+	"parent": "create:block/large_wheels",
 	"ambientocclusion": false,
 	"texture_size": [32, 32],
 	"textures": {
@@ -10,93 +10,9 @@
 		"11": "create:block/mechanical_press_top",
 		"1_2": "create:block/cogwheel",
 		"mechanical_press_pole": "create:block/mechanical_press_pole",
-		"particle": "create:block/andesite_casing"
+		"particle": "create:block/mixer_base_side"
 	},
 	"elements": [
-		{
-			"name": "Gear",
-			"from": [-1, 13.5, 6.5],
-			"to": [17, 16.5, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
-			"faces": {
-				"north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
-				"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
-			}
-		},
-		{
-			"name": "Gear2",
-			"from": [-1, 13.5, 6.5],
-			"to": [17, 16.5, 9.5],
-			"rotation": {"angle": 45, "axis": "y", "origin": [8, 15, 8]},
-			"faces": {
-				"north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
-				"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
-			}
-		},
-		{
-			"name": "Gear3",
-			"from": [-1, 13.5, 6.5],
-			"to": [17, 16.5, 9.5],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, 15, 8]},
-			"faces": {
-				"north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
-				"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
-			}
-		},
-		{
-			"name": "Gear4",
-			"from": [6.5, 13.5, -1],
-			"to": [9.5, 16.5, 17],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
-			"faces": {
-				"north": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"east": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"south": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"},
-				"west": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"},
-				"up": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"},
-				"down": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"}
-			}
-		},
-		{
-			"name": "GearCaseInner",
-			"from": [2, 14, 2],
-			"to": [14, 16, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
-			"faces": {
-				"north": {"uv": [0, 6, 6, 7], "texture": "#1_2"},
-				"east": {"uv": [0, 6, 6, 7], "texture": "#1_2"},
-				"south": {"uv": [0, 6, 6, 7], "texture": "#1_2"},
-				"west": {"uv": [0, 6, 6, 7], "texture": "#1_2"},
-				"up": {"uv": [4, 0, 10, 6], "texture": "#1_2"},
-				"down": {"uv": [4, 0, 10, 6], "texture": "#1_2"}
-			}
-		},
-		{
-			"name": "GearCaseOuter",
-			"from": [4, 13, 4],
-			"to": [12, 17, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
-			"faces": {
-				"north": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
-				"east": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
-				"south": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
-				"west": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
-				"up": {"uv": [0, 0, 4, 4], "texture": "#1_2"},
-				"down": {"uv": [0, 0, 4, 4], "texture": "#1_2"}
-			}
-		},
 		{
 			"name": "Side3",
 			"from": [0, 13, 16],
@@ -370,6 +286,90 @@
 				"east": {"uv": [0, 6, 16, 10], "texture": "#4"},
 				"west": {"uv": [0, 6, 16, 10], "texture": "#4"}
 			}
+		},
+		{
+			"name": "Gear",
+			"from": [-1, 13.5, 6.5],
+			"to": [17, 16.5, 9.5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]},
+			"faces": {
+				"north": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
+				"east": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
+				"south": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
+				"west": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
+				"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
+				"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
+			}
+		},
+		{
+			"name": "Gear2",
+			"from": [-1, 13.5, 6.5],
+			"to": [17, 16.5, 9.5],
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 15, 8]},
+			"faces": {
+				"north": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
+				"east": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
+				"south": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
+				"west": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
+				"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
+				"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
+			}
+		},
+		{
+			"name": "Gear3",
+			"from": [-1, 13.5, 6.5],
+			"to": [17, 16.5, 9.5],
+			"rotation": {"angle": -45, "axis": "y", "origin": [8, 15, 8]},
+			"faces": {
+				"north": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
+				"east": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
+				"south": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
+				"west": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
+				"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
+				"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
+			}
+		},
+		{
+			"name": "Gear4",
+			"from": [6.5, 13.5, -1],
+			"to": [9.5, 16.5, 17],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]},
+			"faces": {
+				"north": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
+				"east": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
+				"south": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
+				"west": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
+				"up": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"},
+				"down": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"}
+			}
+		},
+		{
+			"name": "GearCaseInner",
+			"from": [2, 13.55, 2],
+			"to": [14, 16.45, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]},
+			"faces": {
+				"north": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"},
+				"east": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"},
+				"south": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"},
+				"west": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"},
+				"up": {"uv": [4, 0, 10, 6], "texture": "#1_2"},
+				"down": {"uv": [4, 0, 10, 6], "texture": "#1_2"}
+			}
+		},
+		{
+			"name": "GearCaseOuter",
+			"from": [4, 13, 4],
+			"to": [12, 17, 12],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]},
+			"faces": {
+				"north": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
+				"east": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
+				"south": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
+				"west": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
+				"up": {"uv": [0, 0, 4, 4], "texture": "#1_2"},
+				"down": {"uv": [0, 0, 4, 4], "texture": "#1_2"}
+			}
 		}
 	],
 	"display": {
@@ -405,33 +405,46 @@
 			"scale": [0.5, 0.5, 0.5]
 		}
 	},
-	"groups": [0, 1, 2, 3, 4, 5,
+	"groups": [
 		{
 			"name": "item",
 			"origin": [8, 8, 8],
-			"children": [6, 7,
+			"color": 0,
+			"children": [
+				0,
+				1,
 				{
 					"name": "mixerhead",
 					"origin": [8, 8, 8],
-					"children": [8, 9, 10, 11, 12, 13, 14, 15, 16]
+					"color": 0,
+					"children": [2, 3, 4, 5, 6, 7, 8, 9, 10]
 				},
 				{
 					"name": "mechanical_press_head",
 					"origin": [8, 8, 8],
-					"children": [17, 18, 19, 20, 21, 22, 23]
+					"color": 0,
+					"children": [11, 12, 13, 14, 15, 16, 17]
 				},
 				{
 					"name": "mixer_base",
 					"origin": [8, 8, 8],
+					"color": 0,
 					"children": [
 						{
 							"name": "mixerbase",
 							"origin": [8, 8, 8],
-							"children": [24, 25, 26, 27]
+							"color": 0,
+							"children": [18, 19, 20, 21]
 						}
 					]
 				}
 			]
+		},
+		{
+			"name": "cogwheel_shaftless",
+			"origin": [8, 8, 8],
+			"color": 0,
+			"children": [22, 23, 24, 25, 26, 27]
 		}
 	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/textures/block/andesite_tunnel.png b/src/main/resources/assets/create/textures/block/andesite_tunnel.png
index d9bb320f1c5b9500d296c8c3355ffa318a3619ea..8821d70868c1fe5ef7bed4104f01519b2cae7d54 100644
GIT binary patch
delta 1486
zcmV;<1u^>W2Gt9Y8Gi-<0047(dh`GQ00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m?d01m?e$8V@)000GQNkl<ZSVzTITWefZ6kc=Ye!nDXnl!Pk6|JVW
zmHY$+BlzN5srXdT_ZI4l;03A>U-~2{^hqpz5Ckb`iBc3qeSgqSFNsO0K}niq(k5rl
z+|FEcT;H16$CHzjkP^WU_Uv``Uf<qpueJ7NeCOUgXJxV(T3KG9Xf#R+UTvmn_9T*a
z=oIy$r|w?)z6)<(uwFR%EM=0JUe|UM%REW1-zk4}{Tmr%KYa1P(9ozf0I_JeClRgd
zkEk!(FLKRn(0|58nR2<L=%5d)2f#<$p9}YCb)_I}fY0aaNnNDUNvThaJ#X`E126z4
zal)*Z$*i%vVq7BKi4_8oD9z2>71?RP`t2KZ=F{(`-HmH+y-0nhUKXznG6#GOaY?5}
zWI#-afmFfjj~p8n<>OC}&=aErqK8sq>%mog0CImeA%F6j)6e*h4`-xCK^yv@gK-t#
zclM35mM|DbvDA}xc3;UTORc`$IMSJ?lNY}bSxpRF%g<SNCSRvQ;*@-2azH~iA|{o&
zAIV?HQ?5EgwZDF)lrclm^*dZoQ?_!CR`OG1{rwARtG{!(MMJ|wlF3d!N-7?dft`~p
z)ap%on1BD4%MF{ap#v@r2mLhIm!Q6MjIx<D<+#qIqFl#$&^X0oVM@e9bo5Y0bm2y|
z3MYRz7@T5mzJ`Qo*G&re{ZwzX>0p17V;ZAWB24jUhz4>Akq7#7@(nav9hnqx^8v)(
z3+Y}CJNX*60=5KV9tj7evC*iByQ1MB>7}Z;wSS@;6pM5XzzQ%a;KiR^?ru*f7LAH0
zUp#;<)@rvY6bMkM+M;ln_Z<U+DpD}kjV*xHDtPgC@_>SqFCM^_gIg5f0ZeRJmUu!T
z5)M(j-OVkm8cF2E-w9rPNkSl-3{$Jq*)pNoXh|5>Hfp4?H(*ecSE~6nIUAht;yW>#
zPJejv#Q<2-;{1Wa!M?b3s2qS12XZlLRGZXjw%9X%YI2PjB8yRQg4XJ73bJce$lO2<
zDE?+=)8_9x2Y`Kr09Pgu3I%N!BI9%HGRQDuqtswScx&=*=xl0SHid%$0C*r7kJx<o
zF37JH<g^V1Eb?hS;j2qdLVy(nG>byP?teA{Hd!eg3P>BgU^eQ~-sD&XdwS|1a`G#+
ztvP_nPahccAqVa+>f88o6a#vhk14jZ-L}Z&l{{E0((+n~mI^xG;T1AUHCkLPvtbrl
zTyT(p>*hbwEAsvE55HMB|EK;~f@~tcie+;fKcJEb*f6Su@Rp1kr6OUfa69J?rGFDa
zwjBL6adRl}??K|`<GP*tWKzCox%9jgxy3)}v6rYg{oNM6@BGE{@*<j@Uy=q~t@+zG
zY3#WZVkHzMVI1!POz4(TU;5yEd0{=y^UQt|;y?jZhf-F3JLxDHxcd23-}SG*w6AwJ
zyq;!au^JfIX>h>30`;x*V8A=?zJDhMC=UVfpvro9%K5YlVDi^qeT8oR^s}5!c&RKb
z%*%?8J^7R!1^@#=M}0f{s<rMeQQ<&wV(9^gvG=qaIn*@<kQWgi6iz~lCkNEv3Q9+<
z?%woWS+#uhFnRg1RajZHSF8YIf#HGfn_>B3ceh9mKybQV!5IR#yA|99sDCHko}YKl
zH{s)AKU@X-HvGS^)i?hEE`9W&wbye4*zv!i+Gg%NxboSRU5!@TdN1b&AO;*hd{jO<
zd`~x<CM6RoYV+A0;N(#?;Fa}GOiWBzD&cVUJE3WsBx9@9;^V%1okK@*z$oc*$5*O`
zOdbplP=q(Fsui3b@<OG;mq(UiP`O-|;*^WUq7=xwuG{VQHU!-62HfG<Ed=A^<Kh8a
o<p5;m5wxlAHlAhd5h9|00P|dgZ$(ye-v9sr07*qoM6N<$f=F@4$^ZZW

delta 866
zcmV-o1D*WU3+@Jx8Gi!+002a!ipBr{00d`2O+f$vv5yP<VFdsH0SHh`R7H!y%>V!Z
zMlu|UkB_I%*m-<;TSX>+UN?%2n@dYeN=iy(OfGj=GCn90Mn*<(Q7n5~HGp3@e}aNi
zJtTEjF{7lLTty{uQZ6_+I503Uf`^7yJRn^{Ax<_MT|y#3Eq@h)g@iddIXXHzP&XV@
zJ0Eg(a$Q0sOg9`=Iv;{zI)`L9JUl!zGc${goN8@zY)>s;LnDD;IblmKd08__Nl7#`
zG+I9*Y)&m&L?k;qJ2EmdWJoAmK_q5MDOx`xi^0uENJ!A?=~+G^YfUUmO-yf5D~M$|
zRXZPLNhqYHoPT?Me}#vJOioR3QZ9O0G)^`gsL<K8vaE`bkaKr)e1Cw3h=*flV_IEW
zrYYTu00002bW%=J_W&(!x<UW|0s~1zK~y-)g_4JI+b|4<$?l!*nPxeOoj6WnJKif^
zvMiUB!iD#LlLC~~>YUycB6a$xA0P;VIStOGF92|Qn}3;J-=((p!)-Hj#u#g@w$@x4
ztDQ5}Ef$MkXaLA4uqZM5Qj<=3K`HT8a#}eCHHF^zORd*R8GxFFLBgk;Cj+ns7-sS(
zB26-xBpd~j@?_4&@!tM;)!yBo{fsdO<beM3L=ZElR^iTvPS}~3!{y2XaVBUGGi_(5
zK|_jqvwtC$u>#N2Gy*YmdK?B_(G=$u=_3&P2osq`Fsr$22r19Iayhf$d7253DapC)
zN{rAwo6mfbxxh0Du1BIPMf1z&dN{;F5vMtLW?+URQ8^QDKfVmEepu(3a+pp$GqBfJ
zqVn!l{ppinG_*jBmBdme17gad(<z6i;j%m*jDKm1xKm0d$%H*RCdMt|_TKAp9Pd7u
z9k*$Vxb3oLAjU25E|sGDqI-vJW~9v==mp!%PCiA^GuS-boJ5<A9}zEh9hN%v(b)$&
z@nX|4?ecZ+LBNYm$lRUAKGGJ`(l~KMyx4^IPC-R3HsQTfkf7Lw%&+{lE#&<F0{#yx
z)LSHCSwVafxu8%JEY!il`^WY>J~j`3dvkM(_Tu>){J;oUlA5aFLGuXJqiXN4*E{MR
sey#Rceni?S6I`_V{fkx$=eK_UH!UFhpQU(H7XSbN07*qoM6N<$f~Y}wSO5S3

diff --git a/src/main/resources/assets/create/textures/block/brass_tunnel.png b/src/main/resources/assets/create/textures/block/brass_tunnel.png
index d07ab8491efb25571d445160564d87d59026474a..f9b7076566730ef04df6b34b8e0b02e6d26e81f1 100644
GIT binary patch
delta 1160
zcmV;31b6%R1fdC#85ITq0047(dh`GQ00DDSM?wIu&K&8HArpTIa7bBm000id000id
z0mpBsWB>pJHc3Q5R9Hv7mq}<8K@^5xPvT@U(U^>wxJKg|TtJMtoZK!0ilF2mis&H<
z9=)h14<1Ajym(O1gCe4b;3=L&R8*9p7+f&%ATGfrF0&;wlbIoH|8M&BRQFUzCjmdG
zsaMtY`qg{&s=9y1IJ0ksNj4*yf-U(|Q(J9I<%~z)INiC{G)B^NxO21JMfCCaZ(AxS
z@h#5vt=k`{X+|B(6Vd1C$jncjzfa5C>ZmRhq~UC?tOjrThH3lO7M6vH=m+eYnZKZh
zT4ztA`r43737`#NAe+upFyvBYL_fFv5>4v3T2|v77z2Mq-}RQJ`Y_j_@FcEz61f6T
zWH6a#Stg<b`U4xz(e71CjkZ}0T&o2WS=1b12ZR9D&x;J;@CB>cFo3KAU7h~T-hOjc
zQ?p?=T_iJETPo_8#Sz9aNWw41;T^ok@<@dIfVZ}&Mb!_OHDTA*5aS$rkLOL(rf@Al
z*Q;L%&~<+zAX`UGJOJbH9L6O&I-n0-tbHYDb3i-?VtnvdioV8@c5ex<e&3hkKG*R%
zF=R_6Tsa`27vMeC9LBwo@uT7hU>$V8_{_$7Z9)pV=v4|wKu$7sk3&Yt{frBK4*Uze
z4e{g6Vt5b3G9j;VIVZ%p&H){Br%tw|5>5`tM?!zL9F9~qC!}A<Wk<R8I^dUty@TIP
zNkY|uvV#a-z&IzKWgLb%B0ftXhyyxc94Dh10dc@J0i5?-TgD-a*Q#+D19VB4@7m8t
z@!1E@O{wp^9mw8z(P!eBSKmp(sWTer!}}3ufE>LjkmW;#G2WwC^m}?^ymNxx2WjEM
zBTj#9l~B#?L+prGpD!f2c#^hkUC14H(f9X1Sk?h$jJbaOB{ekEa^FPs`AW8UX@mxT
zWN7oICA^m1cRx{>N}o)SCb!q}T<t&I^~yNe(dJz7fF!8w6cs#k?u6<9ytJ{_EZgI<
z=F;zNAHUpVTs*qQ+_P;1xAA?rcmEyDnO=X46r4P;YrXT`dHkfGbHMzWG%22~a*AnM
z#xX7aDFH*yq{Miz_;P8lXl<sRXZ>8}MIyAUrIGt_q+=p5jwM3D<%E-P-RcOnE(+6*
zXbVL*&Z6q-0F7h|luM*|eWk?XX{%(4C1X(5iW<gnztslVLGs0fF~~43wSYDXFF}9I
zQkH}g{uXXb0?Tyl+H2S4<I#m}CXx&w0#|N5buEG984e>Pq;b4sr8~|Fa##S}B@`g>
zY?0BuZ_M|oe@rT6BD#X!t^dfFm&friu5&;hqC+=O<wRHCn3JwF2l(XLxwqXpK4lAe
z!Mzaw=gxJ%@tr_48Z`~0_!wu2N+4(uAUw<G^Hfz;#eEpV)4{gDmS|ouo%gD@z&N&+
z-%b#QhK4ASNKh)3;-bp&c$^F5SS;rBkGTzXc(<KOdwV-aV06^JtXQ%{1bxyj6bc*>
aBBDR7SFq}I-mbU+0000<MNUMnLSTZvRWjEA

delta 618
zcmV-w0+s!t3HSt%8Gi!+002a!ipBr{00d`2O+f$vv5yP<VFdsH0E$pdR7C&)0E@xR
ziCrwv>gn>qZK%-Mr_b1n!OhdJTf~=3z?4b6jYhhQMXrQCtbskFd^nhPG?Q>Ol5aJL
zWHyLnHHlp;h+Qm*Tr7K6E`n4jfmA4XR4sT^EO%2Zbx$jDOn)m&OG`>hN=ZpcNJvOV
zMn*h5JUcr(IyyQzIXO5uI5adgGcz+XGBPkQFxBZQ6aWAK19VbOQvmn=`;KhC0004s
zNkl<ZcmV~$%Whjo5Cy=RGtDdN5ib--hS&c8&oZ(IKm`WnIMT2uRpW&MSU>?RROgKX
zhS#gSQNZweEq~?fwbSW%x}bc$b~+tT7Ygqm5jxi_c>h@7{B9}Sbb4mE0k`!zZ*YVJ
zB74|K;B*5a1xXAy-GEO(Q@uzA+X`&~fDR?ty%JDq03<NzRRuwSK#;-i3V;Sc8tj!A
zNCN<g(sacDN&^~_g&hW>vj~_G9fqxq4TS;BTT_DRBY$HLCV_|3-RZ86he@LL<EXy%
z?dGvj`^!2X=i}*aJT}$FWlzwTy_#{^KwtLil4k%Q&j6tE^Ym*xH-bLGk8fBCQqFb9
zYDA0X->Z7~boyD&^Y@=Mr{37xw9WT%s!yZ0nJ)j#|ME10x!HSer7N8##>?>=(W0F{
z{>J^bzGHkk{Tk^yoS|57z%%^8J-h$_F8}}m0000O008g}OTns_vI_7QAUKM}QS~+j
ztXIJIZJ_sk8)ftcy%!+qkyblnjmk3sfMcKR$li1MAEElM(bkUjE&u=k07*qoM6N<$
Ef@Lld!vFvP