merge: PR #125 add mouse wheel zoom to SmoothZoom

Author: gaoyu06

src/main/java/top/fpsmaster/features/impl/optimizes/SmoothZoom.java

@@ -1,6 +1,8 @@
 package top.fpsmaster.features.impl.optimizes;
 
 import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
+import top.fpsmaster.FPSMaster;
 import top.fpsmaster.event.Subscribe;
 import top.fpsmaster.event.events.EventUpdate;
 import top.fpsmaster.features.manager.Category;
@@ -14,10 +16,17 @@ public class SmoothZoom extends Module {
 
     private final BindSetting zoomBind = new BindSetting("ZoomBind", Keyboard.KEY_C);
     private final BooleanSetting smoothMouse = new BooleanSetting("SmoothMouse", false);
+    public static BooleanSetting smoothCamera = new BooleanSetting("smoothZoom", false);
+    public static BooleanSetting wheelZoom = new BooleanSetting("wheelZoom", false);
+    public static NumberSetting speed = new NumberSetting("Speed", 4.0, 0.1, 10.0, 0.1, () -> smoothCamera.getValue());
+
+    public static boolean using = false;
+    public static boolean zoom = false;
+    public static float zoomScale = 4f;
 
     public SmoothZoom() {
         super("SmoothZoom", Category.OPTIMIZE);
-        addSettings(smoothCamera, speed, zoomBind, smoothMouse);
+        addSettings(smoothCamera, speed, zoomBind, smoothMouse, wheelZoom);
         set(true);
     }
 
@@ -37,26 +46,32 @@ public void onDisable() {
     public void onUpdate(EventUpdate e) {
         if (Utility.mc.currentScreen != null) return;
 
-        if (Keyboard.isKeyDown(zoomBind.getValue())) {
+        if (isZoomKeyDown()) {
+            if(wheelZoom.getValue()){
+                int dWheel = Mouse.getDWheel();
+                zoomScale += dWheel / 60f;
+                zoomScale = Math.min(Math.max(zoomScale, 2f), 20f);
+            }
             zoom = true;
             if (smoothMouse.getValue()) {
                 Utility.mc.gameSettings.smoothCamera = true;
             }
         } else {
             zoom = false;
+            zoomScale = 4f;
             if (smoothMouse.getValue()) {
                 Utility.mc.gameSettings.smoothCamera = false;
             }
         }
     }
 
-    public static boolean using = false;
-
-    public static boolean zoom = false;
-
-    public static BooleanSetting smoothCamera = new BooleanSetting("smoothZoom", false);
+    public boolean isZoomKeyDown() {
+        return Keyboard.isKeyDown(zoomBind.getValue());
+    }
 
-    public static NumberSetting speed = new NumberSetting("Speed", 4.0, 0.1, 10.0, 0.1, () -> smoothCamera.getValue());
+    public static boolean isZoomKeyActive() {
+        return FPSMaster.moduleManager.getModule(SmoothZoom.class).isZoomKeyDown();
+    }
 }
 
 

src/main/java/top/fpsmaster/forge/mixin/MixinEntityRenderer.java

@@ -96,29 +96,29 @@ private void getFOVModifier(float partialTicks, boolean useFOVSetting, CallbackI
                 if (SmoothZoom.zoom) {
                     if (useFOVSetting) {
                         if (SmoothZoom.smoothCamera.getValue()) {
-                            screenScale = MathUtils.decreasedSpeed(screenScale, f, f / 4.0F, SmoothZoom.speed.getValue().floatValue() / (float) Minecraft.getDebugFPS() * 150.0f);
+                            screenScale = MathUtils.decreasedSpeed(screenScale, f, f / SmoothZoom.zoomScale, SmoothZoom.speed.getValue().floatValue() / (float) Minecraft.getDebugFPS() * 150.0f);
                         } else {
-                            screenScale = f / 4.0F;
+                            screenScale = f / SmoothZoom.zoomScale;
                         }
                     } else {
                         if (SmoothZoom.smoothCamera.getValue()) {
-                            screenScale2 = MathUtils.decreasedSpeed(screenScale2, f, f / 4.0F, SmoothZoom.speed.getValue().floatValue() / (float) Minecraft.getDebugFPS() * 150.0f);
+                            screenScale2 = MathUtils.decreasedSpeed(screenScale2, f, f / SmoothZoom.zoomScale, SmoothZoom.speed.getValue().floatValue() / (float) Minecraft.getDebugFPS() * 150.0f);
                         } else {
-                            screenScale2 = f / 4.0F;
+                            screenScale2 = f / SmoothZoom.zoomScale;
                         }
                     }
                 }
 
                 if (!SmoothZoom.zoom) {
                     if (useFOVSetting) {
                         if (SmoothZoom.smoothCamera.getValue()) {
-                            screenScale = MathUtils.decreasedSpeed(screenScale, f / 4.0F, f, SmoothZoom.speed.getValue().floatValue() / (float) Minecraft.getDebugFPS() * 150.0f);
+                            screenScale = MathUtils.decreasedSpeed(screenScale, f / SmoothZoom.zoomScale, f, SmoothZoom.speed.getValue().floatValue() / (float) Minecraft.getDebugFPS() * 150.0f);
                         } else {
                             screenScale = f;
                         }
                     } else {
                         if (SmoothZoom.smoothCamera.getValue()) {
-                            screenScale2 = MathUtils.decreasedSpeed(screenScale2, f / 4.0F, f, SmoothZoom.speed.getValue().floatValue() / (float) Minecraft.getDebugFPS() * 150.0f);
+                            screenScale2 = MathUtils.decreasedSpeed(screenScale2, f / SmoothZoom.zoomScale, f, SmoothZoom.speed.getValue().floatValue() / (float) Minecraft.getDebugFPS() * 150.0f);
                         } else {
                             screenScale2 = f;
                         }

src/main/java/top/fpsmaster/forge/mixin/MixinInventoryPlayer.java

@@ -0,0 +1,18 @@
+package top.fpsmaster.forge.mixin;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import top.fpsmaster.features.impl.optimizes.SmoothZoom;
+
+@Mixin(InventoryPlayer.class)
+public class MixinInventoryPlayer {
+    @Inject(method = "changeCurrentItem", at = @At("HEAD"), cancellable = true)
+    private void onchangeCurrentItem(int direction, CallbackInfo ci) {
+        if (SmoothZoom.wheelZoom.getValue() && SmoothZoom.isZoomKeyActive()) {
+            ci.cancel();
+        }
+    }
+}

src/main/resources/assets/minecraft/client/lang/en_us.lang

@@ -565,6 +565,7 @@ smoothzoom.smoothzoom=Enable Smooth Zoom
 smoothzoom.speed=Zoom Speed
 smoothzoom.zoombind=Zoom Keybind
 smoothzoom.smoothmouse=Smooth Mouse Input
+smoothzoom.wheelzoom=Mouse Wheel Zoom
 
 skinchanger=Skin Changer
 skinchanger.skin=Skin Name

src/main/resources/assets/minecraft/client/lang/zh_cn.lang

@@ -569,6 +569,7 @@ smoothzoom.smoothzoom=缩放平滑
 smoothzoom.speed=速度
 smoothzoom.zoombind=快捷键
 smoothzoom.smoothmouse=鼠标平滑
+smoothzoom.wheelzoom=鼠标滚轮缩放
 
 skinchanger=皮肤修改器
 skinchanger.skin=皮肤名称

src/main/resources/mixins.fpsmaster.json

@@ -32,6 +32,7 @@
     "MixinGuiNewChat",
     "MixinGuiPlayerOverlay",
     "MixinGuiScreen",
+    "MixinInventoryPlayer",
     "MixinInventoryEffectRenderer",
     "MixinItemRenderer",
     "MixinKeybinding",