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-10-11 18:30:19 +08:00
parent 994f2afa4a
commit 0b0d53ae42
75 changed files with 947 additions and 2312 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,19 +83,12 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
shuan.setPosZ(2.4f * (float) fp); shuan.setPosZ(2.4f * (float) fp);
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
root.setPosX(movePosX); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) swayY + movePosY); root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setRotX((float) swayX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setRotY(0.2f * movePosX); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotZ(0.2f * movePosX + moveRotZ); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");
@ -115,5 +108,13 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
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());
CoreGeoBone shell1 = getAnimationProcessor().getBone("shell1");
CoreGeoBone shell2 = getAnimationProcessor().getBone("shell2");
CoreGeoBone shell3 = getAnimationProcessor().getBone("shell3");
CoreGeoBone shell4 = getAnimationProcessor().getBone("shell4");
CoreGeoBone shell5 = getAnimationProcessor().getBone("shell5");
ClientEventHandler.handleShell(shell1, shell2, shell3, shell4, shell5);
} }
} }

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

@ -76,19 +76,11 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread)));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -72,19 +72,11 @@ public class AbekiriItemModel extends GeoModel<AbekiriItem> {
shen.setRotY(-0.15f * (float) fr); shen.setRotY(-0.15f * (float) fr);
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -117,19 +117,11 @@ public class BocekItemModel extends GeoModel<BocekItem> {
fire.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); fire.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread)));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
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());

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

@ -95,19 +95,11 @@ public class DevotionItemModel extends GeoModel<DevotionItem> {
bolt.setPosZ(-2f * (float) fp); bolt.setPosZ(-2f * (float) fp);
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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);
if (isProne(player)) { if (isProne(player)) {
l.setRotX(1.5f); l.setRotX(1.5f);

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

@ -96,19 +96,11 @@ public class Glock17ItemModel extends GeoModel<Glock17Item> {
} }
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -104,19 +104,11 @@ public class Glock18ItemModel extends GeoModel<Glock18Item> {
} }
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -80,19 +80,11 @@ public class Hk416ItemModel extends GeoModel<Hk416Item> {
shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread)));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -84,19 +84,11 @@ public class HuntingRifleItemModel extends GeoModel<HuntingRifleItem> {
} }
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -71,19 +71,11 @@ public class JavelinItemModel extends GeoModel<JavelinItem> {
shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread)));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
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());

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

@ -88,19 +88,11 @@ public class K98ItemModel extends GeoModel<K98Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -94,19 +94,11 @@ public class M1911ItemModel extends GeoModel<M1911Item> {
} }
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -80,19 +80,11 @@ public class M4ItemModel extends GeoModel<M4Item> {
shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread)));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -125,19 +125,11 @@ public class M60ItemModel extends GeoModel<M60Item> {
tiba.setRotZ((float) (-0.25f * fp + 0.4 * fr)); tiba.setRotZ((float) (-0.25f * fp + 0.4 * fr));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -78,19 +78,11 @@ public class M79ItemModel extends GeoModel<M79Item> {
shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread)));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -81,19 +81,11 @@ public class M870ItemModel extends GeoModel<M870Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("main"); CoreGeoBone main = getAnimationProcessor().getBone("main");

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

@ -82,22 +82,15 @@ public class M98bItemModel extends GeoModel<M98bItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone zhunxing = getAnimationProcessor().getBone("shi"); CoreGeoBone zhunxing = getAnimationProcessor().getBone("shi");
CoreGeoBone move = getAnimationProcessor().getBone("move");
zhunxing.setPosX(75 * movePosX); zhunxing.setPosX(75 * movePosX);
zhunxing.setPosY(75 * movePosY); zhunxing.setPosY(75 * movePosY);
root.setPosX(movePosX); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) swayY + movePosY); root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setRotX((float) swayX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setRotY(0.2f * movePosX); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotZ(0.2f * movePosX + moveRotZ); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
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);
float numR = (float) (1 - 0.88 * zt); float numR = (float) (1 - 0.88 * zt);
float numP = (float) (1 - 0.68 * zt); float numP = (float) (1 - 0.68 * zt);

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

@ -79,19 +79,11 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
} }
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -72,19 +72,11 @@ public class MinigunItemModel extends GeoModel<MinigunItem> {
shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread)));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
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());

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

@ -113,19 +113,11 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
} }
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -101,19 +101,11 @@ public class MosinNagantItemModel extends GeoModel<MosinNagantItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -89,19 +89,11 @@ public class Ntw20Model extends GeoModel<Ntw20Item> {
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 4.3)); stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 4.3));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -85,19 +85,11 @@ public class Qbz95ItemModel extends GeoModel<Qbz95Item> {
} }
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -81,19 +81,11 @@ public class RpgItemModel extends GeoModel<RpgItem> {
gun.setScaleZ(1f - (0.5f * (float) zp)); gun.setScaleZ(1f - (0.5f * (float) zp));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -97,19 +97,11 @@ public class RpkItemModel extends GeoModel<RpkItem> {
shuan.setPosZ(2.4f * (float) fp); shuan.setPosZ(2.4f * (float) fp);
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -100,19 +100,11 @@ public class SentinelItemModel extends GeoModel<SentinelItem> {
charge.setRotZ(charge.getRotZ() + times * 0.05f); charge.setRotZ(charge.getRotZ() + times * 0.05f);
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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);
if ((stack.getOrCreateTag().getDouble("ammo") <= 5)) { if ((stack.getOrCreateTag().getDouble("ammo") <= 5)) {
ammo.setScaleX((float) (stack.getOrCreateTag().getDouble("ammo") / 5)); ammo.setScaleX((float) (stack.getOrCreateTag().getDouble("ammo") / 5));

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

@ -92,19 +92,11 @@ public class SksItemModel extends GeoModel<SksItem> {
shuan.setPosZ(2f * (float) fp); shuan.setPosZ(2f * (float) fp);
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -105,19 +105,11 @@ public class SvdItemModel extends GeoModel<SvdItem> {
holo.setScaleY(0.75f); holo.setScaleY(0.75f);
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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);
glass.setPosX(0.25f * -movePosX); glass.setPosX(0.25f * -movePosX);
glass.setPosY(0.2f * (float) fp + 0.5f * (float) vY + (float) swayY + movePosY); glass.setPosY(0.2f * (float) fp + 0.5f * (float) vY + (float) swayY + movePosY);

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

@ -105,19 +105,11 @@ public class TaserItemModel extends GeoModel<TaserItem> {
gun.setRotZ((float) (0.05f * zpz)); gun.setRotZ((float) (0.05f * zpz));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -73,19 +73,11 @@ public class TracheliumItemModel extends GeoModel<Trachelium> {
shen.setRotZ(-0.1f * (float) (fp + 1.3 * fr)); shen.setRotZ(-0.1f * (float) (fp + 1.3 * fr));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -96,19 +96,11 @@ public class VectorItemModel extends GeoModel<VectorItem> {
shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread)));
CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY));
root.setPosX(movePosX); root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotX - 0.15f * vY));
root.setPosY((float) swayY + movePosY); root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRotY));
root.setRotX((float) swayX); root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * mph + Mth.DEG_TO_RAD * turnRotZ));
root.setRotY(0.2f * movePosX);
root.setRotZ(0.2f * movePosX + moveRotZ);
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 camera = getAnimationProcessor().getBone("camera");
CoreGeoBone main = getAnimationProcessor().getBone("0"); CoreGeoBone main = getAnimationProcessor().getBone("0");

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

@ -7,6 +7,7 @@ import net.mcreator.superbwarfare.entity.ICannonEntity;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModMobEffects; import net.mcreator.superbwarfare.init.ModMobEffects;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
import net.mcreator.superbwarfare.item.gun.GunItem;
import net.mcreator.superbwarfare.network.ModVariables; import net.mcreator.superbwarfare.network.ModVariables;
import net.mcreator.superbwarfare.network.message.ShootMessage; import net.mcreator.superbwarfare.network.message.ShootMessage;
import net.mcreator.superbwarfare.perk.AmmoPerk; import net.mcreator.superbwarfare.perk.AmmoPerk;
@ -23,6 +24,7 @@ import net.minecraft.util.Mth;
import net.minecraft.util.RandomSource; import net.minecraft.util.RandomSource;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.HumanoidArm; import net.minecraft.world.entity.HumanoidArm;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
@ -35,11 +37,13 @@ import net.minecraftforge.client.event.RenderHandEvent;
import net.minecraftforge.client.event.ViewportEvent; import net.minecraftforge.client.event.ViewportEvent;
import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay; import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay;
import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.TickEvent;
import net.minecraftforge.event.entity.living.LivingEquipmentChangeEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.fml.LogicalSide;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.network.NetworkEvent; import net.minecraftforge.network.NetworkEvent;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import software.bernie.geckolib.core.animatable.model.CoreGeoBone;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -101,6 +105,19 @@ public class ClientEventHandler {
public static double lookDistance = 0; public static double lookDistance = 0;
public static double cameraLocation = 0.6; public static double cameraLocation = 0.6;
public static double drawTime = 1;
public static int shellIndex = 0;
public static double shellIndexTime1 = 0;
public static double shellIndexTime2 = 0;
public static double shellIndexTime3 = 0;
public static double shellIndexTime4 = 0;
public static double shellIndexTime5 = 0;
public static double randomShell1 = 0;
public static double randomShell2 = 0;
public static double randomShell3 = 0;
public static MillisTimer clientTimer = new MillisTimer(); public static MillisTimer clientTimer = new MillisTimer();
@SubscribeEvent @SubscribeEvent
@ -187,16 +204,29 @@ public class ClientEventHandler {
// 开火部分 // 开火部分
double weight = stack.getOrCreateTag().getDouble("weight");
double speed = 1;
if (weight == 0) {
speed = 1.05;
} else if (weight == 1) {
speed = 0.85;
} else if (weight == 2) {
speed = 0.6;
}
if (player.getPersistentData().getDouble("noRun") == 0 && player.isSprinting() && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS) { if (player.getPersistentData().getDouble("noRun") == 0 && player.isSprinting() && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS) {
cantFireTime = Mth.clamp(cantFireTime + 3 * times, 0, 24); cantFireTime = Mth.clamp(cantFireTime + 3 * times, 0, 24);
} else { } else {
cantFireTime = Mth.clamp(cantFireTime - 6 * times, 0, 24); cantFireTime = Mth.clamp(cantFireTime - 6 * speed * times, 0, 24);
} }
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_LEFT) == GLFW.GLFW_PRESS if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_LEFT) == GLFW.GLFW_PRESS
&& (player.getMainHandItem().is(ModTags.Items.NORMAL_GUN) && (player.getMainHandItem().is(ModTags.Items.NORMAL_GUN)
&& cantFireTime == 0 && cantFireTime == 0
&& drawTime < 0.01
&& !notInGame() && !notInGame()
|| (stack.is(ModItems.MINIGUN.get()) && !player.isSprinting() && stack.getOrCreateTag().getDouble("overheat") == 0 && !player.getCooldowns().isOnCooldown(stack.getItem()) && stack.getOrCreateTag().getDouble("minigun_rotation") >= 10 || (stack.is(ModItems.MINIGUN.get()) && !player.isSprinting() && stack.getOrCreateTag().getDouble("overheat") == 0 && !player.getCooldowns().isOnCooldown(stack.getItem()) && stack.getOrCreateTag().getDouble("minigun_rotation") >= 10
))) { ))) {
@ -289,9 +319,11 @@ public class ClientEventHandler {
handleWeaponZoom(living); handleWeaponZoom(living);
handlePlayerBreath(living); handlePlayerBreath(living);
handleWeaponFire(event, living); handleWeaponFire(event, living);
handleWeaponShell(living);
handleGunRecoil(); handleGunRecoil();
handleShockCamera(event, living); handleShockCamera(event, living);
handleBowPullAnimation(living); handleBowPullAnimation(living);
handleWeaponDraw(living);
} }
} }
@ -343,6 +375,12 @@ public class ClientEventHandler {
} }
} }
if (event.getHand() == rightHand) {
if (rightHandItem.is(ModTags.Items.GUN) && drawTime > 0.15) {
event.setCanceled(true);
}
}
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) {
player.level().getEntitiesOfClass(DroneEntity.class, player.getBoundingBox().inflate(512)) player.level().getEntitiesOfClass(DroneEntity.class, player.getBoundingBox().inflate(512))
@ -371,7 +409,7 @@ public class ClientEventHandler {
private static void handleWeaponMove(LivingEntity entity) { private static void handleWeaponMove(LivingEntity entity) {
if (entity.getMainHandItem().is(ModTags.Items.GUN)) { if (entity.getMainHandItem().is(ModTags.Items.GUN)) {
float times = 4.5f * Minecraft.getInstance().getDeltaFrameTime(); float times = 3.7f * Minecraft.getInstance().getDeltaFrameTime();
double moveSpeed = (float) Mth.clamp(entity.getDeltaMovement().horizontalDistanceSqr(), 0, 0.02); double moveSpeed = (float) Mth.clamp(entity.getDeltaMovement().horizontalDistanceSqr(), 0, 0.02);
double onGround; double onGround;
if (entity.onGround()) { if (entity.onGround()) {
@ -459,11 +497,13 @@ public class ClientEventHandler {
private static void handleWeaponZoom(LivingEntity entity) { private static void handleWeaponZoom(LivingEntity entity) {
if (!(entity instanceof Player player)) return; if (!(entity instanceof Player player)) return;
ItemStack stack = player.getMainHandItem();
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 && !notInGame()) { double speed = stack.getOrCreateTag().getDouble("zoom_speed");
zoomTime = Mth.clamp(zoomTime + 0.03 * times, 0, 1); if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS && !notInGame() && drawTime < 0.01) {
zoomTime = Mth.clamp(zoomTime + 0.03 * speed * times, 0, 1);
} else { } else {
zoomTime = Mth.clamp(zoomTime - 0.04 * times, 0, 1); zoomTime = Mth.clamp(zoomTime - 0.04 * speed * times, 0, 1);
} }
zoomPos = 0.5 * Math.cos(Math.PI * Math.pow(Math.pow(zoomTime, 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 * zoomTime - 1, 2) + 1; zoomPosZ = -Math.pow(2 * zoomTime - 1, 2) + 1;
@ -472,6 +512,26 @@ public class ClientEventHandler {
public static void handleFireRecoilTimeMessage(double time, Supplier<NetworkEvent.Context> ctx) { public static void handleFireRecoilTimeMessage(double time, Supplier<NetworkEvent.Context> ctx) {
if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) { if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
fireRecoilTime = time; fireRecoilTime = time;
shellIndex++;
switch (shellIndex) {
case 0 ->
shellIndexTime1 = 0;
case 1 ->
shellIndexTime2 = 0;
case 2 ->
shellIndexTime3 = 0;
case 3 ->
shellIndexTime4 = 0;
case 4 ->
shellIndexTime5 = 0;
}
randomShell1 = (1 + 2 * Math.random());
randomShell2 = (1 + 2 * Math.random());
randomShell3 = (1 + 2 * Math.random());
} }
} }
@ -530,6 +590,38 @@ public class ClientEventHandler {
} }
} }
private static void handleWeaponShell(LivingEntity entity) {
Player player = Minecraft.getInstance().player;
if (player == null) return;
float times = Minecraft.getInstance().getDeltaFrameTime();
if (shellIndex >= 5) {
shellIndex = 0;
shellIndexTime1 = 0;
}
shellIndexTime1 = Math.min(shellIndexTime1 + 6 * times * ((50 - shellIndexTime1) / 50), 50);
shellIndexTime2 = Math.min(shellIndexTime2 + 6 * times * ((50 - shellIndexTime2) / 50), 50);
shellIndexTime3 = Math.min(shellIndexTime3 + 6 * times * ((50 - shellIndexTime3) / 50), 50);
shellIndexTime4 = Math.min(shellIndexTime4 + 6 * times * ((50 - shellIndexTime4) / 50), 50);
shellIndexTime5 = Math.min(shellIndexTime5 + 6 * times * ((50 - shellIndexTime5) / 50), 50);
// player.displayClientMessage(Component.literal(new java.text.DecimalFormat("##.##").format(shellIndex) + " "
// + new java.text.DecimalFormat("##").format(shellIndexTime1) + " "
// + new java.text.DecimalFormat("##").format(shellIndexTime2) + " "
// + new java.text.DecimalFormat("##").format(shellIndexTime3) + " "
// + new java.text.DecimalFormat("##").format(shellIndexTime4) + " "
// + new java.text.DecimalFormat("##").format(shellIndexTime5)
// ), true);
}
private static void handleGunRecoil() { private static void handleGunRecoil() {
Player player = Minecraft.getInstance().player; Player player = Minecraft.getInstance().player;
if (player == null) return; if (player == null) return;
@ -764,6 +856,84 @@ public class ClientEventHandler {
event.setCanceled(true); event.setCanceled(true);
} }
} }
@SubscribeEvent
public static void handleChangeSlot(LivingEquipmentChangeEvent event) {
if (event.getEntity() instanceof Player player && event.getSlot() == EquipmentSlot.MAINHAND) {
ItemStack oldStack = event.getFrom();
ItemStack newStack = event.getTo();
if (newStack.getItem() != oldStack.getItem()
|| newStack.getTag() == null || oldStack.getTag() == null
|| !newStack.getTag().hasUUID("gun_uuid") || !oldStack.getTag().hasUUID("gun_uuid")
|| !newStack.getTag().getUUID("gun_uuid").equals(oldStack.getTag().getUUID("gun_uuid"))
) {
if (newStack.getItem() instanceof GunItem) {
drawTime = 1;
}
}
}
}
private static void handleWeaponDraw(LivingEntity entity) {
float times = Minecraft.getInstance().getDeltaFrameTime();
ItemStack stack = entity.getMainHandItem();
double weight = stack.getOrCreateTag().getDouble("weight");
double speed = 1;
if (weight == 0) {
speed = 3;
} else if (weight == 1) {
speed = 2;
} else if (weight == 2) {
speed = 1.2;
}
drawTime = Math.max(drawTime - Math.max(0.2 * speed * times * drawTime, 0.0008), 0);
// Player player = Minecraft.getInstance().player;
// if (player != null) {
// player.displayClientMessage(Component.literal(new java.text.DecimalFormat("##.##").format(drawTime)), true);
// }
}
public static void handleShell(CoreGeoBone shell1, CoreGeoBone shell2, CoreGeoBone shell3, CoreGeoBone shell4, CoreGeoBone shell5) {
shell1.setPosX((float) -shellIndexTime1);
shell1.setPosY((float) (randomShell1 * Math.sin(0.15 * shellIndexTime1)));
shell1.setRotX((float) (randomShell1 * shellIndexTime1));
shell1.setRotY((float) (randomShell3 * shellIndexTime1));
shell2.setPosX((float) -shellIndexTime2);
shell2.setPosY((float) (randomShell1 * Math.sin(0.15 * shellIndexTime2)));
shell2.setRotX((float) (randomShell1 * shellIndexTime2));
shell2.setRotY((float) (randomShell3 * shellIndexTime2));
shell3.setPosX((float) -shellIndexTime3);
shell3.setPosY((float) (randomShell1* Math.sin(0.15 * shellIndexTime3)));
shell2.setRotX((float) (randomShell1* shellIndexTime2));
shell3.setRotY((float) (randomShell3* shellIndexTime3));
shell4.setPosX((float) -shellIndexTime4);
shell4.setPosY((float) (randomShell1* Math.sin(0.15 * shellIndexTime4)));
shell2.setRotX((float) (randomShell1* shellIndexTime2));
shell4.setRotY((float) (randomShell3* shellIndexTime4));
shell5.setPosX((float) -shellIndexTime5);
shell5.setPosY((float) (randomShell1* Math.sin(0.15 * shellIndexTime5)));
shell2.setRotX((float) (randomShell1* shellIndexTime2));
shell5.setRotY((float) (randomShell3* shellIndexTime5));
}
public static void handleMove(CoreGeoBone root) {
root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * movePosHorizon));
root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * velocityY));
root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRot[0] - 0.15f * velocityY));
root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRot[1]));
root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * movePosHorizon + Mth.DEG_TO_RAD * turnRot[3]));
}
} }

14
src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java
View file

@ -289,6 +289,7 @@ public class LivingEventHandler {
} }
if (newStack.getItem() instanceof GunItem) { if (newStack.getItem() instanceof GunItem) {
player.getPersistentData().putDouble("noRun", 40);
newStack.getOrCreateTag().putBoolean("draw", true); newStack.getOrCreateTag().putBoolean("draw", true);
if (newStack.getOrCreateTag().getInt("bolt_action_time") > 0) { if (newStack.getOrCreateTag().getInt("bolt_action_time") > 0) {
newStack.getOrCreateTag().putInt("bolt_action_anim", 0); newStack.getOrCreateTag().putInt("bolt_action_anim", 0);
@ -318,15 +319,10 @@ public class LivingEventHandler {
newStack.getOrCreateTag().putInt("KillingTally", 0); newStack.getOrCreateTag().putInt("KillingTally", 0);
} }
double weight = newStack.getOrCreateTag().getDouble("weight"); player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
capability.tacticalSprint = false;
if (weight == 0) { capability.syncPlayerVariables(player);
player.getCooldowns().addCooldown(newStack.getItem(), 12); });
} else if (weight == 1) {
player.getCooldowns().addCooldown(newStack.getItem(), 17);
} else if (weight == 2) {
player.getCooldowns().addCooldown(newStack.getItem(), 30);
}
} }
} }
} }

8
src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java
View file

@ -57,7 +57,7 @@ public abstract class GunItem extends Item {
if (itemstack.getOrCreateTag().getBoolean("draw")) { if (itemstack.getOrCreateTag().getBoolean("draw")) {
itemstack.getOrCreateTag().putBoolean("draw", false); itemstack.getOrCreateTag().putBoolean("draw", false);
itemstack.getOrCreateTag().putInt("draw_time", 0); // itemstack.getOrCreateTag().putInt("draw_time", 0);
if (itemstack.getItem() == ModItems.RPG.get() && itemstack.getOrCreateTag().getInt("ammo") == 0) { if (itemstack.getItem() == ModItems.RPG.get() && itemstack.getOrCreateTag().getInt("ammo") == 0) {
itemstack.getOrCreateTag().putDouble("empty", 1); itemstack.getOrCreateTag().putDouble("empty", 1);
@ -70,12 +70,6 @@ public abstract class GunItem extends Item {
} }
} }
if (mainHandItem.getItem() == itemstack.getItem()) {
if (itemstack.getOrCreateTag().getInt("draw_time") < 50) {
itemstack.getOrCreateTag().putInt("draw_time", (itemstack.getOrCreateTag().getInt("draw_time") + 1));
}
}
if (itemstack.getOrCreateTag().getInt("fire_animation") > 0) { if (itemstack.getOrCreateTag().getInt("fire_animation") > 0) {
itemstack.getOrCreateTag().putInt("fire_animation", (itemstack.getOrCreateTag().getInt("fire_animation") - 1)); itemstack.getOrCreateTag().putInt("fire_animation", (itemstack.getOrCreateTag().getInt("fire_animation") - 1));
} }

6
src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Glock17Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.Glock17ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.Glock17ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -106,13 +107,10 @@ public class Glock17Item extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 10) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.draw"));
}
if (player.isSprinting() && player.onGround() if (player.isSprinting() && player.onGround()
&& player.getPersistentData().getDouble("noRun") == 0 && player.getPersistentData().getDouble("noRun") == 0
&& !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))) { && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Glock18Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.Glock18ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.Glock18ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -105,13 +106,10 @@ public class Glock18Item extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 10) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.draw"));
}
if (player.isSprinting() && player.onGround() if (player.isSprinting() && player.onGround()
&& player.getPersistentData().getDouble("noRun") == 0 && player.getPersistentData().getDouble("noRun") == 0
&& !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))) { && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/handgun/M1911Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.M1911ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.M1911ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -106,13 +107,9 @@ public class M1911Item extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 10) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.draw"));
}
if (player.isSprinting() && player.onGround() if (player.isSprinting() && player.onGround()
&& player.getPersistentData().getDouble("noRun") == 0 && player.getPersistentData().getDouble("noRun") == 0
&& !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))) { && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Trachelium.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.TracheliumItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.TracheliumItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -92,10 +93,6 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 11) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.trachelium.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 1) { if (stack.getOrCreateTag().getInt("fire_animation") > 1) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.trachelium.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.trachelium.fire"));
} }
@ -104,7 +101,7 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.trachelium.reload")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.trachelium.reload"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.trachelium.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.trachelium.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/launcher/JavelinItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.JavelinItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.JavelinItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -88,9 +89,6 @@ public class JavelinItem extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
var tag = stack.getOrCreateTag(); var tag = stack.getOrCreateTag();
if (tag.getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.javelin.draw"));
}
if (tag.getInt("fire_animation") > 0) { if (tag.getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.javelin.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.javelin.fire"));
@ -100,7 +98,7 @@ public class JavelinItem extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.javelin.reload")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.javelin.reload"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.javelin.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.javelin.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/launcher/M79Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.M79ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.M79ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -90,9 +91,6 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.fire"));
@ -102,7 +100,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.reload")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.reload"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/launcher/RpgItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.RpgItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.RpgItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -86,9 +87,6 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
var tag = stack.getOrCreateTag(); var tag = stack.getOrCreateTag();
if (tag.getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.rpg.draw"));
}
if (tag.getInt("fire_animation") > 0) { if (tag.getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.fire"));
@ -98,7 +96,7 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.reload")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.reload"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.rpg.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.rpg.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/DevotionItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.DevotionItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.DevotionItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -82,9 +83,6 @@ public class DevotionItem extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.devotion.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.fire"));
@ -98,7 +96,7 @@ public class DevotionItem extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.devotion.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.devotion.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/M60Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.M60ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.M60ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -82,9 +83,6 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 29) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m60.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.fire"));
@ -102,7 +100,7 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.reload2")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.reload2"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m60.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m60.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/MinigunItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.MinigunItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.MinigunItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModParticleTypes; import net.mcreator.superbwarfare.init.ModParticleTypes;
import net.mcreator.superbwarfare.init.ModPerks; import net.mcreator.superbwarfare.init.ModPerks;
@ -121,11 +122,7 @@ public class MinigunItem extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 29) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.minigun.draw"));
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.minigun.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.minigun.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/RpkItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.RpkItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.RpkItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -82,9 +83,6 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.fire"));
@ -98,7 +96,7 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.AK47ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.AK47ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -88,10 +89,6 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.fire"));
} }
@ -104,7 +101,7 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.Hk416ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.Hk416ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -83,10 +84,6 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.fire"));
} }
@ -99,7 +96,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.M4ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.M4ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -83,10 +84,6 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.fire"));
} }
@ -99,7 +96,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.MarlinItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.MarlinItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -86,10 +87,6 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem {
if (transformType != null && transformType.firstPerson()) { if (transformType != null && transformType.firstPerson()) {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.draw"));
}
if (stack.getOrCreateTag().getInt("flash_time") > 0) { if (stack.getOrCreateTag().getInt("flash_time") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.fire"));
} }
@ -122,7 +119,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.finish")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.finish"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.Mk14ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.Mk14ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -83,10 +84,6 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m14.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.fire"));
} }
@ -99,7 +96,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m14.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m14.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.Qbz95ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.Qbz95ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -82,10 +83,6 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz95.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.fire"));
} }
@ -98,7 +95,7 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.qbz95.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz95.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.qbz95.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.SksItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.SksItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -88,10 +89,6 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sks.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.fire"));
} }
@ -104,7 +101,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sks.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sks.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/Aa12Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.Aa12ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.Aa12ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -89,10 +90,6 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.fire"));
} }
@ -105,7 +102,7 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/AbekiriItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.AbekiriItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.AbekiriItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -90,10 +91,6 @@ public class AbekiriItem extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 11) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.fire"));
} }
@ -106,7 +103,7 @@ public class AbekiriItem extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/M870Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.M870ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.M870ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -85,9 +86,6 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem {
if (transformType != null && transformType.firstPerson()) { if (transformType != null && transformType.firstPerson()) {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.draw"));
}
if (stack.getOrCreateTag().getDouble("fire_animation") > 0 && stack.getOrCreateTag().getDouble("fire_animation") < 15) { if (stack.getOrCreateTag().getDouble("fire_animation") > 0 && stack.getOrCreateTag().getDouble("fire_animation") < 15) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.shift")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.shift"));
@ -113,7 +111,7 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.finish")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.finish"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/smg/VectorItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.VectorItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.VectorItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -82,9 +83,6 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 11) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.fire"));
@ -98,7 +96,7 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/sniper/HuntingRifleItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.HuntingRifleItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.HuntingRifleItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -87,9 +88,6 @@ public class HuntingRifleItem extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.hunting_rifle.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 0) { if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.hunting_rifle.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.hunting_rifle.fire"));
@ -99,7 +97,7 @@ public class HuntingRifleItem extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.hunting_rifle.reload")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.hunting_rifle.reload"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.hunting_rifle.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.hunting_rifle.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/sniper/K98Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.K98ItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.K98ItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -121,16 +122,14 @@ public class K98Item extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.draw"));
}
if (player.isSprinting() && player.onGround() if (player.isSprinting() && player.onGround()
&& player.getPersistentData().getDouble("noRun") == 0 && player.getPersistentData().getDouble("noRun") == 0
&& !(stack.getOrCreateTag().getBoolean("is_empty_reloading")) && !(stack.getOrCreateTag().getBoolean("is_empty_reloading"))
&& stack.getOrCreateTag().getInt("reload_stage") != 1 && stack.getOrCreateTag().getInt("reload_stage") != 1
&& stack.getOrCreateTag().getInt("reload_stage") != 2 && stack.getOrCreateTag().getInt("reload_stage") != 2
&& stack.getOrCreateTag().getInt("reload_stage") != 3) { && stack.getOrCreateTag().getInt("reload_stage") != 3
&& ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/sniper/M98bItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.M98bItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.M98bItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -110,13 +111,10 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.draw"));
}
if (player.isSprinting() && player.onGround() if (player.isSprinting() && player.onGround()
&& player.getPersistentData().getDouble("noRun") == 0 && player.getPersistentData().getDouble("noRun") == 0
&& !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))) { && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/sniper/MosinNagantItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.MosinNagantItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.MosinNagantItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -121,16 +122,14 @@ public class MosinNagantItem extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin.draw"));
}
if (player.isSprinting() && player.onGround() if (player.isSprinting() && player.onGround()
&& player.getPersistentData().getDouble("noRun") == 0 && player.getPersistentData().getDouble("noRun") == 0
&& !(stack.getOrCreateTag().getBoolean("is_empty_reloading")) && !(stack.getOrCreateTag().getBoolean("is_empty_reloading"))
&& stack.getOrCreateTag().getInt("reload_stage") != 1 && stack.getOrCreateTag().getInt("reload_stage") != 1
&& stack.getOrCreateTag().getInt("reload_stage") != 2 && stack.getOrCreateTag().getInt("reload_stage") != 2
&& stack.getOrCreateTag().getInt("reload_stage") != 3) { && stack.getOrCreateTag().getInt("reload_stage") != 3
&& ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/sniper/Ntw20Item.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.Ntw20Renderer; import net.mcreator.superbwarfare.client.renderer.item.Ntw20Renderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -115,13 +116,11 @@ public class Ntw20Item extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 29) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ntw_20.draw"));
}
if (player.isSprinting() && player.onGround() if (player.isSprinting() && player.onGround()
&& player.getPersistentData().getDouble("noRun") == 0 && player.getPersistentData().getDouble("noRun") == 0
&& !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))) { && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))
&& ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ntw_20.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ntw_20.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/sniper/SentinelItem.java
View file

@ -5,6 +5,7 @@ import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.SentinelItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.SentinelItemRenderer;
import net.mcreator.superbwarfare.energy.ItemEnergyProvider; import net.mcreator.superbwarfare.energy.ItemEnergyProvider;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -163,14 +164,11 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sentinel.draw"));
}
if (player.isSprinting() && player.onGround() if (player.isSprinting() && player.onGround()
&& player.getPersistentData().getDouble("noRun") == 0 && player.getPersistentData().getDouble("noRun") == 0
&& !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))
&& !stack.getOrCreateTag().getBoolean("sentinel_is_charging")) { && !stack.getOrCreateTag().getBoolean("sentinel_is_charging") && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sentinel.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sentinel.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/sniper/SvdItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.SvdItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.SvdItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
@ -83,9 +84,6 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem {
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
var tag = stack.getOrCreateTag(); var tag = stack.getOrCreateTag();
if (tag.getInt("draw_time") < 16) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.svd.draw"));
}
if (tag.getInt("fire_animation") > 0) { if (tag.getInt("fire_animation") > 0) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.fire"));
@ -99,7 +97,7 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload_normal"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.svd.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.svd.run_fast"));
} else { } else {

7
src/main/java/net/mcreator/superbwarfare/item/gun/special/BocekItem.java
View file

@ -4,6 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.BocekItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.BocekItemRenderer;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.init.ModTags;
import net.mcreator.superbwarfare.item.AnimatedItem; import net.mcreator.superbwarfare.item.AnimatedItem;
@ -79,11 +80,7 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem {
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (stack.getOrCreateTag().getInt("draw_time") < 16) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.bocek.draw"));
}
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.bocek.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.bocek.run_fast"));
} else { } else {

6
src/main/java/net/mcreator/superbwarfare/item/gun/special/TaserItem.java
View file

@ -5,6 +5,7 @@ import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.TaserItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.TaserItemRenderer;
import net.mcreator.superbwarfare.energy.ItemEnergyProvider; import net.mcreator.superbwarfare.energy.ItemEnergyProvider;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModItems;
import net.mcreator.superbwarfare.init.ModPerks; import net.mcreator.superbwarfare.init.ModPerks;
import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModSounds;
@ -132,9 +133,6 @@ public class TaserItem extends GunItem implements GeoItem, AnimatedItem {
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (this.animationProcedure.equals("empty")) { if (this.animationProcedure.equals("empty")) {
if (stack.getOrCreateTag().getInt("draw_time") < 11) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.taser.draw"));
}
if (stack.getOrCreateTag().getInt("fire_animation") > 1) { if (stack.getOrCreateTag().getInt("fire_animation") > 1) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.fire")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.fire"));
@ -144,7 +142,7 @@ public class TaserItem extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.reload")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.reload"));
} }
if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.taser.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.taser.run_fast"));
} else { } else {

64
src/main/resources/assets/superbwarfare/animations/ak.animation.json
View file

@ -14,70 +14,6 @@
} }
} }
}, },
"animation.ak47.draw": {
"animation_length": 0.9,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [27.21312, -47.42646, -2.0218]
},
"0.3": {
"vector": [12.5, -15, 0]
},
"0.4": {
"vector": [3.48268, 0.40464, 8.20687]
},
"0.6": {
"vector": [0, 0, -2]
},
"0.7": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [3, -17.3, 0]
},
"0.4": {
"vector": [0, 0, -1.65]
},
"0.5": {
"vector": [0, 0, 0.93]
},
"0.7": {
"vector": [0, 0, 0]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.4": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [0.25, -0.5, 0.5],
"easing": "easeInSine"
},
"0.6": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
}
},
"Lefthand": {
"rotation": {
"vector": [27.6003, 27.5697, -16.00843]
},
"position": {
"vector": [-0.6, -2.7, -3.3]
}
}
}
},
"animation.ak47.run": { "animation.ak47.run": {
"loop": true, "loop": true,
"animation_length": 0.8, "animation_length": 0.8,

56
src/main/resources/assets/superbwarfare/animations/devotion.animation.json
View file

@ -5,62 +5,6 @@
"loop": true, "loop": true,
"animation_length": 1 "animation_length": 1
}, },
"animation.devotion.draw": {
"animation_length": 0.9,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [27.21312, -47.42646, -2.0218]
},
"0.3": {
"vector": [12.5, -15, 0]
},
"0.4": {
"vector": [3.48268, 0.40464, 8.20687]
},
"0.6": {
"vector": [0, 0, -2]
},
"0.7": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [3, -17.3, 0]
},
"0.4": {
"vector": [0, 0, -1.65]
},
"0.5": {
"vector": [0, 0, 0.93]
},
"0.7": {
"vector": [0, 0, 0]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.4": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [0.25, -0.5, 0.5],
"easing": "easeInSine"
},
"0.6": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
}
}
}
},
"animation.devotion.fire": { "animation.devotion.fire": {
"animation_length": 0.0404 "animation_length": 0.0404
}, },

110
src/main/resources/assets/superbwarfare/animations/hunting_rifle.animation.json
View file

@ -5,62 +5,6 @@
"loop": true, "loop": true,
"animation_length": 2 "animation_length": 2
}, },
"animation.hunting_rifle.draw": {
"animation_length": 1,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [27.21312, -47.42646, -2.0218]
},
"0.3": {
"vector": [12.5, -15, 0]
},
"0.4": {
"vector": [3.48268, 0.40464, 8.20687]
},
"0.6": {
"vector": [0, 0, -2]
},
"0.7": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [3, -17.3, 0]
},
"0.4": {
"vector": [0, 0, -1.65]
},
"0.5": {
"vector": [0, 0, 0.93]
},
"0.7": {
"vector": [0, 0, 0]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.4": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [0.25, -0.5, 0.5],
"easing": "easeInSine"
},
"0.6": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
}
}
}
},
"animation.hunting_rifle.run": { "animation.hunting_rifle.run": {
"loop": true, "loop": true,
"animation_length": 0.8, "animation_length": 0.8,
@ -68,29 +12,29 @@
"0": { "0": {
"rotation": { "rotation": {
"0.0": { "0.0": {
"vector": [-37.32442, -57.81517, 38.62375], "vector": [-27.32442, -57.81517, 38.62375],
"easing": "easeOutSine" "easing": "easeOutSine"
}, },
"0.2": { "0.2": {
"vector": [-39.32442, -57.81517, 38.62375], "vector": [-31.82442, -57.81517, 38.62375],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.4": { "0.4": {
"vector": [-37.32442, -57.81517, 38.62375], "vector": [-29.82442, -57.81517, 38.62375],
"easing": "easeOutSine" "easing": "easeOutSine"
}, },
"0.6": { "0.6": {
"vector": [-35.32442, -57.81517, 38.62375], "vector": [-27.82442, -57.81517, 38.62375],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.8": { "0.8": {
"vector": [-37.32442, -57.81517, 38.62375], "vector": [-27.32442, -57.81517, 38.62375],
"easing": "easeOutSine" "easing": "easeOutSine"
} }
}, },
"position": { "position": {
"0.0": { "0.0": {
"vector": [3.5, -2, 3], "vector": [2.5, -2, 3],
"easing": "easeOutSine" "easing": "easeOutSine"
}, },
"0.2": { "0.2": {
@ -106,7 +50,7 @@
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.8": { "0.8": {
"vector": [3.5, -2, 3], "vector": [2.5, -2, 3],
"easing": "easeOutSine" "easing": "easeOutSine"
} }
} }
@ -139,55 +83,47 @@
"0": { "0": {
"rotation": { "rotation": {
"0.0": { "0.0": {
"vector": [-69.0441, 21.19359, 4.89071] "vector": [-40.22249, -46.4793, 37.4509]
}, },
"0.175": { "0.175": {
"vector": [-68.56583, 25.29655, 11.27976], "vector": [-52.41973, -45.43811, 49.66922],
"easing": "easeInSine" "easing": "linear"
}, },
"0.35": { "0.35": {
"vector": [-72.46787, 23.53474, 9.68283], "vector": [-40.22249, -46.4793, 37.4509],
"easing": "easeOutSine" "easing": "linear"
}, },
"0.525": { "0.525": {
"vector": [-74.63904, 19.33922, 0.51567], "vector": [-29.15604, -45.73107, 25.36033],
"easing": "easeInSine" "easing": "linear"
}, },
"0.7": { "0.7": {
"vector": [-69.0441, 21.19359, 4.89071] "vector": [-40.22249, -46.4793, 37.4509],
"easing": "linear"
} }
}, },
"position": { "position": {
"0.0": { "0.0": {
"vector": [-5.5, 6, -1], "vector": [4.5, -3, 1]
"easing": "easeOutSine"
}, },
"0.175": { "0.175": {
"vector": [-6.5, 9, -1], "vector": [1.75, -1.75, 1],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.35": { "0.35": {
"vector": [-8.5, 6, -2], "vector": [-0.5, -3, 1],
"easing": "easeOutSine" "easing": "easeInSine"
}, },
"0.525": { "0.525": {
"vector": [-6.5, 9, -1], "vector": [1.75, -1.75, 1],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.7": { "0.7": {
"vector": [-5.5, 6, -1], "vector": [4.5, -3, 1],
"easing": "easeOutSine" "easing": "easeInSine"
} }
} }
}, },
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": { "camera": {
"rotation": { "rotation": {
"0.0": { "0.0": {

142
src/main/resources/assets/superbwarfare/animations/m60.animation.json
View file

@ -11,62 +11,6 @@
} }
} }
}, },
"animation.m60.draw": {
"animation_length": 2,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [27.21312, -47.42646, -2.0218]
},
"0.3": {
"vector": [12.5, -15, 0]
},
"0.7": {
"vector": [3.48268, 0.40464, 8.20687]
},
"1.2": {
"vector": [0, 0, -2]
},
"1.4": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [3, -17.3, 0]
},
"0.7": {
"vector": [0, 0, -1.65]
},
"0.9": {
"vector": [0, 0, 0.93]
},
"1.4": {
"vector": [0, 0, 0]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.7": {
"vector": [0, 0, 0]
},
"1.1": {
"vector": [0.25, -0.5, 0.5],
"easing": "easeInSine"
},
"1.5": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
}
}
}
},
"animation.m60.run": { "animation.m60.run": {
"loop": true, "loop": true,
"animation_length": 0.8, "animation_length": 0.8,
@ -74,47 +18,60 @@
"0": { "0": {
"rotation": { "rotation": {
"0.0": { "0.0": {
"vector": [-9.99453, -38.25629, 32.22539] "vector": [-23.44315, -47.55382, 37.27264]
}, },
"0.2": { "0.2": {
"vector": [-20.17856, -38.52165, 43.13309], "vector": [-35.18187, -46.95286, 50.48032],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.4": { "0.4": {
"vector": [-9.99453, -38.25629, 32.22539], "vector": [-23.44315, -47.55382, 37.27264],
"easing": "easeOutSine" "easing": "easeOutSine"
}, },
"0.6": { "0.6": {
"vector": [-1.34315, -36.55987, 21.85195], "vector": [-13.22697, -46.33332, 24.68726],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.8": { "0.8": {
"vector": [-9.99453, -38.25629, 32.22539], "vector": [-23.44315, -47.55382, 37.27264],
"easing": "easeOutSine" "easing": "easeOutSine"
} }
}, },
"position": { "position": {
"0.0": { "0.0": {
"vector": [3.5, -2, 1] "vector": [3.5, 0, 1]
}, },
"0.2": { "0.2": {
"vector": [0.75, -1.75, 1], "vector": [0.75, 0.25, 1],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.4": { "0.4": {
"vector": [0.5, -2, 1], "vector": [0.5, 0, 1],
"easing": "easeOutSine" "easing": "easeOutSine"
}, },
"0.6": { "0.6": {
"vector": [2.75, -1.75, 1], "vector": [2.75, 0.25, 1],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.8": { "0.8": {
"vector": [3.5, -2, 1], "vector": [3.5, 0, 1],
"easing": "easeOutSine" "easing": "easeOutSine"
} }
} }
}, },
"tiba": {
"rotation": {
"0.0": {
"vector": [0, 0, -22.5]
},
"0.4": {
"vector": [0, 0, 0]
},
"0.8": {
"vector": [0, 0, -22.5]
}
}
},
"camera": { "camera": {
"rotation": { "rotation": {
"0.0": { "0.0": {
@ -133,19 +90,6 @@
"vector": [-0.3, -0.3, 0.3] "vector": [-0.3, -0.3, 0.3]
} }
} }
},
"tiba": {
"rotation": {
"0.0": {
"vector": [0, 0, -22.5]
},
"0.4": {
"vector": [0, 0, 0]
},
"0.8": {
"vector": [0, 0, -22.5]
}
}
} }
} }
}, },
@ -156,44 +100,44 @@
"0": { "0": {
"rotation": { "rotation": {
"0.0": { "0.0": {
"vector": [-71.5441, 21.19359, 4.89071] "vector": [-40.22249, -46.4793, 37.4509]
}, },
"0.175": { "0.175": {
"vector": [-68.62934, 10.13346, 9.45227], "vector": [-52.41973, -45.43811, 49.66922],
"easing": "easeInSine" "easing": "linear"
}, },
"0.35": { "0.35": {
"vector": [-71.08194, 19.41184, 6.64209], "vector": [-40.22249, -46.4793, 37.4509],
"easing": "easeOutSine" "easing": "linear"
}, },
"0.525": { "0.525": {
"vector": [-73.2118, 28.82149, 4.00081], "vector": [-29.15604, -45.73107, 25.36033],
"easing": "easeInSine" "easing": "linear"
}, },
"0.7": { "0.7": {
"vector": [-71.72375, 21.2133, 4.79361] "vector": [-40.22249, -46.4793, 37.4509],
"easing": "linear"
} }
}, },
"position": { "position": {
"0.0": { "0.0": {
"vector": [-5.16449, 3.24106, -2.41075], "vector": [4.5, -1, 1]
"easing": "easeOutSine"
}, },
"0.175": { "0.175": {
"vector": [-6.01808, 5.20195, -2.4316], "vector": [1.75, 0.25, 1],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.35": { "0.35": {
"vector": [-7.14782, 3.23777, -2.41358], "vector": [-0.5, -1, 1],
"easing": "easeOutSine" "easing": "easeInSine"
}, },
"0.525": { "0.525": {
"vector": [-6.27505, 5.25654, -2.3913], "vector": [1.75, 0.25, 1],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.7": { "0.7": {
"vector": [-5.16513, 3.23951, -2.40714], "vector": [4.5, -1, 1],
"easing": "easeOutSine" "easing": "easeInSine"
} }
} }
}, },
@ -216,14 +160,6 @@
} }
} }
}, },
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": { "camera": {
"rotation": { "rotation": {
"0.0": { "0.0": {

76
src/main/resources/assets/superbwarfare/animations/m98b.animation.json
View file

@ -15,62 +15,6 @@
} }
} }
}, },
"animation.m98b.draw": {
"animation_length": 1,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [27.21312, -47.42646, -2.0218]
},
"0.3": {
"vector": [12.5, -15, 0]
},
"0.4": {
"vector": [3.48268, 0.40464, 8.20687]
},
"0.6": {
"vector": [0, 0, -2]
},
"0.7": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [3, -17.3, 0]
},
"0.4": {
"vector": [0, 0, -1.65]
},
"0.5": {
"vector": [0, 0, 0.93]
},
"0.7": {
"vector": [0, 0, 0]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.4": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [0.25, -0.5, 0.5],
"easing": "easeInSine"
},
"0.6": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
}
}
}
},
"animation.m98b.run": { "animation.m98b.run": {
"loop": true, "loop": true,
"animation_length": 0.8, "animation_length": 0.8,
@ -163,43 +107,43 @@
"0": { "0": {
"rotation": { "rotation": {
"0.0": { "0.0": {
"vector": [-65.32786, 12.14905, 0.43184] "vector": [-71.5441, 21.19359, 4.89071]
}, },
"0.175": { "0.175": {
"vector": [-65.21083, 16.27391, 6.66077], "vector": [-70.81031, 14.38777, 10.95347],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.35": { "0.35": {
"vector": [-68.74727, 14.25203, 5.74607], "vector": [-71.6528, 13.72572, 4.64286],
"easing": "easeOutSine" "easing": "easeOutSine"
}, },
"0.525": { "0.525": {
"vector": [-70.53091, 9.93418, -3.00092], "vector": [-71.51765, 24.09022, 2.19363],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.7": { "0.7": {
"vector": [-65.32786, 12.14905, 0.43184] "vector": [-71.72375, 21.2133, 4.79361]
} }
}, },
"position": { "position": {
"0.0": { "0.0": {
"vector": [-4.52807, 1.28395, -0.712], "vector": [-4.52807, -0.71605, 0.288],
"easing": "easeOutSine" "easing": "easeOutSine"
}, },
"0.175": { "0.175": {
"vector": [-5.57571, 3.65883, -0.7884], "vector": [-5.57571, 1.65883, 0.2116],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.35": { "0.35": {
"vector": [-7.57844, 1.1221, -2.22187], "vector": [-7.57844, -0.8779, -1.22187],
"easing": "easeOutSine" "easing": "easeOutSine"
}, },
"0.525": { "0.525": {
"vector": [-5.75027, 3.85577, -0.76616], "vector": [-5.75027, 1.85577, 0.23384],
"easing": "easeInSine" "easing": "easeInSine"
}, },
"0.7": { "0.7": {
"vector": [-4.52807, 1.28395, -0.712], "vector": [-4.52807, -0.71605, 0.288],
"easing": "easeOutSine" "easing": "easeOutSine"
} }
} }

532
src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json
View file

@ -4,165 +4,7 @@
"animation.ntw_20.idle": { "animation.ntw_20.idle": {
"animation_length": 1 "animation_length": 1
}, },
"animation.ntw_20.draw": {
"animation_length": 1.8,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [27.21312, -47.42646, -2.0218]
},
"0.5": {
"vector": [12.5, -15, 0]
},
"0.7": {
"vector": [3.48268, 0.40464, 8.20687]
},
"1.1": {
"vector": [0, 0, -2]
},
"1.4": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
}
},
"position": {
"0.0": {
"vector": [3, -17.3, 0]
},
"0.7": {
"vector": [0, 0, -1.65]
},
"0.9": {
"vector": [0, 0, 0.93]
},
"1.4": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
}
}
}
}
},
"animation.ntw_20.fire": {
"loop": "hold_on_last_frame",
"animation_length": 0.7917,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-5, 0, 0]
},
"0.1667": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
}
}
},
"action": {
"position": {
"0.0": {
"vector": [0, 0, 4]
},
"0.3333": {
"vector": [0, 0, 0],
"easing": "easeInBounce",
"easingArgs": [0.1]
}
}
},
"Lefthand": {
"position": {
"0.0": {
"vector": [0, 0, -4]
},
"0.3333": {
"vector": [0, 0, 0],
"easing": "easeInBounce",
"easingArgs": [0.1]
}
}
}
}
},
"animation.ntw_20.run_fast": { "animation.ntw_20.run_fast": {
"loop": true,
"animation_length": 0.8,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-59.0441, 21.19359, 4.89071]
},
"0.2": {
"vector": [-57.75009, 19.57377, 12.8696],
"easing": "easeInSine"
},
"0.4": {
"vector": [-63.58194, 19.41184, 6.64209],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-64.63904, 19.33922, 0.51567],
"easing": "easeInSine"
},
"0.8": {
"vector": [-59.22375, 21.2133, 4.79361]
}
},
"position": {
"0.0": {
"vector": [-7.5, 1, -3],
"easing": "easeOutSine"
},
"0.2": {
"vector": [-8.5, 4, -3],
"easing": "easeInSine"
},
"0.4": {
"vector": [-9.5, 1, -3],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-8.5, 4, -3],
"easing": "easeInSine"
},
"0.8": {
"vector": [-7.5, 1, -3],
"easing": "easeOutSine"
}
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.ntw_20.run": {
"loop": true, "loop": true,
"animation_length": 0.8, "animation_length": 0.8,
"bones": { "bones": {
@ -231,6 +73,126 @@
} }
} }
}, },
"animation.ntw_20.run": {
"loop": true,
"animation_length": 0.8,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-27.32442, -57.81517, 38.62375],
"easing": "easeOutSine"
},
"0.2": {
"vector": [-31.82442, -57.81517, 38.62375],
"easing": "easeInSine"
},
"0.4": {
"vector": [-29.82442, -57.81517, 38.62375],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-27.82442, -57.81517, 38.62375],
"easing": "easeInSine"
},
"0.8": {
"vector": [-27.32442, -57.81517, 38.62375],
"easing": "easeOutSine"
}
},
"position": {
"0.0": {
"vector": [2.5, -2, 3],
"easing": "easeOutSine"
},
"0.2": {
"vector": [1.75, -1.5, 3],
"easing": "easeInSine"
},
"0.4": {
"vector": [0.5, -2, 3],
"easing": "easeOutSine"
},
"0.6": {
"vector": [1.75, -1.5, 3],
"easing": "easeInSine"
},
"0.8": {
"vector": [2.5, -2, 3],
"easing": "easeOutSine"
}
}
},
"Lefthand": {
"rotation": {
"vector": [-1.41476, -16.33468, -1.66483]
},
"position": {
"vector": [6, -13, 49]
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.175": {
"vector": [0.3, 0, -0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.ntw_20.fire": {
"loop": "hold_on_last_frame",
"animation_length": 0.7917,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [-5, 0, 0]
},
"0.1667": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
}
}
},
"action": {
"position": {
"0.0": {
"vector": [0, 0, 4]
},
"0.3333": {
"vector": [0, 0, 0],
"easing": "easeInBounce",
"easingArgs": [0.1]
}
}
},
"Lefthand": {
"position": {
"0.0": {
"vector": [0, 0, -4]
},
"0.3333": {
"vector": [0, 0, 0],
"easing": "easeInBounce",
"easingArgs": [0.1]
}
}
}
}
},
"animation.ntw_20.shift": { "animation.ntw_20.shift": {
"loop": "hold_on_last_frame", "loop": "hold_on_last_frame",
"animation_length": 2, "animation_length": 2,
@ -540,40 +502,6 @@
} }
} }
}, },
"camera": {
"rotation": {
"0.05": {
"vector": [0, 0, 0]
},
"0.2": {
"vector": [1, 1, -1.5]
},
"0.35": {
"vector": [-0.5, -1, -0.5]
},
"0.6": {
"vector": [0.2, 1, 3],
"easing": "easeInElastic"
},
"0.7": {
"vector": [0.2, 1, 3],
"easing": "easeInElastic"
},
"0.9": {
"vector": [-0.1, -0.2, -2],
"easing": "easeInElastic"
},
"1.0": {
"vector": [0, 0, 1.5]
},
"1.1": {
"vector": [0, 0, -0.75]
},
"1.2": {
"vector": [0, 0, 0]
}
}
},
"Righthand": { "Righthand": {
"rotation": { "rotation": {
"0.0": { "0.0": {
@ -681,6 +609,40 @@
"easing": "easeInElastic" "easing": "easeInElastic"
} }
} }
},
"camera": {
"rotation": {
"0.05": {
"vector": [0, 0, 0]
},
"0.2": {
"vector": [1, 1, -1.5]
},
"0.35": {
"vector": [-0.5, -1, -0.5]
},
"0.6": {
"vector": [0.2, 1, 3],
"easing": "easeInElastic"
},
"0.7": {
"vector": [0.2, 1, 3],
"easing": "easeInElastic"
},
"0.9": {
"vector": [-0.1, -0.2, -2],
"easing": "easeInElastic"
},
"1.0": {
"vector": [0, 0, 1.5]
},
"1.1": {
"vector": [0, 0, -0.75]
},
"1.2": {
"vector": [0, 0, 0]
}
}
} }
}, },
"sound_effects": { "sound_effects": {
@ -869,99 +831,6 @@
} }
} }
}, },
"camera": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [3, 1, -2]
},
"0.25": {
"vector": [-1, -0.5, 1]
},
"0.45": {
"vector": [1.69, 0, 0]
},
"0.625": {
"vector": [3, 0, 1.5],
"easing": "easeInElastic"
},
"0.675": {
"vector": [4, 1, -2],
"easing": "easeInSine"
},
"0.8": {
"vector": [1, -0.5, 1.5]
},
"0.925": {
"vector": [2.5, 0, 1.2],
"easing": "easeOutSine"
},
"1.225": {
"vector": [3.5, 0, 2],
"easing": "easeInElastic"
},
"1.6": {
"vector": [2.89, 0, 0.12]
},
"1.875": {
"vector": [3.34, 0, 1.5]
},
"2.325": {
"vector": [2.5, 0, 2.2],
"easing": "linear"
},
"2.4": {
"vector": [4.5, -0.7, 1.2],
"easing": "easeInSine"
},
"2.45": {
"vector": [2.6, 0.4, -1.5],
"easing": "easeOutSine"
},
"2.55": {
"vector": [2, 0, 1.5],
"easing": "easeInElastic"
},
"2.8": {
"vector": [0.03, 0.25, -1.18]
},
"2.925": {
"vector": [0, 0, -2],
"easing": "easeInElastic"
},
"3.025": {
"vector": [0.2, 0, 0]
},
"3.15": {
"vector": [1, 2, 1.8]
},
"3.2": {
"vector": [-1.5, -3, -1.5]
},
"3.325": {
"vector": [0.2, 1.5, 3]
},
"3.45": {
"vector": [2, 3, -2],
"easing": "easeInElastic"
},
"3.525": {
"vector": [1, -1, 1.5]
},
"3.625": {
"vector": [0, 0.5, -0.75]
},
"3.725": {
"vector": [0, 0, 0.4],
"easing": "linear"
},
"3.875": {
"vector": [0, 0, 0]
}
}
},
"Lefthand": { "Lefthand": {
"rotation": { "rotation": {
"0.1": { "0.1": {
@ -1250,6 +1119,99 @@
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
} }
},
"camera": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [3, 1, -2]
},
"0.25": {
"vector": [-1, -0.5, 1]
},
"0.45": {
"vector": [1.69, 0, 0]
},
"0.625": {
"vector": [3, 0, 1.5],
"easing": "easeInElastic"
},
"0.675": {
"vector": [4, 1, -2],
"easing": "easeInSine"
},
"0.8": {
"vector": [1, -0.5, 1.5]
},
"0.925": {
"vector": [2.5, 0, 1.2],
"easing": "easeOutSine"
},
"1.225": {
"vector": [3.5, 0, 2],
"easing": "easeInElastic"
},
"1.6": {
"vector": [2.89, 0, 0.12]
},
"1.875": {
"vector": [3.34, 0, 1.5]
},
"2.325": {
"vector": [2.5, 0, 2.2],
"easing": "linear"
},
"2.4": {
"vector": [4.5, -0.7, 1.2],
"easing": "easeInSine"
},
"2.45": {
"vector": [2.6, 0.4, -1.5],
"easing": "easeOutSine"
},
"2.55": {
"vector": [2, 0, 1.5],
"easing": "easeInElastic"
},
"2.8": {
"vector": [0.03, 0.25, -1.18]
},
"2.925": {
"vector": [0, 0, -2],
"easing": "easeInElastic"
},
"3.025": {
"vector": [0.2, 0, 0]
},
"3.15": {
"vector": [1, 2, 1.8]
},
"3.2": {
"vector": [-1.5, -3, -1.5]
},
"3.325": {
"vector": [0.2, 1.5, 3]
},
"3.45": {
"vector": [2, 3, -2],
"easing": "easeInElastic"
},
"3.525": {
"vector": [1, -1, 1.5]
},
"3.625": {
"vector": [0, 0.5, -0.75]
},
"3.725": {
"vector": [0, 0, 0.4],
"easing": "linear"
},
"3.875": {
"vector": [0, 0, 0]
}
}
} }
}, },
"sound_effects": { "sound_effects": {

215
src/main/resources/assets/superbwarfare/geo/ak.geo.json
View file

@ -77,6 +77,221 @@
} }
] ]
}, },
{
"name": "shell1",
"parent": "0",
"pivot": [0.60283, 2.61538, -3.10152],
"cubes": [
{
"origin": [0.4238, 2.43635, -3.68242],
"size": [0.35805, 0.35805, 0.9922],
"uv": {
"north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.47, 2.48255, -3.5949],
"size": [0.26565, 0.26565, 1.04328],
"uv": {
"north": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.4238, 2.43635, -2.59782],
"size": [0.35805, 0.35805, 0.0924],
"uv": {
"north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}
}
}
]
},
{
"name": "shell2",
"parent": "0",
"pivot": [0.60283, 2.61538, -3.10152],
"cubes": [
{
"origin": [0.4238, 2.43635, -3.68242],
"size": [0.35805, 0.35805, 0.9922],
"uv": {
"north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.47, 2.48255, -3.5949],
"size": [0.26565, 0.26565, 1.04328],
"uv": {
"north": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.4238, 2.43635, -2.59782],
"size": [0.35805, 0.35805, 0.0924],
"uv": {
"north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}
}
}
]
},
{
"name": "shell3",
"parent": "0",
"pivot": [0.60283, 2.61538, -3.10152],
"cubes": [
{
"origin": [0.4238, 2.43635, -3.68242],
"size": [0.35805, 0.35805, 0.9922],
"uv": {
"north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.47, 2.48255, -3.5949],
"size": [0.26565, 0.26565, 1.04328],
"uv": {
"north": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.4238, 2.43635, -2.59782],
"size": [0.35805, 0.35805, 0.0924],
"uv": {
"north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}
}
}
]
},
{
"name": "shell4",
"parent": "0",
"pivot": [0.60283, 2.61538, -3.10152],
"cubes": [
{
"origin": [0.4238, 2.43635, -3.68242],
"size": [0.35805, 0.35805, 0.9922],
"uv": {
"north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.47, 2.48255, -3.5949],
"size": [0.26565, 0.26565, 1.04328],
"uv": {
"north": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.4238, 2.43635, -2.59782],
"size": [0.35805, 0.35805, 0.0924],
"uv": {
"north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}
}
}
]
},
{
"name": "shell5",
"parent": "0",
"pivot": [0.60283, 2.61538, -3.10152],
"cubes": [
{
"origin": [0.4238, 2.43635, -3.68242],
"size": [0.35805, 0.35805, 0.9922],
"uv": {
"north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.47, 2.48255, -3.5949],
"size": [0.26565, 0.26565, 1.04328],
"uv": {
"north": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.4238, 2.43635, -2.59782],
"size": [0.35805, 0.35805, 0.0924],
"uv": {
"north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]},
"up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]},
"down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}
}
}
]
},
{ {
"name": "gun", "name": "gun",
"parent": "0", "parent": "0",

1088
src/main/resources/assets/superbwarfare/geo/devotion.geo.json
View file

File diff suppressed because it is too large Load diff

4
src/main/resources/assets/superbwarfare/geo/hunting_rifle.geo.json
View file

@ -58,11 +58,11 @@
{ {
"name": "Lefthand", "name": "Lefthand",
"parent": "0", "parent": "0",
"pivot": [3.26122, -6.96314, 5.70867], "pivot": [3.26122, -6.96314, 0.70867],
"rotation": [127.19582, 8.33077, 153.00339], "rotation": [127.19582, 8.33077, 153.00339],
"cubes": [ "cubes": [
{ {
"origin": [1.26122, -6.96314, 3.70867], "origin": [1.26122, -6.96314, -1.29133],
"size": [4, 12, 4], "size": [4, 12, 4],
"uv": { "uv": {
"north": {"uv": [5.17969, 128], "uv_size": [-5.17969, -5.57812]}, "north": {"uv": [5.17969, 128], "uv_size": [-5.17969, -5.57812]},

4
src/main/resources/data/superbwarfare/guns/svd.json
View file

@ -2,8 +2,8 @@
"zoom_speed": 0.9, "zoom_speed": 0.9,
"zoom": 4, "zoom": 4,
"spread": 5.5, "spread": 5.5,
"recoil_x": 0.008, "recoil_x": 0.004,
"recoil_y": 0.015, "recoil_y": 0.009,
"damage": 18, "damage": 18,
"headshot": 2, "headshot": 2,
"velocity": 25, "velocity": 25,