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:
Atsuihsio 2024-06-11 00:33:37 +08:00
parent ac2a1bcb51
commit 51ef3442d0
1 changed files with 102 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
src/main/java/net/mcreator/target/event/PlayerEventHandler.java
View file

@ -65,6 +65,8 @@ public class PlayerEventHandler {
handleDistantRange(player); handleDistantRange(player);
handleBocekPulling(player); handleBocekPulling(player);
handleGunRecoil(player); handleGunRecoil(player);
handleGunFire(player);
handleGunDev(player);
} }
} }
@ -265,6 +267,10 @@ public class PlayerEventHandler {
} }
} }
/**
* 计算后坐力
*/
private static void handleGunRecoil(Player player) { private static void handleGunRecoil(Player player) {
if (!player.getMainHandItem().is(TargetModTags.Items.GUN)) return; if (!player.getMainHandItem().is(TargetModTags.Items.GUN)) return;
@ -274,34 +280,32 @@ public class PlayerEventHandler {
float recoilYaw = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.recoilHorizon).orElse(0d).floatValue(); float recoilYaw = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.recoilHorizon).orElse(0d).floatValue();
double recoil = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.recoil).orElse(0d);
if (recoil >= 2.5) recoil = 0d;
double sinRes = 0;
if (0 < recoil && recoil < 2) {
recoil = recoil + 0.2;
sinRes = Math.sin(Math.PI * recoil);
}
if (2 <= recoil && recoil < 2.5) {
recoil = recoil + 0.1;
sinRes = 0.4 * Math.sin(2 * Math.PI * recoil);
}
double[] recoilTimer = {0}; double[] recoilTimer = {0};
double totalTime = 20; double totalTime = 20;
int sleepTime = 2; int sleepTime = 2;
double recoilDuration = totalTime / sleepTime; double recoilDuration = totalTime / sleepTime;
double finalRecoil1 = recoil;
double finalSinRes = sinRes;
Runnable recoilRunnable = () -> { Runnable recoilRunnable = () -> {
while (recoilTimer[0] < recoilDuration) { while (recoilTimer[0] < recoilDuration) {
/**
* 开火动画计时器
*/
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).firing > 0) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.firing = (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).firing - 0.1;
capability.syncPlayerVariables(player);
});
} else {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.firing = 0;
capability.syncPlayerVariables(player);
});
}
/**
* 计算后坐力
*/
float rx, ry; float rx, ry;
if (player.isShiftKeyDown() && player.getBbHeight() >= 1 && player.getPersistentData().getDouble("prone") == 0) { if (player.isShiftKeyDown() && player.getBbHeight() >= 1 && player.getPersistentData().getDouble("prone") == 0) {
rx = 0.7f; rx = 0.7f;
@ -319,35 +323,58 @@ public class PlayerEventHandler {
ry = 1f; ry = 1f;
} }
double recoil = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.recoil).orElse(0d); if (0 < finalRecoil1 && finalRecoil1 < 2.5) {
float newPitch = ((float) (player.getXRot() - 6f * recoilY * ry * (finalSinRes + Mth.clamp(1 - finalRecoil1,0,1))));
if (recoil >= 2.5) recoil = 0d;
double sinRes = 0;
if (0 < recoil && recoil < 2) {
recoil = recoil + 0.025;
sinRes = Math.sin(Math.PI * recoil);
}
if (2 <= recoil && recoil < 2.5) {
recoil = recoil + 0.013;
sinRes = 0.4 * Math.sin(2 * Math.PI * recoil);
}
if (0 < recoil && recoil < 2.5) {
float newPitch = ((float) (player.getXRot() - 6f * recoilY * ry * (sinRes + Mth.clamp(0.8 - recoil,0,0.8))));
player.setXRot(newPitch); player.setXRot(newPitch);
player.xRotO = player.getXRot(); player.xRotO = player.getXRot();
float newYaw = ((float) (player.getYRot() - 4f * recoilYaw * recoilX * rx * sinRes)); float newYaw = ((float) (player.getYRot() - 4f * recoilYaw * recoilX * rx * finalSinRes));
player.setYRot(newYaw); player.setYRot(newYaw);
player.yRotO = player.getYRot(); player.yRotO = player.getYRot();
} }
double finalRecoil = finalRecoil1;
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(c -> {
c.recoil = finalRecoil;
c.syncPlayerVariables(player);
});
recoilTimer[0]++;
try {
Thread.sleep(sleepTime);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
};
Thread recoilThread = new Thread(recoilRunnable);
recoilThread.start();
}
/**
* 开火动画计时器
*/
private static void handleGunFire(Player player) {
if (!player.getMainHandItem().is(TargetModTags.Items.GUN)) return;
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).firing > 0) {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.firing = (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).firing - 0.5;
capability.syncPlayerVariables(player);
});
} else {
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.firing = 0;
capability.syncPlayerVariables(player);
});
}
}
/** /**
* 计算散布 * 计算散布
*/ */
private static void handleGunDev(Player player) {
if (!player.getMainHandItem().is(TargetModTags.Items.GUN)) return;
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
@ -385,10 +412,10 @@ public class PlayerEventHandler {
if (player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) < index) { if (player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) < index) {
player.getAttribute(TargetModAttributes.SPREAD.get()) player.getAttribute(TargetModAttributes.SPREAD.get())
.setBaseValue(player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) + 0.125 * Math.pow(index - player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()), 2)); .setBaseValue(player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) + 0.25 * Math.pow(index - player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()), 2));
} else { } else {
player.getAttribute(TargetModAttributes.SPREAD.get()) player.getAttribute(TargetModAttributes.SPREAD.get())
.setBaseValue(player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) - 0.125 * Math.pow(index - player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()), 2)); .setBaseValue(player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) - 0.25 * Math.pow(index - player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()), 2));
} }
if (player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) > 15) { if (player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) > 15) {
@ -397,24 +424,5 @@ public class PlayerEventHandler {
if (player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) < 0) { if (player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) < 0) {
player.getAttribute(TargetModAttributes.SPREAD.get()).setBaseValue(0); player.getAttribute(TargetModAttributes.SPREAD.get()).setBaseValue(0);
} }
double finalRecoil = recoil;
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(c -> {
c.recoil = finalRecoil;
c.syncPlayerVariables(player);
});
recoilTimer[0]++;
try {
Thread.sleep(sleepTime);
} catch (InterruptedException e) {
e.printStackTrace();
} }
} }
};
Thread recoilThread = new Thread(recoilRunnable);
recoilThread.start();
}
}