mirror of https://github.com/kami-blue/client
[enhancement] Added option to disable hand render modifying
#closes #1805
This commit is contained in:
parent
616cc69902
commit
6f45b79664
|
@ -23,8 +23,10 @@ public class MixinItemRenderer {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "renderItemInFirstPerson(Lnet/minecraft/client/entity/AbstractClientPlayer;FFLnet/minecraft/util/EnumHand;FLnet/minecraft/item/ItemStack;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GlStateManager;pushMatrix()V", shift = At.Shift.AFTER))
|
@Inject(method = "renderItemInFirstPerson(Lnet/minecraft/client/entity/AbstractClientPlayer;FFLnet/minecraft/util/EnumHand;FLnet/minecraft/item/ItemStack;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GlStateManager;pushMatrix()V", shift = At.Shift.AFTER))
|
||||||
private void transformSideFirstPerson$pushMatrix(AbstractClientPlayer player, float var0, float pitch, EnumHand hand, float var1, ItemStack stack, float yOffset, CallbackInfo ci) {
|
private void transformSideFirstPerson$pushMatrix(AbstractClientPlayer player, float partialTicks, float pitch, EnumHand hand, float swingProgress, ItemStack stack, float equippedProgress, CallbackInfo ci) {
|
||||||
if (ItemModel.INSTANCE.isEnabled()) {
|
if (ItemModel.INSTANCE.isEnabled()) {
|
||||||
|
if (!ItemModel.INSTANCE.getModifyHand() && stack.isEmpty()) return;
|
||||||
|
|
||||||
EnumHandSide enumhandside = hand == EnumHand.MAIN_HAND ? player.getPrimaryHand() : player.getPrimaryHand().opposite();
|
EnumHandSide enumhandside = hand == EnumHand.MAIN_HAND ? player.getPrimaryHand() : player.getPrimaryHand().opposite();
|
||||||
float sideMultiplier = enumhandside == EnumHandSide.RIGHT ? 1.0f : -1.0f;
|
float sideMultiplier = enumhandside == EnumHandSide.RIGHT ? 1.0f : -1.0f;
|
||||||
|
|
||||||
|
@ -33,8 +35,10 @@ public class MixinItemRenderer {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "renderItemInFirstPerson(Lnet/minecraft/client/entity/AbstractClientPlayer;FFLnet/minecraft/util/EnumHand;FLnet/minecraft/item/ItemStack;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItemSide(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/renderer/block/model/ItemCameraTransforms$TransformType;Z)V"))
|
@Inject(method = "renderItemInFirstPerson(Lnet/minecraft/client/entity/AbstractClientPlayer;FFLnet/minecraft/util/EnumHand;FLnet/minecraft/item/ItemStack;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItemSide(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/renderer/block/model/ItemCameraTransforms$TransformType;Z)V"))
|
||||||
private void transformSideFirstPerson$renderItemSide(AbstractClientPlayer player, float var0, float pitch, EnumHand hand, float var1, ItemStack stack, float yOffset, CallbackInfo ci) {
|
private void transformSideFirstPerson$renderItemSide(AbstractClientPlayer player, float partialTicks, float pitch, EnumHand hand, float swingProgress, ItemStack stack, float equippedProgress, CallbackInfo ci) {
|
||||||
if (ItemModel.INSTANCE.isEnabled()) {
|
if (ItemModel.INSTANCE.isEnabled()) {
|
||||||
|
if (!ItemModel.INSTANCE.getModifyHand() && stack.isEmpty()) return;
|
||||||
|
|
||||||
EnumHandSide enumhandside = hand == EnumHand.MAIN_HAND ? player.getPrimaryHand() : player.getPrimaryHand().opposite();
|
EnumHandSide enumhandside = hand == EnumHand.MAIN_HAND ? player.getPrimaryHand() : player.getPrimaryHand().opposite();
|
||||||
float sideMultiplier = enumhandside == EnumHandSide.RIGHT ? 1.0f : -1.0f;
|
float sideMultiplier = enumhandside == EnumHandSide.RIGHT ? 1.0f : -1.0f;
|
||||||
float scale = ItemModel.INSTANCE.getScale();
|
float scale = ItemModel.INSTANCE.getScale();
|
||||||
|
|
|
@ -16,4 +16,5 @@ object ItemModel : Module() {
|
||||||
val rotateY by setting("RotateY", 0.0f, -180.0f..180.0f, 1.0f)
|
val rotateY by setting("RotateY", 0.0f, -180.0f..180.0f, 1.0f)
|
||||||
val rotateZ by setting("RotateZ", 0.0f, -180.0f..180.0f, 1.0f)
|
val rotateZ by setting("RotateZ", 0.0f, -180.0f..180.0f, 1.0f)
|
||||||
val scale by setting("Scale", 1.0f, 0.1f..3.0f, 0.025f)
|
val scale by setting("Scale", 1.0f, 0.1f..3.0f, 0.025f)
|
||||||
|
val modifyHand by setting("ModifyHand", false)
|
||||||
}
|
}
|
Loading…
Reference in New Issue