From 7c7bbb0dbeac2c8dba52bcf1068ebf7be50b197d Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Sun, 2 Oct 2022 06:03:05 +0600
Subject: [PATCH] Electricity effect around energy sword now GLOWS!!!! ! Energy
 servo multipart model testing that i successfully failed; A little change to
 attack boost icon; Android station now GLOWS TOO!!!

---
 .../models/block/android_station_working.json |  31 +-
 .../models/block/energy_servo_body.json       | 332 ++++++++++++++++++
 .../models/block/energy_servo_effect.json     |  66 ++++
 ...nergy_servo_multiparttest_whatthefuck.json |  19 +
 .../models/item/energy_sword_powered.json     |  10 +-
 .../textures/gui/android_upgrades.png         | Bin 2566 -> 2551 bytes
 6 files changed, 451 insertions(+), 7 deletions(-)
 create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_body.json
 create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_effect.json
 create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_multiparttest_whatthefuck.json

diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json
index fb047e55b..97b5b2064 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json
@@ -3,6 +3,7 @@
     "render_type": "translucent",
 	"textures": {
 		"0": "overdrive_that_matters:block/android_station",
+		"1": "overdrive_that_matters:block/android_station_em",
 		"particle": "overdrive_that_matters:block/android_station"
 	},
 	"elements": [
@@ -19,6 +20,19 @@
 				"down": {"uv": [8, 4.5, 16, 8.5], "texture": "#0"}
 			}
 		},
+		{
+			"name": "platform_em",
+			"from": [0, 7, 0],
+			"to": [16, 9, 16],
+			"faces": {
+				"north": {"uv": [8, 4, 16, 4.5], "texture": "#1", "emissivity": 15},
+				"east": {"uv": [0, 4, 8, 4.5], "texture": "#1", "emissivity": 15},
+				"south": {"uv": [8, 4, 16, 4.5], "texture": "#1", "emissivity": 15},
+				"west": {"uv": [0, 4, 8, 4.5], "texture": "#1", "emissivity": 15},
+				"up": {"uv": [8, 0, 16, 4], "texture": "#1", "emissivity": 15},
+				"down": {"uv": [8, 4.5, 16, 8.5], "texture": "#1", "emissivity": 15}
+			}
+		},
 		{
 			"name": "base",
 			"from": [0, 0, 0],
@@ -45,6 +59,19 @@
 				"down": {"uv": [9, 5, 15, 8], "texture": "#0"}
 			}
 		},
+		{
+			"name": "body_em",
+			"from": [2, 4, 2],
+			"to": [14, 7, 14],
+			"faces": {
+				"north": {"uv": [1, 0, 7, 0.75], "texture": "#1", "emissivity": 15},
+				"east": {"uv": [1, 0, 7, 0.75], "texture": "#1", "emissivity": 15},
+				"south": {"uv": [1, 0, 7, 0.75], "texture": "#1", "emissivity": 15},
+				"west": {"uv": [1, 0, 7, 0.75], "texture": "#1", "emissivity": 15},
+				"up": {"uv": [9, 5, 15, 8], "texture": "#1", "emissivity": 15},
+				"down": {"uv": [9, 5, 15, 8], "texture": "#1", "emissivity": 15}
+			}
+		},
 		{
 			"name": "frame",
 			"from": [1, 4, 13],
@@ -105,8 +132,8 @@
 				"east": {"uv": [0, 0, 8, 0], "texture": "#missing"},
 				"south": {"uv": [0, 0, 8, 0], "texture": "#missing"},
 				"west": {"uv": [0, 0, 8, 0], "texture": "#missing"},
-				"up": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"},
-				"down": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"}
+				"up": {"uv": [0, 9.5, 8, 13.5], "texture": "#0", "emissivity": 15},
+				"down": {"uv": [0, 9.5, 8, 13.5], "texture": "#0", "emissivity": 15}
 			}
 		}
 	],
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_body.json b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_body.json
new file mode 100644
index 000000000..ed73eec4e
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_body.json
@@ -0,0 +1,332 @@
+{
+	"parent": "block/cube_all",
+    "render_type": "solid",
+	"textures": {
+		"0": "overdrive_that_matters:block/energy_servo",
+		"particle": "overdrive_that_matters:block/energy_servo"
+	},
+	"elements": [
+		{
+			"name": "body",
+			"from": [0, 0, 0],
+			"to": [16, 10, 11],
+			"faces": {
+				"north": {"uv": [0, 0, 8, 2.5], "texture": "#0"},
+				"east": {"uv": [13.5, 0, 8, 2.5], "texture": "#0"},
+				"south": {"uv": [0, 9.25, 8, 11.75], "texture": "#0"},
+				"west": {"uv": [8, 0, 13.5, 2.5], "texture": "#0"},
+				"up": {"uv": [0, 6.5, 8, 9.25], "texture": "#0"},
+				"down": {"uv": [0, 2.5, 8, 5.25], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [4, 10, 0],
+			"to": [12, 16, 7],
+			"faces": {
+				"north": {"uv": [8, 2.5, 12, 4], "texture": "#0"},
+				"east": {"uv": [15.5, 2.5, 12, 4], "texture": "#0"},
+				"south": {"uv": [0, 0, 3, 1.5], "texture": "#missing"},
+				"west": {"uv": [12, 2.5, 15.5, 4], "texture": "#0"},
+				"up": {"uv": [8, 4, 12, 5.75], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0, 0, 3, 1.75], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 10, 7],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 14, 8, 15.5], "texture": "#0"},
+				"east": {"uv": [12.5, 14, 8, 15.5], "texture": "#0"},
+				"south": {"uv": [8, 12.5, 16, 14], "texture": "#0"},
+				"west": {"uv": [8, 14, 12.5, 15.5], "texture": "#0"},
+				"up": {"uv": [0, 11.75, 8, 14], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0, 9, 8, 11.25], "texture": "#0"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [5, 2, 11],
+			"to": [11, 10, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 3, 2], "texture": "#missing"},
+				"east": {"uv": [0, 9.25, 2.5, 11.25], "texture": "#0"},
+				"south": {"uv": [8, 10.5, 11, 12.5], "texture": "#0"},
+				"west": {"uv": [5.5, 9.25, 8, 11.25], "texture": "#0"},
+				"up": {"uv": [0, 0, 3, 1.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 3, 1.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 0, 11],
+			"to": [16, 2, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 8, 0.5], "texture": "#missing"},
+				"east": {"uv": [16, 2, 13.5, 2.5], "texture": "#0"},
+				"south": {"uv": [0, 2, 8, 2.5], "texture": "#0"},
+				"west": {"uv": [13.5, 2, 16, 2.5], "texture": "#0"},
+				"up": {"uv": [0, 8, 8, 9.25], "texture": "#0"},
+				"down": {"uv": [0, 5.25, 8, 6.5], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "coil",
+			"from": [1, 2, 11],
+			"to": [5, 3, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
+				"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
+				"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
+			}
+		},
+		{
+			"name": "coil",
+			"from": [1, 4, 11],
+			"to": [5, 5, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
+				"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
+				"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
+			}
+		},
+		{
+			"name": "coil",
+			"from": [1, 6, 11],
+			"to": [5, 7, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
+				"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
+				"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
+			}
+		},
+		{
+			"name": "coil",
+			"from": [1, 8, 11],
+			"to": [5, 9, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
+				"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
+				"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
+			}
+		},
+		{
+			"name": "coil",
+			"from": [11, 2, 11],
+			"to": [15, 3, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
+				"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
+				"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
+			}
+		},
+		{
+			"name": "coil",
+			"from": [11, 4, 11],
+			"to": [15, 5, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
+				"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
+				"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
+			}
+		},
+		{
+			"name": "coil",
+			"from": [11, 6, 11],
+			"to": [15, 7, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
+				"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
+				"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
+			}
+		},
+		{
+			"name": "coil",
+			"from": [11, 8, 11],
+			"to": [15, 9, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"},
+				"east": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"south": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"west": {"uv": [8, 5.75, 10, 6], "texture": "#0"},
+				"up": {"uv": [8, 6, 10, 7], "texture": "#0"},
+				"down": {"uv": [8, 6, 10, 7], "texture": "#0"}
+			}
+		},
+		{
+			"name": "coil",
+			"from": [2, 2, 12],
+			"to": [4, 10, 14],
+			"faces": {
+				"north": {"uv": [9, 8.5, 8, 10.5], "texture": "#0"},
+				"east": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
+				"south": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
+				"west": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 1, 0.5], "texture": "#missing"},
+				"down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "coil",
+			"from": [12, 2, 12],
+			"to": [14, 10, 14],
+			"faces": {
+				"north": {"uv": [9, 8.5, 8, 10.5], "texture": "#0"},
+				"east": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
+				"south": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
+				"west": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 1, 0.5], "texture": "#missing"},
+				"down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}
+			}
+		},
+		{
+			"from": [0, 10, 0],
+			"to": [1, 16, 1],
+			"faces": {
+				"north": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
+				"east": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
+				"south": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
+				"west": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
+				"up": {"uv": [13.5, 0, 14, 0.25], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"from": [15, 10, 0],
+			"to": [16, 16, 1],
+			"faces": {
+				"north": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
+				"east": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
+				"south": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
+				"west": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"},
+				"up": {"uv": [13.5, 0, 14, 0.25], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"from": [15.2, 11, 1],
+			"to": [15.7, 12, 7],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"},
+				"down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}
+			}
+		},
+		{
+			"from": [15.2, 14, 1],
+			"to": [15.7, 15, 7],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"},
+				"down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}
+			}
+		},
+		{
+			"from": [0.3, 14, 1],
+			"to": [0.8, 15, 7],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"},
+				"down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}
+			}
+		},
+		{
+			"from": [0.3, 11, 1],
+			"to": [0.8, 12, 7],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"},
+				"down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}
+			}
+		},
+		{
+			"from": [1.5, 10, 1],
+			"to": [4.5, 14, 7],
+			"faces": {
+				"north": {"uv": [10, 8.5, 11.5, 9.5], "texture": "#0"},
+				"east": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"},
+				"west": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [10, 7, 11.5, 8.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 1.5, 1.5], "texture": "#missing"}
+			}
+		},
+		{
+			"from": [11.5, 10, 1],
+			"to": [14.5, 14, 7],
+			"faces": {
+				"north": {"uv": [10, 8.5, 11.5, 9.5], "texture": "#0"},
+				"east": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"},
+				"west": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [10, 7, 11.5, 8.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 1.5, 1.5], "texture": "#missing"}
+			}
+		}
+	],
+	"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/models/block/energy_servo_effect.json b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_effect.json
new file mode 100644
index 000000000..9bd6745d0
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_effect.json
@@ -0,0 +1,66 @@
+{
+	"parent": "block/cube_all",
+    "render_type": "translucent",
+	"textures": {
+		"1": "overdrive_that_matters:item/energy_sword_charge"
+	},
+	"elements": [
+		{
+			"name": "effect",
+			"from": [0.5, 2, 10.5],
+			"to": [5.5, 10, 15.5],
+			"faces": {
+				"north": {"uv": [0, 0, 2.5, 2], "texture": "#missing"},
+				"east": {"uv": [0, 0, 2.5, 2], "texture": "#missing"},
+				"south": {"uv": [2.5, 8, 5, 12], "texture": "#1"},
+				"west": {"uv": [0, 8, 2.5, 12], "texture": "#1"},
+				"up": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "effect",
+			"from": [10.5, 2, 10.5],
+			"to": [15.5, 10, 15.5],
+			"faces": {
+				"north": {"uv": [0, 0, 2.5, 2], "texture": "#missing"},
+				"east": {"uv": [2.5, 4, 5, 8], "texture": "#1"},
+				"south": {"uv": [0, 4, 2.5, 8], "texture": "#1"},
+				"west": {"uv": [2.5, 4, 5, 6], "texture": "#1"},
+				"up": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"}
+			}
+		}
+	],
+	"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/models/block/energy_servo_multiparttest_whatthefuck.json b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_multiparttest_whatthefuck.json
new file mode 100644
index 000000000..f09d10e58
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_multiparttest_whatthefuck.json
@@ -0,0 +1,19 @@
+{
+  "loader": "forge:composite",
+  "parts": {
+    "body": {
+      "parent": "overdrive_that_matters:block/energy_servo_body",
+      "transform": {
+       "translation": [0, 0, 0],
+	   "origin": [0, 0, 0]
+      }
+	},
+	"effect": {
+      "parent": "overdrive_that_matters:block/energy_servo_effect",
+      "transform": {
+       "translation": [0, 0, 0],
+	   "origin": [0, 0, 0]
+      }
+	}
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json
index ae03d34a5..2e897f089 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json
@@ -260,11 +260,11 @@
         "from": [7.1, 7, 6.9],
         "to": [8.8, 29.3, 12],
         "faces": {
-          "north": {"uv": [2.45, 1, 3.45, 12], "texture": "#1"},
-          "east": {"uv": [0, 1, 2.5, 12], "texture": "#1"},
-          "south": {"uv": [6, 1, 7, 12], "texture": "#1"},
-          "west": {"uv": [3.5, 1, 6, 12], "texture": "#1"},
-          "up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1"},
+          "north": {"uv": [2.45, 1, 3.45, 12], "texture": "#1", "emissivity": 15},
+          "east": {"uv": [0, 1, 2.5, 12], "texture": "#1", "emissivity": 15},
+          "south": {"uv": [6, 1, 7, 12], "texture": "#1", "emissivity": 15},
+          "west": {"uv": [3.5, 1, 6, 12], "texture": "#1", "emissivity": 15},
+          "up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1", "emissivity": 15},
           "down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"}
         }
       },
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png
index f06b97c4ef43435d39128208abf50f8efe70f01e..ce32f5677b5ad6833defe8b74a05a58aaad055b7 100644
GIT binary patch
delta 1866
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

delta 1856
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
Wz**wFNTg8t!X;0Ck5;$H`~L&ypTQvj