kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

优化动画代码

Browse source
This commit is contained in:
Atsuihsio 2024-09-20 15:43:35 +08:00
parent c96e62798d
commit 95e69bd096
32 changed files with 514 additions and 655 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,8 +45,20 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(1.97f * (float) zp);
gun.setPosY(0.011f * (float) zp - (float) (0.2f * zpz));
@ -56,10 +68,6 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.8));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(-0.01f * (float) (fp + 2 * fr));
shen.setPosZ(0.2f * (float) (fp + 0.54f * fr));
@ -78,17 +86,6 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -41,9 +41,21 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(2.105f * (float) zp);
gun.setPosY(0.17f * (float) zp - (float) (0.2f * zpz));
@ -51,9 +63,6 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
gun.setRotZ((float) (0.02f * zpz));
gun.setScaleZ(1f - (0.4f * (float) zp));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.02f * (float) (fp + 2 * fr));
shen.setPosZ(1.3f * (float) (fp + 0.54f * fr));
@ -70,17 +79,6 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -40,9 +40,21 @@ public class AbekiriItemModel extends GeoModel<AbekiriItem> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(2.45f * (float) zp);
@ -52,9 +64,6 @@ public class AbekiriItemModel extends GeoModel<AbekiriItem> {
gun.setRotZ((float) (0.05f * zpz));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
shen.setPosX(-0.2f * (float) (fp + 2 * fr));
shen.setPosY(0.2f * (float) (fp + 2 * fr));
shen.setPosZ(4.2f * (float) (1.3 * fp + 0.54f * fr));
@ -65,17 +74,6 @@ public class AbekiriItemModel extends GeoModel<AbekiriItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -52,9 +52,23 @@ public class BocekItemModel extends GeoModel<BocekItem> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double pp = ClientEventHandler.getPullPos();
double bp = ClientEventHandler.getBowPos();
double hp = ClientEventHandler.getHandPos();
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
double pp = ClientEventHandler.pullPos;
double bp = ClientEventHandler.bowPos;
double hp = ClientEventHandler.handPos;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
arrow.setPosZ(9f * (float) bp);
rh.setPosZ(9f * (float) hp);
@ -79,9 +93,6 @@ public class BocekItemModel extends GeoModel<BocekItem> {
deng3.setPosZ(0.05f * (float) bp);
deng.setScaleZ(1f + (0.07f * (float) bp));
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
lh.setRotX(0.2f * (float) zp);
shen_pos.setPosX(-3.4f * (float) zp);
@ -92,10 +103,6 @@ public class BocekItemModel extends GeoModel<BocekItem> {
stack.getOrCreateTag().putBoolean("HoloHidden", !((shen_pos.getPosX() < -0.7 && gun.getPosZ() < -2.6)));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
fire.setPosY(-0.01f * (float) (fp + 2 * fr));
fire.setPosZ(3f * (float) (fp + 0.54f * fr));
@ -111,17 +118,6 @@ public class BocekItemModel extends GeoModel<BocekItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -44,9 +44,21 @@ public class DevotionItemModel extends GeoModel<DevotionItem> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(2.17f * (float) zp);
gun.setPosY(0.17f * (float) zp - (float) (0.5f * zpz));
@ -67,9 +79,6 @@ public class DevotionItemModel extends GeoModel<DevotionItem> {
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.8));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.05f * (float) (fp + 2 * fr));
holo.setPosY(-0.03f * (float) (fp + 2.3 * fr));
@ -606,17 +615,6 @@ public class DevotionItemModel extends GeoModel<DevotionItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -43,9 +43,21 @@ public class Glock17ItemModel extends GeoModel<Glock17Item> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(-1.34f * (float) zp);
@ -57,9 +69,6 @@ public class Glock17ItemModel extends GeoModel<Glock17Item> {
gun.setRotZ(-11 * Mth.DEG_TO_RAD * (float) zp + (float) (0.05f * zpz));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.03f * (float) (fp + 2 * fr));
shen.setPosZ(2.6f * (float) (fp + 0.84f * fr));
@ -90,17 +99,6 @@ public class Glock17ItemModel extends GeoModel<Glock17Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -51,9 +51,21 @@ public class Glock18ItemModel extends GeoModel<Glock18Item> {
switch_.setRotX(0);
}
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(-1.34f * (float) zp);
@ -65,9 +77,6 @@ public class Glock18ItemModel extends GeoModel<Glock18Item> {
gun.setRotZ(-11 * Mth.DEG_TO_RAD * (float) zp + (float) (0.05f * zpz));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.03f * (float) (fp + 2 * fr));
shen.setPosZ(2.6f * (float) (fp + 0.84f * fr));
@ -98,17 +107,6 @@ public class Glock18ItemModel extends GeoModel<Glock18Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -42,9 +42,21 @@ public class Hk416ItemModel extends GeoModel<Hk416Item> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(3.34f * (float) zp);
gun.setPosY(0.54f * (float) zp - (float) (0.2f * zpz));
@ -55,9 +67,6 @@ public class Hk416ItemModel extends GeoModel<Hk416Item> {
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 3.1));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(-0.01f * (float) (fp + 2 * fr));
shen.setPosZ(1.2f * (float) (fp + 0.54f * fr));
@ -74,17 +83,6 @@ public class Hk416ItemModel extends GeoModel<Hk416Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -39,9 +39,21 @@ public class HuntingRifleItemModel extends GeoModel<HuntingRifleItem> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(1.95f * (float) zp);
@ -53,9 +65,6 @@ public class HuntingRifleItemModel extends GeoModel<HuntingRifleItem> {
gun.setScaleZ(1f - (0.5f * (float) zp));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
shen.setPosX(-0.05f * (float) (fp + 0.2 * fr));
shen.setPosY(0.3f * (float) (fp + 2 * fr));
shen.setPosZ(4.2f * (float) (1.3 * fp + 0.54f * fr));
@ -77,17 +86,6 @@ public class HuntingRifleItemModel extends GeoModel<HuntingRifleItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -41,9 +41,20 @@ public class JavelinItemModel extends GeoModel<JavelinItem> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(1.66f * (float) zp + (float) (0.2f * zpz));
gun.setPosY(5.5f * (float) zp + (float) (0.8f * zpz));
@ -54,9 +65,6 @@ public class JavelinItemModel extends GeoModel<JavelinItem> {
javelin.setHidden(gun.getPosZ() > 15.85);
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosZ() > 15.85));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
shen.setPosY(0.28f * (float) (fp + 2 * fr));
shen.setPosZ(3.8f * (float) (fp + 0.54f * fr));
shen.setRotX(0.17f * (float) (0.18f * fp + fr));
@ -66,17 +74,6 @@ public class JavelinItemModel extends GeoModel<JavelinItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -53,19 +53,27 @@ public class K98ItemModel extends GeoModel<K98Item> {
clip.setScaleZ(1);
}
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(2.11f * (float) zp);
gun.setPosY(1.52f * (float) zp - (float) (0.2f * zpz));
gun.setPosZ(10f * (float) zp + (float) (0.3f * zpz));
gun.setScaleZ(1f - (0.7f * (float) zp));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.1f * (float) (fp + 2 * fr));
shen.setPosZ(5.6f * (float) (fp + 0.54f * fr));
@ -83,17 +91,6 @@ public class K98ItemModel extends GeoModel<K98Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -43,9 +43,21 @@ public class M1911ItemModel extends GeoModel<M1911Item> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(1.86f * (float) zp);
@ -55,9 +67,6 @@ public class M1911ItemModel extends GeoModel<M1911Item> {
gun.setScaleZ(1f - (0.35f * (float) zp));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.03f * (float) (fp + 2 * fr));
shen.setPosZ(2.6f * (float) (fp + 0.84f * fr));
@ -88,17 +97,6 @@ public class M1911ItemModel extends GeoModel<M1911Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -41,9 +41,21 @@ public class M4ItemModel extends GeoModel<M4Item> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(2.935f * (float) zp);
@ -55,9 +67,6 @@ public class M4ItemModel extends GeoModel<M4Item> {
gun.setRotZ((float) (0.05f * zpz));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.02f * (float) (fp + 2 * fr));
shen.setPosZ(1.6f * (float) (fp + 0.54f * fr));
@ -74,17 +83,6 @@ public class M4ItemModel extends GeoModel<M4Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -84,9 +84,21 @@ public class M60ItemModel extends GeoModel<M60Item> {
b1.setScaleZ(0);
}
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(3.74f * (float) zp);
@ -96,9 +108,6 @@ public class M60ItemModel extends GeoModel<M60Item> {
gun.setRotZ(-0.087f * (float) zp + (float) (0.05f * zpz));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(-0.03f * (float) (fp + 2 * fr));
shen.setPosZ(0.6f * (float) (fp + 0.54f * fr));
@ -117,17 +126,6 @@ public class M60ItemModel extends GeoModel<M60Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -41,9 +41,21 @@ public class M79ItemModel extends GeoModel<M79Item> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(2.2f * (float) zp);
@ -53,9 +65,6 @@ public class M79ItemModel extends GeoModel<M79Item> {
gun.setRotZ((float) (0.05f * zpz));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.4f * (float) (fp + 2 * fr));
shen.setPosZ(3.6f * (float) (fp + 0.54f * fr));
@ -72,17 +81,6 @@ public class M79ItemModel extends GeoModel<M79Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -41,9 +41,21 @@ public class M870ItemModel extends GeoModel<M870Item> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(1.7f * (float) zp);
@ -55,9 +67,6 @@ public class M870ItemModel extends GeoModel<M870Item> {
gun.setScaleZ(1f - (0.2f * (float) zp));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.2f * (float) (fp + 2 * fr));
shen.setPosZ(2.6f * (float) (fp + 0.54f * fr));
@ -75,17 +84,6 @@ public class M870ItemModel extends GeoModel<M870Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -41,26 +41,35 @@ public class M98bItemModel extends GeoModel<M98bItem> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.4f * (float) (fp + 2 * fr));
shen.setPosZ(3.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.18f * (float) (fp + fr));
shen.setPosY(0.2f * (float) (fp + 2 * fr));
shen.setPosZ(4.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.1f * (float) (fp + fr));
shen.setRotZ(0f);
} else {
shen.setPosY(0.7f * (float) (fp + 2 * fr));
shen.setPosZ(4.2f * (float) (fp + 0.54f * fr));
shen.setRotX(0.25f * (float) (0.18f * fp + fr));
shen.setPosY(0.3f * (float) (fp + 2 * fr));
shen.setPosZ(5.2f * (float) (fp + 0.54f * fr));
shen.setRotX(0.15f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
gun.setPosX(2.245f * (float) zp);
gun.setPosY(0.3f * (float) zp - (float) (0.2f * zpz));
@ -69,21 +78,12 @@ public class M98bItemModel extends GeoModel<M98bItem> {
gun.setRotZ((float) (0.02f * zpz));
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.8));
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone zhunxing = getAnimationProcessor().getBone("shi");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
zhunxing.setPosX(75 * movePosX);
zhunxing.setPosY(75 * movePosY);

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

@ -40,9 +40,21 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(1.712f * (float) zp);
@ -54,9 +66,6 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
gun.setScaleZ(1f - (0.5f * (float) zp));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
shen.setPosX(-0.2f * (float) (fp + 2 * fr));
shen.setPosY(0.4f * (float) (fp + 2 * fr));
shen.setPosZ(1.9f * (float) (1.3 * fp + 0.54f * fr));
@ -72,17 +81,6 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -47,16 +47,25 @@ public class MinigunItemModel extends GeoModel<MinigunItem> {
}
float times = 250f / fps;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
float heat = (float) stack.getOrCreateTag().getDouble("heat");
heat_barrels.setScaleZ(4 * heat);
gun.setRotZ((float) (gun.getRotZ() + times * -0.008f * stack.getOrCreateTag().getDouble("minigun_rotation")));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
shen.setPosY(0.1f * (float) (fp + 2 * fr));
shen.setPosZ(2.2f * (float) (0.5 * fp + 1.54f * fr));
shen.setRotX(0.05f * (float) (0.18f * fp + fr));
@ -66,17 +75,6 @@ public class MinigunItemModel extends GeoModel<MinigunItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -51,9 +51,21 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
r.setRotX(-1.5f);
}
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(3.105f * (float) zp);
@ -71,9 +83,6 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
CoreGeoBone shen = getAnimationProcessor().getBone("shen");
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.06f * (float) (fp + 2 * fr));
shen.setPosZ(0.9f * (float) (fp + 0.54f * fr));
@ -105,17 +114,6 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -47,9 +47,21 @@ public class MosinNagantItemModel extends GeoModel<MosinNagantItem> {
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(2.105f * (float) zp);
gun.setPosY(0.766f * (float) zp - (float) (0.2f * zpz));
@ -72,9 +84,6 @@ public class MosinNagantItemModel extends GeoModel<MosinNagantItem> {
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.4));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.07f * (float) (fp + 2 * fr));
shen.setPosZ(3.6f * (float) (fp + 0.54f * fr));
@ -95,17 +104,6 @@ public class MosinNagantItemModel extends GeoModel<MosinNagantItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -44,42 +44,45 @@ public class Ntw20Model extends GeoModel<Ntw20Item> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
if (player.getPersistentData().getDouble("prone") > 0) {
l.setRotX(-1.5f);
r.setRotX(-1.5f);
}
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.4f * (float) (fp + 2 * fr));
shen.setPosZ(3.6f * (float) (fp + 0.54f * fr));
shen.setPosY(0.1f * (float) (fp + 2 * fr));
shen.setPosZ(5.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.1f * (float) (fp + fr));
shen.setRotZ(0f);
} else {
shen.setPosY(1.2f * (float) (fp + 2 * fr));
shen.setPosZ(7.2f * (float) (fp + 0.54f * fr));
shen.setPosY(0.2f * (float) (fp + 2 * fr));
shen.setPosZ(4.2f * (float) (fp + 0.54f * fr));
shen.setRotX(0.1f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr));
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
gun.setPosX(4.54f * (float) zp);
gun.setPosY(-0.45f * (float) zp - (float) (0.2f * zpz));
gun.setPosZ(10.0f * (float) zp + (float) (0.3f * zpz));
gun.setRotZ((float) (0.02f * zpz));
gun.setScaleZ(1f - (0.8f * (float) zp));
scope.setScaleZ(1f - (0.85f * (float) zp));
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 4.3));
@ -87,17 +90,6 @@ public class Ntw20Model extends GeoModel<Ntw20Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -42,9 +42,21 @@ public class Qbz95ItemModel extends GeoModel<Qbz95Item> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(3.73f * (float) zp);
gun.setPosY(-0.5f * (float) zp - (float) (0.2f * zpz));
@ -54,9 +66,6 @@ public class Qbz95ItemModel extends GeoModel<Qbz95Item> {
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 3.1));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(-0.01f * (float) (fp + 2 * fr));
shen.setPosZ(1.2f * (float) (fp + 0.54f * fr));
@ -79,17 +88,6 @@ public class Qbz95ItemModel extends GeoModel<Qbz95Item> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -46,8 +46,21 @@ public class RpgItemModel extends GeoModel<RpgItem> {
hammer.setRotX(-90 * Mth.DEG_TO_RAD);
}
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.02f * (float) (fp + 2 * fr));
@ -62,10 +75,6 @@ public class RpgItemModel extends GeoModel<RpgItem> {
}
shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp));
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
gun.setPosX(0.91f * (float) zp);
gun.setPosY(-0.04f * (float) zp - (float) (0.2f * zpz));
gun.setPosZ(2f * (float) zp + (float) (0.15f * zpz));
@ -75,17 +84,6 @@ public class RpgItemModel extends GeoModel<RpgItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -45,9 +45,21 @@ public class RpkItemModel extends GeoModel<RpkItem> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(1.69f * (float) zp);
@ -70,9 +82,6 @@ public class RpkItemModel extends GeoModel<RpkItem> {
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.65));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(-0.01f * (float) (fp + 2 * fr));
shen.setPosZ(0.7f * (float) (fp + 0.54f * fr));
@ -91,17 +100,6 @@ public class RpkItemModel extends GeoModel<RpkItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -44,9 +44,21 @@ public class SentinelItemModel extends GeoModel<SentinelItem> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(2.928f * (float) zp);
@ -71,17 +83,14 @@ public class SentinelItemModel extends GeoModel<SentinelItem> {
CoreGeoBone holo = getAnimationProcessor().getBone("holo");
holo.setPosY(0.09f);
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.4f * (float) (fp + 2 * fr));
shen.setPosZ(3.6f * (float) (fp + 0.54f * fr));
shen.setPosY(0.1f * (float) (fp + 2 * fr));
shen.setPosZ(4.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.12f * (float) (fp + fr));
shen.setRotZ(0f);
} else {
shen.setPosY(0.7f * (float) (fp + 2 * fr));
shen.setPosZ(4.2f * (float) (fp + 0.54f * fr));
shen.setPosY(0.2f * (float) (fp + 2 * fr));
shen.setPosZ(5.2f * (float) (fp + 0.54f * fr));
shen.setRotX(0.15f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr));
}
@ -94,17 +103,6 @@ public class SentinelItemModel extends GeoModel<SentinelItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -47,9 +47,21 @@ public class SksItemModel extends GeoModel<SksItem> {
bolt.setPosZ(2.5f);
}
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(1.53f * (float) zp);
@ -65,9 +77,6 @@ public class SksItemModel extends GeoModel<SksItem> {
CoreGeoBone shen = getAnimationProcessor().getBone("shen");
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.04f * (float) (fp + 2 * fr));
holo.setPosY(-0.43f * (float) (fp + 2.3 * fr));
@ -86,17 +95,6 @@ public class SksItemModel extends GeoModel<SksItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -51,9 +51,21 @@ public class SvdItemModel extends GeoModel<SvdItem> {
bolt.setPosZ(3.25f);
}
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(2.02f * (float) zp);
@ -75,9 +87,6 @@ public class SvdItemModel extends GeoModel<SvdItem> {
CoreGeoBone shen = getAnimationProcessor().getBone("shen");
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.02f * (float) (fp + 2 * fr));
shen.setPosZ(1.6f * (float) (fp + 0.54f * fr));
@ -99,17 +108,6 @@ public class SvdItemModel extends GeoModel<SvdItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -48,6 +48,22 @@ public class TaserItemModel extends GeoModel<TaserItem> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
AtomicInteger energy = new AtomicInteger(0);
stack.getCapability(ForgeCapabilities.ENERGY).ifPresent(
e -> energy.set(e.getEnergyStored())
@ -73,9 +89,6 @@ public class TaserItemModel extends GeoModel<TaserItem> {
redcover.setScaleZ(1);
}
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
shen.setPosX(-0.05f * (float) (fp + 0.2 * fr));
shen.setPosY(0.1f * (float) (fp + 2 * fr));
shen.setPosZ(1.2f * (float) (1.3 * fp + 0.54f * fr));
@ -83,10 +96,6 @@ public class TaserItemModel extends GeoModel<TaserItem> {
shen.setRotY(0.02f * (float) fr);
shen.setRotZ(-0.02f * (float) (fp + 1.3 * fr));
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
gun.setPosX(1.82f * (float) zp);
gun.setPosY(1.3f * (float) zp - (float) (0.3f * zpz));
@ -98,17 +107,6 @@ public class TaserItemModel extends GeoModel<TaserItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -39,9 +39,21 @@ public class TracheliumItemModel extends GeoModel<Trachelium> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(1.48f * (float) zp);
@ -53,9 +65,6 @@ public class TracheliumItemModel extends GeoModel<Trachelium> {
gun.setScaleZ(1f - (0.2f * (float) zp));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
shen.setPosX(-0.4f * (float) (fp + 0.2 * fr));
shen.setPosY(0.6f * (float) (fp + 2 * fr));
shen.setPosZ(4.2f * (float) (1.3 * fp + 0.54f * fr));
@ -66,17 +75,6 @@ public class TracheliumItemModel extends GeoModel<Trachelium> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -53,9 +53,21 @@ public class VectorItemModel extends GeoModel<VectorItem> {
kmj.setRotX(0);
}
double zt = ClientEventHandler.getZoomTime();
double zp = ClientEventHandler.getZoomPos();
double zpz = ClientEventHandler.getZoomPosZ();
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;
double zpz = ClientEventHandler.zoomPosZ;
double swayX = ClientEventHandler.swayX;
double swayY = ClientEventHandler.swayY;
float moveRotZ = (float) ClientEventHandler.moveRotZ;
float movePosX = (float) ClientEventHandler.movePosX;
float movePosY = (float) ClientEventHandler.movePosY;
double mph = ClientEventHandler.movePosHorizon;
double vY = ClientEventHandler.velocityY;
double turnRotX = ClientEventHandler.turnRot[0];
double turnRotY = ClientEventHandler.turnRot[1];
double turnRotZ = ClientEventHandler.turnRot[2];
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
gun.setPosX(2.35f * (float) zp);
@ -71,9 +83,6 @@ public class VectorItemModel extends GeoModel<VectorItem> {
stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 2));
double fp = ClientEventHandler.getFirePos();
double fr = ClientEventHandler.getFireRot();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
shen.setPosY(0.05f * (float) (fp + 2 * fr));
holo.setPosY(-0.43f * (float) (fp + 2.3 * fr));
@ -90,17 +99,6 @@ public class VectorItemModel extends GeoModel<VectorItem> {
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone move = getAnimationProcessor().getBone("move");
double swayX = ClientEventHandler.getSwayX();
double swayY = ClientEventHandler.getSwayY();
float moveRotZ = (float) ClientEventHandler.getMoveRotZ();
float movePosX = (float) ClientEventHandler.getMovePosX();
float movePosY = (float) ClientEventHandler.getMovePosY();
double mph = ClientEventHandler.getMovePosHorizon();
double vY = ClientEventHandler.getVelocityY();
double turnRotX = ClientEventHandler.getTurnRotX();
double turnRotY = ClientEventHandler.getTurnRotY();
double turnRotZ = ClientEventHandler.getTurnRotZ();
root.setPosX(movePosX);
root.setPosY((float) swayY + movePosY);
root.setRotX((float) swayX);

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

@ -35,41 +35,41 @@ import static net.mcreator.superbwarfare.entity.DroneEntity.ROT_Z;
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
public class ClientEventHandler {
public static double zoomTime = 0;
private static double zoomPos = 0;
private static double zoomPosZ = 0;
private static double swayTime = 0;
private static double swayX = 0;
private static double swayY = 0;
private static double moveXTime = 0;
private static double moveYTime = 0;
private static double movePosX = 0;
private static double movePosY = 0;
private static double moveRotZ = 0;
private static double movePosHorizon = 0;
private static double velocityY = 0;
public static double zoomPos = 0;
public static double zoomPosZ = 0;
public static double swayTime = 0;
public static double swayX = 0;
public static double swayY = 0;
public static double moveXTime = 0;
public static double moveYTime = 0;
public static double movePosX = 0;
public static double movePosY = 0;
public static double moveRotZ = 0;
public static double movePosHorizon = 0;
public static double velocityY = 0;
public static double[] turnRot = {0, 0, 0};
public static double[] cameraRot = {0, 0, 0};
private static double firePosTimer = 0;
private static double fireRotTimer = 0;
private static double firePos = 0;
private static double firePosZ = 0;
private static double fireRot = 0;
private static double droneCameraRotX = 0;
private static double droneCameraRotY = 0;
private static double droneRotX = 0;
private static double droneRotZ = 0;
private static double breathTime = 0;
public static double firePosTimer = 0;
public static double fireRotTimer = 0;
public static double firePos = 0;
public static double firePosZ = 0;
public static double fireRot = 0;
public static double droneCameraRotX = 0;
public static double droneCameraRotY = 0;
public static double droneRotX = 0;
public static double droneRotZ = 0;
public static double breathTime = 0;
public static double fov = 0;
private static double pullTimer = 0;
private static double bowTimer = 0;
private static double handTimer = 0;
private static double pullPos = 0;
private static double bowPos = 0;
private static double handPos = 0;
public static double pullTimer = 0;
public static double bowTimer = 0;
public static double handTimer = 0;
public static double pullPos = 0;
public static double bowPos = 0;
public static double handPos = 0;
@SubscribeEvent
public static void handleWeaponTurn(RenderHandEvent event) {
@ -81,26 +81,16 @@ public class ClientEventHandler {
float yRotOffset = Mth.lerp(event.getPartialTick(), player.yBobO, player.yBob);
float xRot = player.getViewXRot(event.getPartialTick()) - xRotOffset;
float yRot = player.getViewYRot(event.getPartialTick()) - yRotOffset;
if (player.getMainHandItem().is(ModTags.Items.GUN)) {
turnRot[0] = Mth.clamp(0.05 * xRot, -5, 5) * (1 - 0.75 * zoomTime);
turnRot[1] = Mth.clamp(0.05 * yRot, -10, 10) * (1 - 0.75 * zoomTime);
turnRot[2] = Mth.clamp(0.1 * yRot, -10, 10) * (1 - zoomTime);
}
droneCameraRotX = Mth.clamp(0.25f * xRot, -10, 10);
droneCameraRotY = Mth.clamp(0.25f * yRot, -20, 10);
}
public static double getTurnRotX() {
return turnRot[0];
}
public static double getTurnRotY() {
return turnRot[1];
}
public static double getTurnRotZ() {
return turnRot[2];
}
@SubscribeEvent
public static void computeCameraAngles(ViewportEvent.ComputeCameraAngles event) {
ClientLevel level = Minecraft.getInstance().level;
@ -221,14 +211,6 @@ public class ClientEventHandler {
}
}
public static double getSwayX() {
return swayX;
}
public static double getSwayY() {
return swayY;
}
private static void handleWeaponMove(LivingEntity entity) {
if (entity.getMainHandItem().is(ModTags.Items.GUN)) {
float times = 4.5f * Minecraft.getInstance().getDeltaFrameTime();
@ -317,26 +299,6 @@ public class ClientEventHandler {
}
}
public static double getMoveRotZ() {
return moveRotZ;
}
public static double getMovePosX() {
return movePosX;
}
public static double getMovePosY() {
return movePosY;
}
public static double getMovePosHorizon() {
return movePosHorizon;
}
public static double getVelocityY() {
return velocityY;
}
private static void handleWeaponZoom() {
float times = 5 * Minecraft.getInstance().getDeltaFrameTime();
if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
@ -348,18 +310,6 @@ public class ClientEventHandler {
zoomPosZ = -Math.pow(2 * zoomTime - 1, 2) + 1;
}
public static double getZoomTime() {
return zoomTime;
}
public static double getZoomPos() {
return zoomPos;
}
public static double getZoomPosZ() {
return zoomPosZ;
}
private static void handleWeaponFire(ViewportEvent.ComputeCameraAngles event, LivingEntity entity) {
float times = 1.5f * Minecraft.getInstance().getDeltaFrameTime();
double yaw = event.getYaw();
@ -415,14 +365,6 @@ public class ClientEventHandler {
}
}
public static double getFirePos() {
return firePos;
}
public static double getFireRot() {
return fireRot;
}
private static void handlePlayerBreath(LivingEntity entity) {
float times = 4 * Minecraft.getInstance().getDeltaFrameTime();
@ -476,18 +418,6 @@ public class ClientEventHandler {
bowPos = 0.5 * Math.cos(Math.PI * Math.pow(Math.pow(bowTimer, 2) - 1, 2)) + 0.5;
}
public static double getHandPos() {
return handPos;
}
public static double getPullPos() {
return pullPos;
}
public static double getBowPos() {
return bowPos;
}
@SubscribeEvent
public static void onFovUpdate(ViewportEvent.ComputeFov event) {
Player player = Minecraft.getInstance().player;