细节调整
This commit is contained in:
parent
bd159870e1
commit
3a8ec95e5a
2 changed files with 24 additions and 17 deletions
|
@ -173,24 +173,28 @@ public class ClickHandler {
|
||||||
}
|
}
|
||||||
if (key == ModKeyMappings.EDIT_MODE.getKey().getValue()) {
|
if (key == ModKeyMappings.EDIT_MODE.getKey().getValue()) {
|
||||||
ModUtils.PACKET_HANDLER.sendToServer(new EditModeMessage(0));
|
ModUtils.PACKET_HANDLER.sendToServer(new EditModeMessage(0));
|
||||||
|
editModelShake();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
|
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
|
||||||
if (key == ModKeyMappings.EDIT_SCOPE.getKey().getValue()) {
|
if (key == ModKeyMappings.EDIT_SCOPE.getKey().getValue()) {
|
||||||
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(0));
|
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(0));
|
||||||
|
editModelShake();
|
||||||
}
|
}
|
||||||
if (key == ModKeyMappings.EDIT_BARREL.getKey().getValue()) {
|
if (key == ModKeyMappings.EDIT_BARREL.getKey().getValue()) {
|
||||||
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(1));
|
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(1));
|
||||||
|
editModelShake();
|
||||||
}
|
}
|
||||||
if (key == ModKeyMappings.EDIT_MAGAZINE.getKey().getValue()) {
|
if (key == ModKeyMappings.EDIT_MAGAZINE.getKey().getValue()) {
|
||||||
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(2));
|
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(2));
|
||||||
|
editModelShake();
|
||||||
}
|
}
|
||||||
if (key == ModKeyMappings.EDIT_STOCK.getKey().getValue()) {
|
if (key == ModKeyMappings.EDIT_STOCK.getKey().getValue()) {
|
||||||
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(3));
|
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(3));
|
||||||
|
editModelShake();
|
||||||
}
|
}
|
||||||
|
|
||||||
ClientEventHandler.movePosY = -0.8;
|
|
||||||
ClientEventHandler.fireRotTimer = 0.4;
|
|
||||||
}
|
}
|
||||||
if (key == ModKeyMappings.SENSITIVITY_INCREASE.getKey().getValue()) {
|
if (key == ModKeyMappings.SENSITIVITY_INCREASE.getKey().getValue()) {
|
||||||
ModUtils.PACKET_HANDLER.sendToServer(new SensitivityMessage(true));
|
ModUtils.PACKET_HANDLER.sendToServer(new SensitivityMessage(true));
|
||||||
|
@ -201,6 +205,11 @@ public class ClickHandler {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void editModelShake() {
|
||||||
|
ClientEventHandler.movePosY = -0.8;
|
||||||
|
ClientEventHandler.fireRotTimer = 0.4;
|
||||||
|
}
|
||||||
|
|
||||||
private static void setKeyState(InputEvent.Key event) {
|
private static void setKeyState(InputEvent.Key event) {
|
||||||
int key = event.getKey();
|
int key = event.getKey();
|
||||||
int state;
|
int state;
|
||||||
|
|
|
@ -428,22 +428,20 @@ public class ClientEventHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isMoving() && firePosTimer == 0) {
|
if (isMoving() && firePosTimer == 0) {
|
||||||
if (!entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
|
if (moveYTime < 1.25) {
|
||||||
if (moveYTime < 1.25) {
|
moveYTime += 1.2 * onGround * times * moveSpeed;
|
||||||
moveYTime += 1.2 * onGround * times * moveSpeed;
|
} else {
|
||||||
} else {
|
moveYTime = 0.25;
|
||||||
moveYTime = 0.25;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (moveXTime < 2) {
|
|
||||||
moveXTime += 1.2 * onGround * times * moveSpeed;
|
|
||||||
} else {
|
|
||||||
moveXTime = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
movePosX = 0.2 * Math.sin(1 * Math.PI * moveXTime) * (1 - 0.95 * zoomTime);
|
|
||||||
movePosY = -0.135 * Math.sin(2 * Math.PI * (moveYTime - 0.25)) * (1 - 0.95 * zoomTime);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (moveXTime < 2) {
|
||||||
|
moveXTime += 1.2 * onGround * times * moveSpeed;
|
||||||
|
} else {
|
||||||
|
moveXTime = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
movePosX = 0.2 * Math.sin(1 * Math.PI * moveXTime) * (1 - 0.95 * zoomTime);
|
||||||
|
movePosY = -0.135 * Math.sin(2 * Math.PI * (moveYTime - 0.25)) * (1 - 0.95 * zoomTime);
|
||||||
} else {
|
} else {
|
||||||
if (moveYTime > 0.25) {
|
if (moveYTime > 0.25) {
|
||||||
moveYTime -= 0.5 * times;
|
moveYTime -= 0.5 * times;
|
||||||
|
|
Loading…
Add table
Reference in a new issue