From 37c8dd039c2668b5299cae3615057c553e0d5902 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Thu, 1 Sep 2022 17:59:36 +0600
Subject: [PATCH] Matter capacitor bank frame model update

---
 .../models/block/battery_bank.json            | 276 +++++++++++-------
 .../models/block/matter_capacitor_bank.json   | 234 ++++++++++++++-
 .../textures/block/batterybank_frame.png      | Bin 242 -> 338 bytes
 .../block/mattercapacitorbank_frame.png       | Bin 0 -> 329 bytes
 4 files changed, 396 insertions(+), 114 deletions(-)
 create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame.png

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 e6d2d86fd..fa97e8bbd 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,23 +1,21 @@
 {
-	"parent": "block/block", 
-	"texture_size": [32, 16],
+	"parent": "block/block",
 	"textures": {
-		"frame": "overdrive_that_matters:block/batterybank_frame",
-		"core": "overdrive_that_matters:block/batterybank_core",
+		"1": "overdrive_that_matters:block/batterybank_frame",
 		"particle": "overdrive_that_matters:block/batterybank_frame"
 	},
-		"elements": [
+	"elements": [
 		{
 			"name": "frame",
 			"from": [14, 0, 0],
 			"to": [16, 2, 16],
 			"faces": {
-				"north": {"uv": [0, 14, 1, 16], "texture": "#frame"},
-				"east": {"uv": [0, 14, 8, 16], "texture": "#frame"},
-				"south": {"uv": [7, 14, 8, 16], "texture": "#frame"},
-				"west": {"uv": [8, 0, 16, 2], "texture": "#frame"},
-				"up": {"uv": [8, 0, 16, 2], "rotation": 90, "texture": "#frame"},
-				"down": {"uv": [7, 0, 8, 16], "texture": "#frame"}
+				"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"}
 			}
 		},
 		{
@@ -25,12 +23,12 @@
 			"from": [0, 0, 0],
 			"to": [2, 2, 16],
 			"faces": {
-				"north": {"uv": [7, 14, 8, 16], "texture": "#frame"},
-				"east": {"uv": [8, 0, 16, 2], "texture": "#frame"},
-				"south": {"uv": [0, 14, 1, 16], "texture": "#frame"},
-				"west": {"uv": [0, 14, 8, 16], "texture": "#frame"},
-				"up": {"uv": [8, 0, 16, 2], "rotation": 90, "texture": "#frame"},
-				"down": {"uv": [0, 0, 1, 16], "texture": "#frame"}
+				"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"}
 			}
 		},
 		{
@@ -38,12 +36,12 @@
 			"from": [2, 0, 0],
 			"to": [14, 2, 2],
 			"faces": {
-				"north": {"uv": [1, 14, 7, 16], "texture": "#frame"},
-				"east": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"south": {"uv": [9, 0, 15, 2], "texture": "#frame"},
-				"west": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"up": {"uv": [9, 0, 15, 2], "texture": "#frame"},
-				"down": {"uv": [1, 14, 7, 16], "texture": "#frame"}
+				"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"}
 			}
 		},
 		{
@@ -51,12 +49,12 @@
 			"from": [2, 0, 14],
 			"to": [14, 2, 16],
 			"faces": {
-				"north": {"uv": [9, 0, 15, 2], "texture": "#frame"},
-				"east": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"south": {"uv": [1, 14, 7, 16], "texture": "#frame"},
-				"west": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"up": {"uv": [9, 0, 15, 2], "texture": "#frame"},
-				"down": {"uv": [1, 0, 7, 2], "texture": "#frame"}
+				"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"}
 			}
 		},
 		{
@@ -64,12 +62,12 @@
 			"from": [2, 14, 0],
 			"to": [14, 16, 2],
 			"faces": {
-				"north": {"uv": [1, 0, 7, 2], "texture": "#frame"},
-				"east": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"south": {"uv": [9, 0, 15, 2], "texture": "#frame"},
-				"west": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"up": {"uv": [1, 0, 7, 2], "texture": "#frame"},
-				"down": {"uv": [9, 0, 15, 2], "texture": "#frame"}
+				"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"}
 			}
 		},
 		{
@@ -77,12 +75,12 @@
 			"from": [0, 14, 0],
 			"to": [2, 16, 16],
 			"faces": {
-				"north": {"uv": [7, 0, 8, 2], "texture": "#frame"},
-				"east": {"uv": [8, 0, 16, 2], "texture": "#frame"},
-				"south": {"uv": [0, 0, 1, 2], "texture": "#frame"},
-				"west": {"uv": [0, 0, 8, 2], "texture": "#frame"},
-				"up": {"uv": [0, 0, 1, 16], "texture": "#frame"},
-				"down": {"uv": [8, 0, 16, 2], "rotation": 90, "texture": "#frame"}
+				"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"}
 			}
 		},
 		{
@@ -90,12 +88,12 @@
 			"from": [2, 14, 14],
 			"to": [14, 16, 16],
 			"faces": {
-				"north": {"uv": [9, 0, 15, 2], "texture": "#frame"},
-				"east": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"south": {"uv": [1, 0, 7, 2], "texture": "#frame"},
-				"west": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"up": {"uv": [1, 14, 7, 16], "texture": "#frame"},
-				"down": {"uv": [9, 0, 15, 2], "texture": "#frame"}
+				"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"}
 			}
 		},
 		{
@@ -103,64 +101,12 @@
 			"from": [14, 14, 0],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [0, 0, 1, 2], "texture": "#frame"},
-				"east": {"uv": [0, 0, 8, 2], "texture": "#frame"},
-				"south": {"uv": [7, 0, 8, 2], "texture": "#frame"},
-				"west": {"uv": [8, 0, 16, 2], "texture": "#frame"},
-				"up": {"uv": [7, 0, 8, 16], "texture": "#frame"},
-				"down": {"uv": [9, 0, 15, 2], "rotation": 90, "texture": "#frame"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [14, 2, 14],
-			"to": [16, 14, 16],
-			"faces": {
-				"north": {"uv": [9, 0, 15, 2], "rotation": 90, "texture": "#frame"},
-				"east": {"uv": [0, 2, 1, 14], "texture": "#frame"},
-				"south": {"uv": [7, 2, 8, 14], "texture": "#frame"},
-				"west": {"uv": [9, 0, 15, 2], "rotation": 90, "texture": "#frame"},
-				"up": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"down": {"uv": [0, 0, 2, 2], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [0, 2, 14],
-			"to": [2, 14, 16],
-			"faces": {
-				"north": {"uv": [9, 0, 15, 2], "rotation": 90, "texture": "#frame"},
-				"east": {"uv": [9, 0, 15, 2], "rotation": 90, "texture": "#frame"},
-				"south": {"uv": [0, 2, 1, 14], "texture": "#frame"},
-				"west": {"uv": [7, 2, 8, 14], "texture": "#frame"},
-				"up": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"down": {"uv": [0, 0, 2, 2], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [14, 2, 0],
-			"to": [16, 14, 2],
-			"faces": {
-				"north": {"uv": [0, 2, 1, 14], "texture": "#frame"},
-				"east": {"uv": [7, 2, 8, 14], "texture": "#frame"},
-				"south": {"uv": [9, 0, 15, 2], "rotation": 90, "texture": "#frame"},
-				"west": {"uv": [9, 0, 15, 2], "rotation": 90, "texture": "#frame"},
-				"up": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"down": {"uv": [0, 0, 2, 2], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [0, 2, 0],
-			"to": [2, 14, 2],
-			"faces": {
-				"north": {"uv": [7, 2, 8, 14], "texture": "#frame"},
-				"east": {"uv": [9, 0, 15, 2], "rotation": 90, "texture": "#frame"},
-				"south": {"uv": [9, 0, 15, 2], "rotation": 90, "texture": "#frame"},
-				"west": {"uv": [0, 2, 1, 14], "texture": "#frame"},
-				"up": {"uv": [0, 0, 2, 2], "texture": "#missing"},
-				"down": {"uv": [0, 0, 2, 2], "texture": "#missing"}
+				"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"}
 			}
 		},
 		{
@@ -168,12 +114,120 @@
 			"from": [1, 1, 7],
 			"to": [15, 15, 9],
 			"faces": {
-				"north": {"uv": [8.5, 2, 15.5, 16], "texture": "#frame"},
-				"east": {"uv": [8.5, 2, 9.5, 16], "texture": "#frame"},
-				"south": {"uv": [8.5, 2, 15.5, 16], "texture": "#frame"},
-				"west": {"uv": [8.5, 2, 9.5, 16], "texture": "#frame"},
-				"up": {"uv": [8.5, 2, 15.5, 4], "rotation": 180, "texture": "#frame"},
-				"down": {"uv": [8.5, 2, 15.5, 4], "texture": "#frame"}
+				"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"from": [3, 3, 0],
+			"to": [13, 13, 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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
 			}
 		}
 	]
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_capacitor_bank.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_capacitor_bank.json
index 958be3df2..1604b9b6d 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_capacitor_bank.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_capacitor_bank.json
@@ -1,6 +1,234 @@
 {
-	"parent": "overdrive_that_matters:block/battery_bank",
+	"parent": "block/block",
 	"textures": {
-		"core": "overdrive_that_matters:block/matterybank_core"
-	}
+		"1": "overdrive_that_matters:block/mattercapacitorbank_frame",
+		"particle": "overdrive_that_matters:block/mattercapacitorbank_frame"
+	},
+	"elements": [
+		{
+			"name": "frame",
+			"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"}
+			}
+		},
+		{
+			"name": "frame",
+			"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"}
+			}
+		},
+		{
+			"name": "frame",
+			"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"}
+			}
+		},
+		{
+			"name": "frame",
+			"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"}
+			}
+		},
+		{
+			"name": "frame",
+			"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"}
+			}
+		},
+		{
+			"name": "frame",
+			"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"}
+			}
+		},
+		{
+			"name": "frame",
+			"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"}
+			}
+		},
+		{
+			"name": "frame",
+			"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"}
+			}
+		},
+		{
+			"name": "battery holder",
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"from": [3, 3, 0],
+			"to": [13, 13, 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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		},
+		{
+			"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"}
+			}
+		}
+	]
 }
\ No newline at end of file
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 c1282b3d0bde6d81037b1017077570d4df58f087..8477ff62681348254a6faf7fa76436a279bcf389 100644
GIT binary patch
delta 296
zcmeywc!_C(IF|wkGXn#I%aX2R6BQNer2~9IToV!!OifM2#KhFp)ME3ia+~`9-(dLv
zz!Rvh<Dlp(AjMe{<QM!O3K)X@D}+FT1s;*b3=Dh+L6~vJ#O${~!PTBFjv*HQYbP=C
zwJ7kgXo@}kufOl^HpK^u^PaUG;gZ~z;n8^Fhmlx;?vpvJi|ePZ+;EaDz~{oH3z>(c
z7v={x<||CvFQnmdJmiCAXUlQj8ow~7HM&tdQk{|oPQ<h5&EdQ|gKImd?fO=W#uzS5
z(WggO{5i8=x5iQj0|l39GXy3%U8oHY<=S_j^@)(T1>c$22l_UgN^=_y9(OW$p4c7F
nml?p}W6=5ZoBL6{mGT+FzPyj$yf{z+bU1^jtDnm{r-UW|=EZhO

delta 199
zcmcb_^oenTIF|qiGXn#I!@b_@iHZvKLIFM@uBN7@xlR2E2?=6iVrpt?K<OPp=JSCR
zTS<^#@P80s*t~zqexL|vfk$L90|Vb75M~tB@M-`GhI_g=hG+zzofyb<z<|Sf@y&Pj
zPa}Dqcl90G_sv0smrbz2ltEwa=v-~n#-BF}lsh|8M7$3w#<2>XG%9bDNnt!Iq+^!D
sTE8P{dt%+RU!I)H%KPWZ9BSIbAoYrk^;Bj=G|&zPPgg&ebxsLQ09FM=asU7T

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
new file mode 100644
index 0000000000000000000000000000000000000000..ca8540c959f9cf866e311c5f3419b1e063519b02
GIT binary patch
literal 329
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij?1AIbU6A}_kO-;qb#MIQ(V)LtVoBDw=x67ul15)fIL4Lvi!GJ-^o7oL0
z#981GS<Jw|cL;<TMK!z{fP$+$T^vI!{MSz6=4(;lVbv6SSD$h}TUt!y<78POZHp})
zvzR7+OyzkHb;6R{jXOATGOxmn1xpuR=813F=fb+L(Zeovfr4!C!RIPQd-NU_ZxTw%
z4LqbPEY<ArPpROc$BSbjJI-GC9N8g!V(EmSKr^?e`E0R^r!XCC5ZHO7Wr7IPF3(WS
zA9dmrrbn;|o{4=RD#udums6rfhov}fT1AmZvr|HoC(m|q(cMelg}L!?>l`tN0=k;P
L)78&q9Z(Jc(>iU=

literal 0
HcmV?d00001