From d539042e2986e2e515086dad1040a0cb8cfeee31 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Thu, 24 Nov 2022 16:37:45 +0600
Subject: [PATCH 1/3] Better battery bank plug; Battery/matter banks and
 android station texture updates

---
 .../models/block/battery_bank.json            | 281 +++++++++++-------
 .../textures/block/android_station.png        | Bin 939 -> 1204 bytes
 .../block/android_station_offline.png         | Bin 397 -> 530 bytes
 .../textures/block/batterybank_frame.png      | Bin 328 -> 451 bytes
 .../block/mattercapacitorbank_frame.png       | Bin 328 -> 451 bytes
 5 files changed, 168 insertions(+), 113 deletions(-)

diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery_bank.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery_bank.json
index fa97e8bbd..c8e2cc246 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/battery_bank.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery_bank.json
@@ -1,7 +1,7 @@
 {
-	"parent": "block/block",
+	"texture_size": [32, 32],
 	"textures": {
-		"1": "overdrive_that_matters:block/batterybank_frame",
+		"0": "overdrive_that_matters:block/batterybank_frame",
 		"particle": "overdrive_that_matters:block/batterybank_frame"
 	},
 	"elements": [
@@ -10,12 +10,12 @@
 			"from": [14, 0, 0],
 			"to": [16, 2, 16],
 			"faces": {
-				"north": {"uv": [8, 1, 9, 2], "texture": "#1"},
-				"east": {"uv": [8, 1, 16, 2], "texture": "#1"},
-				"south": {"uv": [15, 1, 16, 2], "texture": "#1"},
-				"west": {"uv": [8, 1, 16, 2], "texture": "#1"},
-				"up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#1"},
-				"down": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#1"}
+				"north": {"uv": [8, 1, 9, 2], "texture": "#0"},
+				"east": {"uv": [8, 1, 16, 2], "texture": "#0"},
+				"south": {"uv": [15, 1, 16, 2], "texture": "#0"},
+				"west": {"uv": [8, 1, 16, 2], "texture": "#0"},
+				"up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
@@ -23,12 +23,12 @@
 			"from": [0, 0, 0],
 			"to": [2, 2, 16],
 			"faces": {
-				"north": {"uv": [8, 1, 9, 2], "texture": "#1"},
-				"east": {"uv": [8, 1, 16, 2], "texture": "#1"},
-				"south": {"uv": [15, 1, 16, 2], "texture": "#1"},
-				"west": {"uv": [8, 1, 16, 2], "texture": "#1"},
-				"up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#1"},
-				"down": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#1"}
+				"north": {"uv": [8, 1, 9, 2], "texture": "#0"},
+				"east": {"uv": [8, 1, 16, 2], "texture": "#0"},
+				"south": {"uv": [15, 1, 16, 2], "texture": "#0"},
+				"west": {"uv": [8, 1, 16, 2], "texture": "#0"},
+				"up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
@@ -36,12 +36,12 @@
 			"from": [2, 0, 0],
 			"to": [14, 2, 2],
 			"faces": {
-				"north": {"uv": [9, 1, 15, 2], "texture": "#1"},
-				"east": {"uv": [0, 0, 2, 2], "texture": "#1"},
-				"south": {"uv": [9, 1, 15, 2], "texture": "#1"},
-				"west": {"uv": [0, 0, 2, 2], "texture": "#1"},
-				"up": {"uv": [9, 0, 15, 1], "texture": "#1"},
-				"down": {"uv": [9, 2, 15, 3], "texture": "#1"}
+				"north": {"uv": [9, 1, 15, 2], "texture": "#0"},
+				"east": {"uv": [0, 0, 2, 2], "texture": "#0"},
+				"south": {"uv": [9, 1, 15, 2], "texture": "#0"},
+				"west": {"uv": [0, 0, 2, 2], "texture": "#0"},
+				"up": {"uv": [9, 0, 15, 1], "texture": "#0"},
+				"down": {"uv": [9, 2, 15, 3], "texture": "#0"}
 			}
 		},
 		{
@@ -49,12 +49,12 @@
 			"from": [2, 0, 14],
 			"to": [14, 2, 16],
 			"faces": {
-				"north": {"uv": [9, 1, 15, 2], "texture": "#1"},
-				"east": {"uv": [0, 0, 2, 2], "texture": "#1"},
-				"south": {"uv": [9, 1, 15, 2], "texture": "#1"},
-				"west": {"uv": [0, 0, 2, 2], "texture": "#1"},
-				"up": {"uv": [9, 0, 15, 1], "texture": "#1"},
-				"down": {"uv": [9, 2, 15, 3], "texture": "#1"}
+				"north": {"uv": [9, 1, 15, 2], "texture": "#0"},
+				"east": {"uv": [0, 0, 2, 2], "texture": "#0"},
+				"south": {"uv": [9, 1, 15, 2], "texture": "#0"},
+				"west": {"uv": [0, 0, 2, 2], "texture": "#0"},
+				"up": {"uv": [9, 0, 15, 1], "texture": "#0"},
+				"down": {"uv": [9, 2, 15, 3], "texture": "#0"}
 			}
 		},
 		{
@@ -62,12 +62,12 @@
 			"from": [2, 14, 0],
 			"to": [14, 16, 2],
 			"faces": {
-				"north": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#1"},
-				"east": {"uv": [0, 0, 2, 2], "texture": "#1"},
-				"south": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#1"},
-				"west": {"uv": [0, 0, 2, 2], "texture": "#1"},
-				"up": {"uv": [9, 2, 15, 3], "texture": "#1"},
-				"down": {"uv": [9, 0, 15, 1], "texture": "#1"}
+				"north": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [0, 0, 2, 2], "texture": "#0"},
+				"south": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#0"},
+				"west": {"uv": [0, 0, 2, 2], "texture": "#0"},
+				"up": {"uv": [9, 2, 15, 3], "texture": "#0"},
+				"down": {"uv": [9, 0, 15, 1], "texture": "#0"}
 			}
 		},
 		{
@@ -75,12 +75,12 @@
 			"from": [0, 14, 0],
 			"to": [2, 16, 16],
 			"faces": {
-				"north": {"uv": [15, 0, 16, 1], "texture": "#1"},
-				"east": {"uv": [8, 0, 16, 2], "texture": "#1"},
-				"south": {"uv": [8, 0, 9, 1], "texture": "#1"},
-				"west": {"uv": [8, 1, 16, 2], "rotation": 180, "texture": "#1"},
-				"up": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#1"},
-				"down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#1"}
+				"north": {"uv": [15, 0, 16, 1], "texture": "#0"},
+				"east": {"uv": [8, 0, 16, 2], "texture": "#0"},
+				"south": {"uv": [8, 0, 9, 1], "texture": "#0"},
+				"west": {"uv": [8, 1, 16, 2], "rotation": 180, "texture": "#0"},
+				"up": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
@@ -88,12 +88,12 @@
 			"from": [2, 14, 14],
 			"to": [14, 16, 16],
 			"faces": {
-				"north": {"uv": [9, 0, 15, 2], "texture": "#1"},
-				"east": {"uv": [0, 0, 2, 2], "texture": "#1"},
-				"south": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#1"},
-				"west": {"uv": [0, 0, 2, 2], "texture": "#1"},
-				"up": {"uv": [9, 2, 15, 3], "texture": "#1"},
-				"down": {"uv": [9, 0, 15, 1], "texture": "#1"}
+				"north": {"uv": [9, 0, 15, 2], "texture": "#0"},
+				"east": {"uv": [0, 0, 2, 2], "texture": "#0"},
+				"south": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#0"},
+				"west": {"uv": [0, 0, 2, 2], "texture": "#0"},
+				"up": {"uv": [9, 2, 15, 3], "texture": "#0"},
+				"down": {"uv": [9, 0, 15, 1], "texture": "#0"}
 			}
 		},
 		{
@@ -101,12 +101,12 @@
 			"from": [14, 14, 0],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [8, 0, 9, 1], "texture": "#1"},
-				"east": {"uv": [8, 1, 16, 2], "rotation": 180, "texture": "#1"},
-				"south": {"uv": [15, 0, 16, 1], "texture": "#1"},
-				"west": {"uv": [8, 0, 16, 2], "texture": "#1"},
-				"up": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#1"},
-				"down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#1"}
+				"north": {"uv": [8, 0, 9, 1], "texture": "#0"},
+				"east": {"uv": [8, 1, 16, 2], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [15, 0, 16, 1], "texture": "#0"},
+				"west": {"uv": [8, 0, 16, 2], "texture": "#0"},
+				"up": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
@@ -114,121 +114,176 @@
 			"from": [1, 1, 7],
 			"to": [15, 15, 9],
 			"faces": {
-				"north": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#1"},
-				"east": {"uv": [0.5, 0, 1.5, 7.5], "texture": "#1"},
-				"south": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#1"},
-				"west": {"uv": [0.5, 0, 1.5, 7.5], "texture": "#1"},
-				"up": {"uv": [0.5, 0, 7.5, 1], "rotation": 180, "texture": "#1"},
-				"down": {"uv": [0.5, 6.5, 7.5, 7.5], "texture": "#1"}
+				"north": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#0"},
+				"east": {"uv": [0.5, 0, 1.5, 7.5], "texture": "#0"},
+				"south": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#0"},
+				"west": {"uv": [0.5, 0, 1.5, 7.5], "texture": "#0"},
+				"up": {"uv": [0.5, 0, 7.5, 1], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 6.5, 7.5, 7.5], "texture": "#0"}
 			}
 		},
 		{
 			"from": [2, 0.5, 2],
 			"to": [14, 1.5, 14],
 			"faces": {
-				"north": {"uv": [0, 0, 6, 0.5], "texture": "#missing"},
-				"east": {"uv": [0, 0, 6, 0.5], "texture": "#missing"},
-				"south": {"uv": [0, 0, 6, 0.5], "texture": "#missing"},
-				"west": {"uv": [0, 0, 6, 0.5], "texture": "#missing"},
-				"up": {"uv": [10, 3, 16, 9], "texture": "#1"},
-				"down": {"uv": [10, 3, 16, 9], "texture": "#1"}
+				"north": {"uv": [0, 0, 6, 0.5], "texture": "#0"},
+				"east": {"uv": [0, 0, 6, 0.5], "texture": "#0"},
+				"south": {"uv": [0, 0, 6, 0.5], "texture": "#0"},
+				"west": {"uv": [0, 0, 6, 0.5], "texture": "#0"},
+				"up": {"uv": [10, 3, 16, 9], "texture": "#0"},
+				"down": {"uv": [10, 3, 16, 9], "texture": "#0"}
 			}
 		},
 		{
 			"from": [2, 14.5, 2],
 			"to": [14, 15.5, 14],
 			"faces": {
-				"north": {"uv": [0, 0, 6, 0.5], "texture": "#missing"},
-				"east": {"uv": [0, 0, 6, 0.5], "texture": "#missing"},
-				"south": {"uv": [0, 0, 6, 0.5], "texture": "#missing"},
-				"west": {"uv": [0, 0, 6, 0.5], "texture": "#missing"},
-				"up": {"uv": [10, 3, 16, 9], "texture": "#1"},
-				"down": {"uv": [10, 3, 16, 9], "texture": "#1"}
+				"north": {"uv": [0, 0, 6, 0.5], "texture": "#0"},
+				"east": {"uv": [0, 0, 6, 0.5], "texture": "#0"},
+				"south": {"uv": [0, 0, 6, 0.5], "texture": "#0"},
+				"west": {"uv": [0, 0, 6, 0.5], "texture": "#0"},
+				"up": {"uv": [10, 3, 16, 9], "texture": "#0"},
+				"down": {"uv": [10, 3, 16, 9], "texture": "#0"}
 			}
 		},
 		{
-			"from": [3, 3, 0],
-			"to": [13, 13, 3],
+			"from": [5, 5, 0],
+			"to": [11, 11, 3],
 			"faces": {
-				"north": {"uv": [0.5, 11.5, 4.5, 15.5], "texture": "#1"},
-				"east": {"uv": [6.5, 11.5, 5, 15.5], "texture": "#1"},
-				"south": {"uv": [7, 11.5, 11, 15.5], "texture": "#1"},
-				"west": {"uv": [5, 11.5, 6.5, 15.5], "texture": "#1"},
-				"up": {"uv": [5, 11.5, 6.5, 15.5], "rotation": 90, "texture": "#1"},
-				"down": {"uv": [5, 11.5, 6.5, 15.5], "rotation": 270, "texture": "#1"}
+				"north": {"uv": [0, 8, 3, 11], "texture": "#0"},
+				"east": {"uv": [4, 8, 3, 11], "texture": "#0"},
+				"south": {"uv": [4, 8, 7, 11], "texture": "#0"},
+				"west": {"uv": [3, 8, 4, 11], "texture": "#0"},
+				"up": {"uv": [3, 8, 4, 11], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [3, 8, 4, 11], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
 			"from": [1, 2, 2],
 			"to": [2, 14, 4],
 			"faces": {
-				"north": {"uv": [11.5, 10, 12, 16], "texture": "#1"},
-				"east": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"},
-				"south": {"uv": [12, 10, 12.5, 16], "texture": "#1"},
-				"west": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"},
-				"up": {"uv": [0, 0, 0.5, 1], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}
+				"north": {"uv": [11.5, 10, 12, 16], "texture": "#0"},
+				"east": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"},
+				"south": {"uv": [12, 10, 12.5, 16], "texture": "#0"},
+				"west": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.5, 1], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 1], "texture": "#0"}
 			}
 		},
 		{
 			"from": [1, 2, 12],
 			"to": [2, 14, 14],
 			"faces": {
-				"north": {"uv": [11.5, 10, 12, 16], "texture": "#1"},
-				"east": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"},
-				"south": {"uv": [12, 10, 12.5, 16], "texture": "#1"},
-				"west": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"},
-				"up": {"uv": [0, 0, 0.5, 1], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}
+				"north": {"uv": [11.5, 10, 12, 16], "texture": "#0"},
+				"east": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"},
+				"south": {"uv": [12, 10, 12.5, 16], "texture": "#0"},
+				"west": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.5, 1], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 1], "texture": "#0"}
 			}
 		},
 		{
 			"from": [14, 2, 12],
 			"to": [15, 14, 14],
 			"faces": {
-				"north": {"uv": [11.5, 10, 12, 16], "texture": "#1"},
-				"east": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"},
-				"south": {"uv": [12, 10, 12.5, 16], "texture": "#1"},
-				"west": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"},
-				"up": {"uv": [0, 0, 0.5, 1], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}
+				"north": {"uv": [11.5, 10, 12, 16], "texture": "#0"},
+				"east": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"},
+				"south": {"uv": [12, 10, 12.5, 16], "texture": "#0"},
+				"west": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.5, 1], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 1], "texture": "#0"}
 			}
 		},
 		{
 			"from": [14, 2, 2],
 			"to": [15, 14, 4],
 			"faces": {
-				"north": {"uv": [11.5, 10, 12, 16], "texture": "#1"},
-				"east": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"},
-				"south": {"uv": [12, 10, 12.5, 16], "texture": "#1"},
-				"west": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"},
-				"up": {"uv": [0, 0, 0.5, 1], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}
+				"north": {"uv": [11.5, 10, 12, 16], "texture": "#0"},
+				"east": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"},
+				"south": {"uv": [12, 10, 12.5, 16], "texture": "#0"},
+				"west": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.5, 1], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 1], "texture": "#0"}
+			}
+		},
+		{
+			"from": [2, 10, 2.5],
+			"to": [14, 12, 3.5],
+			"faces": {
+				"north": {"uv": [11.5, 10, 12.5, 16], "rotation": 90, "texture": "#0"},
+				"east": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"south": {"uv": [11.5, 10, 12.5, 16], "rotation": 90, "texture": "#0"},
+				"west": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"up": {"uv": [11.5, 10, 12, 16], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [11.5, 10, 12, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [2, 4, 2.5],
+			"to": [14, 6, 3.5],
+			"faces": {
+				"north": {"uv": [11.5, 10, 12.5, 16], "rotation": 90, "texture": "#0"},
+				"east": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"south": {"uv": [11.5, 10, 12.5, 16], "rotation": 90, "texture": "#0"},
+				"west": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"up": {"uv": [11.5, 10, 12, 16], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [11.5, 10, 12, 16], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
 			"from": [0, 2, 6],
 			"to": [2, 14, 10],
 			"faces": {
-				"north": {"uv": [14.5, 10, 15.5, 16], "texture": "#1"},
-				"east": {"uv": [12.5, 10, 14.5, 16], "texture": "#1"},
-				"south": {"uv": [14.5, 10, 15.5, 16], "texture": "#1"},
-				"west": {"uv": [12.5, 10, 14.5, 16], "texture": "#1"},
-				"up": {"uv": [0, 0, 1, 2], "texture": "#missing"},
-				"down": {"uv": [0, 0, 1, 2], "texture": "#missing"}
+				"north": {"uv": [14.5, 10, 15.5, 16], "texture": "#0"},
+				"east": {"uv": [12.5, 10, 14.5, 16], "texture": "#0"},
+				"south": {"uv": [14.5, 10, 15.5, 16], "texture": "#0"},
+				"west": {"uv": [12.5, 10, 14.5, 16], "texture": "#0"},
+				"up": {"uv": [0, 0, 1, 2], "texture": "#0"},
+				"down": {"uv": [0, 0, 1, 2], "texture": "#0"}
 			}
 		},
 		{
 			"from": [14, 2, 6],
 			"to": [16, 14, 10],
 			"faces": {
-				"north": {"uv": [14.5, 10, 15.5, 16], "texture": "#1"},
-				"east": {"uv": [12.5, 10, 14.5, 16], "texture": "#1"},
-				"south": {"uv": [14.5, 10, 15.5, 16], "texture": "#1"},
-				"west": {"uv": [12.5, 10, 14.5, 16], "texture": "#1"},
-				"up": {"uv": [0, 0, 1, 2], "texture": "#missing"},
-				"down": {"uv": [0, 0, 1, 2], "texture": "#missing"}
+				"north": {"uv": [14.5, 10, 15.5, 16], "texture": "#0"},
+				"east": {"uv": [12.5, 10, 14.5, 16], "texture": "#0"},
+				"south": {"uv": [14.5, 10, 15.5, 16], "texture": "#0"},
+				"west": {"uv": [12.5, 10, 14.5, 16], "texture": "#0"},
+				"up": {"uv": [0, 0, 1, 2], "texture": "#0"},
+				"down": {"uv": [0, 0, 1, 2], "texture": "#0"}
 			}
 		}
-	]
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 45, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, 225, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		},
+		"gui": {
+			"rotation": [30, 225, 0],
+			"scale": [0.625, 0.625, 0.625]
+		},
+		"fixed": {
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png
index e198859cf000e2fae6d9c6c6b2ed6b4b5a057248..e63176da71abc9d6983c2f0f7286912ad5a6d520 100644
GIT binary patch
delta 1146
zcmV-=1cm#n2eb*0Nq@fp01m$aI0aKA000C@Nkl<ZXhZFoK}b|V7{_N9Bwe>wI<(+H
zJ!}+7pphLG%1eZGse@g_gF*y?o@4VCZQD%<!9%1M^ITn&=u&~FvXf!4fp$=o5I5J=
z^03YSbH3Nx@xArEHxH!n2gA&K^L;bld^2xmb|c;0-Q}jHCVw$GIVl<&8^!YSvRHk$
zCX!c92|Fxfo!;JFvA(`8ip8Rc$KzsteqLz`(c0Qda^wJQZaU-uDq~|~qPe+Qtgfz-
zLTzoW*xA{koIyRAOp2wYB{48CV0An@JF7JOkxr*Y6ot*rO%m+x?$RJjufL0pjSVUz
zNBZ*WE7hR`*nfs+#qC}abOCH5R5GBWqoZ6X6s*p@fT$uR5{bPCgvsNfHCkJzgf<;x
z2Y90~gSnV0?MH8et+4}`Sx{gbdIaojeeR^>Mko<5#n=J+;i6N2?ky!ZU~B9E4x*sI
zHuMOLW=g8GAHD7WI*4$5bH@iI=rYC;=<Dk%n_Nc54u9Y_HNK9~I59Cn4f%XtWHK4b
zYieq&+b@+$iCiv6Iq2{2w@yLW4-XGpZ3ltAv)SyP19vkI%StYe)zyn%+gsxIN}lRa
zK<7Nr$<uA5!$6l|TYEbL`KLE8Mf=s8R?e6&!JQ#%0-&z`xGD*;y|wpdU>Vo#gyKN{
z!+TY8#(%z)c2XBFhvxv^iGIM_5)K%j1NM;n1-8ZxIIXK6LOThAa;Qsy=p9-F@MVOu
z2TTYp0+@|o_+0q+Hz9C3<-BreOTZXAfQ=M10{99-y^P!<0SBEfr1PCO!oQ9IW`@W(
z9a1dkJaTX3DRmH&m68-9kDo}8vJ=Ih1yvHH&wm89j|@E+DeEtrYB=ed*hg9L;@K0*
zQRl>U#!VLlwU4y5wUtYy68#O+(9j@au~@}s(l?M@7e6c@H?fbD7q8!^79kd8T8Okv
z&q>(@<Pf5aT&tgzsRi{*w|`{OIbKBQ)C+I`FCsWb4#>_QsWxB0w*A&h79HWAGmZe@
zS$}gh^a$V|ImmDjVdgY5dxFdfy&W^h;DE!=gK`d7&JMx`ws2s9Boc&~lM?MiZ^NvS
z5K^x|m+hj}2J-+#PoH@;SPvTzgmM`Lf%k;#Q7qTFM->SfsVP;oz+O0W?b}D5jUV6u
zHe}TZU{JS#RgvJ?1R>B8@V?>P%i6n9)qepjgT54DgM)}pJ<gTf6R-)o2LS$CvOYsU
zgJWP-B!cV#wuy3QdZ%7sr?H#Sp%+J34>kaMpo>ZpIN|1qo1-|_k^KBThc4S;4~)v0
z45~I?NZTHH89m2WpkGFA=$8>WAm!s6PM)E?jxx(7xQan2*YOcY96EFqt1|6;{c|e_
z3x}_XU<bNnqxCS=m2}*kvky{j0<s+!Tw11adXOjqzUvv(?Hn{1mr3XyoW6_FeyZX&
zR1HjpGu39~1vN>`8fW$l_gC>G^Wp?MtV9(kd%`v;P|@e#ex~RC0Q;0PyD<^7!vFvP
M07*qoM6N<$f~|QMF8}}l

delta 879
zcmV-#1Cac*39AQ?Nq@iq01m(bYSxJf0009(Nkl<ZXhZFoJ!n%=6vyw&ltr@HF-0;I
zItWUNWN;Je;OJ5ik}+U$ZzqMQn@b_!U?+pFI<)BK5Ja%x5Qq{aaS&P@5?r#y`#-rS
zz3;w{-1qK#m6rbCaL@fd=e+yQeTi4E*JtH&S+v`2fpRn&iGSlyCt~IHRiVReJf_)f
zQpxmsJ*5e;zP?T+#sVG}HYQ-eWHO<SC`zSLz<_SIOJ!1OwVEg>eZhD<7T@3fpi&oZ
zGhwgLKb=mk1Y-f_dZal}tyX7<8ZT}`u~;NQGy@TE<@xrB(t?EbIY$6z2xlNo1VYci
zS>tQ~ziMF|e}B125(Va-{|M;G$Yf>XD@hcXd;TM!r&o~VHN04fX!PONV&P?iu}o%(
zC=EzNnHYdF?5efCj-l-D?^DBIFc7U)D{#0lVRv^|R4Ns!HyRBp8NF{Aya({MpS&Og
zbpHPQrZhiSu3cAJaz4NBh+Frz7A52S2p&Az2{@31On(gMcR#9HGS+H$vNIqqC5M3n
z3Ij4t#aPrvbTYpS5Q#W3$?Y<V^I9ht1F)g#d6W^kMSzL(9^`5OM<R|~4Oq50$i)DD
z=DI`~lUoF^p)OHmZh+~zDJK6t6<>_YNU5pt9>09!w16w2Uqolg;w^Z)_e^Qa2^*Vs
zzK0(cP=9cW!(Njx!p5eZ@6CpHcSsXrD5dYM9vsQG8z|8T9i>rUld_8X#{EC^dFy0=
zT>L535`wv|2H*_9bMj0Vw1r{zV=+ilcpePs&zt69W>HN6%szO+Vv9bf5Vx5H6g?Mm
zyA5rLOvUm!pZ<Q5$VhdRx&UWE9>VDVU@VA@0Dm@(+E}U1q<RE=ZXC}K5o-V*gZU`3
z28oEW9+#@!3e0gn18KsEjg{(5ffq}&XjW%nbFR*fh%zL~P)?~y(y=}VXJAiy@=*09
zLeAZiXW%t-EM}XI^|AC8=w3lL>s%_KH$w`pak`Q(x#V0!saWZhSh$`=lF`As`uYqT
zuxKee7aykPAd@KL^iAR%ko~yeYEoX&2Z?IHJAH_{&a%x|r$&2_eTQ;>$9Eg54#sCp
zoJTe&C*k#PDTlnC?~}~N2sT(X`B3u-%_-np^K_kqqkoe&VShde?C}5q002ovPDHLk
FV1k&4oaX=l

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_offline.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_offline.png
index 5d2bef60427b59e3fbe695692579743840bd57f6..faee6d94ea249db7b4475739d95e596c4ef395b0 100644
GIT binary patch
delta 475
zcmeBWp2RZ2vEC-YC&V=*B&4XQNK8!3z`!6OA;Hwtw7$MxPEJluO^u6->;M1%w{PE0
zt8B?_>JLfDjm@tr@1NZ`Yenyh?F<YIeNGK&KuV+}$S)YE5*;x3`#%>1%5xTYL>4nJ
z@ErhQ#;j|doD2+%_MY`Fjv*f2Zzn%2YgXWK3wD~KDHePGf9!Y0n|&O%FL&+VJukR9
zhFNXOi)S}9-{j5P(@`-?jkiNh{j<z7fkQfc{ep8EE~Y7Pe(qHGvV*~~^n=fjfVQT5
z*87}SxUO&pYy0dMKcjlach>x$UJLzrxUU*$gj~<tucN)u;PNh=iU)<i>(h=}9NXdA
zU))r1dz;Y_*@+LjHby_<3-bD@-u^u<fwjA7;sR3*o|Y?ICr^E7D~LRFt2sh4WrAbL
zI)kV~B4>P~B;zzh9xrIPwYG7B=g!A3%=K=4Pqw$yK3@3dy5UsgB~v~a9h+FZV|wwj
zL~AuZy(hU(Z55}y-f?@$hRgd|3hr=+=$vS{K9O0n#ac0Z`4z?|vr3&#yw^S<SoJV{
zR|2PvK*=g2p?~unmuoHia4kHd)yO+`cBrJ;>74IV>lY?*^dA?W`7@2>=Pmi=z#wMu
MboFyt=akR{0O+&XlmGw#

delta 341
zcmbQl(#t%-v0f#>C&V=&A)&s$UQA5P)YMc>O-)Wt?*IS)w{PFhZR(HBuWFpNf`Ne{
zR@{9Zkm4x`@(Tva!T^KN{d4Dl;+zE@k;M!Qd<Q|8amU2$w?M&Lo-U3d9^P*!MT<2n
z@VGELZYll$`>g=ewD6U`Uca@py5L=ZL}B8_9MNrU9Wx|1dkDD{T;o(aGNYqOYy#JY
z={==B)vUW+OE<&_t`K>#C&BCB9PxMWAJ)k)Tbsw{{oMF%;pFexCwx|aPwa_KI$FTp
zQrXMiBmeKxshQ!f+AYgvzp%V*ydYj;D8ac)CQ;+WC;6r;6AZ*2<?5(BeWko?c1W93
znx8_=MNuv*C)T~{SLO#Yv#b{M&^i7iru(|rbdIFWCx1J=@MCNCYn|lYF-QDg#@8ns
jmN}hOc2PUDubyFHtabO<q-)hce=>Nw`njxgN@xNAud|j>

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame.png
index 7d03dbf1ce648286add240a479fc37df7f132e3a..223803a70cd3d7ce9bf0359f923b260472a557ec 100644
GIT binary patch
delta 396
zcmX@XbeMU9W4(HSPl#(sNQi-ffvKr!LPCO=n3$ZLoSK?iY<^W*WlL^Te^F5p7Z(=;
z1H<uReKR1%TN30K{2vK0*uGF|14?ifctjR6F!1dMVMYtqU=;=iMjlTW#}Etu)=80*
znhkhdw$7+{{O|ePylCeI1q(ha)=&MiMyyYD$+!6{cI=+P^+-p#kE!Xjhrk6zcAKSV
zC#iBIdcVBg>Bu0m|9m<N!z}NWTdy!Zy~@I1%5p$VEIlD{qqB$8uDfai0j3^;V%9yJ
zJ}YKy*f673CMtS?(5!}Kg-j1^60b1ri0t81VcM{BYb>KygR{B9zDE}}G7E8a&e&f6
zY>!B$@08p)5tEugv7X2FXX>|~WGOIc;XD^O!|A|nmUFw9<gQL$#u`;qB`0<v#;H{N
z$7jVN={-j>J|~>4h)VrGZ|AAnJu}!Hir!m3pU<FERlg}fIpDSbfi2(qbmepyY$7}M
m>-_vRbG`V{?6#8s%un>BI1PU`JOu_9gQu$>tIIm4geCy@0-~J&

delta 272
zcmX@ie1d6$W4&mAPl#(mLV~HOshF6UnwnZ{epPN$KLZ29?Xv0XfE0U4kYDhBFkq1K
zW_AM#aTa()7BevL9ROj*tZSW|K*5!sE{-7<{%a>O@*Pp&U};_Szy8x(Cc|5szumes
zL&TIhBH7dB*-4oLTNkWqx_CIq;t2zXUc}q_8=DSEC+1vqP!YJeo=YSpLG#G0l-A?A
zNxo%H?{cGBo;sxqorq`2o8x&ml54xDTO4;K(@qhumB-pI{+NC8LqJyR1BVk)kDR>N
z4o*mNQ~c!Y5c^0pWFuc=c!iJ)8)NhQ-UsIni|v=Wv~a?X2SSJ6x~5Ls!XMAYBOY<4
RwH)LX22WQ%mvv4FO#tXjZOZ@v

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame.png
index 97841ad7020ae21a6c586e1309d019801af0784b..223803a70cd3d7ce9bf0359f923b260472a557ec 100644
GIT binary patch
delta 396
zcmX@XbeMU9W4(HSPl#(sNQi-ffvKr!LPCO=n3$ZLoSK?iY<^W*WlL^Te^F5p7Z(=;
z1H<uReKR1%TN30K{2vK0*uGF|14?ifctjR6F!1dMVMYtqU=;=iMjlTW#}Etu)=80*
znhkhdw$7+{{O|ePylCeI1q(ha)=&MiMyyYD$+!6{cI=+P^+-p#kE!Xjhrk6zcAKSV
zC#iBIdcVBg>Bu0m|9m<N!z}NWTdy!Zy~@I1%5p$VEIlD{qqB$8uDfai0j3^;V%9yJ
zJ}YKy*f673CMtS?(5!}Kg-j1^60b1ri0t81VcM{BYb>KygR{B9zDE}}G7E8a&e&f6
zY>!B$@08p)5tEugv7X2FXX>|~WGOIc;XD^O!|A|nmUFw9<gQL$#u`;qB`0<v#;H{N
z$7jVN={-j>J|~>4h)VrGZ|AAnJu}!Hir!m3pU<FERlg}fIpDSbfi2(qbmepyY$7}M
m>-_vRbG`V{?6#8s%un>BI1PU`JOu_9gQu$>tIIm4geCy@0-~J&

delta 272
zcmX@ie1d6$W4&mAPl#(mLV~HOshF6UnwnZ{epPN$KLZ29?Xv0XfE0U4kYDhBFkq1K
zW_AM#aTa()7BevL?FV5-3)Wy2px{bR7sn6_|Fx4C`Hm=Xu(U4vU;pVXli{t+-)`NR
zA!5oLk?iU6?4-<rtqWE)T|69Q@q~dxFXC<ejZKH76LT&)s0dtK&n1$Qpm}6gO6zgm
zB;PWpcezn5Po2_*PQ<h1&GEb&$+cb7EsndAX{U(S%46*pf6PAlAt0;ufy0TYM^0XB
z2PY)CDSmQxh<zj)vXQSbyh6x@jj?%t?}KxP#rDfwS~y|H1EIrjT~nuR;g9Fy5sx_2
RS`P9GgQu&X%Q~loCIAUgY^wkO


From 768bd83920d1fa3b3782a7c1ad88ac2c871c7083 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Thu, 24 Nov 2022 18:33:13 +0600
Subject: [PATCH 2/3] Matter decomposer texture update; Why is this widget
 colored like that

---
 .../textures/block/matter_decomposer.png        | Bin 486 -> 807 bytes
 .../textures/gui/widgets/vertical_gauges.png    | Bin 494 -> 494 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer.png
index 4a4fcc0dbbbe1e83d52216dbe1d815d62c0209e6..18e8653822094befcf294524026dc5fe2390c683 100644
GIT binary patch
delta 734
zcmV<40wMk81E&U%L0vXbOjJd3a&jgnCVzi_H8nL<R8(MKU`PMEH^z__78Z@Dw}G0d
zcaNKGf{$i-g#Z8lhlhtSFfafB0E1B3DF6Tf5_D2dQ~&?}|NsC0|NsC0|NsC0|Nj8u
zzrPZZeiwfNTuDShR9Hvtm2GpRAP|HZ2NHGVWdHx4y`Eu27ukz1`H;HGlPZX=(>6G*
z?s=16fnNdPe-Lnv$lZ`}u4C@*2oMu9+0g|c0EIgOx0mn@n@IN@co4iDUBG=Pc60&v
zso2p4%t24UPMyOX+z>Da4D8f7et-kl0oO}6*r|VWICN3)9s(D;NjfnIvI&yx0gS`A
z;lcbE$6=6p7_6?~e6Iw`Gfz7rQCw%MD{KVd#6v&~d9S64ghkdV;JnopT*v~Rd$|Gv
z#Mswh)xhqMc`pD5CgA0<Y#n@ltbgH42Q&o{*lfj%gNA_pzAixp$f`luI%q9HH_5L8
zwuFDkqRVkIi<yRi)mNLi*#qqTauaZ13AjogS8-5bb%mWkjB!F0rUm&Ql{&|0b%oMM
zi@={Ru)0F&0}~*<%|EcZ!e$A%mFw^zO^lO*&Q@0_ORzAZ0bawCH&xt86q=7Q|BNu>
zGfPy5XYvyCg@yoLNwXmB<2vW+@QA=XOR;~9ZyHJNCzE>g@_JlADn0qRgNlv~fy8(t
zr^JalQO~Ik&lEVIlvxD0A;3vr>6tzuOm=fcmw<S|fsTzdiUTu{9aQ1LlHdTU>Z2im
zt5BRtIH<#u9pEA9*bvYSFyLYHA~5jE$5N!#FgEspO1Xkoehp8QZw5XbdGz~Meie2|
zWSLn()jW%UjD8;`X~31V4-+1~J_Q{QI6!<58vQ=WybDjw&cQG~f=3#WN*^%Wb#G}2
zXq=Z=+jVcL1elh>;{x>_oL)lJNT(gtt!(EHV`0ijnC$#vc5$}z2YEjK0wnp+7fRVV
Q7XSbN07*qoM6N<$g7!#PjsO4v

delta 411
zcmV;M0c8HC2Id2hK|LN&OjJdGe}6SKHDF+1NB_Gw#*h{k7J-_mZGw;g|Nj6003yYC
zW&i*H3UpFVQ~&?}|NsC0|Nj88%q-85o)>=sJ4r-AR9HvtmWy)2AP_|XO*Q}j!|vnm
z1|?~bHSOqlIu0eU$4h`2(;Vb0_zIX$5TulI3TWbjETA_)T=4(zAS@^XdIO}BfZhP<
zETA_45=_H;i39<`2P9CY;lqG~6c&`iYhZp_?4h)%b5fZEl;?bDv4_&4&S?c2NK1bh
z?He5ezMQER=me!lP<U5r!TGfObqlIjF_xef>?J^<;Y-Nk?MQ$^qkV~Y^ejOqdV&W~
z=d^+yQ0Fv)>kg=MUZ21&%~p##XDxxn&{kinv629w-gdzt0S1I$1jggRIbM+SvVQ*e
z4Fxm{g9LS+-UW;}asp~75r)V=B%o7;v4cKSPXgSTg?mAJnNa88dlyLH^dzuLV=d-w
zvL+}+>b1qZO%6#A7X0xNcyk=;;CVNcpcXv;Ln$bj=NlskY@;j0E&l)j002ovPDHLk
FV1nNBxs(6^

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/vertical_gauges.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/vertical_gauges.png
index 8f94dd84e0dc350cc057960fe8194c5a494890e0..677f594224305e4809a7e27d13ed3ee6f2725ae8 100644
GIT binary patch
delta 50
zcmaFI{Em4-kfi(n-Opbz0KtKS4Ccosq@;q_%{5}V6SI}L4l*$C9c0`wG5hVt>EVn3
D_G=RX

delta 50
zcmaFI{Em4-kfiys3C~|J0KtKS4DSDTr=)_|P4^4ePs~>0I>f-hcZg9`!>eKA^l(N1
D`alwB


From 6ead1cfaf5157435929c0d5b72b2c0d0717c6eb0 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Thu, 24 Nov 2022 19:01:07 +0600
Subject: [PATCH 3/3] Let there be light. (For batteries)

---
 .../models/block/battery/battery0.json           | 16 +++++++++++++++-
 .../models/block/battery/battery6.json           | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery0.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery0.json
index 6e75065c7..194766728 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery0.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery0.json
@@ -1,4 +1,5 @@
 {
+	"credit": "Made with Blockbench",
 	"texture_size": [32, 16],
 	"textures": {
 		"1": "overdrive_that_matters:block/batterybank_core"
@@ -9,13 +10,26 @@
 			"from": [11, 2, 1],
 			"to": [13, 7, 7],
 			"faces": {
-				"north": {"uv": [1.5, 3, 2.5, 8], "texture": "#1"},
+				"north": {"uv": [12, 2, 13, 7], "texture": "#1"},
 				"east": {"uv": [8, 7, 11, 2], "rotation": 180, "texture": "#1"},
 				"south": {"uv": [11, 2, 12, 7], "texture": "#1"},
 				"west": {"uv": [8, 2, 11, 7], "texture": "#1"},
 				"up": {"uv": [8, 0, 11, 2], "rotation": 90, "texture": "#1"},
 				"down": {"uv": [8, 7, 11, 9], "rotation": 270, "texture": "#1"}
 			}
+		},
+		{
+			"name": "emissive",
+			"from": [11, 2, 1],
+			"to": [13, 7, 1],
+			"faces": {
+				"north": {"uv": [1.5, 3, 2.5, 8], "texture": "#1", "emissivity": 15},
+				"east": {"uv": [0, 0, 0, 5], "texture": "#missing"},
+				"south": {"uv": [0, 0, 1, 5], "texture": "#missing"},
+				"west": {"uv": [0, 0, 0, 5], "texture": "#missing"},
+				"up": {"uv": [0, 0, 1, 0], "texture": "#missing"},
+				"down": {"uv": [0, 0, 1, 0], "texture": "#missing"}
+			}
 		}
 	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery6.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery6.json
index fd4b949b2..ca6135657 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery6.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery6.json
@@ -1,4 +1,5 @@
 {
+	"credit": "Made with Blockbench",
 	"texture_size": [32, 16],
 	"textures": {
 		"1": "overdrive_that_matters:block/batterybank_core"
@@ -12,11 +13,24 @@
 			"faces": {
 				"north": {"uv": [11, 2, 12, 7], "texture": "#1"},
 				"east": {"uv": [8, 2, 11, 7], "texture": "#1"},
-				"south": {"uv": [1.5, 3, 2.5, 8], "texture": "#1"},
+				"south": {"uv": [12, 2, 13, 7], "texture": "#1"},
 				"west": {"uv": [8, 7, 11, 2], "rotation": 180, "texture": "#1"},
 				"up": {"uv": [8, 0, 11, 2], "rotation": 270, "texture": "#1"},
 				"down": {"uv": [8, 7, 11, 9], "rotation": 90, "texture": "#1"}
 			}
+		},
+		{
+			"name": "emissive",
+			"from": [3, 2, 15],
+			"to": [5, 7, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 1, 5], "texture": "#missing"},
+				"east": {"uv": [0, 0, 0, 5], "texture": "#missing"},
+				"south": {"uv": [2, 3, 3, 8], "texture": "#1", "emissivity": 15},
+				"west": {"uv": [0, 0, 0, 5], "texture": "#missing"},
+				"up": {"uv": [0, 0, 1, 0], "texture": "#missing"},
+				"down": {"uv": [0, 0, 1, 0], "texture": "#missing"}
+			}
 		}
 	]
 }
\ No newline at end of file