@@ -26,7 +26,8 @@ public class FishingBobberRendererMixin {
26
26
27
27
private boolean doCorrect () {
28
28
return FirstPersonModelCore .instance .isEnabled ()
29
- && Minecraft .getInstance ().options .getCameraType () == CameraType .FIRST_PERSON ;
29
+ && Minecraft .getInstance ().options .getCameraType () == CameraType .FIRST_PERSON
30
+ && !FirstPersonModelCore .instance .getLogicHandler ().hideArmsAndItems ();
30
31
}
31
32
32
33
// spotless:off
@@ -54,26 +55,26 @@ private void calcOffset(FishingHook fishingBobberEntity, float f, float g, PoseS
54
55
55
56
// spotless:off
56
57
//#if MC <= 12004
57
- //$$ @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;getX()D"))
58
- //$$ private double offsetX(Player playerEntity) {
59
- //$$ return playerEntity.getX() + offsetvec3d.x();
60
- //$$ }
61
- //$$
62
- //$$ @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;getZ()D"))
63
- //$$ private double offsetZ(Player playerEntity) {
64
- //$$ return playerEntity.getZ() + offsetvec3d.z();
65
- //$$ }
66
- //$$
67
- //$$ @Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Player;xo:D"))
68
- //$$ private double prevOffsetX(Player playerEntity) {
69
- //$$ return playerEntity.xo + offsetvec3d.x();
70
- //$$ }
71
- //$$
72
- //$$ @Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Player;zo:D"))
73
- //$$ private double prevOffsetZ(Player playerEntity) {
74
- //$$ return playerEntity.zo + offsetvec3d.z();
75
- //$$ }
76
- //#else
58
+ //$$ @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;getX()D"))
59
+ //$$ private double offsetX(Player playerEntity) {
60
+ //$$ return playerEntity.getX() + offsetvec3d.x();
61
+ //$$ }
62
+ //$$
63
+ //$$ @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;getZ()D"))
64
+ //$$ private double offsetZ(Player playerEntity) {
65
+ //$$ return playerEntity.getZ() + offsetvec3d.z();
66
+ //$$ }
67
+ //$$
68
+ //$$ @Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Player;xo:D"))
69
+ //$$ private double prevOffsetX(Player playerEntity) {
70
+ //$$ return playerEntity.xo + offsetvec3d.x();
71
+ //$$ }
72
+ //$$
73
+ //$$ @Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Player;zo:D"))
74
+ //$$ private double prevOffsetZ(Player playerEntity) {
75
+ //$$ return playerEntity.zo + offsetvec3d.z();
76
+ //$$ }
77
+ //#else
77
78
@ Inject (method = "getPlayerHandPos" , at = @ At ("RETURN" ), cancellable = true )
78
79
private void getPlayerHandPosOffset (Player player , float f , float g , CallbackInfoReturnable <Vec3 > ci ) {
79
80
ci .setReturnValue (ci .getReturnValue ().add (offsetvec3d ));
0 commit comments