diff --git a/src/main/java/com/gtnewhorizons/angelica/zoom/Zoom.java b/src/main/java/com/gtnewhorizons/angelica/zoom/Zoom.java index 3ce5a5f44..45d10071f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/zoom/Zoom.java +++ b/src/main/java/com/gtnewhorizons/angelica/zoom/Zoom.java @@ -43,6 +43,10 @@ public class Zoom { return zoomEnabled; } + public static boolean isCinematicCameraEnabled(){ + return (boolean)Settings.ZOOM_CINEMATIC.option.getStore(); + } + public static void modifyZoom(int eventDWheel) { if (eventDWheel == 0) return; zoom = MathHelper.clamp_float((float) (zoom * Math.pow(ZOOM_STEP, Integer.signum(eventDWheel))), ZOOM_MIN, ZOOM_MAX); diff --git a/src/main/java/jss/notfine/core/Settings.java b/src/main/java/jss/notfine/core/Settings.java index 6ebcf61b6..f15db4612 100644 --- a/src/main/java/jss/notfine/core/Settings.java +++ b/src/main/java/jss/notfine/core/Settings.java @@ -176,7 +176,8 @@ public enum Settings { }, VOID_FOG(new NotFineOptionTickBox(false, OptionImpact.LOW)), ZOOM_SMOOTH(new NotFineOptionTickBox(true, OptionImpact.LOW)), - ZOOM_SMOOTH_SPEED(new NotFineOptionSlider(20, 1, 30, 1, OptionImpact.LOW)); + ZOOM_SMOOTH_SPEED(new NotFineOptionSlider(20, 1, 30, 1, OptionImpact.LOW)), + ZOOM_CINEMATIC(new NotFineOptionTickBox(true, OptionImpact.LOW)); public final NotFineOption option; diff --git a/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java b/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java index 8221441ba..cc930f2e8 100644 --- a/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java +++ b/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java @@ -168,6 +168,7 @@ public class NotFineGameOptionPages { groups.add(OptionGroup.createBuilder() .add(Settings.ZOOM_SMOOTH.option) .add(Settings.ZOOM_SMOOTH_SPEED.option) + .add(Settings.ZOOM_CINEMATIC.option) .build()); } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java index 122bbbe7b..ac6243983 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java @@ -830,6 +830,7 @@ public class SodiumGameOptionPages { groups.add(OptionGroup.createBuilder() .add(Settings.ZOOM_SMOOTH.option) .add(Settings.ZOOM_SMOOTH_SPEED.option) + .add(Settings.ZOOM_CINEMATIC.option) .build()); } diff --git a/src/main/resources/assets/notfine/lang/en_US.lang b/src/main/resources/assets/notfine/lang/en_US.lang index df74e085a..ddfbe66f1 100644 --- a/src/main/resources/assets/notfine/lang/en_US.lang +++ b/src/main/resources/assets/notfine/lang/en_US.lang @@ -82,4 +82,6 @@ options.background.random=Random options.zoom_smooth=Smooth Zoom options.zoom_smooth.tooltip=Smoothly interpolates the camera toward the zoom level instead of snapping instantly. options.zoom_smooth_speed=Smooth Zoom Speed -options.zoom_smooth_speed.tooltip=How fast smooth zoom converges to the target zoom. Higher is snappier, lower is floatier. No effect when Smooth Zoom is off. \ No newline at end of file +options.zoom_smooth_speed.tooltip=How fast smooth zoom converges to the target zoom. Higher is snappier, lower is floatier. No effect when Smooth Zoom is off. +options.zoom_cinematic=Cinematic Camera Zoom +options.zoom_cinematic.tooltip=Whether or not to use the Cinematic Camera smooth movement. Off is standard Minecraft mouse camera movement where camera snaps to mouse position. On is floating uninterrupted movement after initial mouse movement, where the camera continues to shift after halting mouse movement. \ No newline at end of file diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/zoom/MixinEntityRenderer_Zoom.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/zoom/MixinEntityRenderer_Zoom.java index e93b2cd7d..cdbfbf748 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/zoom/MixinEntityRenderer_Zoom.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/zoom/MixinEntityRenderer_Zoom.java @@ -35,7 +35,12 @@ public class MixinEntityRenderer_Zoom { target = "Lnet/minecraft/client/settings/GameSettings;smoothCamera:Z", value = "FIELD")) private boolean angelica$checkZoomEnablement(GameSettings settings) { - return settings.smoothCamera || Zoom.isZoomedIn(); + if (Zoom.isCinematicCameraEnabled()){ + return settings.smoothCamera || Zoom.isZoomedIn(); + } + else{ + return settings.smoothCamera; + } } }