diff --git a/src/main/java/jss/notfine/core/Settings.java b/src/main/java/jss/notfine/core/Settings.java index ee6e8204b..b0e536729 100644 --- a/src/main/java/jss/notfine/core/Settings.java +++ b/src/main/java/jss/notfine/core/Settings.java @@ -10,6 +10,7 @@ import cpw.mods.fml.relauncher.SideOnly; import jss.notfine.gui.options.control.NotFineControlValueFormatter; import jss.notfine.gui.options.named.AlwaysNever; import jss.notfine.gui.options.named.BackgroundSelect; +import jss.notfine.gui.options.named.BobviewMode; import jss.notfine.gui.options.named.DownfallQuality; import jss.notfine.gui.options.named.FOVMode; import jss.notfine.gui.options.named.GraphicsQualityOff; @@ -50,6 +51,7 @@ public enum Settings { SettingsManager.downfallDistanceUpdated(); } }, + BOBVIEW_MODE(new NotFineOptionCycling<>(BobviewMode.DEFAULT, null)), DYNAMIC_FOV(new NotFineOptionCycling<>(FOVMode.ALL, OptionImpact.VARIES)), HURT_SHAKE(new NotFineOptionSliderPercentage(100, 0, 300, 5, OptionImpact.LOW)), DYNAMIC_LIGHTS(new NotFineOptionCycling<>(DynamicLightsMode.FANCY, OptionImpact.VARIES)){ diff --git a/src/main/java/jss/notfine/gui/options/named/BobviewMode.java b/src/main/java/jss/notfine/gui/options/named/BobviewMode.java new file mode 100644 index 000000000..d08e83909 --- /dev/null +++ b/src/main/java/jss/notfine/gui/options/named/BobviewMode.java @@ -0,0 +1,20 @@ +package jss.notfine.gui.options.named; + +import me.jellysquid.mods.sodium.client.gui.options.named.NamedState; + +public enum BobviewMode implements NamedState { + DEFAULT("generator.default"), + HAND("options.bobview.hand"), + CAMERA("options.bobview.camera"); + + private final String name; + + BobviewMode(String name) { + this.name = name; + } + + @Override + public String getKey() { + return this.name; + } +} 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 66ad2ea30..41301f6c7 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 @@ -143,6 +143,7 @@ public class SodiumGameOptionPages { .setControl(TickBoxControl::new) .setBinding((opts, value) -> opts.viewBobbing = value, opts -> opts.viewBobbing) .build()) + .add(Settings.BOBVIEW_MODE.option) .add(Settings.DYNAMIC_FOV.option) .add(Settings.HURT_SHAKE.option) .add(Settings.MODE_WATER.option) diff --git a/src/main/resources/assets/notfine/lang/en_US.lang b/src/main/resources/assets/notfine/lang/en_US.lang index dc5c44661..372150301 100644 --- a/src/main/resources/assets/notfine/lang/en_US.lang +++ b/src/main/resources/assets/notfine/lang/en_US.lang @@ -26,6 +26,10 @@ options.terrain_fog=Terrain Fog options.terrain_fog.tooltip=Terrain Fog (aka View Distance Fog) options.fog_near_distance=Near Fog Distance options.fog_near_distance.tooltip=Distance away from the player when the view distance fog will start (0%% opacity then linear increase to render distance) +options.bobview_mode=View Bobbing Mode +options.bobview_mode.tooltip=Change the view bobbing behaviour to bob only the hand or camera. +options.bobview.hand=Hand Only +options.bobview.camera=Camera Only options.fov.all=Enabled options.fov.mods=Mods Only options.fov.none=Disabled diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java index 725948180..507deb9fb 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java @@ -3,7 +3,9 @@ package com.gtnewhorizons.angelica.mixins.early.angelica; import com.gtnewhorizons.angelica.compat.mojang.Camera; import com.gtnewhorizons.angelica.mixins.interfaces.EntityRendererAccessor; import com.gtnewhorizons.angelica.rendering.RenderingState; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import jss.notfine.core.Settings; +import jss.notfine.gui.options.named.BobviewMode; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.texture.DynamicTexture; @@ -54,4 +56,14 @@ public abstract class MixinEntityRenderer implements EntityRendererAccessor { int value = (int) Settings.HURT_SHAKE.option.getStore(); return orig * (value/100F); } + + @WrapWithCondition(method = "setupCameraTransform", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/EntityRenderer;setupViewBobbing(F)V")) + private boolean angelica$cameraBobbing(EntityRenderer entity, float partialTicks) { + return Settings.BOBVIEW_MODE.option.getStore() != BobviewMode.HAND; + } + + @WrapWithCondition(method = "renderHand", at= @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/EntityRenderer;setupViewBobbing(F)V")) + private boolean angelica$handBobbing(EntityRenderer entity, float partialTicks) { + return Settings.BOBVIEW_MODE.option.getStore() != BobviewMode.CAMERA; + } }