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 4de530ccd..8398d892f 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/models/armor/tritanium_armor.png and b/src/main/resources/assets/overdrive_that_matters/textures/models/armor/tritanium_armor.png differ