From b57b954e5c7719f2b8adbc5027c5ba1ca20dfb74 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Sun, 19 Mar 2023 00:13:40 +0600
Subject: [PATCH] essence storage glows oooo

---
 .../mc/otm/datagen/blocks/BlockStates.kt      |  1 +
 .../mc/otm/datagen/items/ItemModels.kt        |  2 +
 .../models/block/essence_storage.json         | 38 +++++++++++++++++--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
index 1ac73e92c..52135accd 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
@@ -89,6 +89,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
 	provider.block(MBlocks.MATTER_RECYCLER)
 	provider.block(MBlocks.ENERGY_SERVO)
 	provider.block(MBlocks.COBBLESTONE_GENERATOR)
+	provider.block(MBlocks.ESSENCE_STORAGE)
 
 	provider.exec {
 		for (crate in MRegistry.CARGO_CRATES.allBlocks.values) {
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
index 03b014868..8c2d8c79b 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
@@ -60,6 +60,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
 
 	provider.generated(MItems.ESSENCE_DRIVE)
 	provider.generated(MItems.ESSENCE_CAPSULE)
+	provider.generated(MItems.ESSENCE_SERVO)
 
 	for (item in MItems.ExopackUpgrades.INVENTORY_UPGRADES) {
 		provider.generated(item, modLocation("item/exosuit_inventory_upgrade"))
@@ -123,6 +124,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
 	provider.block(MItems.MATTER_CABLE, "matter_cable_core")
 	provider.block(MItems.MATTER_DECOMPOSER, "matter_decomposer_working")
 	provider.block(MItems.ENERGY_SERVO, "energy_servo")
+	provider.block(MItems.ESSENCE_STORAGE, "essence_storage")
 
 	provider.block(MItems.PLATE_PRESS, "plate_press_idle")
 	provider.block(MItems.STORAGE_POWER_SUPPLIER, "storage_power_supplier")
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json
index 52e8636b9..5f9f56224 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json
@@ -1,6 +1,6 @@
 {
-	"texture_size": [32, 64],
 	"render_type": "cutout",
+	"texture_size": [32, 64],
 	"textures": {
 		"0": "overdrive_that_matters:block/essence_storage",
 		"particle": "overdrive_that_matters:block/essence_storage"
@@ -117,7 +117,8 @@
 				"south": {"uv": [9, 12, 12.5, 13.5], "texture": "#0"},
 				"west": {"uv": [11.5, 14.5, 15, 16], "texture": "#0"},
 				"up": {"uv": [9.5, 12.5, 13, 14.25], "texture": "#0"}
-			}
+			},
+			"forge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "container",
@@ -128,5 +129,36 @@
 				"west": {"uv": [8, 2, 12, 4.5], "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