From aab8de2e894185bc624053dceef7e26d0a774507 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 23 Jun 2021 23:44:52 +0200 Subject: [PATCH] Update Mson --- build.gradle | 1 + gradle.properties | 2 +- .../client/model/AbstractPonyModel.java | 10 ++++----- .../model/entity/PonyArmourStandModel.java | 22 +++++++++---------- .../client/model/entity/ZomponyModel.java | 6 ++--- .../model/entity/ZomponyVillagerModel.java | 6 ++--- .../client/model/part/PonyTail.java | 2 +- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index 6107f256..b2b0aeff 100644 --- a/build.gradle +++ b/build.gradle @@ -43,6 +43,7 @@ minecraft { } repositories { + mavenLocal() maven { name = 'modmenu' url = 'https://maven.terraformersmc.com/releases' diff --git a/gradle.properties b/gradle.properties index 77f124ae..e3fa8d45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,4 @@ org.gradle.daemon=false modmenu_version=2.0.0-beta.7 kirin_version=1.8.7-1.17 hd_skins_version=6.4.6-1.17-rc1 - mson_version=1.3.3-1.17-rc1 + mson_version=1.4.0-beta.4 diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java index 52148918..802118bd 100644 --- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -9,7 +9,7 @@ import com.minelittlepony.api.pony.meta.Race; import com.minelittlepony.api.pony.meta.Sizes; import com.minelittlepony.client.model.armour.ArmourWrapper; import com.minelittlepony.client.transform.PonyTransformation; -import com.minelittlepony.mson.api.model.MsonPart; +import com.minelittlepony.mson.util.PartUtil; import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.VertexConsumer; @@ -125,10 +125,10 @@ public abstract class AbstractPonyModel extends ClientPo head.setPivot(1, 2, sneaking ? -1 : 1); - MsonPart.of(rightArm).shift(0, 2, 6); - MsonPart.of(leftArm).shift(0, 2, 6); - MsonPart.of(rightLeg).shift(0, 2, -8); - MsonPart.of(leftLeg).shift(0, 2, -8); + PartUtil.shift(rightArm, 0, 2, 6); + PartUtil.shift(leftArm, 0, 2, 6); + PartUtil.shift(rightLeg, 0, 2, -8); + PartUtil.shift(leftLeg, 0, 2, -8); } protected void ponySit() { diff --git a/src/main/java/com/minelittlepony/client/model/entity/PonyArmourStandModel.java b/src/main/java/com/minelittlepony/client/model/entity/PonyArmourStandModel.java index 25c45ef5..ea77502f 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/PonyArmourStandModel.java +++ b/src/main/java/com/minelittlepony/client/model/entity/PonyArmourStandModel.java @@ -5,7 +5,7 @@ import net.minecraft.client.render.entity.model.ArmorStandEntityModel; import net.minecraft.client.render.entity.model.BipedEntityModel; import net.minecraft.entity.decoration.ArmorStandEntity; -import com.minelittlepony.mson.api.model.MsonPart; +import com.minelittlepony.mson.util.PartUtil; public class PonyArmourStandModel extends ArmorStandEntityModel { @@ -16,22 +16,22 @@ public class PonyArmourStandModel extends ArmorStandEntityModel { @Override public void setAngles(ArmorStandEntity entity, float move, float swing, float ticks, float headYaw, float headPitch) { super.setAngles(entity, move, swing, ticks, headYaw, headPitch); - this.leftArm.visible = true; - this.rightArm.visible = true; + leftArm.visible = true; + rightArm.visible = true; - MsonPart.of(this.leftLeg).rotateTo(this.leftArm); - MsonPart.of(this.rightLeg).rotateTo(this.rightArm); + PartUtil.copyAngles(leftArm, leftLeg); + PartUtil.copyAngles(rightArm, rightLeg); leftLeg.pitch *= -1; rightLeg.pitch *= -1; } public void applyAnglesTo(BipedEntityModel dest) { - MsonPart.of(dest.head).rotateTo(head); - MsonPart.of(dest.hat).rotateTo(hat); - MsonPart.of(dest.leftLeg).rotateTo(leftLeg); - MsonPart.of(dest.rightLeg).rotateTo(rightLeg); - MsonPart.of(dest.leftArm).rotateTo(leftArm); - MsonPart.of(dest.rightArm).rotateTo(rightArm); + PartUtil.copyAngles(head, dest.head); + PartUtil.copyAngles(hat, dest.hat); + PartUtil.copyAngles(leftLeg, dest.leftLeg); + PartUtil.copyAngles(rightLeg, dest.rightLeg); + PartUtil.copyAngles(leftArm, dest.leftArm); + PartUtil.copyAngles(rightArm, dest.rightArm); } } diff --git a/src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java b/src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java index 9aad56d5..c68d4e7c 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.model.entity; import com.minelittlepony.client.model.IMobModel; import com.minelittlepony.client.model.entity.race.AlicornModel; -import com.minelittlepony.mson.api.model.MsonPart; +import com.minelittlepony.mson.util.PartUtil; import net.minecraft.client.model.ModelPart; import net.minecraft.entity.mob.HostileEntity; @@ -29,10 +29,10 @@ public class ZomponyModel extends AlicornModel implements IMobModel { @@ -20,10 +20,10 @@ public class ZomponyVillagerModel extends VillagerPonyModel