Fixed Phantom attractor item display; Added energy servo model; Yet another change in android upgrades texture atals.

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt

@@ -84,6 +84,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
 
 	provider.block(MBlocks.STORAGE_POWER_SUPPLIER)
 	provider.block(MBlocks.MATTER_RECYCLER)
+	provider.block(MBlocks.ENERGY_SERVO)
 
 	provider.exec {
 		for (crate in MRegistry.CARGO_CRATES.allBlocks.values) {

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt

@@ -81,6 +81,8 @@ fun addItemModels(provider: MatteryItemModelProvider) {
 
 	provider.generated(MItems.MATTER_DUST)
 
+	provider.generated(MItems.TRITANIUM_DOOR)
+
 	for (item in MRegistry.CARGO_CRATES.allItems.values) {
 		provider.block(item, "${item.registryName!!.path}_closed")
 	}
@@ -90,6 +92,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
 	provider.block(MItems.MATTER_BOTTLER, "matter_bottler_working")
 	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.PLATE_PRESS, "plate_press_idle")
 	provider.block(MItems.STORAGE_POWER_SUPPLIER, "storage_power_supplier")

src/main/resources/assets/overdrive_that_matters/models/block/energy_servo.json

@@ -0,0 +1,359 @@
+{
+	"parent": "block/cube_all",
+    "render_type": "translucent",
+	"textures": {
+		"0": "overdrive_that_matters:block/energy_servo",
+		"1": "overdrive_that_matters:item/energy_sword_charge",
+		"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"}
+			}
+		},
+		{
+			"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]
+		}
+	}
+}

src/main/resources/assets/overdrive_that_matters/models/block/phantom_attractor.json

@@ -172,5 +172,41 @@
 				"down": {"uv": [7, 11, 10, 14], "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],
+			"translation": [0, -3, 0],
+			"scale": [0.53, 0.53, 0.53]
+		},
+		"head": {
+			"translation": [0, 13, 0]
+		},
+		"fixed": {
+			"translation": [0, -3.25, 0],
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
 }