mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 11:59:25 +00:00
* [HOT FIX]: Fixes #8985 by no-oping for vanilla models instead of throwing error Signed-off-by: tmvkrpxl0 <[email protected]>
60 lines
2.3 KiB
Diff
60 lines
2.3 KiB
Diff
--- a/net/minecraft/client/model/HumanoidModel.java
|
|
+++ b/net/minecraft/client/model/HumanoidModel.java
|
|
@@ -264,6 +_,8 @@
|
|
case TOOT_HORN:
|
|
this.f_102811_.f_104203_ = Mth.m_14036_(this.f_102808_.f_104203_, -1.2F, 1.2F) - 1.4835298F;
|
|
this.f_102811_.f_104204_ = this.f_102808_.f_104204_ - ((float)Math.PI / 6F);
|
|
+ default:
|
|
+ this.f_102816_.applyTransform(this, p_102876_, net.minecraft.world.entity.HumanoidArm.RIGHT);
|
|
}
|
|
|
|
}
|
|
@@ -304,6 +_,8 @@
|
|
case TOOT_HORN:
|
|
this.f_102812_.f_104203_ = Mth.m_14036_(this.f_102808_.f_104203_, -1.2F, 1.2F) - 1.4835298F;
|
|
this.f_102812_.f_104204_ = this.f_102808_.f_104204_ + ((float)Math.PI / 6F);
|
|
+ default:
|
|
+ this.f_102815_.applyTransform(this, p_102879_, net.minecraft.world.entity.HumanoidArm.LEFT);
|
|
}
|
|
|
|
}
|
|
@@ -396,7 +_,7 @@
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
- public static enum ArmPose {
|
|
+ public static enum ArmPose implements net.minecraftforge.common.IExtensibleEnum {
|
|
EMPTY(false),
|
|
ITEM(false),
|
|
BLOCK(false),
|
|
@@ -411,10 +_,29 @@
|
|
|
|
private ArmPose(boolean p_102896_) {
|
|
this.f_102890_ = p_102896_;
|
|
+ this.forgeArmPose = null;
|
|
}
|
|
|
|
public boolean m_102897_() {
|
|
return this.f_102890_;
|
|
}
|
|
+ // FORGE START
|
|
+ @javax.annotation.Nullable
|
|
+ private final net.minecraftforge.client.IArmPoseTransformer forgeArmPose;
|
|
+
|
|
+ private ArmPose(boolean twoHanded, @javax.annotation.Nonnull net.minecraftforge.client.IArmPoseTransformer forgeArmPose) {
|
|
+ this.f_102890_ = twoHanded;
|
|
+ com.google.common.base.Preconditions.checkNotNull(forgeArmPose, "Cannot create new ArmPose with null transformer!");
|
|
+ this.forgeArmPose = forgeArmPose;
|
|
+ }
|
|
+
|
|
+ public static ArmPose create(String name, boolean twoHanded, @javax.annotation.Nonnull net.minecraftforge.client.IArmPoseTransformer forgeArmPose) {
|
|
+ throw new IllegalStateException("Enum not extended");
|
|
+ }
|
|
+
|
|
+ public <T extends LivingEntity> void applyTransform(HumanoidModel<T> model, T entity, net.minecraft.world.entity.HumanoidArm arm) {
|
|
+ if (this.forgeArmPose != null) this.forgeArmPose.applyTransform(model, entity, arm);
|
|
+ }
|
|
+ // FORGE END
|
|
}
|
|
}
|