Skip to content

Commit 622ce0d

Browse files
Change getFov mixin to use @ModifyReturnValue
Fixes Wurst-Imperium#1218 Fixes Wurst-Imperium#922 Fixes Wurst-Imperium#823
1 parent 11dc6df commit 622ce0d

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/main/java/net/wurstclient/mixin/GameRendererMixin.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1616
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1717

18+
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
1819
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
1920
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
2021

21-
import net.minecraft.client.render.Camera;
2222
import net.minecraft.client.render.GameRenderer;
2323
import net.minecraft.client.render.RenderTickCounter;
2424
import net.minecraft.client.util.math.MatrixStack;
@@ -84,14 +84,12 @@ private void onRenderHand(float tickDelta, boolean bl, Matrix4f matrix4f,
8484
cancelNextBobView = false;
8585
}
8686

87-
@Inject(at = @At(value = "RETURN", ordinal = 1),
88-
method = "getFov(Lnet/minecraft/client/render/Camera;FZ)F",
89-
cancellable = true)
90-
private void onGetFov(Camera camera, float tickDelta, boolean changingFov,
91-
CallbackInfoReturnable<Float> cir)
87+
@ModifyReturnValue(at = @At("RETURN"),
88+
method = "getFov(Lnet/minecraft/client/render/Camera;FZ)F")
89+
private float onGetFov(float original)
9290
{
93-
cir.setReturnValue(WurstClient.INSTANCE.getOtfs().zoomOtf
94-
.changeFovBasedOnZoom(cir.getReturnValueF()));
91+
return WurstClient.INSTANCE.getOtfs().zoomOtf
92+
.changeFovBasedOnZoom(original);
9593
}
9694

9795
/**

0 commit comments

Comments
 (0)