Merge branch 'v7.51' into v7.51-1.21.9

Author: Alexander01998

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

@@ -7,9 +7,7 @@
  */
 package net.wurstclient.mixin;
 
-import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -20,7 +18,6 @@
 
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.render.RenderTickCounter;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
@@ -33,55 +30,19 @@
 @Mixin(GameRenderer.class)
 public abstract class GameRendererMixin implements AutoCloseable
 {
-	@Unique
-	private boolean cancelNextBobView;
-	
-	/**
-	 * Fires the CameraTransformViewBobbingEvent event and records whether the
-	 * next view-bobbing call should be cancelled.
-	 */
-	@Inject(at = @At(value = "INVOKE",
+	@WrapOperation(at = @At(value = "INVOKE",
 		target = "Lnet/minecraft/client/render/GameRenderer;bobView(Lnet/minecraft/client/util/math/MatrixStack;F)V",
 		ordinal = 0),
 		method = "renderWorld(Lnet/minecraft/client/render/RenderTickCounter;)V")
-	private void onRenderWorldViewBobbing(RenderTickCounter tickCounter,
-		CallbackInfo ci)
+	private void onBobView(GameRenderer instance, MatrixStack matrices,
+		float tickDelta, Operation<Void> original)
 	{
 		CameraTransformViewBobbingEvent event =
 			new CameraTransformViewBobbingEvent();
 		EventManager.fire(event);
 
-		if(event.isCancelled())
-			cancelNextBobView = true;
-	}
-	
-	/**
-	 * Cancels the view-bobbing call if requested by the last
-	 * CameraTransformViewBobbingEvent.
-	 */
-	@Inject(at = @At("HEAD"),
-		method = "bobView(Lnet/minecraft/client/util/math/MatrixStack;F)V",
-		cancellable = true)
-	private void onBobView(MatrixStack matrices, float tickDelta,
-		CallbackInfo ci)
-	{
-		if(!cancelNextBobView)
-			return;
-		
-		ci.cancel();
-		cancelNextBobView = false;
-	}
-	
-	/**
-	 * This mixin is injected into a random method call later in the
-	 * renderWorld() method to ensure that cancelNextBobView is always reset
-	 * after the view-bobbing call.
-	 */
-	@Inject(at = @At("HEAD"), method = "renderHand(FZLorg/joml/Matrix4f;)V")
-	private void onRenderHand(float tickDelta, boolean bl, Matrix4f matrix4f,
-		CallbackInfo ci)
-	{
-		cancelNextBobView = false;
+		if(!event.isCancelled())
+			original.call(instance, matrices, tickDelta);
 	}
 
 	@Inject(at = @At(value = "RETURN", ordinal = 1),