fix 24w33a compat

CHANGELOG.md

@@ -1,2 +1,2 @@
-- fix NeoForge 21.0.112-beta support
+- fix 24w33a
 - further improvements to overall system stability and other minor adjustments have been made to enhance the user experience

modern/src/main/java/dev/nolij/zume/mixin/modern/GameRendererMixin.java

@@ -6,6 +6,7 @@
 import org.spongepowered.asm.mixin.Dynamic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Group;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
@@ -18,12 +19,24 @@ public abstract class GameRendererMixin {
 		Zume.renderHook();
 	}
 
-	@ModifyReturnValue(method = "getFov", at = @At("TAIL"))
+	@Group(name = "zume$getFov", min = 1, max = 1)
+	@ModifyReturnValue(method = "getFov", at = @At("TAIL"), require = 0)
 	public double zume$getFov$TAIL(double original) {
 		if (Zume.isFOVHookActive())
 			return Zume.fovHook(original);
 
 		return original;
 	}
 
+	// 24w33a (21.2)+ compat
+	@Dynamic
+	@Group(name = "zume$getFov", min = 1, max = 1)
+	@ModifyReturnValue(method = "method_3196(Lnet/minecraft/class_4184;FZ)F", at = @At("TAIL"), require = 0)
+	public float zume$getFov$TAIL(float original) {
+		if (Zume.isFOVHookActive())
+			return (float) Zume.fovHook(original);
+
+		return original;
+	}
+
 }

modern/src/main/java/dev/nolij/zume/mixin/modern/MouseHandlerMixin.java

@@ -2,6 +2,8 @@
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import dev.nolij.zume.impl.Zume;
 import net.minecraft.client.MouseHandler;
 import net.minecraft.world.entity.player.Inventory;
@@ -48,9 +50,21 @@ public abstract class MouseHandlerMixin {
 		return original;
 	}
 
-	@WrapWithCondition(method = "onScroll", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Inventory;swapPaint(D)V"))
+	@Group(name = "zume$onScroll", min = 1, max = 1)
+	@WrapWithCondition(method = "onScroll", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Inventory;swapPaint(D)V"), require = 0)
 	public boolean onMouseScroll$scrollInHotbar(Inventory instance, double scrollAmount) {
 		return !Zume.mouseScrollHook((int) scrollAmount);
 	}
 
+	// 24w33a (21.2)+ compat
+	@Dynamic
+	@Group(name = "zume$onScroll", min = 1, max = 1)
+	@WrapOperation(method = "onScroll", at = @At(value = "INVOKE", target = "Lnet/minecraft/class_9928;method_61972(DII)I"), require = 0)
+	public int zume$onScroll$getNextScrollWheelSelection(double scrollAmount, int current, int max, Operation<Integer> original) {
+		if (Zume.mouseScrollHook((int) scrollAmount))
+			return current;
+
+		return original.call(scrollAmount, current, max);
+	}
+
 }