kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

修复灵敏度计算问题

Browse source
This commit is contained in:
Light_Quanta 2025-04-18 19:24:25 +08:00
parent 9445228954
commit c72ac64ad8
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/main/java/com/atsuishio/superbwarfare/event/ClientMouseHandler.java
View file

@ -89,8 +89,9 @@ public class ClientMouseHandler {
@SubscribeEvent @SubscribeEvent
public static void calculatePlayerTurn(CalculatePlayerTurnEvent event) { public static void calculatePlayerTurn(CalculatePlayerTurnEvent event) {
var newSensitivity = changeSensitivity(event.getMouseSensitivity()) * invertY(); var raw = event.getMouseSensitivity() * 0.6 + 0.2;
event.setMouseSensitivity(newSensitivity); var newSensitivity = changeSensitivity(raw) * invertY();
event.setMouseSensitivity((newSensitivity - 0.2) / 0.6);
} }
public static float invertY() { public static float invertY() {
@ -120,6 +121,18 @@ public class ClientMouseHandler {
} }
ItemStack stack = mc.player.getMainHandItem(); ItemStack stack = mc.player.getMainHandItem();
if (stack.getItem() instanceof GunItem) {
var data = GunData.from(stack);
float customSens = (float) data.tag.getInt("sensitivity");
if (!player.getMainHandItem().isEmpty() && mc.options.getCameraType() == CameraType.FIRST_PERSON) {
return original / Math.max((1 + (0.2 * (data.zoom() - (0.3 * customSens)) * ClientEventHandler.zoomTime)), 0.1);
}
}
if (stack.is(ModItems.MONITOR.get()) && NBTTool.getTag(stack).getBoolean("Using") && NBTTool.getTag(stack).getBoolean("Linked")) {
return 0.33 / (1 + 0.08 * (droneFovLerp - 1));
}
if (isFreeCam(player)) { if (isFreeCam(player)) {
return 0; return 0;
@ -157,22 +170,6 @@ public class ClientMouseHandler {
return 0.3; return 0.3;
} }
var tag = NBTTool.getTag(stack);
if (stack.is(ModItems.MONITOR.get()) && tag.getBoolean("Using") && tag.getBoolean("Linked")) {
return 0.33 / (1 + 0.08 * (droneFovLerp - 1));
}
if (!(stack.getItem() instanceof GunItem)) {
return original;
}
var data = GunData.from(stack);
float customSens = (float) data.tag().getInt("sensitivity");
if (!player.getMainHandItem().isEmpty() && mc.options.getCameraType() == CameraType.FIRST_PERSON) {
return original / Math.max((1 + (0.2 * (data.zoom() - (0.3 * customSens)) * ClientEventHandler.zoomTime)), 0.1);
}
return original; return original;
} }
} }