Skip to content

Commit 9d753f3

Browse files
committed
Small fix for the fishing rod in dynamic mode
1 parent 264f83c commit 9d753f3

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

src/main/java/dev/tr7zw/firstperson/mixins/FishingBobberRendererMixin.java

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ public class FishingBobberRendererMixin {
2626

2727
private boolean doCorrect() {
2828
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();
3031
}
3132

3233
// spotless:off
@@ -54,26 +55,26 @@ private void calcOffset(FishingHook fishingBobberEntity, float f, float g, PoseS
5455

5556
// spotless:off
5657
//#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
7778
@Inject(method = "getPlayerHandPos", at = @At("RETURN"), cancellable = true)
7879
private void getPlayerHandPosOffset(Player player, float f, float g, CallbackInfoReturnable<Vec3> ci) {
7980
ci.setReturnValue(ci.getReturnValue().add(offsetvec3d));

0 commit comments

Comments
 (0)