mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
Lots of rendering related changes, specifically for BackedQuad and IQuadTransformers. Removed our deprecated model generators, modders should have been using vanilla's for a while.
60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
--- a/net/minecraft/client/model/HumanoidModel.java
|
|
+++ b/net/minecraft/client/model/HumanoidModel.java
|
|
@@ -308,6 +_,8 @@
|
|
break;
|
|
case SPEAR:
|
|
SpearAnimations.thirdPersonHandUse(this.rightArm, this.head, true, p_362371_.getUseItemStackForArm(HumanoidArm.RIGHT), p_362371_);
|
|
+ default:
|
|
+ p_362371_.rightArmPose.applyTransform(this, p_362371_, net.minecraft.world.entity.HumanoidArm.RIGHT);
|
|
}
|
|
}
|
|
|
|
@@ -355,6 +_,8 @@
|
|
break;
|
|
case SPEAR:
|
|
SpearAnimations.thirdPersonHandUse(this.leftArm, this.head, false, p_363560_.getUseItemStackForArm(HumanoidArm.LEFT), p_363560_);
|
|
+ default:
|
|
+ p_363560_.leftArmPose.applyTransform(this, p_363560_, net.minecraft.world.entity.HumanoidArm.LEFT);
|
|
}
|
|
}
|
|
|
|
@@ -427,7 +_,7 @@
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
- public static enum ArmPose {
|
|
+ public static enum ArmPose implements net.minecraftforge.common.IExtensibleEnum {
|
|
EMPTY(false, false),
|
|
ITEM(false, false),
|
|
BLOCK(false, false),
|
|
@@ -453,10 +_,29 @@
|
|
ArmPose(final boolean p_102896_, final boolean p_456170_) {
|
|
this.twoHanded = p_102896_;
|
|
this.affectsOffhandPose = p_456170_;
|
|
+ this.forgeArmPose = null;
|
|
}
|
|
|
|
public boolean isTwoHanded() {
|
|
return this.twoHanded;
|
|
+ }
|
|
+
|
|
+ @javax.annotation.Nullable
|
|
+ private final net.minecraftforge.client.IArmPoseTransformer forgeArmPose;
|
|
+
|
|
+ private ArmPose(boolean twoHanded, boolean affectsOffhandPose, @javax.annotation.Nonnull net.minecraftforge.client.IArmPoseTransformer forgeArmPose) {
|
|
+ this.twoHanded = twoHanded;
|
|
+ this.affectsOffhandPose = affectsOffhandPose;
|
|
+ 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, boolean affectsOffhandPose, @javax.annotation.Nonnull net.minecraftforge.client.IArmPoseTransformer forgeArmPose) {
|
|
+ throw new IllegalStateException("Enum not extended");
|
|
+ }
|
|
+
|
|
+ public <T extends HumanoidRenderState> void applyTransform(HumanoidModel<T> model, T state, net.minecraft.world.entity.HumanoidArm arm) {
|
|
+ if (this.forgeArmPose != null) this.forgeArmPose.applyTransform(model, state, arm);
|
|
}
|
|
|
|
public boolean affectsOffhandPose() {
|