From 429860bb5ddc21b4a65ea6798b15ce5d4abeb285 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Sun, 15 May 2022 16:12:55 +0600
Subject: [PATCH] Matter dust texture; Matter recycler model/texture;
 Gravitation field limiter and sensor textures; Fixed matter capacitor parts
 matter color; Singularity scanner now has a face;

---
 .../ru/dbotthepony/mc/otm/datagen/DataGen.kt  |   4 +
 .../models/block/matter_recycler_error.json   | 231 ++++++++++++++++++
 .../models/block/matter_recycler_idle.json    | 231 ++++++++++++++++++
 .../models/block/matter_recycler_working.json | 231 ++++++++++++++++++
 .../textures/block/matter_recycler.png        | Bin 0 -> 470 bytes
 .../gravitation_field_limiter.png             | Bin
 .../gravitation_field_sensor.png              | Bin
 .../item/component/matter_capacitor_parts.png | Bin 260 -> 260 bytes
 .../textures/item/matter_capacitor_parts.png  | Bin 260 -> 0 bytes
 .../textures/item/matter_dust.png             | Bin 0 -> 245 bytes
 .../textures/item/singularity_scanner.png     | Bin 272 -> 271 bytes
 11 files changed, 697 insertions(+)
 create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_error.json
 create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_idle.json
 create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_working.json
 create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler.png
 rename src/main/resources/assets/overdrive_that_matters/textures/item/{ => component}/gravitation_field_limiter.png (100%)
 rename src/main/resources/assets/overdrive_that_matters/textures/item/{ => component}/gravitation_field_sensor.png (100%)
 delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_parts.png
 create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/matter_dust.png

diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
index 96e417666..c98f1a51a 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
@@ -195,6 +195,7 @@ object DataGen {
 			block(MBlocks.GRAVITATION_STABILIZER_LENS)
 
 			block(MBlocks.STORAGE_POWER_SUPPLIER)
+			block(MBlocks.MATTER_RECYCLER)
 		}
 
 		with(itemModelProvider) {
@@ -244,6 +245,8 @@ object DataGen {
 
 			generated(MItems.PATTERN_DRIVE_CREATIVE)
 
+			generated(MItems.MATTER_DUST)
+
 			for (item in MItems.CARGO_CRATES) {
 				// block(item, "${item.registryName!!.path}_closed")
 			}
@@ -256,6 +259,7 @@ object DataGen {
 
 			block(MItems.PLATE_PRESS, "plate_press_idle")
 			block(MItems.STORAGE_POWER_SUPPLIER, "storage_power_supplier")
+			block(MItems.MATTER_RECYCLER, "matter_recycler_working")
 		}
 
 		blockStateProvider.lambda { provider ->
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_error.json
new file mode 100644
index 000000000..4e34c1f7d
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_error.json
@@ -0,0 +1,231 @@
+{
+	"parent": "block/block",
+	"textures": {
+		"0": "overdrive_that_matters:block/matter_recycler",
+		"particle": "overdrive_that_matters:block/matter_recycler"
+	},
+	"elements": [
+		{
+			"name": "body",
+			"from": [0, 0, 0],
+			"to": [16, 10, 11],
+			"faces": {
+				"north": {"uv": [0, 9.5, 8, 12], "texture": "#0"},
+				"east": {"uv": [14.5, 1, 9, 3.5], "texture": "#0"},
+				"south": {"uv": [0, 12, 8, 14.5], "texture": "#0"},
+				"west": {"uv": [9, 1, 14.5, 3.5], "texture": "#0"},
+				"up": {"uv": [8, 5.5, 16, 8.25], "texture": "#0"},
+				"down": {"uv": [8, 12, 16, 14.75], "texture": "#0"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 5, 11],
+			"to": [16, 10, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 8, 1.5], "texture": "#missing"},
+				"east": {"uv": [16, 9.5, 13.5, 10.75], "texture": "#0"},
+				"south": {"uv": [0, 14.5, 8, 15.75], "texture": "#0"},
+				"west": {"uv": [13.5, 9.5, 16, 10.75], "texture": "#0"},
+				"up": {"uv": [8, 8.25, 16, 9.5], "texture": "#0"},
+				"down": {"uv": [8, 14.75, 16, 16], "texture": "#0"}
+			}
+		},
+		{
+			"name": "hopper",
+			"from": [3, 10, 3],
+			"to": [13, 11, 13],
+			"faces": {
+				"north": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"east": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"south": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"west": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 5, 2.5], "texture": "#missing"},
+				"down": {"uv": [0, 0, 5, 2.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "hopper",
+			"from": [2, 11, 2],
+			"to": [14, 13, 14],
+			"faces": {
+				"north": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"east": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"south": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"west": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 6, 3], "texture": "#missing"},
+				"down": {"uv": [0.5, 0.25, 6.5, 3.25], "texture": "#0"}
+			}
+		},
+		{
+			"name": "hopper",
+			"from": [1, 13, 1],
+			"to": [15, 15, 15],
+			"faces": {
+				"north": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"east": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"south": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"west": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"up": {"uv": [0, 0, 7, 3.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 7, 3.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15, 10, 0],
+			"to": [16, 16, 1],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15, 10, 15],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 10, 15],
+			"to": [1, 16, 16],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 10, 0],
+			"to": [1, 16, 1],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0.3, 13, 1],
+			"to": [0.8, 14, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15.2, 13, 1],
+			"to": [15.7, 14, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 0, 11],
+			"to": [0.5, 1, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"},
+				"west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"},
+				"down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 1, 15],
+			"to": [0.5, 5, 16],
+			"faces": {
+				"north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15.5, 0, 11],
+			"to": [16, 1, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"},
+				"west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"},
+				"down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15.5, 1, 15],
+			"to": [16, 5, 16],
+			"faces": {
+				"north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "canister",
+			"from": [1, 1, 11],
+			"to": [15, 5, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 7, 1], "texture": "#missing"},
+				"east": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"},
+				"south": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"},
+				"west": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 7, 1], "texture": "#missing"},
+				"down": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "screen",
+			"from": [9, 8.4, -0.4],
+			"to": [13, 12.4, 0.6],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [4, 10, -0.5]},
+			"faces": {
+				"north": {"uv": [11, 0, 13, 1], "texture": "#0"},
+				"east": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [7, 1.25, 9, 2.25], "texture": "#0"},
+				"west": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7, 1, 9, 1.25], "texture": "#0"},
+				"down": {"uv": [7, 1, 9, 1.25], "texture": "#0"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_idle.json
new file mode 100644
index 000000000..1344f2dce
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_idle.json
@@ -0,0 +1,231 @@
+{
+	"parent": "block/block",
+	"textures": {
+		"0": "overdrive_that_matters:block/matter_recycler",
+		"particle": "overdrive_that_matters:block/matter_recycler"
+	},
+	"elements": [
+		{
+			"name": "body",
+			"from": [0, 0, 0],
+			"to": [16, 10, 11],
+			"faces": {
+				"north": {"uv": [0, 9.5, 8, 12], "texture": "#0"},
+				"east": {"uv": [14.5, 1, 9, 3.5], "texture": "#0"},
+				"south": {"uv": [0, 12, 8, 14.5], "texture": "#0"},
+				"west": {"uv": [9, 1, 14.5, 3.5], "texture": "#0"},
+				"up": {"uv": [8, 5.5, 16, 8.25], "texture": "#0"},
+				"down": {"uv": [8, 12, 16, 14.75], "texture": "#0"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 5, 11],
+			"to": [16, 10, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 8, 1.5], "texture": "#missing"},
+				"east": {"uv": [16, 9.5, 13.5, 10.75], "texture": "#0"},
+				"south": {"uv": [0, 14.5, 8, 15.75], "texture": "#0"},
+				"west": {"uv": [13.5, 9.5, 16, 10.75], "texture": "#0"},
+				"up": {"uv": [8, 8.25, 16, 9.5], "texture": "#0"},
+				"down": {"uv": [8, 14.75, 16, 16], "texture": "#0"}
+			}
+		},
+		{
+			"name": "hopper",
+			"from": [3, 10, 3],
+			"to": [13, 11, 13],
+			"faces": {
+				"north": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"east": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"south": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"west": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 5, 2.5], "texture": "#missing"},
+				"down": {"uv": [0, 0, 5, 2.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "hopper",
+			"from": [2, 11, 2],
+			"to": [14, 13, 14],
+			"faces": {
+				"north": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"east": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"south": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"west": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 6, 3], "texture": "#missing"},
+				"down": {"uv": [0.5, 0.25, 6.5, 3.25], "texture": "#0"}
+			}
+		},
+		{
+			"name": "hopper",
+			"from": [1, 13, 1],
+			"to": [15, 15, 15],
+			"faces": {
+				"north": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"east": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"south": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"west": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"up": {"uv": [0, 0, 7, 3.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 7, 3.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15, 10, 0],
+			"to": [16, 16, 1],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15, 10, 15],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 10, 15],
+			"to": [1, 16, 16],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 10, 0],
+			"to": [1, 16, 1],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0.3, 13, 1],
+			"to": [0.8, 14, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15.2, 13, 1],
+			"to": [15.7, 14, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 0, 11],
+			"to": [0.5, 1, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"},
+				"west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"},
+				"down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 1, 15],
+			"to": [0.5, 5, 16],
+			"faces": {
+				"north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15.5, 0, 11],
+			"to": [16, 1, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"},
+				"west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"},
+				"down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15.5, 1, 15],
+			"to": [16, 5, 16],
+			"faces": {
+				"north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "canister",
+			"from": [1, 1, 11],
+			"to": [15, 5, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 7, 1], "texture": "#missing"},
+				"east": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"},
+				"south": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"},
+				"west": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 7, 1], "texture": "#missing"},
+				"down": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "screen",
+			"from": [9, 8.4, -0.4],
+			"to": [13, 12.4, 0.6],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [4, 10, -0.5]},
+			"faces": {
+				"north": {"uv": [9, 0, 11, 1], "texture": "#0"},
+				"east": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [7, 1.25, 9, 2.25], "texture": "#0"},
+				"west": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7, 1, 9, 1.25], "texture": "#0"},
+				"down": {"uv": [7, 1, 9, 1.25], "texture": "#0"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_working.json
new file mode 100644
index 000000000..f84d27999
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_working.json
@@ -0,0 +1,231 @@
+{
+	"parent": "block/block",
+	"textures": {
+		"0": "overdrive_that_matters:block/matter_recycler",
+		"particle": "overdrive_that_matters:block/matter_recycler"
+	},
+	"elements": [
+		{
+			"name": "body",
+			"from": [0, 0, 0],
+			"to": [16, 10, 11],
+			"faces": {
+				"north": {"uv": [0, 9.5, 8, 12], "texture": "#0"},
+				"east": {"uv": [13.5, 9.5, 8, 12], "texture": "#0"},
+				"south": {"uv": [0, 12, 8, 14.5], "texture": "#0"},
+				"west": {"uv": [8, 9.5, 13.5, 12], "texture": "#0"},
+				"up": {"uv": [8, 5.5, 16, 8.25], "texture": "#0"},
+				"down": {"uv": [8, 12, 16, 14.75], "texture": "#0"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 5, 11],
+			"to": [16, 10, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 8, 1.5], "texture": "#missing"},
+				"east": {"uv": [16, 9.5, 13.5, 10.75], "texture": "#0"},
+				"south": {"uv": [0, 14.5, 8, 15.75], "texture": "#0"},
+				"west": {"uv": [13.5, 9.5, 16, 10.75], "texture": "#0"},
+				"up": {"uv": [8, 8.25, 16, 9.5], "texture": "#0"},
+				"down": {"uv": [8, 14.75, 16, 16], "texture": "#0"}
+			}
+		},
+		{
+			"name": "hopper",
+			"from": [3, 10, 3],
+			"to": [13, 11, 13],
+			"faces": {
+				"north": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"east": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"south": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"west": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 5, 2.5], "texture": "#missing"},
+				"down": {"uv": [0, 0, 5, 2.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "hopper",
+			"from": [2, 11, 2],
+			"to": [14, 13, 14],
+			"faces": {
+				"north": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"east": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"south": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"west": {"uv": [0, 4, 6, 4.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 6, 3], "texture": "#missing"},
+				"down": {"uv": [0.5, 0.25, 6.5, 3.25], "texture": "#0"}
+			}
+		},
+		{
+			"name": "hopper",
+			"from": [1, 13, 1],
+			"to": [15, 15, 15],
+			"faces": {
+				"north": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"east": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"south": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"west": {"uv": [0, 3.5, 7, 4], "texture": "#0"},
+				"up": {"uv": [0, 0, 7, 3.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 7, 3.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15, 10, 0],
+			"to": [16, 16, 1],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15, 10, 15],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 10, 15],
+			"to": [1, 16, 16],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 10, 0],
+			"to": [1, 16, 1],
+			"faces": {
+				"north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"},
+				"up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0.3, 13, 1],
+			"to": [0.8, 14, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15.2, 13, 1],
+			"to": [15.7, 14, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"},
+				"up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 0, 11],
+			"to": [0.5, 1, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"},
+				"west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"},
+				"down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 1, 15],
+			"to": [0.5, 5, 16],
+			"faces": {
+				"north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15.5, 0, 11],
+			"to": [16, 1, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"},
+				"west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"},
+				"down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15.5, 1, 15],
+			"to": [16, 5, 16],
+			"faces": {
+				"north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"},
+				"west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "canister",
+			"from": [1, 1, 11],
+			"to": [15, 5, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 7, 1], "texture": "#missing"},
+				"east": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"},
+				"south": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"},
+				"west": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 7, 1], "texture": "#missing"},
+				"down": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "screen",
+			"from": [9, 8.4, -0.4],
+			"to": [13, 12.4, 0.6],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [4, 10, -0.5]},
+			"faces": {
+				"north": {"uv": [7, 0, 9, 1], "texture": "#0"},
+				"east": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [7, 1.25, 9, 2.25], "texture": "#0"},
+				"west": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7, 1, 9, 1.25], "texture": "#0"},
+				"down": {"uv": [7, 1, 9, 1.25], "texture": "#0"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler.png
new file mode 100644
index 0000000000000000000000000000000000000000..69d034775768e0149083cc40100f7062cc16f15a
GIT binary patch
literal 470
zcmV;{0V)28P)<h;3K|Lk000e1NJLTq001BW002M)0{{R3iJ)km00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMJ6UD|JVTk;7Jx17PSBX{{R300015y9)Ev-
zU|?W1H8pL5k6mwiQBhHZr00B^)};XwE&u=k32;bRa{vGi!vFvd!vV){sAK>D0WV2J
zK~y-)t<teh!!QsAU~dQ{2KorRf+sS=Bk&40ck3&pnV6!w5)x9Rs9ZB6wcZ)346Hl_
zGfRZeXJ3phF#!J(<;&T=B&R|aS6biQ0)RSOQI?Bq2lpN{Wtmh2$Sc+xG%l@xF_!X@
zz=0~hfxF!NQ1RSmdlX>Wk@707Z~F)#Tfhpj>IHf*9JS&=jLPmo`9pL9kmWDnKG@^C
zF(~lF4PFR5@cHNe3U3UTs@Y|Lm@O$FE)l3dDD@0G4^0X3a&d{gKJxFtcvUuwvi!vQ
z@$i7P%i12MY5MfAA!w3{0AXH0mI#cz=@{n4K^g)Y9K;U80Kwd8c%Y6I?bhuJ&<uL6
z2>A`1kUGLaAT}wdq@DUcicaIVJXN%?8%j7L-Qs?R(1$>rAck)E0sxHmwLK%FjQ{`u
M07*qoM6N<$f)atf2mk;8

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/gravitation_field_limiter.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_limiter.png
similarity index 100%
rename from src/main/resources/assets/overdrive_that_matters/textures/item/gravitation_field_limiter.png
rename to src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_limiter.png
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/gravitation_field_sensor.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_sensor.png
similarity index 100%
rename from src/main/resources/assets/overdrive_that_matters/textures/item/gravitation_field_sensor.png
rename to src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_sensor.png
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png
index 3d368b089102892bfae6a640667699b8c1520ac6..3a9c598161340690862df5323e7486f5add0fc4b 100644
GIT binary patch
delta 29
lcmZo+YGIlXB;2y(dCjbA2?+_Nrlt%G4BI|l`!O+fJ^-*148{Ne

delta 29
lcmZo+YGIlXB<vCW-!bTULPCP6sVM^k!v@W&rxR1>0|1wc3aS7A

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_parts.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_parts.png
deleted file mode 100644
index 3a9c598161340690862df5323e7486f5add0fc4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G}%0G|-oz`#H;F|qpkdNnn*mL<<?W?f52NH8@u1<G&xc<l#};w%aB3;quU
z48i^tLLk8ckH}&M2EP3u%xJ+HtO68_^>lFz(Fo4%zs=WRz~QW!ar}S%#+YR@GQMvp
za=Pvl!?I6x(&ASQ9~c=TG|#YA&8fVk8nBM7TlObI1MiKAJLDv@7h8MnO)T%e%4XUB
pNq$eXnM7%d-E=|zea|<1;J(GdyhyZL<q*&!22WQ%mvv4FO#n|NR*C=s

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_dust.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_dust.png
new file mode 100644
index 0000000000000000000000000000000000000000..5194c771f5cfa03c4742b7d14da43ace2d182c94
GIT binary patch
literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G}f0G|+78xQ~7rvAoRE9UM#6PsV9t*s4|`6ISj3P`b+1o;L32LlEvZ)P{3
z5NCl$WHAE+-yslY6xHx*01AeAx;Tbt1oxhH6gr^5!R&D0!2kI%POIjA4B_(<+pz1E
z{f*3f=ab8;l39b^p4+Fw(*2;V-(<#jnbU^hEd}!&w0S#EGR|mtWIN9$VCJzCItrR{
dKVCJhVqXx?a?fJHrXHXT44$rjF6*2Ung9#PQNaKJ

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/singularity_scanner.png b/src/main/resources/assets/overdrive_that_matters/textures/item/singularity_scanner.png
index b194eb08b37c92c0eb5a43b67734b6eede197878..5dfd067e4712158962f57c00c2f3474b392b1d0f 100644
GIT binary patch
delta 146
zcmV;D0B!$}0*?Zaa}L1(01m+cxRGn^0001bk%1L?umDE!_KHHdKximXpmRo{v85$g
zKr}5aP!Oa7CLjm{#ugTE0b?*gQUMWwsxXEFsDNl<p`ZW*BSJtdP!OsMZU#&Rs<m*F
z7?3&G1&q<ar~n}WMEZaVAkqg+U^IP<Q~_gS0D=F*Z}^2nUH||907*qoM6N<$f|YtQ
A-~a#s

delta 147
zcmV;E0Brw{0+0fba}L4)01m<d6(~x80001ck%1L@v;;=+_KHHdKxk+Hqj=|xLSsuy
zuz+Y<TB0CG1x!E?28=B%-~z^AfTRK<099cO2T%dg#6m#<21bN{SfC(O7u*b(3RG+1
zCNUs$unQQYfl&cM0*Leh6+om9n80ZI7^wor#sH`e!_S=*T4ewL002ovPDHLkV1lQ!
BGd=(S