From 834efad36358dbd1ec57082e4f88be6c4ac6f435 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Fri, 21 Oct 2022 20:08:19 +0700 Subject: [PATCH] Proper exosuit model --- .../mc/otm/client/model/ExosuitModel.java | 13 ++++++++----- .../otm/capability/MatteryPlayerCapability.kt | 2 +- .../textures/models/armor/exosuit.png | Bin 372 -> 432 bytes 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/model/ExosuitModel.java b/src/main/java/ru/dbotthepony/mc/otm/client/model/ExosuitModel.java index caf5c1a4e..46fb5ca2d 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/model/ExosuitModel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/model/ExosuitModel.java @@ -40,14 +40,16 @@ public final class ExosuitModel { partdefinition.addOrReplaceChild("head", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); partdefinition.addOrReplaceChild("hat", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); - partdefinition.addOrReplaceChild("body", CubeListBuilder.create().texOffs(20, 0).addBox(-3.0F, -0.1F, 3.5F, 6.0F, 8.0F, 3.0F, new CubeDeformation(0.0F)) + partdefinition.addOrReplaceChild("body", CubeListBuilder.create() + .texOffs(20, 0).addBox(-3.0F, -0.1F, 3.5F, 6.0F, 8.0F, 3.0F, new CubeDeformation(0.0F)) .texOffs(0, 14).addBox(-3.0F, 8.6F, 3.5F, 6.0F, 3.0F, 3.0F, new CubeDeformation(0.0F)) .texOffs(0, 0).addBox(-3.5F, 0.5F, 1.5F, 7.0F, 11.0F, 3.0F, new CubeDeformation(0.0F)) .texOffs(18, 12).addBox(-4.0F, 9.0F, 2.5F, 1.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)) .texOffs(18, 12).addBox(3.0F, 9.0F, 2.5F, 1.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)) .texOffs(0, 20).addBox(-2.5F, 7.0F, 4.0F, 5.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) .texOffs(38, 0).addBox(2.0F, 1.0F, 3.5F, 2.0F, 6.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(15, 17).addBox(-4.0F, 1.0F, 2.5F, 2.0F, 3.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + .texOffs(15, 17).addBox(-4.0F, 1.0F, 2.5F, 2.0F, 3.0F, 3.0F, new CubeDeformation(0.0F)) + , PartPose.offset(0.0F, 0.0F, 0.0F)); partdefinition.addOrReplaceChild("right_arm", CubeListBuilder.create(), PartPose.offset(-5.0F, 2.0F, 0.0F)); partdefinition.addOrReplaceChild("left_arm", CubeListBuilder.create(), PartPose.offset(5.0F, 2.0F, 0.0F)); @@ -72,9 +74,10 @@ public final class ExosuitModel { partdefinition.addOrReplaceChild("head", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); partdefinition.addOrReplaceChild("hat", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); - partdefinition.addOrReplaceChild("body", CubeListBuilder.create().texOffs(20, 0).addBox(-3.0F, -0.1F, 3.5F, 6.0F, 8.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(29, 4).addBox(-2.0F, 0.9F, 6.5F, 4.0F, 1.0F, 0.0F, new CubeDeformation(0.0F)) - .texOffs(29, 4).addBox(-2.0F, 2.9F, 6.5F, 4.0F, 1.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + partdefinition.addOrReplaceChild("body", CubeListBuilder.create() + .texOffs(12, 0).addBox(-2.0F, 0.9F, 5.5F, 4.0F, 1.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(12, 0).addBox(-2.0F, 2.9F, 5.5F, 4.0F, 1.0F, 1.0F, new CubeDeformation(0.0F)) + , PartPose.offset(0.0F, 0.0F, 0.0F)); partdefinition.addOrReplaceChild("right_arm", CubeListBuilder.create(), PartPose.offset(-5.0F, 2.0F, 0.0F)); partdefinition.addOrReplaceChild("left_arm", CubeListBuilder.create(), PartPose.offset(5.0F, 2.0F, 0.0F)); diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt index eb66ee6ce..7f4bcfe2b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt @@ -86,7 +86,7 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial } var hasExoSuit by publicSynchronizer.bool(name = "hasExoSuit") - var displayExoSuit by publicSynchronizer.bool(name = "displayExoSuit") + var displayExoSuit by publicSynchronizer.bool(true, name = "displayExoSuit") private val exoSuitSlotCountModifiersMap: MutableMap by synchronizer.Map( keyCodec = UUIDValueCodec, diff --git a/src/main/resources/assets/overdrive_that_matters/textures/models/armor/exosuit.png b/src/main/resources/assets/overdrive_that_matters/textures/models/armor/exosuit.png index 476b967d2cd0e10b1ae105f5b8130b331fc26046..c0356ba002db6aeae0c3cb8b67622be56f6d0282 100644 GIT binary patch delta 389 zcmeyuw1Iho1SbbG0|Ud{?Tv3HDk{{g2l#}z0{MQi=}k>dW@cuGO&{E|{ja8`R!~sT zuB$uG)KpAN%+%BrsAg)oRz8s8EeY}q{*MG0Y+op~0VOyKJR*x382Ao>Fr%o3R|8P+ zr>Bc!NQC>_$*08*De$;t1|7ZrzkdBp&zy~m*w>z}zvIf!QOvng_n68mt;x0yGx^(h za##wz(Y*R#fpd7nfqtf@zgzW~=9h_1e%Ms1Vk7^<*Tv7VB}#%>??J}N*$eOWRPiZY zX}ZB0@L+M+0~f~kS`Y3RU!>-7h1z)`z?@H$P@%vmWw>-1?z^(6d5BT>qe-yu^=`l&g6NKyo bPRag>F delta 329 zcmV-P0k;0I1M~ur7zqRe00013M{MnpAs~MwP)t-s0000^U1x%Vf;KibCMG6uaBzn$ zEyFe7-aY@GH8mC%7Bw|BTmzVk00009a7bBm000id000id0mpBsWB>pF*-1n}R7l6| zkues6FbsyHJP+Uz46