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-09-20 03:59:29 +08:00
parent ecce390148
commit 9411c752e5
34 changed files with 239 additions and 279 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,14 +84,11 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
root.setRotY(0.2f * PosX);

49
src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java
View file

@ -48,7 +48,7 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
gun.setPosX(2.105f * (float) zp);
gun.setPosY(0.17f * (float) zp - (float) (0.2f * zpz));
gun.setPosZ(0.1f * (float) zp + (float) (0.3f * zpz));
gun.setRotZ((float) (0.02f * zp));
gun.setRotZ((float) (0.02f * zpz));
gun.setScaleZ(1f - (0.4f * (float) zp));
double fp = player.getPersistentData().getDouble("fire_pos");
@ -68,37 +68,30 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
CoreGeoBone root = getAnimationProcessor().getBone("root");
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");
root.setRotY(0.2f * PosX);
root.setRotZ(0.2f * PosX + RotZ);
CoreGeoBone move = getAnimationProcessor().getBone("move");
double m = player.getPersistentData().getDouble("move");
double vy = player.getPersistentData().getDouble("vy");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
move.setPosX(9.3f * (float) m);
move.setPosY(-2f * (float) vy);
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
double xRot = player.getPersistentData().getDouble("xRot");
double yRot = player.getPersistentData().getDouble("yRot");
double zRot = player.getPersistentData().getDouble("zRot");
move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy);
move.setRotY(Mth.DEG_TO_RAD * (float) yRot);
move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot);
move.setPosX(9.3f * (float) mph);
move.setPosY(-2f * (float) vY);
move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY);
move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY);
move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ);
CoreGeoBone camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0");

13
src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java
View file

@ -67,16 +67,11 @@ public class AbekiriItemModel extends GeoModel<AbekiriItem> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = 0;
double x = 0;
y = player.getPersistentData().getDouble("y");
x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

10
src/main/java/net/mcreator/superbwarfare/client/model/item/BocekItemModel.java
View file

@ -112,14 +112,12 @@ public class BocekItemModel extends GeoModel<BocekItem> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java
View file

@ -618,14 +618,11 @@ public class DevotionItemModel extends GeoModel<DevotionItem> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java
View file

@ -92,14 +92,11 @@ public class Glock17ItemModel extends GeoModel<Glock17Item> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java
View file

@ -100,14 +100,11 @@ public class Glock18ItemModel extends GeoModel<Glock18Item> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

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

@ -76,12 +76,11 @@ public class Hk416ItemModel extends GeoModel<Hk416Item> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java
View file

@ -79,14 +79,11 @@ public class HuntingRifleItemModel extends GeoModel<HuntingRifleItem> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

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

@ -68,12 +68,11 @@ public class JavelinItemModel extends GeoModel<JavelinItem> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

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

@ -85,12 +85,11 @@ public class K98ItemModel extends GeoModel<K98Item> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java
View file

@ -90,14 +90,11 @@ public class M1911ItemModel extends GeoModel<M1911Item> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java
View file

@ -76,14 +76,11 @@ public class M4ItemModel extends GeoModel<M4Item> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

10
src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java
View file

@ -118,14 +118,12 @@ public class M60ItemModel extends GeoModel<M60Item> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java
View file

@ -74,14 +74,11 @@ public class M79ItemModel extends GeoModel<M79Item> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java
View file

@ -77,14 +77,11 @@ public class M870ItemModel extends GeoModel<M870Item> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java
View file

@ -75,14 +75,11 @@ public class M98bItemModel extends GeoModel<M98bItem> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java
View file

@ -74,14 +74,11 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java
View file

@ -1,6 +1,7 @@
package net.mcreator.superbwarfare.client.model.item;
import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModTags;
import net.mcreator.superbwarfare.item.gun.machinegun.MinigunItem;
import net.mcreator.superbwarfare.network.ModVariables;
@ -66,14 +67,12 @@ public class MinigunItemModel extends GeoModel<MinigunItem> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java
View file

@ -107,14 +107,11 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + 1.2f * PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

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

@ -97,12 +97,11 @@ public class MosinNagantItemModel extends GeoModel<MosinNagantItem> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java
View file

@ -89,14 +89,11 @@ public class Ntw20Model extends GeoModel<Ntw20Item> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

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

@ -81,12 +81,11 @@ public class Qbz95ItemModel extends GeoModel<Qbz95Item> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java
View file

@ -77,14 +77,11 @@ public class RpgItemModel extends GeoModel<RpgItem> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

10
src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java
View file

@ -92,14 +92,12 @@ public class RpkItemModel extends GeoModel<RpkItem> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java
View file

@ -96,14 +96,11 @@ public class SentinelItemModel extends GeoModel<SentinelItem> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

10
src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java
View file

@ -87,14 +87,12 @@ public class SksItemModel extends GeoModel<SksItem> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

12
src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java
View file

@ -101,14 +101,12 @@ public class SvdItemModel extends GeoModel<SvdItem> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");
@ -140,7 +138,7 @@ public class SvdItemModel extends GeoModel<SvdItem> {
glass.setPosX(0.25f * -PosX);
glass.setPosY(0.2f * (float) fp + 0.5f * (float) vy + (float) y + PosY);
glass.setPosY(0.2f * (float) fp + 0.5f * (float) vy + (float) swayY + PosY);
CoreGeoBone camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0");

12
src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java
View file

@ -99,17 +99,13 @@ public class TaserItemModel extends GeoModel<TaserItem> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
root.setRotY(0.2f * PosX);

11
src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java
View file

@ -68,14 +68,11 @@ public class TracheliumItemModel extends GeoModel<Trachelium> {
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

11
src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java
View file

@ -92,14 +92,11 @@ public class VectorItemModel extends GeoModel<VectorItem> {
float PosX = (float) player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float) player.getPersistentData().getDouble("gun_move_posY");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
root.setPosX(PosX);
root.setPosY((float) y + PosY);
root.setRotX((float) x);
root.setPosY((float) swayY + PosY);
root.setRotX((float) swayX);
float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ");

6
src/main/java/net/mcreator/superbwarfare/entity/projectile/JavelinMissileEntity.java
View file

@ -119,14 +119,14 @@ public class JavelinMissileEntity extends ThrowableItemProjectile implements Geo
}
if (entity instanceof Monster monster) {
monster.hurt(ModDamageTypes.causeCannonFireDamage(this.level().registryAccess(), this, this.getOwner()), 2 * this.damage * damageMultiplier);
monster.hurt(ModDamageTypes.causeCannonFireDamage(this.level().registryAccess(), this, this.getOwner()), this.damage * damageMultiplier);
} else {
entity.hurt(ModDamageTypes.causeCannonFireDamage(this.level().registryAccess(), this, this.getOwner()), 2 * this.damage);
entity.hurt(ModDamageTypes.causeCannonFireDamage(this.level().registryAccess(), this, this.getOwner()), this.damage);
}
if (this.tickCount > 1) {
if (this.level() instanceof ServerLevel) {
ProjectileTool.causeCustomExplode(this, entity, 1.25f *this.damage, 8.0f, this.monsterMultiplier);
ProjectileTool.causeCustomExplode(this, entity, this.damage, 8.0f, this.monsterMultiplier);
}
}

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

@ -37,6 +37,22 @@ public class ClientEventHandler {
protected static double zoomTime = 0;
protected static double zoomPos = 0;
protected static double zoomPosZ = 0;
private static double swayTime = 0;
protected static double swayX = 0;
protected static double swayY = 0;
private static double moveXTime = 0;
private static double moveYTime = 0;
protected static double movePosX = 0;
protected static double movePosY = 0;
protected static double moveRotZ = 0;
protected static double movePosHorizon = 0;
protected static double velocityY = 0;
protected static double turnRotX = 0;
protected static double turnRotY = 0;
protected static double turnRotZ = 0;
@SubscribeEvent
public static void handleWeaponTurn(RenderHandEvent event) {
@ -49,14 +65,26 @@ public class ClientEventHandler {
float yRotOffset = Mth.lerp(event.getPartialTick(), player.yBobO, player.yBob);
float xRot = player.getViewXRot(event.getPartialTick()) - xRotOffset;
float yRot = player.getViewYRot(event.getPartialTick()) - yRotOffset;
data.putDouble("xRot", Mth.clamp(0.05 * xRot, -5, 5) * (1 - 0.75 * zoomTime));
data.putDouble("yRot", Mth.clamp(0.05 * yRot, -10, 10) * (1 - 0.75 * zoomTime));
data.putDouble("zRot", Mth.clamp(0.1 * yRot, -10, 10) * (1 - zoomTime));
turnRotX = Mth.clamp(0.05 * xRot, -5, 5) * (1 - 0.75 * zoomTime);
turnRotY = Mth.clamp(0.05 * yRot, -10, 10) * (1 - 0.75 * zoomTime);
turnRotZ = Mth.clamp(0.1 * yRot, -10, 10) * (1 - zoomTime);
data.putDouble("droneCameraRotX", Mth.clamp(0.25f * xRot, -10, 10));
data.putDouble("droneCameraRotY", Mth.clamp(0.25f * yRot, -20, 10));
}
public static double getTurnRotX() {
return turnRotX;
}
public static double getTurnRotY() {
return turnRotY;
}
public static double getTurnRotZ() {
return turnRotZ;
}
@SubscribeEvent
public static void computeCameraAngles(ViewportEvent.ComputeCameraAngles event) {
ClientLevel level = Minecraft.getInstance().level;
@ -188,12 +216,20 @@ public class ClientEventHandler {
pose = 1;
}
data.putDouble("sway_time", data.getDouble("sway_time") + 0.05 * times);
data.putDouble("x", (pose * -0.008 * Math.sin(data.getDouble("sway_time")) * (1 - 0.95 * zoomTime)));
data.putDouble("y", (pose * 0.125 * Math.sin(data.getDouble("sway_time") - 1.585) * (1 - 0.95 * zoomTime)) - 3 * data.getDouble("gun_move_rotZ"));
swayTime += 0.05 * times;
swayX = pose * -0.008 * Math.sin(swayTime) * (1 - 0.95 * zoomTime);
swayY = pose * 0.125 * Math.sin(swayTime - 1.585) * (1 - 0.95 * zoomTime) - 3 * moveRotZ;
}
}
public static double getSwayX() {
return swayX;
}
public static double getSwayY() {
return swayY;
}
private static void handleWeaponMove(LivingEntity entity) {
if (entity.getMainHandItem().is(ModTags.Items.GUN)) {
float times = 4.5f * Minecraft.getInstance().getDeltaFrameTime();
@ -211,15 +247,9 @@ public class ClientEventHandler {
}
if (Minecraft.getInstance().options.keyUp.isDown() && data.getDouble("firetime") == 0 && zoomTime == 0) {
if (data.getDouble("gun_move_rotZ") < 0.14) {
data.putDouble("gun_move_rotZ", data.getDouble("gun_move_rotZ") + 0.007 * times);
}
moveRotZ = Mth.clamp(moveRotZ + 0.007 * times,0,0.14);
} else {
if (data.getDouble("gun_move_rotZ") > 0) {
data.putDouble("gun_move_rotZ", data.getDouble("gun_move_rotZ") - 0.007 * times);
} else {
data.putDouble("gun_move_rotZ", 0);
}
moveRotZ = Mth.clamp(moveRotZ - 0.007 * times,0,0.14);
}
if ((Minecraft.getInstance().options.keyLeft.isDown()
@ -227,78 +257,90 @@ public class ClientEventHandler {
|| Minecraft.getInstance().options.keyUp.isDown()
|| Minecraft.getInstance().options.keyDown.isDown()) && data.getDouble("firetime") == 0) {
if (data.getDouble("gun_moveY_time") < 1.25) {
data.putDouble("gun_moveY_time", data.getDouble("gun_moveY_time") + 1.2 * on_ground * times * move_speed);
if (moveYTime < 1.25) {
moveYTime += 1.2 * on_ground * times * move_speed;
} else {
data.putDouble("gun_moveY_time", 0.25);
moveYTime = 0.25;
}
if (data.getDouble("gun_moveX_time") < 2) {
data.putDouble("gun_moveX_time", data.getDouble("gun_moveX_time") + 1.2 * on_ground * times * move_speed);
if (moveXTime < 2) {
moveXTime += 1.2 * on_ground * times * move_speed;
} else {
data.putDouble("gun_moveX_time", 0);
moveXTime = 0;
}
data.putDouble("gun_move_posY", -0.135 * Math.sin(2 * Math.PI * (data.getDouble("gun_moveY_time") - 0.25)) * (1 - 0.95 * zoomTime));
data.putDouble("gun_move_posX", 0.2 * Math.sin(1 * Math.PI * data.getDouble("gun_moveX_time")) * (1 - 0.95 * zoomTime));
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 {
if (data.getDouble("gun_moveY_time") > 0.25) {
data.putDouble("gun_moveY_time", data.getDouble("gun_moveY_time") - 0.5 * times);
if (moveYTime > 0.25) {
moveYTime -= 0.5 * times;
} else {
data.putDouble("gun_moveY_time", 0.25);
moveYTime = 0.25;
}
if (data.getDouble("gun_moveX_time") > 0) {
data.putDouble("gun_moveX_time", data.getDouble("gun_moveX_time") - 0.5 * times);
if (moveXTime > 0) {
moveXTime -= 0.5 * times;
} else {
data.putDouble("gun_moveX_time", 0);
moveXTime = 0;
}
if (data.getDouble("gun_move_posX") > 0) {
data.putDouble("gun_move_posX", data.getDouble("gun_move_posX") - 1.5 * (Math.pow(data.getDouble("gun_move_posX"), 2) * times) * (1 - 0.75 * zoomTime));
if (movePosX > 0) {
movePosX -= 1.5 * (Math.pow(movePosX, 2) * times) * (1 - 0.75 * zoomTime);
} else {
data.putDouble("gun_move_posX", data.getDouble("gun_move_posX") + 1.5 * (Math.pow(data.getDouble("gun_move_posX"), 2) * times) * (1 - 0.75 * zoomTime));
movePosX += 1.5 * (Math.pow(movePosX, 2) * times) * (1 - 0.75 * zoomTime);
}
if (data.getDouble("gun_move_posY") > 0) {
data.putDouble("gun_move_posY", data.getDouble("gun_move_posY") - 1.5 * (Math.pow(data.getDouble("gun_move_posY"), 2) * times) * (1 - 0.75 * zoomTime));
if (movePosY > 0) {
movePosY -= 1.5 * (Math.pow(movePosY, 2) * times) * (1 - 0.75 * zoomTime);
} else {
data.putDouble("gun_move_posY", data.getDouble("gun_move_posY") + 1.5 * (Math.pow(data.getDouble("gun_move_posY"), 2) * times) * (1 - 0.75 * zoomTime));
movePosY += 1.5 * (Math.pow(movePosY, 2) * times) * (1 - 0.75 * zoomTime);
}
}
if (data.getDouble("move") < 0) {
data.putDouble("move", ((data.getDouble("move") + 1 * times * Math.pow(data.getDouble("move"), 2) * (1 - 0.6 * zoomTime))
* (1 - 1 * zoomTime)));
if (movePosHorizon < 0) {
movePosHorizon += 2 * times * Math.pow(movePosHorizon, 2);
} else {
data.putDouble("move", ((data.getDouble("move") - 1 * times * Math.pow(data.getDouble("move"), 2) * (1 - 0.6 * zoomTime))
* (1 - 1 * zoomTime)));
movePosHorizon -= 2 * times * Math.pow(movePosHorizon, 2);
}
if (Minecraft.getInstance().options.keyRight.isDown()) {
data.putDouble("move",
((data.getDouble("move") + Math.pow(Math.abs(data.getDouble("move")) + 0.05, 2) * 0.2 * times * (1 - 0.1 * zoomTime))
* (1 - 0.1 * zoomTime)));
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()) {
data.putDouble("move",
((data.getDouble("move") - Math.pow(Math.abs(data.getDouble("move")) + 0.05, 2) * 0.2 * times * (1 - 0.1 * zoomTime))
* (1 - 0.1 * zoomTime)));
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();
if (-0.8 < velocity + 0.078 && velocity + 0.078 < 0.8) {
if (data.getDouble("vy") < entity.getDeltaMovement().y() + 0.078) {
data.putDouble("vy", Mth.clamp(((data.getDouble("vy") + 0.35 * Math.pow((velocity + 0.078) - data.getDouble("vy"), 2)) * (1 - 0.8 * zoomTime)), -0.8, 0.8));
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 * zoomTime);
} else {
data.putDouble("vy", Mth.clamp(((data.getDouble("vy") - 0.35 * Math.pow((velocity + 0.078) - data.getDouble("vy"), 2)) * (1 - 0.8 * zoomTime)), -0.8, 0.8));
velocityY = Mth.clamp((velocityY - 0.55 * Math.pow((velocity + 0.078) - velocityY , 2)), -0.8, 0.8) * (1 - 0.8 * zoomTime);
}
}
}
}
public static double getMoveRotZ() {
return moveRotZ;
}
public static double getMovePosX() {
return movePosX;
}
public static double getMovePosY() {
return movePosY;
}
public static double getMovePosHorizon() {
return movePosHorizon;
}
public static double getVelocityY() {
return velocityY;
}
private static void handleWeaponZoom() {
float times = 5 * Minecraft.getInstance().getDeltaFrameTime();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {

1
src/main/resources/assets/superbwarfare/lang/zh_cn.json
View file

@ -183,6 +183,7 @@
"block.superbwarfare.tungsten_block": "钨块",
"block.superbwarfare.silver_block": "银块",
"block.superbwarfare.cemented_carbide_block": "硬质合金块",
"block.superbwarfare.steel_block": "钢块",
"item.superbwarfare.high_energy_explosives": "高能炸药",
"item.superbwarfare.grain": "推进药柱",