diff --git a/src/main/java/net/mcreator/target/mixins/MouseHandlerMixin.java b/src/main/java/net/mcreator/target/mixins/MouseHandlerMixin.java index d4727d978..5b54d0177 100644 --- a/src/main/java/net/mcreator/target/mixins/MouseHandlerMixin.java +++ b/src/main/java/net/mcreator/target/mixins/MouseHandlerMixin.java @@ -24,22 +24,22 @@ public class MouseHandlerMixin { float additionalAdsSensitivity = 1.0F; Minecraft mc = Minecraft.getInstance(); Player player = Minecraft.getInstance().player; + ItemStack stack = mc.player.getMainHandItem(); if (player == null) { return original; } - ItemStack stack = mc.player.getMainHandItem(); - boolean flag = false; - float sens = 0.01f; + float sens = 0.2f; float fov = (float) player.getPersistentData().getDouble("fov"); + float custom_sens = (float) stack.getOrCreateTag().getInt("sensitivity"); float original_fov = mc.options.fov().get(); if (mc.player != null && !mc.player.getMainHandItem().isEmpty() && mc.options.getCameraType() == CameraType.FIRST_PERSON) { if (stack.is(TargetModTags.Items.GUN) && (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { - additionalAdsSensitivity = Mth.clamp(1.5F * fov / original_fov, 0.25F, 0.8F); + additionalAdsSensitivity = (float) Mth.clamp((1 + 0.1f * custom_sens) * (1.25F * fov / original_fov) * (1 + 0.05f * Math.pow((original_fov / fov), 2)), 0.125F, 2F); flag = true; } diff --git a/src/main/resources/data/target/guns/kraber.json b/src/main/resources/data/target/guns/kraber.json index 056f4c01b..d0e8b445e 100644 --- a/src/main/resources/data/target/guns/kraber.json +++ b/src/main/resources/data/target/guns/kraber.json @@ -1,6 +1,6 @@ { "zoom_speed": 0.8, - "zoom": 3, + "zoom": 6, "bipod": 1, "dev": 6, "recoil_x": 0.008, diff --git a/src/main/resources/data/target/guns/m_98b.json b/src/main/resources/data/target/guns/m_98b.json index 372f3c096..72dc293b0 100644 --- a/src/main/resources/data/target/guns/m_98b.json +++ b/src/main/resources/data/target/guns/m_98b.json @@ -1,6 +1,6 @@ { "zoom_speed": 0.85, - "zoom": 4, + "zoom": 8, "dev": 6, "recoil_x": 0.007, "recoil_y": 0.013, diff --git a/src/main/resources/data/target/guns/mk_14.json b/src/main/resources/data/target/guns/mk_14.json index 1f52fec78..6215bcf2a 100644 --- a/src/main/resources/data/target/guns/mk_14.json +++ b/src/main/resources/data/target/guns/mk_14.json @@ -1,6 +1,6 @@ { "zoom_speed": 0.9, - "zoom": 3.4, + "zoom": 4, "dev": 6, "bipod": 1, "recoil_x": 0.006,