From af6ff7061358db87cbf6168bd0fb0c05669bcab6 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sat, 24 Aug 2024 13:05:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9B=B4=E5=A4=9A=E7=9A=84?= =?UTF-8?q?=E7=9E=84=E5=87=86=E6=97=B6=E6=8D=A2=E5=BC=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/AK47ItemModel.java | 28 +- .../client/model/item/Aa12ItemModel.java | 16 + .../client/model/item/AbekiriItemModel.java | 16 + .../client/model/item/DevotionItemModel.java | 16 + .../client/model/item/Glock17ItemModel.java | 23 ++ .../client/model/item/Glock18ItemModel.java | 23 ++ .../client/model/item/Hk416ItemModel.java | 16 + .../model/item/HuntingRifleItemModel.java | 16 + .../client/model/item/K98ItemModel.java | 23 ++ .../client/model/item/M1911ItemModel.java | 23 ++ .../client/model/item/M4ItemModel.java | 16 + .../client/model/item/M60ItemModel.java | 16 + .../client/model/item/M79ItemModel.java | 16 + .../client/model/item/M870ItemModel.java | 16 + .../client/model/item/M98bItemModel.java | 25 ++ .../client/model/item/MarlinItemModel.java | 20 +- .../client/model/item/Mk14ItemModel.java | 16 + .../client/model/item/Ntw20Model.java | 16 + .../client/model/item/Qbz95ItemModel.java | 16 + .../client/model/item/RpgItemModel.java | 20 +- .../client/model/item/RpkItemModel.java | 16 + .../client/model/item/SentinelItemModel.java | 16 + .../client/model/item/SksItemModel.java | 16 + .../client/model/item/SvdItemModel.java | 16 + .../client/model/item/TaserItemModel.java | 16 + .../model/item/TracheliumItemModel.java | 16 + .../client/model/item/VectorItemModel.java | 16 + .../event/ClientEventHandler.java | 31 +- .../event/PlayerEventHandler.java | 13 +- .../mcreator/superbwarfare/init/ModItems.java | 2 +- .../superbwarfare/init/ModSounds.java | 2 - .../superbwarfare/item/gun/MarlinItem.java | 2 +- .../network/message/BreathMessage.java | 7 - .../animations/m98b.animation.json | 343 ++++++++++++++++++ .../assets/superbwarfare/sounds.json | 16 - .../sounds/breath_exhaustion.ogg | Bin 44628 -> 0 bytes .../assets/superbwarfare/sounds/breath_in.ogg | Bin 17942 -> 0 bytes .../loot_tables/chests/blue_print_common.json | 4 +- .../loot_tables/chests/blue_print_rare.json | 2 +- .../recipes/marlin_smithing.json | 2 +- 40 files changed, 841 insertions(+), 72 deletions(-) delete mode 100644 src/main/resources/assets/superbwarfare/sounds/breath_exhaustion.ogg delete mode 100644 src/main/resources/assets/superbwarfare/sounds/breath_in.ogg diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java index 6a7bebaec..c3799775b 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java @@ -117,6 +117,22 @@ public class AK47ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.94 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.8 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); @@ -124,17 +140,5 @@ public class AK47ItemModel extends GeoModel { player.getPersistentData().putDouble("camera_rot_z", Mth.RAD_TO_DEG * camera.getRotZ()); - CoreGeoBone main = getAnimationProcessor().getBone("0"); - var data = player.getPersistentData(); - float num = (float) (1 - 0.9 * data.getDouble("zoom_time")); - - if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { - main.setRotX(num * main.getRotX()); - main.setRotY(num * main.getRotY()); - main.setRotZ(num * main.getRotZ()); - main.setPosX(num * main.getPosX()); - main.setPosY(num * main.getPosY()); - main.setPosZ(num * main.getPosZ()); - } } } diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java index 19dd86eee..a6ab03031 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java @@ -99,6 +99,22 @@ public class Aa12ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.82 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.68 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); player.getPersistentData().putDouble("camera_rot_y", Mth.RAD_TO_DEG * camera.getRotY()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java index 8561c8c7f..725831def 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java @@ -108,6 +108,22 @@ public class AbekiriItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.42 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.48 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java index 9b4c0ae03..083ad44fc 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java @@ -662,6 +662,22 @@ public class DevotionItemModel extends GeoModel { } CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.82 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.78 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java index 6acad249c..3aa0b915e 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java @@ -127,6 +127,29 @@ public class Glock17ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + CoreGeoBone body = getAnimationProcessor().getBone("gun"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.12 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.68 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + body.setRotX(numR * body.getRotX()); + body.setRotY(numR * body.getRotY()); + body.setRotZ(numR * body.getRotZ()); + body.setPosX(numP * body.getPosX()); + body.setPosY(numP * body.getPosY()); + body.setPosZ(numP * body.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java index 4327d95f7..fdd97968b 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java @@ -135,6 +135,29 @@ public class Glock18ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + CoreGeoBone body = getAnimationProcessor().getBone("gun"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.12 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.68 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + body.setRotX(numR * body.getRotX()); + body.setRotY(numR * body.getRotY()); + body.setRotZ(numR * body.getRotZ()); + body.setPosX(numP * body.getPosX()); + body.setPosY(numP * body.getPosY()); + body.setPosZ(numP * body.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java index ce89fb048..d60580526 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java @@ -109,6 +109,22 @@ public class Hk416ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.88 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.78 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java index 92649c016..2b1461e4c 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java @@ -120,6 +120,22 @@ public class HuntingRifleItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.82 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.78 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java index 137db4bc9..c68c6b73b 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java @@ -118,6 +118,29 @@ public class K98ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + CoreGeoBone body = getAnimationProcessor().getBone("roll"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.52 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.58 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0 || stack.getOrCreateTag().getBoolean("reloading")) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + body.setRotX(numR * body.getRotX()); + body.setRotY(numR * body.getRotY()); + body.setRotZ(numR * body.getRotZ()); + body.setPosX(numP * body.getPosX()); + body.setPosY(numP * body.getPosY()); + body.setPosZ(numP * body.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java index 70b53bef6..25db07786 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java @@ -125,6 +125,29 @@ public class M1911ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + CoreGeoBone body = getAnimationProcessor().getBone("gun"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.12 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.68 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + body.setRotX(numR * body.getRotX()); + body.setRotY(numR * body.getRotY()); + body.setRotZ(numR * body.getRotZ()); + body.setPosX(numP * body.getPosX()); + body.setPosY(numP * body.getPosY()); + body.setPosZ(numP * body.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java index acced6091..2916e1162 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java @@ -111,6 +111,22 @@ public class M4ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.8 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.65 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java index 2b3984040..64d901e38 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java @@ -154,6 +154,22 @@ public class M60ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.88 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.28 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java index 792036d5a..f45b0fcc6 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java @@ -109,6 +109,22 @@ public class M79ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.58 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.58 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java index 003fa32e4..b73696788 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java @@ -112,6 +112,22 @@ public class M870ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("main"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.72 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.82 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getBoolean("reloading")) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java index 222a4223f..3017447ef 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java @@ -128,6 +128,31 @@ public class M98bItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + CoreGeoBone scope = getAnimationProcessor().getBone("scope2"); + + var data = player.getPersistentData(); + float numR = (float) (1 - 0.88 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.68 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + + scope.setRotX(numR * scope.getRotX()); + scope.setRotY(numR * scope.getRotY()); + scope.setRotZ(numR * scope.getRotZ()); + scope.setPosX(numP * scope.getPosX()); + scope.setPosY(numP * scope.getPosY()); + scope.setPosZ(numP * scope.getPosZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java index 56ecd13f2..0e822d8eb 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java @@ -46,11 +46,11 @@ public class MarlinItemModel extends GeoModel { gun.setPosY(1.06f * (float) p - (float) (0.7f * zp)); - gun.setPosZ(1.5f * (float) p + (float) (0.9f * zp)); + gun.setPosZ(4f * (float) p + (float) (0.9f * zp)); gun.setRotZ((float) (0.02f * zp)); - gun.setScaleZ(1f - (0.2f * (float) p)); + gun.setScaleZ(1f - (0.5f * (float) p)); double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); @@ -110,6 +110,22 @@ public class MarlinItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.55 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.88 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getBoolean("reloading")) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java index 88d94f9ce..bd8519f9d 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java @@ -142,6 +142,22 @@ public class Mk14ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.95 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.94 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java index 19b2b63ce..0617c6393 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java @@ -124,6 +124,22 @@ public class Ntw20Model extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.92 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.88 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java index 8c60be04e..af5a308cf 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java @@ -114,6 +114,22 @@ public class Qbz95ItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.92 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.88 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java index b4279faff..d9372687f 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java @@ -64,12 +64,10 @@ public class RpgItemModel extends GeoModel { double zp = player.getPersistentData().getDouble("zoom_pos_z"); gun.setPosX(0.91f * (float) p); - gun.setPosY(-0.04f * (float) p - (float) (0.2f * zp)); - gun.setPosZ(2f * (float) p + (float) (0.15f * zp)); - gun.setRotZ(0.45f * (float) p + (float) (0.02f * zp)); + gun.setScaleZ(1f - (0.5f * (float) p)); CoreGeoBone root = getAnimationProcessor().getBone("root"); @@ -114,6 +112,22 @@ public class RpgItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.82 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.78 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java index 82fdabdb2..490f41455 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java @@ -127,6 +127,22 @@ public class RpkItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.94 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.8 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java index a20a800fa..af1042913 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java @@ -136,6 +136,22 @@ public class SentinelItemModel extends GeoModel { } CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.9 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.98 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java index af5b49395..2f3087623 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java @@ -123,6 +123,22 @@ public class SksItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.92 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.88 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java index d078bfa31..f9eeca05d 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java @@ -140,6 +140,22 @@ public class SvdItemModel extends GeoModel { glass.setPosY(0.2f * (float) fp + 0.5f * (float) vy + (float) y + PosY); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.94 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.88 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java index 7acd6210c..a76fa588e 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java @@ -127,6 +127,22 @@ public class TaserItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.72 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.68 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java index 514fa3c73..fa00e55d9 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java @@ -120,6 +120,22 @@ public class TracheliumItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.22 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.48 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java index 2a71ceff2..36905d728 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java @@ -127,6 +127,22 @@ public class VectorItemModel extends GeoModel { move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + CoreGeoBone main = getAnimationProcessor().getBone("0"); + var data = player.getPersistentData(); + float numR = (float) (1 - 0.92 * data.getDouble("zoom_time")); + float numP = (float) (1 - 0.88 * data.getDouble("zoom_time")); + + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + main.setRotX(numR * main.getRotX()); + main.setRotY(numR * main.getRotY()); + main.setRotZ(numR * main.getRotZ()); + main.setPosX(numP * main.getPosX()); + main.setPosY(numP * main.getPosY()); + main.setPosZ(numP * main.getPosZ()); + camera.setRotX(numR * camera.getRotX()); + camera.setRotY(numR * camera.getRotY()); + camera.setRotZ(numR * camera.getRotZ()); + } player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index 7229f9054..b3446c262 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -73,6 +73,7 @@ public class ClientEventHandler { handleWeaponSway(living); handleWeaponMove(living); handleWeaponZoom(living); + handlePlayerBreath(living); handleWeaponFire(event, living); handleShockCamera(event, living); handlePlayerCameraShake(event, living); @@ -309,18 +310,9 @@ public class ClientEventHandler { var data = entity.getPersistentData(); if ((entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) { - if (data.getDouble("zoom_time") < 1) { - data.putDouble("zoom_time", - (data.getDouble("zoom_time") + entity.getMainHandItem().getOrCreateTag().getDouble("zoom_speed") * 0.03 * times)); - } else { - data.putDouble("zoom_time", 1); - } + data.putDouble("zoom_time", Mth.clamp(data.getDouble("zoom_time") + 0.03 * times,0,1)); } else { - if (data.getDouble("zoom_time") > 0) { - data.putDouble("zoom_time", (data.getDouble("zoom_time") - 0.04 * times)); - } else { - data.putDouble("zoom_time", 0); - } + data.putDouble("zoom_time", Mth.clamp(data.getDouble("zoom_time") - 0.04 * times,0,1)); } data.putDouble("zoom_pos", (0.5 * Math.cos(Math.PI * Math.pow(Math.pow(data.getDouble("zoom_time"), 2) - 1, 2)) + 0.5)); data.putDouble("zoom_pos_z", (-Math.pow(2 * data.getDouble("zoom_time") - 1, 2) + 1)); @@ -398,6 +390,21 @@ public class ClientEventHandler { } } + private static void handlePlayerBreath(LivingEntity entity) { + float fps = Minecraft.getInstance().getFps(); + if (fps <= 0) { + fps = 1f; + } + float times = 110f / fps; + var data = entity.getPersistentData(); + + if ((entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).breath) { + data.putDouble("BreathTime", Mth.clamp(data.getDouble("BreathTime") + 0.06 * times,0,1)); + } else { + data.putDouble("BreathTime", Mth.clamp(data.getDouble("BreathTime") - 0.06 * times,0,1)); + } + } + private static void handleShockCamera(ViewportEvent.ComputeCameraAngles event, LivingEntity entity) { if (entity.hasEffect(ModMobEffects.SHOCK.get()) && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON) { event.setYaw(Minecraft.getInstance().gameRenderer.getMainCamera().getYRot() + (float) Mth.nextDouble(RandomSource.create(), -3, 3)); @@ -465,7 +472,7 @@ public class ClientEventHandler { double p = player.getPersistentData().getDouble("zoom_pos"); double zoom = stack.getOrCreateTag().getDouble("zoom") + stack.getOrCreateTag().getDouble("custom_zoom"); - event.setFOV(event.getFOV() / (1.0 + p * (zoom - 1))); + event.setFOV(event.getFOV() / (1.0 + p * (zoom - 1)) * (1 - 0.4 * player.getPersistentData().getDouble("BreathTime"))); player.getPersistentData().putDouble("fov", event.getFOV()); return; } diff --git a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java index 26511f963..f96d33dcb 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java @@ -129,9 +129,6 @@ public class PlayerEventHandler { } private static void handleBreath(Player player) { - if (player.getPersistentData().getInt("NoBreath") > 0) { - player.getPersistentData().putInt("NoBreath", player.getPersistentData().getInt("NoBreath") - 1); - } if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).breath) { player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { @@ -153,9 +150,6 @@ public class PlayerEventHandler { capability.breath = false; capability.syncPlayerVariables(player); }); - if (player instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, ModSounds.BREATH_EXHAUSTION.get(), 1, 1); - } } if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).breathTime == 100) { @@ -346,12 +340,7 @@ public class PlayerEventHandler { private static void handlePrepareZoom(Player player) { ItemStack stack = player.getMainHandItem(); - if (stack.is(ModTags.Items.GUN) -// && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) - && !player.isSpectator() -// && !stack.getOrCreateTag().getBoolean("charging") -// && !stack.getOrCreateTag().getBoolean("reloading") - ) { + if (stack.is(ModTags.Items.GUN) && !player.isSpectator()) { if (player.getMainHandItem().getItem() != ModItems.MINIGUN.get()) { if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zoom) { player.setSprinting(false); diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index f66bf7756..ae514492f 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -165,7 +165,7 @@ public class ModItems { public static final RegistryObject SENTINEL_BLUEPRINT = ITEMS.register("sentinel_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); public static final RegistryObject M_60_BLUEPRINT = ITEMS.register("m_60_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final RegistryObject SVD_BLUEPRINT = ITEMS.register("svd_blueprint", () -> new BlueprintItem(Rarity.EPIC)); - public static final RegistryObject MARLIN_BLUEPRINT = ITEMS.register("marlin_blueprint", () -> new BlueprintItem(Rarity.RARE)); + public static final RegistryObject MARLIN_BLUEPRINT = ITEMS.register("marlin_blueprint", () -> new BlueprintItem(Rarity.COMMON)); public static final RegistryObject M_870_BLUEPRINT = ITEMS.register("m_870_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final RegistryObject M_98B_BLUEPRINT = ITEMS.register("m_98b_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final RegistryObject AK_47_BLUEPRINT = ITEMS.register("ak_47_blueprint", () -> new BlueprintItem(Rarity.RARE)); diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModSounds.java b/src/main/java/net/mcreator/superbwarfare/init/ModSounds.java index 65feb696f..b6220323d 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModSounds.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModSounds.java @@ -264,6 +264,4 @@ public class ModSounds { public static final RegistryObject DRONE_SOUND = REGISTRY.register("drone_sound", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "drone_sound"))); public static final RegistryObject GRENADE_PULL = REGISTRY.register("grenade_pull", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "grenade_pull"))); public static final RegistryObject GRENADE_THROW = REGISTRY.register("grenade_throw", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "grenade_throw"))); - public static final RegistryObject BREATH_IN = REGISTRY.register("breath_in", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "breath_in"))); - public static final RegistryObject BREATH_EXHAUSTION = REGISTRY.register("breath_exhaustion", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "breath_exhaustion"))); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java index 553bda5fe..95c56439b 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java @@ -48,7 +48,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { public static ItemDisplayContext transformType; public MarlinItem() { - super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); + super(new Item.Properties().stacksTo(1).rarity(Rarity.COMMON)); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/BreathMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/BreathMessage.java index 25ce66347..9b954954b 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/BreathMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/BreathMessage.java @@ -1,10 +1,7 @@ package net.mcreator.superbwarfare.network.message; -import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.network.ModVariables; -import net.mcreator.superbwarfare.tools.SoundTool; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraftforge.network.NetworkEvent; @@ -50,10 +47,6 @@ public class BreathMessage { capability.breath = true; capability.syncPlayerVariables(entity); }); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, ModSounds.BREATH_IN.get(), 1, 1); - } - entity.getPersistentData().putInt("NoBreath", 20); } if (!type) { diff --git a/src/main/resources/assets/superbwarfare/animations/m98b.animation.json b/src/main/resources/assets/superbwarfare/animations/m98b.animation.json index a94fac03c..ec9e9c1ec 100644 --- a/src/main/resources/assets/superbwarfare/animations/m98b.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/m98b.animation.json @@ -1009,6 +1009,204 @@ } } }, + "scope2": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.05": { + "vector": [2.2309, 1.32745, 5.98455] + }, + "0.425": { + "vector": [-24.01, 2.98, -9.37], + "easing": "easeInOutSine" + }, + "0.475": { + "vector": [-22.25012, 1.71575, -15.23679] + }, + "0.525": { + "vector": [-23.67625, 0.53753, -20.43357] + }, + "0.625": { + "vector": [-27.27359, 1.63911, -16.2464] + }, + "0.725": { + "vector": [-25.02119, 0.16741, -19.71243] + }, + "0.825": { + "vector": [-22.36586, -0.75486, -21.85957] + }, + "0.9": { + "vector": [-13.42984, -0.39385, -15.87027] + }, + "1.075": { + "vector": [-22.35117, -0.9689, -22.83651] + }, + "1.225": { + "vector": [-26.3817, -0.19101, -19.94063] + }, + "1.4": { + "vector": [-21.33329, -1.14849, -23.82073] + }, + "1.55": { + "vector": [-18.24, -1.53, -25.8] + }, + "1.85": { + "vector": [-10.66408, -4.02619, -38.55877], + "easing": "easeInSine" + }, + "1.925": { + "vector": [-13.44223, -4.57576, -41.51634] + }, + "2.025": { + "vector": [-10.27854, -4.93547, -43.49053] + }, + "2.1": { + "vector": [-19.33014, -4.0613, -42.67664] + }, + "2.25": { + "vector": [-17.01373, -1.99374, -36.83067] + }, + "2.4": { + "vector": [-12.09992, 3.01404, -13.77342] + }, + "2.675": { + "vector": [-7.40059, 2.13505, 2.35223] + }, + "2.85": { + "vector": [-6.51035, 1.75117, 0.30854] + }, + "3.0": { + "vector": [-5.22334, 2.78078, 12.97442] + }, + "3.175": { + "vector": [-9.62459, 3.44337, 11.29843] + }, + "3.25": { + "vector": [-3.52825, 1.15456, -0.01567] + }, + "3.35": { + "vector": [-2.59087, 0.51593, -2.26254] + }, + "3.475": { + "vector": [-2.96513, 0.06632, -7.37447], + "easing": "easeOutSine" + }, + "3.6": { + "vector": [0, 0, 4.5], + "easing": "easeInOutSine" + }, + "3.775": { + "vector": [1, 0, -0.25] + }, + "4.0": { + "vector": [-0.5, 0, -0.1] + }, + "4.075": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.075": { + "vector": [-0.04, 0.41, 0.04] + }, + "0.375": { + "vector": [-1.1, 0.3, 0.9], + "easing": "easeInQuad" + }, + "0.475": { + "vector": [-1.1, 0, 0.2], + "easing": "easeOutSine" + }, + "0.525": { + "vector": [-1.13656, 0.11648, 0.43653] + }, + "0.65": { + "vector": [-1.11162, 0.03023, 0.28738] + }, + "0.825": { + "vector": [-0.96981, -0.32115, 0.20478] + }, + "0.9": { + "vector": [-0.75494, -0.64671, -0.12279] + }, + "0.975": { + "vector": [-1.1, 0, 0.3] + }, + "1.15": { + "vector": [-0.95347, -0.36221, 0.21435] + }, + "1.325": { + "vector": [-0.84854, -0.60732, 0.04107] + }, + "1.475": { + "vector": [-0.88449, -0.56099, 0.25543] + }, + "1.65": { + "vector": [-0.79, -0.44, 0.2] + }, + "1.85": { + "vector": [-0.89507, -0.06932, 0.3549] + }, + "1.925": { + "vector": [-1.16342, 0.21638, 0.44269] + }, + "2.025": { + "vector": [-1.03823, 0.0689, 0.38061] + }, + "2.1": { + "vector": [-1.27235, 0.41208, 0.43655], + "easing": "easeInSine" + }, + "2.225": { + "vector": [-0.8044, 0.0239, 0.36148], + "easing": "easeOutSine" + }, + "2.3": { + "vector": [-0.55391, 0.01857, 0.28596], + "easing": "easeInSine" + }, + "2.475": { + "vector": [-0.27874, -0.05921, 0.2782] + }, + "2.625": { + "vector": [-0.38027, -0.15396, -0.28202] + }, + "2.8": { + "vector": [-0.21, -0.24, -0.04] + }, + "3.0": { + "vector": [-0.19, 0.19, -0.04] + }, + "3.2": { + "vector": [-0.16, -0.18, 1.11], + "easing": "easeInElastic" + }, + "3.375": { + "vector": [-0.14, -0.16, -0.54], + "easing": "easeInElastic" + }, + "3.475": { + "vector": [-0.02, -0.13, -0.17] + }, + "3.7": { + "vector": [0.05, -0.08, -0.02] + }, + "3.875": { + "vector": [0.1, -0.1, 0.3], + "easing": "easeInElastic" + }, + "4.0": { + "vector": [0, 0.07, -0.21] + }, + "4.075": { + "vector": [0, 0, 0] + } + } + }, "camera": { "rotation": { "0.175": { @@ -1461,6 +1659,151 @@ "vector": [0, 0, 0] } } + }, + "scope2": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.05": { + "vector": [2.2309, 1.32745, 5.98455] + }, + "0.425": { + "vector": [-24.01, 2.98, -9.37], + "easing": "easeInOutSine" + }, + "0.475": { + "vector": [-22.25012, 1.71575, -15.23679] + }, + "0.525": { + "vector": [-23.67625, 0.53753, -20.43357] + }, + "0.625": { + "vector": [-27.27359, 1.63911, -16.2464] + }, + "0.725": { + "vector": [-25.02119, 0.16741, -19.71243] + }, + "0.825": { + "vector": [-22.36586, -0.75486, -21.85957] + }, + "0.9": { + "vector": [-13.42984, -0.39385, -15.87027] + }, + "1.075": { + "vector": [-22.35117, -0.9689, -22.83651] + }, + "1.225": { + "vector": [-26.3817, -0.19101, -19.94063] + }, + "1.4": { + "vector": [-21.33329, -1.14849, -23.82073] + }, + "1.55": { + "vector": [-18.24, -1.53, -25.8] + }, + "1.85": { + "vector": [-10.66408, -4.02619, -38.55877], + "easing": "easeInSine" + }, + "1.925": { + "vector": [-13.44223, -4.57576, -41.51634] + }, + "2.025": { + "vector": [-10.27854, -4.93547, -43.49053] + }, + "2.1": { + "vector": [-19.33014, -4.0613, -42.67664] + }, + "2.25": { + "vector": [-17.01373, -1.99374, -36.83067] + }, + "2.4": { + "vector": [-12.09992, 3.01404, -13.77342] + }, + "2.675": { + "vector": [1, 0, -0.25] + }, + "2.9": { + "vector": [-0.5, 0, -0.1] + }, + "2.975": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.075": { + "vector": [-0.04, 0.41, 0.04] + }, + "0.375": { + "vector": [-1.1, 0.3, 0.9], + "easing": "easeInQuad" + }, + "0.475": { + "vector": [-1.1, 0, 0.2], + "easing": "easeOutSine" + }, + "0.525": { + "vector": [-1.13656, 0.11648, 0.43653] + }, + "0.65": { + "vector": [-1.11162, 0.03023, 0.28738] + }, + "0.825": { + "vector": [-0.96981, -0.32115, 0.20478] + }, + "0.9": { + "vector": [-0.75494, -0.64671, -0.12279] + }, + "0.975": { + "vector": [-1.1, 0, 0.3] + }, + "1.15": { + "vector": [-0.95347, -0.36221, 0.21435] + }, + "1.325": { + "vector": [-0.84854, -0.60732, 0.04107] + }, + "1.475": { + "vector": [-0.88449, -0.56099, 0.25543] + }, + "1.65": { + "vector": [-0.79, -0.44, 0.2] + }, + "1.85": { + "vector": [-0.89507, -0.06932, 0.3549] + }, + "1.925": { + "vector": [-1.16342, 0.21638, 0.44269] + }, + "2.025": { + "vector": [-1.03823, 0.0689, 0.38061] + }, + "2.1": { + "vector": [-1.27235, 0.41208, 0.43655], + "easing": "easeInSine" + }, + "2.225": { + "vector": [-0.8044, 0.0239, 0.36148], + "easing": "easeOutSine" + }, + "2.3": { + "vector": [-0.55391, 0.01857, 0.28596], + "easing": "easeInSine" + }, + "2.675": { + "vector": [0, 0, -0.65] + }, + "2.775": { + "vector": [0, 0, 0.33] + }, + "2.975": { + "vector": [0, 0, 0] + } + } } }, "sound_effects": { diff --git a/src/main/resources/assets/superbwarfare/sounds.json b/src/main/resources/assets/superbwarfare/sounds.json index 8093df4cc..d86f6c2ab 100644 --- a/src/main/resources/assets/superbwarfare/sounds.json +++ b/src/main/resources/assets/superbwarfare/sounds.json @@ -1874,21 +1874,5 @@ "stream": false } ] - }, - "breath_in": { - "sounds": [ - { - "name": "superbwarfare:breath_in", - "stream": false - } - ] - }, - "breath_exhaustion": { - "sounds": [ - { - "name": "superbwarfare:breath_exhaustion", - "stream": false - } - ] } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/sounds/breath_exhaustion.ogg b/src/main/resources/assets/superbwarfare/sounds/breath_exhaustion.ogg deleted file mode 100644 index 900d260df61e9616555a09de001df9e12f05cfe8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44628 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 T-*gI!?8FHm4uWqNnDzevN#iX# diff --git a/src/main/resources/assets/superbwarfare/sounds/breath_in.ogg b/src/main/resources/assets/superbwarfare/sounds/breath_in.ogg deleted file mode 100644 index 6591958afa02ac67bdd1a8fff426c346f603bbe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17942 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 J7Dxm*{uklnU|RqH diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json index 94d6a7c58..a33b99b3f 100644 --- a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json @@ -7,7 +7,7 @@ { "type": "minecraft:item", "name": "superbwarfare:taser_blueprint", - "weight": 40, + "weight": 30, "functions": [ { "function": "set_count", @@ -105,7 +105,7 @@ { "type": "minecraft:item", "name": "superbwarfare:marlin_blueprint", - "weight": 15, + "weight": 35, "functions": [ { "function": "set_count", diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json index e9d27b09a..8d932b449 100644 --- a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json @@ -91,7 +91,7 @@ { "type": "minecraft:item", "name": "superbwarfare:marlin_blueprint", - "weight": 15, + "weight": 9, "functions": [ { "function": "set_count", diff --git a/src/main/resources/data/superbwarfare/recipes/marlin_smithing.json b/src/main/resources/data/superbwarfare/recipes/marlin_smithing.json index a35327432..5cda9ec51 100644 --- a/src/main/resources/data/superbwarfare/recipes/marlin_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/marlin_smithing.json @@ -4,7 +4,7 @@ "item": "superbwarfare:marlin_blueprint" }, "base": { - "item": "superbwarfare:rare_material_pack" + "item": "superbwarfare:common_material_pack" }, "addition": { "tag": "minecraft:logs"