From 88755f991a77d6eccb09b34f7f60253affe677da Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Sun, 23 Jan 2022 03:38:05 +0600
Subject: [PATCH] -Fixed Plate press UV error; -Tritanium armor model is
 practically complete

---
 .../otm/client/model/TritaniumArmorModel.java |  24 ++++++++++++------
 .../models/block/plate_press_idle.json        |   2 +-
 .../textures/models/armor/tritanium_armor.png | Bin 3586 -> 5908 bytes
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java b/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java
index 42a9e750f..94fe3f644 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java
@@ -51,22 +51,30 @@ public class TritaniumArmorModel {
 		MeshDefinition meshdefinition = new MeshDefinition();
 		PartDefinition partdefinition = meshdefinition.getRoot();
 
-		PartDefinition head = partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.9F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.3F)), PartPose.offset(0.0F, 0.0F, 0.0F));
-		partdefinition.addOrReplaceChild("hat", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F));
+		PartDefinition head = partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.3F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.51F))
+		.texOffs(32, 0).addBox(-4.0F, -8.3F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.7F))
+		.texOffs(44, 47).addBox(-4.0F, -8.6F, -5.6F, 8.0F, 2.0F, 2.0F, new CubeDeformation(0.5F))
+		.texOffs(46, 52).addBox(-3.0F, -7.6F, 4.4F, 6.0F, 2.0F, 1.0F, new CubeDeformation(0.5F)), PartPose.offset(0.0F, 0.0F, 0.0F));
+
+		PartDefinition Helmet_r1 = head.addOrReplaceChild("Helmet_r1", CubeListBuilder.create().texOffs(44, 47).addBox(-4.0F, 0.5F, 0.5F, 8.0F, 1.0F, 2.0F, new CubeDeformation(0.49F)), PartPose.offsetAndRotation(0.0F, -6.1F, -6.1F, 1.1781F, 0.0F, 0.0F));
+
+		PartDefinition hat = partdefinition.addOrReplaceChild("hat", CubeListBuilder.create(), PartPose.offset(0.0F, 24.0F, 0.0F));
 
 		PartDefinition body = partdefinition.addOrReplaceChild("body", CubeListBuilder.create().texOffs(40, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.41F))
-			.texOffs(0, 32).addBox(-4.0F, 0.0F, -5.7F, 8.0F, 6.0F, 3.0F, new CubeDeformation(0.4F))
-			.texOffs(44, 33).addBox(-4.0F, 0.0F, 2.8F, 8.0F, 6.0F, 2.0F, new CubeDeformation(0.4F))
-			.texOffs(56, 0).addBox(-4.0F, 0.0F, 5.6F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.4F))
-			.texOffs(56, 0).addBox(1.0F, 0.0F, 5.6F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.4F)), PartPose.offset(0.0F, 0.0F, 0.0F));
+		.texOffs(0, 32).addBox(-4.0F, 0.0F, -5.7F, 8.0F, 6.0F, 3.0F, new CubeDeformation(0.4F))
+		.texOffs(44, 33).addBox(-4.0F, 0.0F, 2.8F, 8.0F, 6.0F, 2.0F, new CubeDeformation(0.4F))
+		.texOffs(56, 0).addBox(-4.0F, 0.0F, 5.6F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.4F))
+		.texOffs(56, 0).addBox(1.0F, 0.0F, 5.6F, 3.0F, 5.0F, 1.0F, new CubeDeformation(0.4F)), PartPose.offset(0.0F, 0.0F, 0.0F));
 
 		PartDefinition backpackslope_r1 = body.addOrReplaceChild("backpackslope_r1", CubeListBuilder.create().texOffs(44, 41).addBox(-4.0F, 0.4F, -2.4F, 8.0F, 3.0F, 2.0F, new CubeDeformation(0.39F)), PartPose.offsetAndRotation(0.0F, 6.4F, 5.2F, -1.0908F, 0.0F, 0.0F));
 
 		PartDefinition chestplateslope_r1 = body.addOrReplaceChild("chestplateslope_r1", CubeListBuilder.create().texOffs(44, 41).addBox(-4.0F, 0.5F, 0.4F, 8.0F, 4.0F, 2.0F, new CubeDeformation(0.39F)), PartPose.offsetAndRotation(0.0F, 6.4F, -6.2F, 1.2217F, 0.0F, 0.0F));
 
-		PartDefinition right_arm = partdefinition.addOrReplaceChild("right_arm", CubeListBuilder.create().texOffs(24, 32).addBox(-3.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.3F)), PartPose.offset(-5.0F, 2.0F, 0.0F));
+		PartDefinition right_arm = partdefinition.addOrReplaceChild("right_arm", CubeListBuilder.create().texOffs(24, 32).addBox(-3.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.3F))
+		.texOffs(42, 56).addBox(-4.0F, -3.0F, -2.0F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.4F)), PartPose.offset(-5.0F, 2.0F, 0.0F));
 
-		PartDefinition left_arm = partdefinition.addOrReplaceChild("left_arm", CubeListBuilder.create().texOffs(24, 32).mirror().addBox(-1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.3F)).mirror(false), PartPose.offset(5.0F, 2.0F, 0.0F));
+		PartDefinition left_arm = partdefinition.addOrReplaceChild("left_arm", CubeListBuilder.create().texOffs(24, 32).mirror().addBox(-1.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.3F)).mirror(false)
+		.texOffs(42, 56).mirror().addBox(0.0F, -3.0F, -2.0F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.4F)).mirror(false), PartPose.offset(5.0F, 2.0F, 0.0F));
 
 		PartDefinition right_leg = partdefinition.addOrReplaceChild("right_leg", CubeListBuilder.create().texOffs(26, 48).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(1.0F)), PartPose.offset(-1.9F, 12.0F, 0.0F));
 
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/plate_press_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/plate_press_idle.json
index 008632b96..7a89ce8e7 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/plate_press_idle.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/plate_press_idle.json
@@ -49,7 +49,7 @@
 			"from": [2, 8, 4],
 			"to": [11, 16, 13],
 			"faces": {
-				"north": {"uv": [8.1, 8, 10.25, 12], "texture": "#body"},
+				"north": {"uv": [8, 8, 10.25, 12], "texture": "#body"},
 				"east": {"uv": [10.25, 8, 12.5, 12], "texture": "#body"},
 				"south": {"uv": [8, 12, 10.25, 16], "texture": "#body"},
 				"west": {"uv": [10.25, 8, 12.5, 12], "texture": "#body"},
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/models/armor/tritanium_armor.png b/src/main/resources/assets/overdrive_that_matters/textures/models/armor/tritanium_armor.png
index 4de530ccd7841be57ba438b4e9149ecc150a7cd0..8398d892f6f5014cd96356a1a7932693c698419f 100644
GIT binary patch
delta 5875
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
JPDHLkV1h^`)!YC8

delta 3535
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
JPDHLkV1nVVy@>z-