mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 04:09:51 +00:00
56 lines
3.6 KiB
Diff
56 lines
3.6 KiB
Diff
--- a/net/minecraft/client/renderer/ItemInHandRenderer.java
|
|
+++ b/net/minecraft/client/renderer/ItemInHandRenderer.java
|
|
@@ -336,12 +_,14 @@
|
|
if (iteminhandrenderer$handrenderselection.renderMainHand) {
|
|
float f4 = interactionhand == InteractionHand.MAIN_HAND ? f : 0.0F;
|
|
float f5 = 1.0F - Mth.lerp(p_109315_, this.oMainHandHeight, this.mainHandHeight);
|
|
+ if (!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(InteractionHand.MAIN_HAND, p_109316_, p_109317_, p_109319_, p_109315_, f1, f4, f5, this.mainHandItem))
|
|
this.renderArmWithItem(p_109318_, p_109315_, f1, InteractionHand.MAIN_HAND, f4, this.mainHandItem, f5, p_109316_, p_109317_, p_109319_);
|
|
}
|
|
|
|
if (iteminhandrenderer$handrenderselection.renderOffHand) {
|
|
float f6 = interactionhand == InteractionHand.OFF_HAND ? f : 0.0F;
|
|
float f7 = 1.0F - Mth.lerp(p_109315_, this.oOffHandHeight, this.offHandHeight);
|
|
+ if (!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(InteractionHand.OFF_HAND, p_109316_, p_109317_, p_109319_, p_109315_, f1, f6, f7, this.offHandItem))
|
|
this.renderArmWithItem(p_109318_, p_109315_, f1, InteractionHand.OFF_HAND, f6, this.offHandItem, f7, p_109316_, p_109317_, p_109319_);
|
|
}
|
|
|
|
@@ -407,7 +_,7 @@
|
|
} else {
|
|
this.renderOneHandedMap(p_109379_, p_109380_, p_109381_, p_109378_, humanoidarm, p_109376_, p_109377_);
|
|
}
|
|
- } else if (p_109377_.is(Items.CROSSBOW)) {
|
|
+ } else if (p_109377_.getItem() instanceof CrossbowItem) {
|
|
boolean flag1 = CrossbowItem.isCharged(p_109377_);
|
|
boolean flag2 = humanoidarm == HumanoidArm.RIGHT;
|
|
int i = flag2 ? 1 : -1;
|
|
@@ -452,6 +_,7 @@
|
|
} else {
|
|
boolean flag3 = humanoidarm == HumanoidArm.RIGHT;
|
|
int j = flag3 ? 1 : -1;
|
|
+ if (!net.minecraftforge.client.extensions.common.IClientItemExtensions.of(p_109377_).applyForgeHandTransform(p_109379_, minecraft.player, humanoidarm, p_109377_, p_109373_, p_109378_, p_109376_)) // FORGE: Allow items to define custom arm animation
|
|
if (p_109372_.isUsingItem() && p_109372_.getUseItemRemainingTicks() > 0 && p_109372_.getUsedItemHand() == p_109375_) {
|
|
switch (p_109377_.getUseAnimation()) {
|
|
case NONE:
|
|
@@ -579,8 +_,18 @@
|
|
this.offHandHeight = Mth.clamp(this.offHandHeight - 0.4F, 0.0F, 1.0F);
|
|
} else {
|
|
float f = localplayer.getAttackStrengthScale(1.0F);
|
|
- float f1 = this.mainHandItem != itemstack ? 0.0F : f * f * f;
|
|
- float f2 = this.offHandItem != itemstack1 ? 0.0F : 1.0F;
|
|
+
|
|
+ boolean requipM = net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.mainHandItem, itemstack, localplayer.getInventory().getSelectedSlot());
|
|
+ boolean requipO = net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.offHandItem, itemstack1, -1);
|
|
+
|
|
+ if (!requipM && this.mainHandItem != itemstack)
|
|
+ this.mainHandItem = itemstack;
|
|
+ if (!requipO && this.offHandItem != itemstack1)
|
|
+ this.offHandItem = itemstack1;
|
|
+
|
|
+ float f1 = requipM ? 0.0F : f * f * f;
|
|
+ float f2 = requipO ? 0.0F : 1.0F;
|
|
+
|
|
this.mainHandHeight = this.mainHandHeight + Mth.clamp(f1 - this.mainHandHeight, -0.4F, 0.4F);
|
|
this.offHandHeight = this.offHandHeight + Mth.clamp(f2 - this.offHandHeight, -0.4F, 0.4F);
|
|
}
|