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:
17146 2024-09-20 13:28:24 +08:00
parent 5d312db28e
commit a9f8ee9e32
3 changed files with 67 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java
View file

@ -15,7 +15,6 @@ import software.bernie.geckolib.core.animatable.model.CoreGeoBone;
import software.bernie.geckolib.core.animation.AnimationState; import software.bernie.geckolib.core.animation.AnimationState;
import software.bernie.geckolib.model.GeoModel; import software.bernie.geckolib.model.GeoModel;
public class AK47ItemModel extends GeoModel<AK47Item> { public class AK47ItemModel extends GeoModel<AK47Item> {
@Override @Override
@ -45,7 +44,7 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return; if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime(); double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.getZoomPos(); double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ(); double zpz = ClientEventHandler.getZoomPosZ();
@ -55,10 +54,8 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
gun.setScaleZ(1f - (0.2f * (float) zp)); gun.setScaleZ(1f - (0.2f * (float) zp));
scope.setScaleZ(1f - (0.4f * (float) zp)); scope.setScaleZ(1f - (0.4f * (float) zp));
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.8)); stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.8));
double fp = ClientEventHandler.getFirePos(); double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot(); double fr = ClientEventHandler.getFireRot();
@ -74,7 +71,7 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
shen.setRotX(0.07f * (float) (0.18f * fp + fr)); shen.setRotX(0.07f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr));
} }
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
shuan.setPosZ(2.4f * (float) fp); shuan.setPosZ(2.4f * (float) fp);
@ -121,6 +118,6 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
camera.setRotY(numR * camera.getRotY()); camera.setRotY(numR * camera.getRotY());
camera.setRotZ(numR * camera.getRotZ()); camera.setRotZ(numR * camera.getRotZ());
} }
ClientEventHandler.shake(Mth.RAD_TO_DEG * camera.getRotX(),Mth.RAD_TO_DEG * camera.getRotY(), Mth.RAD_TO_DEG * camera.getRotZ()); ClientEventHandler.shake(Mth.RAD_TO_DEG * camera.getRotX(), Mth.RAD_TO_DEG * camera.getRotY(), Mth.RAD_TO_DEG * camera.getRotZ());
} }
} }

133
src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
View file

@ -1,5 +1,6 @@
package net.mcreator.superbwarfare.event; package net.mcreator.superbwarfare.event;
import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.entity.DroneEntity; import net.mcreator.superbwarfare.entity.DroneEntity;
import net.mcreator.superbwarfare.entity.ICannonEntity; import net.mcreator.superbwarfare.entity.ICannonEntity;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
@ -33,25 +34,23 @@ import static net.mcreator.superbwarfare.entity.DroneEntity.ROT_Z;
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT) @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
public class ClientEventHandler { public class ClientEventHandler {
private static double zoomTimer = 0; public static double zoomTime = 0;
private static double zoomPos = 0; private static double zoomPos = 0;
private static double zoomPosZ = 0; private static double zoomPosZ = 0;
private static double swayTimer = 0; private static double swayTime = 0;
private static double swayX = 0; private static double swayX = 0;
private static double swayY = 0; private static double swayY = 0;
private static double moveXTimer = 0; private static double moveXTime = 0;
private static double moveYTimer = 0; private static double moveYTime = 0;
private static double movePosX = 0; private static double movePosX = 0;
private static double movePosY = 0; private static double movePosY = 0;
private static double moveRotZ = 0; private static double moveRotZ = 0;
private static double movePosHorizon = 0; private static double movePosHorizon = 0;
private static double velocityY = 0; private static double velocityY = 0;
private static double turnRotX = 0;
private static double turnRotY = 0; public static double[] turnRot = {0, 0, 0};
private static double turnRotZ = 0; public static double[] cameraRot = {0, 0, 0};
private static double cameraRotX = 0;
private static double cameraRotY = 0;
private static double cameraRotZ = 0;
private static double firePosTimer = 0; private static double firePosTimer = 0;
private static double fireRotTimer = 0; private static double fireRotTimer = 0;
private static double firePos = 0; private static double firePos = 0;
@ -62,7 +61,9 @@ public class ClientEventHandler {
private static double droneRotX = 0; private static double droneRotX = 0;
private static double droneRotZ = 0; private static double droneRotZ = 0;
private static double breathTime = 0; private static double breathTime = 0;
private static double fov = 0;
public static double fov = 0;
private static double pullTimer = 0; private static double pullTimer = 0;
private static double bowTimer = 0; private static double bowTimer = 0;
private static double handTimer = 0; private static double handTimer = 0;
@ -70,7 +71,6 @@ public class ClientEventHandler {
private static double bowPos = 0; private static double bowPos = 0;
private static double handPos = 0; private static double handPos = 0;
@SubscribeEvent @SubscribeEvent
public static void handleWeaponTurn(RenderHandEvent event) { public static void handleWeaponTurn(RenderHandEvent event) {
LocalPlayer player = Minecraft.getInstance().player; LocalPlayer player = Minecraft.getInstance().player;
@ -81,24 +81,24 @@ public class ClientEventHandler {
float yRotOffset = Mth.lerp(event.getPartialTick(), player.yBobO, player.yBob); float yRotOffset = Mth.lerp(event.getPartialTick(), player.yBobO, player.yBob);
float xRot = player.getViewXRot(event.getPartialTick()) - xRotOffset; float xRot = player.getViewXRot(event.getPartialTick()) - xRotOffset;
float yRot = player.getViewYRot(event.getPartialTick()) - yRotOffset; float yRot = player.getViewYRot(event.getPartialTick()) - yRotOffset;
turnRotX = Mth.clamp(0.05 * xRot, -5, 5) * (1 - 0.75 * zoomTimer); turnRot[0] = Mth.clamp(0.05 * xRot, -5, 5) * (1 - 0.75 * zoomTime);
turnRotY = Mth.clamp(0.05 * yRot, -10, 10) * (1 - 0.75 * zoomTimer); turnRot[1] = Mth.clamp(0.05 * yRot, -10, 10) * (1 - 0.75 * zoomTime);
turnRotZ = Mth.clamp(0.1 * yRot, -10, 10) * (1 - zoomTimer); turnRot[2] = Mth.clamp(0.1 * yRot, -10, 10) * (1 - zoomTime);
droneCameraRotX = Mth.clamp(0.25f * xRot, -10, 10); droneCameraRotX = Mth.clamp(0.25f * xRot, -10, 10);
droneCameraRotY = Mth.clamp(0.25f * yRot, -20, 10); droneCameraRotY = Mth.clamp(0.25f * yRot, -20, 10);
} }
public static double getTurnRotX() { public static double getTurnRotX() {
return turnRotX; return turnRot[0];
} }
public static double getTurnRotY() { public static double getTurnRotY() {
return turnRotY; return turnRot[1];
} }
public static double getTurnRotZ() { public static double getTurnRotZ() {
return turnRotZ; return turnRot[2];
} }
@SubscribeEvent @SubscribeEvent
@ -112,7 +112,8 @@ public class ClientEventHandler {
&& living.getMainHandItem().getOrCreateTag().getBoolean("Linked")) { && living.getMainHandItem().getOrCreateTag().getBoolean("Linked")) {
handleDroneCamera(event, living); handleDroneCamera(event, living);
} else { } else {
if (Minecraft.getInstance().gameRenderer.currentEffect() != null && Minecraft.getInstance().gameRenderer.currentEffect().getName().equals("superbwarfare:shaders/post/scan_pincushion.json")) { var effect = Minecraft.getInstance().gameRenderer.currentEffect();
if (effect != null && effect.getName().equals(ModUtils.MODID + ":shaders/post/scan_pincushion.json")) {
Minecraft.getInstance().gameRenderer.shutdownEffect(); Minecraft.getInstance().gameRenderer.shutdownEffect();
} }
} }
@ -155,12 +156,11 @@ public class ClientEventHandler {
if (drone != null && stack.getOrCreateTag().getBoolean("Using")) { if (drone != null && stack.getOrCreateTag().getBoolean("Using")) {
if (Minecraft.getInstance().gameRenderer.currentEffect() == null) { if (Minecraft.getInstance().gameRenderer.currentEffect() == null) {
Minecraft.getInstance().gameRenderer.loadEffect(new ResourceLocation("superbwarfare:shaders/post/scan_pincushion.json")); Minecraft.getInstance().gameRenderer.loadEffect(new ResourceLocation(ModUtils.MODID, "shaders/post/scan_pincushion.json"));
} }
} }
} }
private static void handleCannonScreen(LivingEntity entity) { private static void handleCannonScreen(LivingEntity entity) {
if (entity.level().isClientSide() && entity instanceof Player player) { if (entity.level().isClientSide() && entity instanceof Player player) {
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
@ -200,7 +200,7 @@ public class ClientEventHandler {
.stream().filter(e -> e.getStringUUID().equals(stack.getOrCreateTag().getString("LinkedDrone"))).findFirst().ifPresent(drone -> event.setCanceled(true)); .stream().filter(e -> e.getStringUUID().equals(stack.getOrCreateTag().getString("LinkedDrone"))).findFirst().ifPresent(drone -> event.setCanceled(true));
} }
} }
private static void handleWeaponSway(LivingEntity entity) { private static void handleWeaponSway(LivingEntity entity) {
if (entity.getMainHandItem().is(ModTags.Items.GUN)) { if (entity.getMainHandItem().is(ModTags.Items.GUN)) {
float times = 2 * Minecraft.getInstance().getDeltaFrameTime(); float times = 2 * Minecraft.getInstance().getDeltaFrameTime();
@ -215,9 +215,9 @@ public class ClientEventHandler {
pose = 1; pose = 1;
} }
swayTimer += 0.05 * times; swayTime += 0.05 * times;
swayX = pose * -0.008 * Math.sin(swayTimer) * (1 - 0.95 * zoomTimer); swayX = pose * -0.008 * Math.sin(swayTime) * (1 - 0.95 * zoomTime);
swayY = pose * 0.125 * Math.sin(swayTimer - 1.585) * (1 - 0.95 * zoomTimer) - 3 * moveRotZ; swayY = pose * 0.125 * Math.sin(swayTime - 1.585) * (1 - 0.95 * zoomTime) - 3 * moveRotZ;
} }
} }
@ -244,55 +244,53 @@ public class ClientEventHandler {
on_ground = 0.001; on_ground = 0.001;
} }
if (Minecraft.getInstance().options.keyUp.isDown() && firePosTimer == 0 && zoomTimer == 0) { if (Minecraft.getInstance().options.keyUp.isDown() && firePosTimer == 0 && zoomTime == 0) {
moveRotZ = Mth.clamp(moveRotZ + 0.007 * times,0,0.14); moveRotZ = Mth.clamp(moveRotZ + 0.007 * times, 0, 0.14);
} else { } else {
moveRotZ = Mth.clamp(moveRotZ - 0.007 * times,0,0.14); moveRotZ = Mth.clamp(moveRotZ - 0.007 * times, 0, 0.14);
} }
if ((Minecraft.getInstance().options.keyLeft.isDown() if ((Minecraft.getInstance().options.keyLeft.isDown()
|| Minecraft.getInstance().options.keyRight.isDown() || Minecraft.getInstance().options.keyRight.isDown()
|| Minecraft.getInstance().options.keyUp.isDown() || Minecraft.getInstance().options.keyUp.isDown()
|| Minecraft.getInstance().options.keyDown.isDown()) && firePosTimer == 0) { || Minecraft.getInstance().options.keyDown.isDown()) && firePosTimer == 0) {
if (moveYTime < 1.25) {
if (moveYTimer < 1.25) { moveYTime += 1.2 * on_ground * times * move_speed;
moveYTimer += 1.2 * on_ground * times * move_speed;
} else { } else {
moveYTimer = 0.25; moveYTime = 0.25;
} }
if (moveXTimer < 2) { if (moveXTime < 2) {
moveXTimer += 1.2 * on_ground * times * move_speed; moveXTime += 1.2 * on_ground * times * move_speed;
} else { } else {
moveXTimer = 0; moveXTime = 0;
} }
movePosX= 0.2 * Math.sin(1 * Math.PI * moveXTimer) * (1 - 0.95 * zoomTimer); movePosX = 0.2 * Math.sin(1 * Math.PI * moveXTime) * (1 - 0.95 * zoomTime);
movePosY = -0.135 * Math.sin(2 * Math.PI * (moveYTimer - 0.25)) * (1 - 0.95 * zoomTimer); movePosY = -0.135 * Math.sin(2 * Math.PI * (moveYTime - 0.25)) * (1 - 0.95 * zoomTime);
} else { } else {
if (moveYTimer > 0.25) { if (moveYTime > 0.25) {
moveYTimer -= 0.5 * times; moveYTime -= 0.5 * times;
} else { } else {
moveYTimer = 0.25; moveYTime = 0.25;
} }
if (moveXTimer > 0) { if (moveXTime > 0) {
moveXTimer -= 0.5 * times; moveXTime -= 0.5 * times;
} else { } else {
moveXTimer = 0; moveXTime = 0;
} }
if (movePosX > 0) { if (movePosX > 0) {
movePosX -= 1.5 * (Math.pow(movePosX, 2) * times) * (1 - 0.75 * zoomTimer); movePosX -= 1.5 * (Math.pow(movePosX, 2) * times) * (1 - 0.75 * zoomTime);
} else { } else {
movePosX += 1.5 * (Math.pow(movePosX, 2) * times) * (1 - 0.75 * zoomTimer); movePosX += 1.5 * (Math.pow(movePosX, 2) * times) * (1 - 0.75 * zoomTime);
} }
if (movePosY > 0) { if (movePosY > 0) {
movePosY -= 1.5 * (Math.pow(movePosY, 2) * times) * (1 - 0.75 * zoomTimer); movePosY -= 1.5 * (Math.pow(movePosY, 2) * times) * (1 - 0.75 * zoomTime);
} else { } else {
movePosY += 1.5 * (Math.pow(movePosY, 2) * times) * (1 - 0.75 * zoomTimer); movePosY += 1.5 * (Math.pow(movePosY, 2) * times) * (1 - 0.75 * zoomTime);
} }
} }
@ -302,18 +300,18 @@ public class ClientEventHandler {
movePosHorizon -= 2 * times * Math.pow(movePosHorizon, 2); movePosHorizon -= 2 * times * Math.pow(movePosHorizon, 2);
} }
if (Minecraft.getInstance().options.keyRight.isDown()) { if (Minecraft.getInstance().options.keyRight.isDown()) {
movePosHorizon = Mth.clamp(movePosHorizon + Math.pow(Math.abs(movePosHorizon) + 0.05, 2) * 0.2 * times, -0.5,0.5) * (1 - zoomTimer); movePosHorizon = Mth.clamp(movePosHorizon + Math.pow(Math.abs(movePosHorizon) + 0.05, 2) * 0.2 * times, -0.5, 0.5) * (1 - zoomTime);
} else if (Minecraft.getInstance().options.keyLeft.isDown()) { } else if (Minecraft.getInstance().options.keyLeft.isDown()) {
movePosHorizon = Mth.clamp(movePosHorizon - Math.pow(Math.abs(movePosHorizon) + 0.05, 2) * 0.2 * times, -0.5,0.5) * (1 - zoomTimer); movePosHorizon = Mth.clamp(movePosHorizon - Math.pow(Math.abs(movePosHorizon) + 0.05, 2) * 0.2 * times, -0.5, 0.5) * (1 - zoomTime);
} }
double velocity = entity.getDeltaMovement().y(); double velocity = entity.getDeltaMovement().y();
if (-0.8 < velocity + 0.078 && velocity + 0.078 < 0.8) { if (-0.8 < velocity + 0.078 && velocity + 0.078 < 0.8) {
if (velocityY < entity.getDeltaMovement().y() + 0.078) { if (velocityY < entity.getDeltaMovement().y() + 0.078) {
velocityY = Mth.clamp((velocityY + 0.55 * Math.pow((velocity + 0.078) - velocityY , 2)), -0.8, 0.8) * (1 - 0.8 * zoomTimer); velocityY = Mth.clamp((velocityY + 0.55 * Math.pow((velocity + 0.078) - velocityY, 2)), -0.8, 0.8) * (1 - 0.8 * zoomTime);
} else { } else {
velocityY = Mth.clamp((velocityY - 0.55 * Math.pow((velocity + 0.078) - velocityY , 2)), -0.8, 0.8) * (1 - 0.8 * zoomTimer); velocityY = Mth.clamp((velocityY - 0.55 * Math.pow((velocity + 0.078) - velocityY, 2)), -0.8, 0.8) * (1 - 0.8 * zoomTime);
} }
} }
} }
@ -342,16 +340,16 @@ public class ClientEventHandler {
private static void handleWeaponZoom() { private static void handleWeaponZoom() {
float times = 5 * Minecraft.getInstance().getDeltaFrameTime(); float times = 5 * Minecraft.getInstance().getDeltaFrameTime();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
zoomTimer = Mth.clamp(zoomTimer + 0.03 * times,0,1); zoomTime = Mth.clamp(zoomTime + 0.03 * times, 0, 1);
} else { } else {
zoomTimer = Mth.clamp(zoomTimer - 0.04 * times,0,1); zoomTime = Mth.clamp(zoomTime - 0.04 * times, 0, 1);
} }
zoomPos = 0.5 * Math.cos(Math.PI * Math.pow(Math.pow(zoomTimer, 2) - 1, 2)) + 0.5; zoomPos = 0.5 * Math.cos(Math.PI * Math.pow(Math.pow(zoomTime, 2) - 1, 2)) + 0.5;
zoomPosZ = -Math.pow(2 * zoomTimer - 1, 2) + 1; zoomPosZ = -Math.pow(2 * zoomTime - 1, 2) + 1;
} }
public static double getZoomTime() { public static double getZoomTime() {
return zoomTimer; return zoomTime;
} }
public static double getZoomPos() { public static double getZoomPos() {
@ -427,12 +425,11 @@ public class ClientEventHandler {
private static void handlePlayerBreath(LivingEntity entity) { private static void handlePlayerBreath(LivingEntity entity) {
float times = 4 * Minecraft.getInstance().getDeltaFrameTime(); float times = 4 * Minecraft.getInstance().getDeltaFrameTime();
var data = entity.getPersistentData();
if ((entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).breath) { if ((entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).breath) {
breathTime = Mth.clamp(breathTime + 0.06 * times,0,1); breathTime = Mth.clamp(breathTime + 0.06 * times, 0, 1);
} else { } else {
breathTime = Mth.clamp(breathTime - 0.06 * times,0,1); breathTime = Mth.clamp(breathTime - 0.06 * times, 0, 1);
} }
} }
@ -445,18 +442,18 @@ public class ClientEventHandler {
} }
public static void shake(double boneRotX, double boneRotY, double boneRotZ) { public static void shake(double boneRotX, double boneRotY, double boneRotZ) {
cameraRotX = boneRotX; cameraRot[0] = boneRotX;
cameraRotY = boneRotY; cameraRot[1] = boneRotY;
cameraRotZ = boneRotZ; cameraRot[2] = boneRotZ;
} }
private static void handlePlayerCameraShake(ViewportEvent.ComputeCameraAngles event) { private static void handlePlayerCameraShake(ViewportEvent.ComputeCameraAngles event) {
double yaw = event.getYaw(); double yaw = event.getYaw();
double pitch = event.getPitch(); double pitch = event.getPitch();
double roll = event.getRoll(); double roll = event.getRoll();
event.setPitch((float) (pitch + cameraRotX + 0.2 * turnRotX + 3 * velocityY)); event.setPitch((float) (pitch + cameraRot[0] + 0.2 * turnRot[0] + 3 * velocityY));
event.setYaw((float) (yaw + cameraRotY + 0.8 * turnRotY)); event.setYaw((float) (yaw + cameraRot[1] + 0.8 * turnRot[1]));
event.setRoll((float) (roll + cameraRotZ + 0.35 * turnRotZ)); event.setRoll((float) (roll + cameraRot[2] + 0.35 * turnRot[2]));
} }
private static void handleBowPullAnimation(LivingEntity entity) { private static void handleBowPullAnimation(LivingEntity entity) {
@ -517,10 +514,6 @@ public class ClientEventHandler {
} }
} }
public static double getFov() {
return fov;
}
@SubscribeEvent @SubscribeEvent
public static void handleRenderCrossHair(RenderGuiOverlayEvent.Pre event) { public static void handleRenderCrossHair(RenderGuiOverlayEvent.Pre event) {
if (event.getOverlay() != VanillaGuiOverlay.CROSSHAIR.type()) { if (event.getOverlay() != VanillaGuiOverlay.CROSSHAIR.type()) {

2
src/main/java/net/mcreator/superbwarfare/mixins/MouseHandlerMixin.java
View file

@ -52,7 +52,7 @@ public class MouseHandlerMixin {
boolean flag = false; boolean flag = false;
float sens = 0.2f; float sens = 0.2f;
double fov = ClientEventHandler.getFov(); double fov = ClientEventHandler.fov;
float customSens = (float) stack.getOrCreateTag().getInt("sensitivity"); float customSens = (float) stack.getOrCreateTag().getInt("sensitivity");
float originalFov = mc.options.fov().get(); float originalFov = mc.options.fov().get();